[Pkg-gnupg-commit] [gnupg2] 284/292: New upstream version 2.1.16

Daniel Kahn Gillmor dkg at fifthhorseman.net
Mon Nov 21 06:31:55 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 648ae6f725cb6b1c0691d070d654fba326d8a43d
Merge: d5cdb89 0a641ad
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sun Nov 20 21:19:00 2016 -0500

    New upstream version 2.1.16

 AUTHORS                                           |    9 +-
 COPYING                                           |   12 +-
 COPYING.CC0                                       |  123 +
 COPYING.LIB                                       |    8 +-
 ChangeLog                                         | 2473 +++++++
 Makefile.am                                       |   14 +-
 NEWS                                              |   76 +-
 VERSION                                           |    2 +-
 acinclude.m4                                      |    4 +-
 agent/Makefile.am                                 |    8 +-
 agent/agent.h                                     |   14 +-
 agent/cache.c                                     |    2 +-
 agent/call-pinentry.c                             |  115 +-
 agent/call-scd.c                                  |   35 +-
 agent/command-ssh.c                               |   38 +-
 agent/command.c                                   |  151 +-
 agent/cvt-openpgp.c                               |    2 +-
 agent/cvt-openpgp.h                               |    2 +-
 agent/divert-scd.c                                |    2 +-
 agent/findkey.c                                   |   59 +-
 agent/genkey.c                                    |    2 +-
 agent/gpg-agent.c                                 |  398 +-
 agent/learncard.c                                 |   32 +-
 agent/pkdecrypt.c                                 |    2 +-
 agent/pksign.c                                    |   24 +-
 agent/preset-passphrase.c                         |    2 +-
 agent/protect-tool.c                              |    4 +-
 agent/protect.c                                   |    2 +-
 agent/t-protect.c                                 |    2 +-
 agent/trans.c                                     |    2 +-
 agent/trustlist.c                                 |    2 +-
 am/cmacros.am                                     |    2 +-
 autogen.sh                                        |    2 +-
 build-aux/speedo/w32/exdll.h                      |    2 +-
 build-aux/speedo/w32/g4wihelp.c                   |   10 +-
 common/Makefile.am                                |   10 +-
 common/agent-opt.c                                |    2 +-
 common/argparse.h                                 |    2 +-
 common/asshelp.c                                  |   71 +-
 common/asshelp.h                                  |    7 +-
 common/asshelp2.c                                 |    2 +-
 common/audit-events.h                             |    2 +-
 common/audit.c                                    |    2 +-
 common/audit.h                                    |    2 +-
 common/b64dec.c                                   |    2 +-
 common/b64enc.c                                   |    4 +-
 common/call-gpg.c                                 |    2 +-
 common/call-gpg.h                                 |    2 +-
 common/ccparray.c                                 |    2 +-
 common/ccparray.h                                 |    2 +-
 common/common-defs.h                              |    2 +-
 common/convert.c                                  |    4 +-
 common/dotlock.c                                  |    2 +-
 common/dotlock.h                                  |    2 +-
 common/dynload.h                                  |    2 +-
 common/exechelp-posix.c                           |  202 +-
 common/exechelp-w32.c                             |   74 +-
 common/exechelp-w32ce.c                           |    2 +-
 common/exechelp.h                                 |    2 +-
 common/exectool.c                                 |   14 +-
 common/exectool.h                                 |    2 +-
 common/fwddecl.h                                  |    2 +-
 common/get-passphrase.c                           |   12 +-
 common/get-passphrase.h                           |    2 +-
 common/gettime.c                                  |   34 +-
 common/gettime.h                                  |    2 +-
 common/gpgrlhelp.c                                |    2 +-
 common/helpfile.c                                 |    2 +-
 common/homedir.c                                  |    9 +-
 common/host2net.h                                 |    2 +-
 common/i18n.c                                     |    2 +-
 common/init.c                                     |   16 +-
 common/init.h                                     |    2 +-
 common/iobuf.c                                    |    2 +-
 common/iobuf.h                                    |    2 +-
 common/keyserver.h                                |    2 +-
 common/localename.c                               |    2 +-
 common/logging.c                                  |   55 +-
 common/logging.h                                  |    3 +-
 common/mapstrings.c                               |    2 +-
 common/mbox-util.c                                |   24 +-
 common/mbox-util.h                                |   20 +-
 common/membuf.c                                   |    2 +-
 common/membuf.h                                   |    2 +-
 common/miscellaneous.c                            |    2 +-
 common/mischelp.c                                 |    2 +-
 common/mischelp.h                                 |    2 +-
 common/mkdir_p.c                                  |    2 +-
 common/mkdir_p.h                                  |    2 +-
 common/name-value.c                               |    9 +-
 common/name-value.h                               |    2 +-
 common/openpgp-oid.c                              |   14 +-
 common/openpgpdefs.h                              |    2 +-
 common/percent.c                                  |    2 +-
 common/recsel.c                                   |   61 +-
 common/recsel.h                                   |    2 +-
 common/server-help.c                              |    2 +-
 common/server-help.h                              |    2 +-
 common/session-env.c                              |    4 +-
 common/session-env.h                              |    2 +-
 common/sexp-parse.h                               |    2 +-
 common/sexputil.c                                 |    2 +-
 common/shareddefs.h                               |    2 +-
 common/signal.c                                   |    4 +-
 common/simple-pwquery.c                           |   23 +-
 common/simple-pwquery.h                           |    2 +-
 common/ssh-utils.c                                |    2 +-
 common/ssh-utils.h                                |    2 +-
 common/status-codes.h                             |    2 +-
 common/status.c                                   |    2 +-
 common/status.h                                   |    2 +-
 common/stringhelp.c                               |   65 +-
 common/stringhelp.h                               |    2 +-
 common/strlist.c                                  |    2 +-
 common/strlist.h                                  |    2 +-
 common/sysutils.c                                 |  418 +-
 common/sysutils.h                                 |   10 +-
 common/t-b64.c                                    |    2 +-
 common/t-ccparray.c                               |    2 +-
 common/t-convert.c                                |    2 +-
 common/t-exechelp.c                               |    2 +-
 common/t-exectool.c                               |    2 +-
 common/t-gettime.c                                |    2 +-
 common/t-helpfile.c                               |    2 +-
 common/t-mapstrings.c                             |    2 +-
 common/t-mbox-util.c                              |    2 +-
 common/t-name-value.c                             |    2 +-
 common/t-openpgp-oid.c                            |    2 +-
 common/t-percent.c                                |    2 +-
 common/t-recsel.c                                 |   35 +-
 common/t-session-env.c                            |    2 +-
 common/t-sexputil.c                               |    2 +-
 common/t-ssh-utils.c                              |    2 +-
 common/t-stringhelp.c                             |   67 +-
 common/t-strlist.c                                |    2 +-
 common/t-support.h                                |    2 +-
 common/t-sysutils.c                               |    2 +-
 common/t-timestuff.c                              |    2 +-
 common/t-w32-reg.c                                |    2 +-
 common/t-zb32.c                                   |    2 +-
 common/tlv.c                                      |    2 +-
 common/tlv.h                                      |    2 +-
 common/ttyio.c                                    |    2 +-
 common/ttyio.h                                    |    2 +-
 common/types.h                                    |    2 +-
 common/userids.c                                  |    2 +-
 common/userids.h                                  |    2 +-
 common/utf8conv.c                                 |    2 +-
 common/utf8conv.h                                 |    2 +-
 common/util.h                                     |    5 +-
 common/utilproto.h                                |    2 +-
 common/w32-reg.c                                  |    2 +-
 common/w32help.h                                  |    2 +-
 common/xasprintf.c                                |    2 +-
 common/xreadline.c                                |    2 +-
 common/yesno.c                                    |    2 +-
 common/zb32.c                                     |    2 +-
 common/zb32.h                                     |    2 +-
 configure.ac                                      |   53 +-
 dirmngr/Makefile.am                               |   28 +-
 dirmngr/cdblib.c                                  |   13 +-
 dirmngr/certcache.c                               |    2 +-
 dirmngr/crlcache.c                                |    4 +-
 dirmngr/crlcache.h                                |    2 +-
 dirmngr/crlfetch.c                                |    2 +-
 dirmngr/crlfetch.h                                |    2 +-
 dirmngr/dirmngr-client.c                          |    2 +-
 dirmngr/dirmngr.c                                 |  310 +-
 dirmngr/dirmngr.h                                 |   10 +-
 dirmngr/dirmngr_ldap.c                            |    2 +-
 dirmngr/dns-stuff.c                               |   40 +-
 dirmngr/dns-stuff.h                               |    2 +-
 dirmngr/http.c                                    |   51 +-
 dirmngr/http.h                                    |    4 +-
 dirmngr/ks-action.c                               |    2 +-
 dirmngr/ks-action.h                               |    2 +-
 dirmngr/ks-engine-finger.c                        |    2 +-
 dirmngr/ks-engine-hkp.c                           |   71 +-
 dirmngr/ks-engine-http.c                          |    2 +-
 dirmngr/ks-engine-kdns.c                          |    2 +-
 dirmngr/ks-engine-ldap.c                          |   20 +-
 dirmngr/ks-engine.h                               |    2 +-
 dirmngr/ldap-parse-uri.c                          |    2 +-
 dirmngr/ldap-parse-uri.h                          |    2 +-
 dirmngr/ldap-wrapper-ce.c                         |    2 +-
 dirmngr/ldap-wrapper.c                            |    2 +-
 dirmngr/ldap-wrapper.h                            |    2 +-
 dirmngr/ldapserver.h                              |    2 +-
 dirmngr/loadswdb.c                                |  394 ++
 dirmngr/server.c                                  |  123 +-
 dirmngr/t-dns-stuff.c                             |    2 +-
 dirmngr/t-http.c                                  |    2 +-
 dirmngr/t-ldap-parse-uri.c                        |    2 +-
 dirmngr/t-support.h                               |    2 +-
 dirmngr/w32-ldap-help.h                           |    2 +-
 doc/DETAILS                                       |   57 +-
 doc/HACKING                                       |   55 +-
 doc/Makefile.am                                   |   11 +-
 doc/TRANSLATE                                     |    4 +-
 doc/contrib.texi                                  |   22 +-
 doc/debugging.texi                                |   21 +-
 doc/defsincdate                                   |    2 +-
 doc/dirmngr.texi                                  |  100 +-
 doc/examples/README                               |    4 +-
 doc/examples/systemd-user/README                  |   66 +
 doc/examples/systemd-user/dirmngr.service         |   10 +
 doc/examples/systemd-user/dirmngr.socket          |   11 +
 doc/examples/systemd-user/gpg-agent-extra.socket  |   13 +
 doc/examples/systemd-user/gpg-agent-ssh.socket    |   13 +
 doc/examples/systemd-user/gpg-agent.service       |   10 +
 doc/examples/systemd-user/gpg-agent.socket        |   12 +
 doc/glossary.texi                                 |    2 +-
 doc/gnupg.info                                    |  215 -
 doc/gnupg.info-1                                  | 7373 ---------------------
 doc/gnupg.info-2                                  | 4326 ------------
 doc/gpg-agent.texi                                |   80 +-
 doc/gpg.texi                                      |  189 +-
 doc/gpgsm.texi                                    |   81 +-
 doc/gpgv.texi                                     |   16 +
 doc/gpl.texi                                      |    8 +-
 doc/help.be.txt                                   |    4 +-
 doc/help.ca.txt                                   |    4 +-
 doc/help.cs.txt                                   |    4 +-
 doc/help.da.txt                                   |    4 +-
 doc/help.de.txt                                   |    2 +-
 doc/help.el.txt                                   |    4 +-
 doc/help.eo.txt                                   |    4 +-
 doc/help.es.txt                                   |    2 +-
 doc/help.et.txt                                   |    4 +-
 doc/help.fi.txt                                   |    2 +-
 doc/help.fr.txt                                   |    2 +-
 doc/help.gl.txt                                   |    4 +-
 doc/help.hu.txt                                   |    2 +-
 doc/help.id.txt                                   |    2 +-
 doc/help.it.txt                                   |    2 +-
 doc/help.ja.txt                                   |    2 +-
 doc/help.nb.txt                                   |    4 +-
 doc/help.pl.txt                                   |    2 +-
 doc/help.pt.txt                                   |    2 +-
 doc/help.pt_BR.txt                                |    2 +-
 doc/help.ro.txt                                   |    2 +-
 doc/help.ru.txt                                   |    2 +-
 doc/help.sk.txt                                   |    2 +-
 doc/help.sv.txt                                   |    4 +-
 doc/help.tr.txt                                   |    2 +-
 doc/help.txt                                      |   19 +-
 doc/help.zh_CN.txt                                |    2 +-
 doc/help.zh_TW.txt                                |    2 +-
 doc/howto-create-a-server-cert.texi               |    3 +-
 doc/instguide.texi                                |   10 +-
 doc/opt-homedir.texi                              |    4 +-
 doc/scdaemon.texi                                 |   57 +-
 doc/specify-user-id.texi                          |   10 +-
 doc/sysnotes.texi                                 |    2 +-
 doc/tools.texi                                    |  203 +-
 doc/yat2m.c                                       |    3 +-
 g10/ChangeLog-2011                                |    4 +-
 g10/Makefile.am                                   |    4 +-
 g10/armor.c                                       |    4 +-
 g10/build-packet.c                                |   17 +-
 g10/call-agent.c                                  |  264 +-
 g10/call-agent.h                                  |   12 +-
 g10/call-dirmngr.c                                |   18 +-
 g10/call-dirmngr.h                                |    6 +-
 g10/card-util.c                                   |   67 +-
 g10/cipher.c                                      |    2 +-
 g10/compress-bz2.c                                |    2 +-
 g10/compress.c                                    |    2 +-
 g10/cpr.c                                         |   35 +-
 g10/dearmor.c                                     |    2 +-
 g10/decrypt-data.c                                |    2 +-
 g10/decrypt.c                                     |    2 +-
 g10/dek.h                                         |    2 +-
 g10/delkey.c                                      |    2 +-
 g10/ecdh.c                                        |   28 +-
 g10/encrypt.c                                     |    2 +-
 g10/exec.c                                        |    2 +-
 g10/exec.h                                        |    2 +-
 g10/export.c                                      |   88 +-
 g10/filter.h                                      |    2 +-
 g10/free-packet.c                                 |  120 +-
 g10/getkey.c                                      |  371 +-
 g10/gpg.c                                         |  259 +-
 g10/gpg.h                                         |    7 +-
 g10/gpgcompose.c                                  |   42 +-
 g10/gpgsql.c                                      |   12 +-
 g10/gpgsql.h                                      |   18 +-
 g10/gpgv.c                                        |   31 +-
 g10/helptext.c                                    |    2 +-
 g10/import.c                                      |  144 +-
 g10/kbnode.c                                      |    2 +-
 g10/keydb.c                                       |   22 +-
 g10/keydb.h                                       |    9 +-
 g10/keyedit.c                                     |   44 +-
 g10/keygen.c                                      |  288 +-
 g10/keyid.c                                       |    6 +-
 g10/keylist.c                                     |  118 +-
 g10/keyring.c                                     |    6 +-
 g10/keyring.h                                     |    2 +-
 g10/keyserver-internal.h                          |    8 +-
 g10/keyserver.c                                   |   81 +-
 g10/main.h                                        |   11 +-
 g10/mainproc.c                                    |  232 +-
 g10/mdfilter.c                                    |    2 +-
 g10/migrate.c                                     |    2 +-
 g10/misc.c                                        |    7 +-
 g10/openfile.c                                    |    6 +-
 g10/options.h                                     |   10 +-
 g10/packet.h                                      |   16 +-
 g10/parse-packet.c                                |    4 +-
 g10/passphrase.c                                  |    6 +-
 g10/photoid.c                                     |    2 +-
 g10/photoid.h                                     |    2 +-
 g10/pkclist.c                                     |   55 +-
 g10/pkglue.c                                      |   62 +-
 g10/pkglue.h                                      |    2 +-
 g10/plaintext.c                                   |    2 +-
 g10/progress.c                                    |    2 +-
 g10/pubkey-enc.c                                  |    2 +-
 g10/revoke.c                                      |    2 +-
 g10/rmd160.c                                      |    2 +-
 g10/rmd160.h                                      |    2 +-
 g10/server.c                                      |   16 +-
 g10/seskey.c                                      |    2 +-
 g10/sig-check.c                                   |   60 +-
 g10/sign.c                                        |    2 +-
 g10/skclist.c                                     |    2 +-
 g10/sqrtu32.c                                     |  244 +
 g10/sqrtu32.h                                     |   14 +
 g10/t-keydb-get-keyblock.c                        |    2 +-
 g10/t-keydb.c                                     |    2 +-
 g10/t-rmd160.c                                    |    2 +-
 g10/t-stutter.c                                   |    2 +-
 g10/tdbdump.c                                     |    2 +-
 g10/tdbio.c                                       |    2 +-
 g10/tdbio.h                                       |    2 +-
 g10/test-stubs.c                                  |   22 +-
 g10/test.c                                        |    2 +-
 g10/textfilter.c                                  |    2 +-
 g10/tofu.c                                        | 2471 +++++--
 g10/tofu.h                                        |   55 +-
 g10/trust.c                                       |    2 +-
 g10/trustdb.c                                     |  124 +-
 g10/trustdb.h                                     |    2 +-
 g10/verify.c                                      |    2 +-
 g13/Makefile.am                                   |    2 +-
 g13/backend.c                                     |    2 +-
 g13/backend.h                                     |    2 +-
 g13/be-dmcrypt.c                                  |    2 +-
 g13/be-dmcrypt.h                                  |    2 +-
 g13/be-encfs.c                                    |    2 +-
 g13/be-encfs.h                                    |    2 +-
 g13/be-truecrypt.c                                |    2 +-
 g13/be-truecrypt.h                                |    2 +-
 g13/call-syshelp.c                                |    2 +-
 g13/call-syshelp.h                                |    2 +-
 g13/create.c                                      |    2 +-
 g13/create.h                                      |    2 +-
 g13/g13-common.c                                  |    2 +-
 g13/g13-common.h                                  |    2 +-
 g13/g13-syshelp.c                                 |    4 +-
 g13/g13-syshelp.h                                 |    2 +-
 g13/g13.c                                         |    4 +-
 g13/g13.h                                         |    2 +-
 g13/g13tuple.c                                    |    2 +-
 g13/g13tuple.h                                    |    2 +-
 g13/keyblob.c                                     |    2 +-
 g13/keyblob.h                                     |    2 +-
 g13/mount.c                                       |    2 +-
 g13/mount.h                                       |    2 +-
 g13/mountinfo.c                                   |    2 +-
 g13/mountinfo.h                                   |    2 +-
 g13/runner.c                                      |    2 +-
 g13/runner.h                                      |    2 +-
 g13/server.c                                      |    2 +-
 g13/server.h                                      |    2 +-
 g13/sh-blockdev.c                                 |    2 +-
 g13/sh-cmd.c                                      |    6 +-
 g13/sh-dmcrypt.c                                  |    4 +-
 g13/suspend.c                                     |    2 +-
 g13/suspend.h                                     |    2 +-
 g13/t-g13tuple.c                                  |    2 +-
 kbx/Makefile.am                                   |    5 +-
 kbx/kbxutil.c                                     |    2 +-
 kbx/keybox-blob.c                                 |    2 +-
 kbx/keybox-defs.h                                 |    2 +-
 kbx/keybox-dump.c                                 |    2 +-
 kbx/keybox-file.c                                 |    2 +-
 kbx/keybox-init.c                                 |    4 +-
 kbx/keybox-openpgp.c                              |    2 +-
 kbx/keybox-search-desc.h                          |    2 +-
 kbx/keybox-search.c                               |    2 +-
 kbx/keybox-update.c                               |    6 +-
 kbx/keybox-util.c                                 |   68 +-
 kbx/keybox.h                                      |    4 +-
 m4/pkg.m4                                         |    2 +-
 po/ca.po                                          | 2984 +++++----
 po/cs.po                                          | 3009 +++++----
 po/da.po                                          | 2984 +++++----
 po/de.po                                          | 3113 +++++----
 po/el.po                                          | 7188 ++++++++++----------
 po/en at boldquot.po                                 | 2995 +++++----
 po/en at quot.po                                     | 2994 +++++----
 po/eo.po                                          | 4963 +++++++-------
 po/es.po                                          | 5511 +++++++--------
 po/et.po                                          | 5674 ++++++++--------
 po/fi.po                                          | 2980 +++++----
 po/fr.po                                          | 3002 +++++----
 po/gl.po                                          | 5066 +++++++-------
 po/gnupg2.pot                                     | 2901 ++++----
 po/hu.po                                          | 6940 +++++++++----------
 po/id.po                                          | 2980 +++++----
 po/it.po                                          | 3740 ++++++-----
 po/ja.po                                          | 3109 +++++----
 po/nb.po                                          | 3116 +++++----
 po/pl.po                                          | 6540 +++++++++---------
 po/pt.po                                          | 5403 +++++++--------
 po/ro.po                                          | 6387 +++++++++---------
 po/ru.po                                          | 3084 ++++-----
 po/sk.po                                          | 6996 +++++++++----------
 po/sv.po                                          | 2984 +++++----
 po/tr.po                                          | 2982 +++++----
 po/uk.po                                          | 3123 +++++----
 po/zh_CN.po                                       | 2982 +++++----
 po/zh_TW.po                                       | 2988 +++++----
 scd/Makefile.am                                   |    2 +-
 scd/apdu.c                                        |   58 +-
 scd/apdu.h                                        |    3 +-
 scd/app-common.h                                  |    6 +-
 scd/app-dinsig.c                                  |    2 +-
 scd/app-geldkarte.c                               |    2 +-
 scd/app-help.c                                    |    2 +-
 scd/app-nks.c                                     |   12 +-
 scd/app-openpgp.c                                 |  817 ++-
 scd/app-p15.c                                     |    2 +-
 scd/app-sc-hsm.c                                  |    2 +-
 scd/app.c                                         |    7 +-
 scd/atr.c                                         |    2 +-
 scd/atr.h                                         |    2 +-
 scd/ccid-driver.c                                 |   74 +-
 scd/ccid-driver.h                                 |    2 +-
 scd/command.c                                     |   23 +-
 scd/iso7816.c                                     |   11 +-
 scd/iso7816.h                                     |    6 +-
 scd/scdaemon.c                                    |   29 +-
 scd/scdaemon.h                                    |    2 +-
 sm/Makefile.am                                    |    2 +-
 sm/base64.c                                       |    2 +-
 sm/call-agent.c                                   |   97 +-
 sm/call-dirmngr.c                                 |   28 +-
 sm/certchain.c                                    |   74 +-
 sm/certcheck.c                                    |    2 +-
 sm/certdump.c                                     |    2 +-
 sm/certlist.c                                     |   17 +-
 sm/certreqgen-ui.c                                |    2 +-
 sm/certreqgen.c                                   |    4 +-
 sm/decrypt.c                                      |    6 +-
 sm/delete.c                                       |   10 +-
 sm/encrypt.c                                      |    4 +-
 sm/export.c                                       |   13 +-
 sm/fingerprint.c                                  |    2 +-
 sm/gpgsm.c                                        |   23 +-
 sm/gpgsm.h                                        |    7 +-
 sm/import.c                                       |   10 +-
 sm/keydb.c                                        |   94 +-
 sm/keydb.h                                        |   30 +-
 sm/keylist.c                                      |   11 +-
 sm/minip12.c                                      |    2 +-
 sm/minip12.h                                      |    2 +-
 sm/misc.c                                         |    2 +-
 sm/passphrase.c                                   |    2 +-
 sm/passphrase.h                                   |    2 +-
 sm/qualified.c                                    |    2 +-
 sm/server.c                                       |   19 +-
 sm/sign.c                                         |   14 +-
 sm/verify.c                                       |    8 +-
 tests/Makefile.am                                 |   20 +-
 tests/asschk.c                                    |    2 +-
 tests/fake-pinentries/README.txt                  |   38 +
 tests/fake-pinentries/fake-pinentry.php           |   27 +
 tests/fake-pinentries/fake-pinentry.pl            |   27 +
 tests/fake-pinentries/fake-pinentry.py            |   30 +
 tests/fake-pinentries/fake-pinentry.sh            |   33 +
 tests/gpgscm/Makefile.am                          |    2 +-
 tests/gpgscm/Manual.txt                           |    2 +-
 tests/gpgscm/ffi-private.h                        |    2 +-
 tests/gpgscm/ffi.c                                |  235 +-
 tests/gpgscm/ffi.h                                |    4 +-
 tests/gpgscm/ffi.scm                              |   40 +
 tests/gpgscm/init.scm                             |   10 +-
 tests/gpgscm/lib.scm                              |   74 +
 tests/gpgscm/main.c                               |   16 +-
 tests/gpgscm/private.h                            |    2 +-
 tests/gpgscm/repl.scm                             |   42 +-
 tests/gpgscm/scheme-config.h                      |    2 +-
 tests/gpgscm/scheme-private.h                     |   11 +-
 tests/gpgscm/scheme.c                             |  957 +--
 tests/gpgscm/scheme.h                             |   17 +-
 tests/gpgscm/t-child.c                            |   12 +-
 tests/gpgscm/t-child.scm                          |   25 +
 tests/gpgscm/tests.scm                            |   48 +-
 tests/migrations/Makefile.am                      |    2 +-
 tests/openpgp/4gb-packet.scm                      |    1 +
 tests/openpgp/Makefile.am                         |   35 +-
 tests/openpgp/README                              |   92 +-
 tests/openpgp/armdetach.scm                       |    1 +
 tests/openpgp/armdetachm.scm                      |    1 +
 tests/openpgp/armencrypt.scm                      |    1 +
 tests/openpgp/armencryptp.scm                     |    1 +
 tests/openpgp/armor.scm                           |    1 +
 tests/openpgp/armsignencrypt.scm                  |    1 +
 tests/openpgp/armsigs.scm                         |    1 +
 tests/openpgp/clearsig.scm                        |    1 +
 tests/openpgp/conventional-mdc.scm                |   19 +-
 tests/openpgp/conventional.scm                    |    1 +
 tests/openpgp/decrypt-dsa.scm                     |    1 +
 tests/openpgp/decrypt.scm                         |    1 +
 tests/openpgp/default-key.scm                     |    3 +-
 tests/openpgp/defs.inc                            |  265 -
 tests/openpgp/defs.scm                            |  146 +-
 tests/openpgp/detach.scm                          |    1 +
 tests/openpgp/detachm.scm                         |    1 +
 tests/openpgp/ecc.scm                             |    3 +-
 tests/openpgp/encrypt-dsa.scm                     |    1 +
 tests/openpgp/encrypt.scm                         |    1 +
 tests/openpgp/encryptp.scm                        |    1 +
 tests/openpgp/export.scm                          |    5 +-
 tests/openpgp/fake-pinentry.c                     |   95 +-
 tests/openpgp/finish.scm                          |   23 -
 tests/openpgp/genkey1024.scm                      |    1 +
 tests/openpgp/gpgtar.scm                          |    1 +
 tests/openpgp/gpgv-forged-keyring.scm             |    3 +-
 tests/openpgp/import.scm                          |    5 +-
 tests/openpgp/issue2015.scm                       |    4 +-
 tests/openpgp/issue2346.scm                       |   15 +-
 tests/openpgp/issue2417.scm                       |   23 +-
 tests/openpgp/issue2419.scm                       |    3 +-
 tests/openpgp/key-selection.scm                   |   83 +
 tests/openpgp/key-selection/0.asc                 |   30 +
 tests/openpgp/key-selection/1.asc                 |   30 +
 tests/openpgp/key-selection/2.asc                 |   30 +
 tests/openpgp/key-selection/3.asc                 |   43 +
 tests/openpgp/key-selection/4.asc                 |   18 +
 tests/openpgp/mds.scm                             |    1 +
 tests/openpgp/multisig.scm                        |    3 +-
 tests/openpgp/pinentry.sh                         |   28 -
 tests/openpgp/quick-key-manipulation.scm          |   83 +
 tests/openpgp/run-tests.scm                       |  196 +-
 tests/openpgp/seat.scm                            |    1 +
 tests/openpgp/setup.scm                           |  109 +-
 tests/openpgp/{4gb-packet.scm => shell.scm}       |   18 +-
 tests/openpgp/signencrypt-dsa.scm                 |    1 +
 tests/openpgp/signencrypt.scm                     |    1 +
 tests/openpgp/sigs-dsa.scm                        |    1 +
 tests/openpgp/sigs.scm                            |    1 +
 tests/openpgp/ssh.scm                             |    1 +
 tests/openpgp/tofu.scm                            |  312 +-
 tests/openpgp/tofu/cross-sigs/871C2247-1.gpg      |  Bin 0 -> 1173 bytes
 tests/openpgp/tofu/cross-sigs/871C2247-1.txt      |  Bin 0 -> 321 bytes
 tests/openpgp/tofu/cross-sigs/871C2247-2.gpg      |  Bin 0 -> 1460 bytes
 tests/openpgp/tofu/cross-sigs/871C2247-2.txt      |  Bin 0 -> 333 bytes
 tests/openpgp/tofu/cross-sigs/871C2247-3.gpg      |  Bin 0 -> 1800 bytes
 tests/openpgp/tofu/cross-sigs/871C2247-3.txt      |  Bin 0 -> 334 bytes
 tests/openpgp/tofu/cross-sigs/871C2247-4.gpg      |  Bin 0 -> 2087 bytes
 tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg |  Bin 0 -> 2475 bytes
 tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg      |  Bin 0 -> 1171 bytes
 tests/openpgp/tofu/cross-sigs/EC38277E-1.txt      |  Bin 0 -> 321 bytes
 tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg      |  Bin 0 -> 1458 bytes
 tests/openpgp/tofu/cross-sigs/EC38277E-2.txt      |  Bin 0 -> 334 bytes
 tests/openpgp/tofu/cross-sigs/EC38277E-3.txt      |  Bin 0 -> 334 bytes
 tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg |  Bin 0 -> 2473 bytes
 tests/openpgp/tofu/cross-sigs/README              |   79 +
 tests/openpgp/use-exact-key.scm                   |    1 +
 tests/openpgp/verify.scm                          |   88 +-
 tests/openpgp/version.scm                         |    1 +
 tests/pkits/Makefile.am                           |    2 +-
 tests/pkits/README                                |    2 +-
 tools/Makefile.am                                 |   30 +-
 tools/applygnupgdefaults                          |    2 +-
 tools/call-dirmngr.c                              |   57 +-
 tools/call-dirmngr.h                              |    3 +-
 tools/ccidmon.c                                   |   25 +-
 tools/gpg-check-pattern.c                         |    2 +-
 tools/gpg-connect-agent.c                         |    4 +-
 tools/gpg-wks-client.c                            |  337 +-
 tools/gpg-wks-server.c                            |  487 +-
 tools/gpg-wks.h                                   |   29 +-
 tools/gpgconf-comp.c                              |   99 +-
 tools/gpgconf.c                                   |  262 +-
 tools/gpgconf.h                                   |    2 +-
 tools/gpgparsemail.c                              |    2 +-
 tools/gpgsplit.c                                  |    2 +-
 tools/gpgtar-create.c                             |    6 +-
 tools/gpgtar-extract.c                            |   10 +-
 tools/gpgtar-list.c                               |    2 +-
 tools/gpgtar.c                                    |    2 +-
 tools/gpgtar.h                                    |    2 +-
 tools/make-dns-cert.c                             |    2 +-
 tools/mime-maker.c                                |  280 +-
 tools/mime-maker.h                                |    8 +-
 tools/mime-parser.c                               |   79 +-
 tools/mime-parser.h                               |    9 +-
 tools/mk-tdata.c                                  |   75 -
 tools/rfc822parse.c                               |    2 +-
 tools/rfc822parse.h                               |    2 +-
 tools/send-mail.c                                 |    2 +-
 tools/send-mail.h                                 |    2 +-
 tools/sockprox.c                                  |    2 +-
 tools/symcryptrun.c                               |    2 +-
 tools/watchgnupg.c                                |    2 +-
 tools/wks-receive.c                               |   78 +-
 tools/wks-util.c                                  |  110 +-
 612 files changed, 75904 insertions(+), 75169 deletions(-)

diff --cc ChangeLog
index ce3a460,8bd68a6..6114a5d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13201 -1,16 +1,15674 @@@
 -No more ChangeLog files
 -========================
++2016-11-18  Werner Koch  <wk at gnupg.org>
+ 
 -Do not modify any of the ChangeLog files in GnuPG.  Starting on
 -December 1st, 2011 we put change information only in the GIT commit
 -log, and generate a top-level ChangeLog file from logs at "make dist"
 -time.  As such, there are strict requirements on the form of the
 -commit log messages.  See doc/HACKING for details.  The old ChangeLog
 -files have all be renamed to ChangeLog-2011.
++	Release 2.1.16.
+ 
++2016-11-18  Ineiev  <ineiev at gnu.org>
+ 
++	po: Update Russian translation.
+ 
 -Local Variables:
 -buffer-read-only: t
 -mode: text
 -End:
++2016-11-18  NIIBE Yutaka  <gniibe at fsij.org>
++
++	g10: Fix flags to open for lock of ToFU.
++	* g10/tofu.c (busy_handler): Fix the flags and utime is not needed.
++
++2016-11-18  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Use a longer timer tick interval.
++	* dirmngr/dirmngr.c (TIMERTICK_INTERVAL): Always use 60 seconds like
++	we did for WindowsCE.
++
++2016-11-18  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	dirmngr: More w32 system daemon cleanup.
++	* dirmngr/dirmngr.c (handle_tick): Remove w32 tests for
++	shutdown_pending; no longer needed.
++
++2016-11-18  NIIBE Yutaka  <gniibe at fsij.org>
++
++	g10: Fix creating a lock for ToFU.
++	* g10/tofu.c (busy_handler): Add third argument which is mandatory for
++	O_CREATE flag.
++
++	scd: Don't limit to ST-2xxx for PC/SC.
++	* scd/apdu.c (pcsc_vendor_specific_init): Only check vender ID.
++
++2016-11-17  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	dirmngr: Use a default keyserver if none is explicitly set.
++	* configure.ac: Define DIRMNGR_DEFAULT_KEYSERVER.
++	* dirmngr/server.c (ensure_keyserver): Use it if no keyservers are set.
++	* doc/dirmngr.texi: Document this behavior.
++
++	dirmngr: Add system CAs if no hkp-cacert is given.
++	* dirmngr/dirmngr.c (http_session_new): If the user isn't talking to
++	the HKPS pool, and they have not specified any hkp-cacert, then we
++	should default to the system CAs, rather than nothing.
++	* doc/dirmngr.texi: Document choice of CAs.
++
++	dirmngr: Register hkp-cacert even if the file doesn't exist yet.
++	* dirmngr/dirmngr.c (parse_readable_options): If we're unable to turn
++	an argument for hkp-cacert into an absolute filename, terminate
++	completely.
++	* dirmngr/http.c (http_register_tls_ca): Show a warning if file is not
++	immediately accessible, but register it anyway.
++
++2016-11-17  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Re-enable the garbage collector in case of errors.
++	* tests/gpgscm/scheme.c (opexe_0): Enable gc before calling 'Error_1'.
++
++	Fixes-commit: 83c184a66b73f312425b01008f0495610e5329a4
++
++	gpgscm: Fix string.
++	* tests/gpgscm/scheme.c (type_to_string): Fix string.
++
++2016-11-17  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Auto-sownload the swdb.lst.
++	* dirmngr/dirmngr.h (struct opt): Add field allow_version_check.
++	* dirmngr/dirmngr.c (oAllowVersionCheck): New.
++	(opts): Add --allow-version-check.
++	(network_activity_seen): New variable.
++	(parse_rereadable_options): Set opt.allow_version_check.
++	(main) <aGPGConfList>: Do not anymore set the no change flag for
++	Windows.  Add allow-version-check.
++	(netactivity_action): Set network_activity_seen.
++	(housekeeping_thread): Call dirmngr_load_swdb.
++	* tools/gpgconf-comp.c (gc_options_dirmngr): Add allow-version-check.
++	Make "use-tor" available at Basic level.
++
++	dirmngr: Improve downloading of swdb.lst.
++	* dirmngr/loadswdb.c (time_of_saved_swdb): Aslo return the "verified"
++	timestamp.
++	(dirmngr_load_swdb): Avoid unnecessary disk or network access witout
++	FORCE.  Do not update swdb.lst if it did not change.
++
++	gpgconf: Change the displayed names of the components.
++
++2016-11-16  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Add command to only load the swdb.
++	* dirmngr/loadswdb.c: New.
++	* dirmngr/Makefile.am (dirmngr_SOURCES): Add that file.
++	* dirmngr/server.c: Remove includes cpparray.h and exectool.h.
++	(cmd_loadswdb): New.
++	(parse_version_number,parse_version_string): Remove.
++	(my_mktmpdir, cmp_version): Remove.
++	(fetch_into_tmpdir): Remove.
++	(struct verify_swdb_parm_s): Remove.
++	(verify_swdb_status_cb): Remove.
++	(cmd_versioncheck): Remove.
++	(register_commands): Register LOADSWDB.  Remove VERSIONCHECK.
++
++	scd,dirmngr: Keep the standard fds when daemonizing.
++	* dirmngr/dirmngr.c (main): Before calling setsid do not close the
++	standard fds but connect them to /dev/null.
++	* scd/scdaemon.c (main): Ditto.  Noet that the old test for a log
++	stream was even reverted.
++
++	common: Rename keybox_file_rename to gnupg_rename_file.
++	* kbx/keybox-util.c (keybox_file_rename): Rename to ...
++	* common/sysutils.c (gnupg_rename_file): this.  Change all callers.
++
++	wks: Always build gpg-wks-client.
++	* tools/Makefile.am (gpg_wks_client): Remove macro.
++	(libexec_PROGRAMS): Add gpg-wks-client.
++
++	gpg: New option --override-session-key-fd.
++	* g10/gpg.c (oOverrideSessionKeyFD): New.
++	(opts): Add option --override-session-key-fd.
++	(main): Handle that option.
++	(read_sessionkey_from_fd): New.
++
++2016-11-15  Werner Koch  <wk at gnupg.org>
++
++	gpgv: New option --enable-special-filenames.
++	* g10/gpgv.c (oEnableSpecialFilenames): New.
++	(opts): Add option --enable-special-filenames.
++	(main): Implement that option.
++
++	gpg: Add new compliance mode "de-vs".
++	* g10/options.h (CO_DE_VS): New.
++	(GNUPG): Also allow CO_DE_VS.
++	* g10/gpg.c (oDE_VS): New.
++	(parse_compliance_option): Add "de-vs".
++	(set_compliance_option): Set "de-vs".
++	* g10/misc.c (compliance_option_string): Return a description string.
++	(compliance_failure): Ditto.
++	* g10/keygen.c (ask_algo): Take care of CO_DE_VS.
++	(get_keysize_range): Ditto.
++	(ask_curve): Add new field to CURVES and trun flags into bit flags.
++	Allow only Brainpool curves in CO_DE_VS mode.
++
++	gpg: Use usual free semantics for packet structure free functions.
++	* g10/free-packet.c (free_attributes): Turn function into a nop for a
++	NULL arg.
++	(free_user_id): Ditto.
++	(free_compressed): Ditto.
++	(free_encrypted): Ditto.
++	(free_plaintext): Ditto.
++	(release_public_key_parts): Avoid extra check for NULL.
++	* g10/getkey.c (get_best_pubkey_byname): Ditto.
++
++2016-11-15  Justus Winter  <justus at g10code.com>
++
++	g10: Optimize key iteration.
++	* g10/getkey.c (get_best_pubkey_byname): Use the node returned by
++	'getkey_next' instead of doing another lookup.
++
++	g10: Fix memory leak.
++	* g10/getkey.c (finish_lookup): Clarify that we do not return a
++	reference.
++	(lookup): Clarify the relation between RET_KEYBLOCK and RET_FOUND_KEY.
++	Check arguments.  Actually release the node if it is not returned.
++
++	g10: Fix iteration over getkey results.
++	* g10/getkey.c (getkey_next): Fix invocation of 'lookup'.  If we want
++	to use RET_FOUND_KEY, RET_KEYBLOCK must be valid.
++
++	Fixes-commit: 8ea72a776a88f3c851e812d258355be80caa1bc1
++
++	g10: Fix use-after-free.
++	* g10/getkey.c (pubkey_cmp): Make a copy of the user id.
++	(get_best_pubkey_byname): Free the user ids.
++
++2016-11-15  Werner Koch  <wk at gnupg.org>
++
++	sm: New stub option --compliance.
++	* sm/gpgsm.c (oCompliance): New.
++	(opts): Add "--compliance".
++	(main): Implement as stub.
++
++2016-11-15  NIIBE Yutaka  <gniibe at fsij.org>
++
++	g10: Fix memory leak.
++	* g10/keyedit.c (menu_adduid): Don't copy 'sig'.
++
++2016-11-15  Werner Koch  <wk at gnupg.org>
++
++	gpg: New option --compliance.
++	* g10/gpg.c (oCompliance): New.
++	(opts): Add "--compliance".
++	(parse_tofu_policy): Use a generic description string for "help".
++	(parse_compliance_option): New.
++	(main): Add option oCompliance.  Factor out code for compliance
++	setting to ...
++	(set_compliance_option): new.
++
++2016-11-15  Justus Winter  <justus at g10code.com>
++
++	g10: Fix memory leak.
++	* g10/keyedit.c (menu_adduid): Deallocate 'sig'.
++
++	gpgscm: Mark cells requiring finalization.
++	* tests/gpgscm/scheme.c (T_FINALIZE): New macro.
++	(mk_port): Use the new macro.
++	(mk_foreign_object): Likewise.
++	(mk_counted_string): Likewise.
++	(mk_empty_string): Likewise.
++	(gc): Only call 'finalize_cell' for cells with the new flag.
++
++	gpgscm: Recover more cells.
++	* tests/gpgscm/scheme.c (_s_return): Recover the cell holding the
++	opcode.
++
++	Fixes-commit: e0cbd3389e2dd6ec19ee3a4c7bad81fa0f1907f5
++
++2016-11-14  Justus Winter  <justus at g10code.com>
++
++	g10: Fix memory leak.
++	* g10/mainproc.c (check_sig_and_print): Free 'pk'.
++
++	Fixes-commit: 37e3c897252babc203447be9d2f286a4507875ad
++
++	gpgscm: Avoid cell allocation overhead.
++	* tests/gpgscm/scheme-private.h (struct scheme): New fields
++	'inhibit_gc', 'reserved_cells', and 'reserved_lineno'.
++	* tests/gpgscm/scheme.c (GC_ENABLED): New macro.
++	(USE_GC_LOCKING): Likewise.
++	(gc_reservations): Likewise.
++	(gc_reservation_failure): New function.
++	(_gc_disable): Likewise.
++	(gc_disable): New macro.
++	(gc_enable): Likewise.
++	(gc_enabled): Likewise.
++	(gc_consume): Likewise.
++	(get_cell_x): Consume reserved cell if garbage collection is disabled.
++	(_get_cell): Assert that gc is enabled.
++	(get_cell): Only record cell in the list of recently allocated cells
++	if gc is enabled.
++	(get_vector_object): Likewise.
++	(gc): Assert that gc is enabled.
++	(s_return): Add comment, adjust call to '_s_return'.
++	(s_return_enable_gc): New macro.
++	(_s_return): Add flag 'enable_gc' and re-enable gc if set.
++	(oblist_add_by_name): Use the new facilities to protect the
++	allocations.
++	(new_frame_in_env): Likewise.
++	(new_slot_spec_in_env): Likewise.
++	(s_save): Likewise.
++	(opexe_0): Likewise.
++	(opexe_1): Likewise.
++	(opexe_2): Likewise.
++	(opexe_5): Likewise.
++	(opexe_6): Likewise.
++	(scheme_init_custom_alloc): Initialize the new fields.
++
++2016-11-14  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Fix status info encoding.
++	* scd/command.c (send_status_info): Do percent plus encoding correctly.
++
++2016-11-12  Werner Koch  <wk at gnupg.org>
++
++	agent: Improve concurrency when Libgcrypt 1.8 is used.
++	* agent/gpg-agent.c (thread_init_once): Tell Libgcrypt to reinit the
++	system call clamp.
++	(agent_libgcrypt_progress_cb): Do not sleep if Libgcrypt is recent
++	enough.
++
++2016-11-11  Werner Koch  <wk at gnupg.org>
++
++	agent: Kludge to mitigate blocking calls in Libgcrypt.
++	* agent/gpg-agent.c (agent_libgcrypt_progress_cb): Sleep for 100ms on
++	"need_entropy".
++
++	dirmngr: Prepare to trigger jobs by network activity.
++	* dirmngr/http.c (netactivity_cb): New.
++	(http_register_netactivity_cb): New.
++	(notify_netactivity): New.
++	(connect_server): Call that function.
++	* dirmngr/dirmngr.c (main): Call http_register_netactivity_cb.
++	(netactivity_action): New stub handler.
++
++2016-11-11  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	agent: Clean up comments.
++	* agent/agent.h: Clean up comments.
++
++2016-11-10  Werner Koch  <wk at gnupg.org>
++
++	gpg,sm: Add STATUS_ERROR keydb_search and keydb_add-resource.
++	* g10/keydb.c (keydb_add_resource): Make ANY_REGISTERED
++	file-global.  Write a STATUS_ERROR.
++	(maybe_create_keyring_or_box): Check for non-accessible but existant
++	file.
++	(keydb_search): Write a STATUS_ERROR if no keyring has been registered
++	but continue to return NOT_FOUND.
++	* sm/keydb.c (keydb_add_resource): Rename ANY_PUBLIC to ANY_REGISTERED
++	and make file-global.  Write a STATUS_ERROR.
++	(keydb_search): Write a STATUS_ERROR if no keyring has been registered
++	but continue to return NOT_FOUND.  Also add new arg CTRL and change
++	all callers to pass it down.
++
++	sm: Remove unused arg SECRET from keydb functions.
++	* sm/keydb.c (struct resource_item): Remove field 'secret'.
++	(keydb_add_resource): Remove arg 'secret' and change all callers.
++	(keydb_new): Ditto.
++
++2016-11-10  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Recover cells from the list of recently allocated cells.
++	* tests/gpgscm/scheme.c (ok_to_freely_gc): Recover cells.
++
++	gpgscm: Recover cells used to maintain interpreter state.
++	* tests/gpgscm/scheme.c (free_cell): New function.
++	(free_cons): Likewise.
++	(_s_return): Use the new function to recover cells used to save the
++	state of the interpreter in 's_save'.  This reduces the need to do a
++	garbage collection considerably.
++
++	gpgscm: Reduce opcode dispatch overhead.
++	* tests/gpgscm/scheme.c (s_thread_to): New macro.
++	(CASE): Likewise.
++	(opexe_[0-6]): Use 'CASE' instead of 'case' statements, replace
++	's_goto' with 's_thread_to' where applicable.
++
++	gpgscm: Make the compile-hook configurable.
++	* tests/gpgscm/scheme-private.h (struct scheme): Make field
++	'COMPILE_HOOK' optional.
++	* tests/gpgscm/scheme.c (opexe_0): Fix guard.
++	(scheme_init_custom_alloc): Conditionally initialize 'COMPILE_HOOK'.
++	* tests/gpgscm/scheme.h (USE_COMPILE_HOOK): Define to 1 by default.
++
++	gpgscm: Drop obsolete commented-out code.
++	* tests/gpgscm/scheme.c (opexe_5): Drop obsolete code.
++
++	gpgscm: Remove dubious stack implementation.
++	* tests/gpgscm/scheme-private.h (struct scheme): Remove related fields.
++	* tests/gpgscm/scheme.c: Drop all !USE_SCHEME_STACK code.
++	* tests/gpgscm/scheme.h (USE_SCHEME_STACK): Remove macro.
++
++2016-11-10  Werner Koch  <wk at gnupg.org>
++
++	gpg: Improve error message for --quick-gen-key.
++	* g10/keygen.c (parse_algo_usage_expire): Use a different error
++	message for an unknown algorithm name.
++
++	dirmngr: Improve concurrency in the non-adns case.
++	* dirmngr/dns-stuff.c (map_adns_status_to_gpg_error): New.
++	(resolve_name_adns, get_dns_cert, get_dns_cname): Use that function.
++	(getsrv) [!USE_ADNS]: Call res_query outside of nPth.
++
++2016-11-08  Justus Winter  <justus at g10code.com>
++
++	tests: Fix environment setup.
++	* tests/openpgp/defs.scm (setup-legacy-environment): Do not call
++	'setup-environment' because that will start the agent, and hence
++	register the atexit function twice.
++
++	Fixes: a55393cb5f4b331cb3a715c7d9a8b91f7606f337
++
++	tests: Log and display output from tests when run in parallel.
++	* tests/openpgp/run-tests.scm (test): Add field 'logfd'.
++	(test::new, test::set-*): Adapt accordingly.
++	(test::set-logfd): New function.
++	(test::open-log-file): Likewise.
++	(test::run-sync): Use the new function.
++	(test::run-async): Likewise.
++	(test::report): Replay the log.
++	(run-tests-parallel): Reverse the results to restore the original
++	order.
++
++	tests: Simplify test.
++	* tests/openpgp/issue2417.scm: Simplify.
++
++	gpgscm: Expose seek and associated constants.
++	* tests/gpgscm/ffi.c (do_seek): New function.
++	(ffi_init): Expose 'seek' and 'SEEK_{SET,CUR,END}'.
++	* tests/gpgscm/lib.scm: Document the new function.
++
++	gpgscm: Fix error message.
++	* tests/gpgscm/ffi.c (do_wait_processes): Fix and improve error
++	messages.
++
++	tests,w32: Make cleanup more robust.
++	* tests/openpgp/run-tests.scm (run-tests-parallel): Catch errors when
++	removing the working directory.  On Windows this can fail if there is
++	still a process using one of the files there.
++	(run-tests-sequential): Likewise.
++
++	common,w32: Simplify locking.
++	* common/asshelp.c (lock_spawning): Use the same code on Windows that
++	we use on all other platforms.
++	(unlock_spawning): Likewise.
++
++2016-11-07  Justus Winter  <justus at g10code.com>
++
++	tests: Write a log file for each test.
++	* tests/openpgp/Makefile.am (CLEANFILES): Delete logs.
++	* tests/openpgp/run-tests.scm (test::run-sync): Write logs.
++
++	gpgscm: Generalize splice to write to multiple sinks.
++	* tests/gpgscm/ffi.c (ordinal_suffix): New function.
++	(do_splice): Generalize splice to write to multiple sinks.
++	* tests/gpgscm/lib.scm (splice): Document this fact.
++
++	gpgscm: Drop 'len' argument from splice.
++	* tests/gpgscm/ffi.c (do_splice): Drop 'len' argument, no-one uses it.
++	* tests/gpgscm/lib.scm (splice): Document foreign function.
++
++	tests: Move environment creation and teardown into each test.
++	* tests/gpgscm/tests.scm (log): New function.
++	* tests/openpgp/run-tests.scm (run-tests-parallel): Do not run the
++	startup and teardown scripts.
++	(run-tests-sequential): Likewise.
++	* tests/openpgp/setup.scm: Move all functions...
++	* tests/openpgp/defs.scm: ... here and make them less verbose.
++	(setup-environment): New function.
++	(setup-legacy-environment): Likewise.
++	(start-agent): Make less verbose, run 'stop-agent' at interpreter
++	exit.
++	(stop-agent): Make less verbose.
++	* tests/openpgp/finish.scm: Drop file.
++	* tests/openpgp/Makefile.am (EXTRA_DIST): Drop removed file.
++	* tests/openpgp/4gb-packet.scm: Use 'setup-environment' or
++	'setup-legacy-environment' as appropriate.
++	* tests/openpgp/armdetach.scm: Likewise.
++	* tests/openpgp/armdetachm.scm: Likewise.
++	* tests/openpgp/armencrypt.scm: Likewise.
++	* tests/openpgp/armencryptp.scm: Likewise.
++	* tests/openpgp/armor.scm: Likewise.
++	* tests/openpgp/armsignencrypt.scm: Likewise.
++	* tests/openpgp/armsigs.scm: Likewise.
++	* tests/openpgp/clearsig.scm: Likewise.
++	* tests/openpgp/conventional-mdc.scm: Likewise.
++	* tests/openpgp/conventional.scm: Likewise.
++	* tests/openpgp/decrypt-dsa.scm: Likewise.
++	* tests/openpgp/decrypt.scm: Likewise.
++	* tests/openpgp/default-key.scm: Likewise.
++	* tests/openpgp/detach.scm: Likewise.
++	* tests/openpgp/detachm.scm: Likewise.
++	* tests/openpgp/ecc.scm: Likewise.
++	* tests/openpgp/encrypt-dsa.scm: Likewise.
++	* tests/openpgp/encrypt.scm: Likewise.
++	* tests/openpgp/encryptp.scm: Likewise.
++	* tests/openpgp/export.scm: Likewise.
++	* tests/openpgp/finish.scm: Likewise.
++	* tests/openpgp/genkey1024.scm: Likewise.
++	* tests/openpgp/gpgtar.scm: Likewise.
++	* tests/openpgp/gpgv-forged-keyring.scm: Likewise.
++	* tests/openpgp/import.scm: Likewise.
++	* tests/openpgp/issue2015.scm: Likewise.
++	* tests/openpgp/issue2417.scm: Likewise.
++	* tests/openpgp/issue2419.scm: Likewise.
++	* tests/openpgp/key-selection.scm: Likewise.
++	* tests/openpgp/mds.scm: Likewise.
++	* tests/openpgp/multisig.scm: Likewise.
++	* tests/openpgp/quick-key-manipulation.scm: Likewise.
++	* tests/openpgp/seat.scm: Likewise.
++	* tests/openpgp/shell.scm: Likewise.
++	* tests/openpgp/signencrypt-dsa.scm: Likewise.
++	* tests/openpgp/signencrypt.scm: Likewise.
++	* tests/openpgp/sigs-dsa.scm: Likewise.
++	* tests/openpgp/sigs.scm: Likewise.
++	* tests/openpgp/ssh.scm: Likewise.
++	* tests/openpgp/tofu.scm: Likewise.
++	* tests/openpgp/use-exact-key.scm: Likewise.
++	* tests/openpgp/verify.scm: Likewise.
++	* tests/openpgp/version.scm: Likewise.
++	* tests/openpgp/issue2346.scm: Likewise and simplify.
++
++	tests: Do not allow tests to be run in a shared environment.
++	* tests/openpgp/README: Update.
++	* tests/openpgp/run-tests.scm (run-tests-parallel-shared): Drop
++	function.
++	(run-tests-parallel-isolated): Rename to 'run-tests-parallel'.
++	(run-tests-sequential-shared): Drop function.
++	(run-tests-sequential-isolated): Rename to 'run-tests-sequential'.
++
++	tests: Fix build.
++	* tests/openpgp/Makefile.am: Drop dependency on 'mk-tdata'.
++
++	Fixes: 70215ff470c82d144e872057dfa5a478cc9195f2
++
++2016-11-07  Werner Koch  <wk at gnupg.org>
++
++	wks: Encrypt all client mails also the target key,
++	* tools/gpg-wks-client.c (encrypt_response): Add arg FINGERPRINT.
++	(send_confirmation_response): Ditto.
++	(process_confirmation_request): Parse out fingerprint and pass
++	send_confirmation_response.
++
++2016-11-07  Justus Winter  <justus at g10code.com>
++
++	tests,tools: Reimplement 'mk-tdata' in Scheme.
++	* tests/openpgp/defs.scm (tools): Drop 'mk-tdata'.
++	* tests/openpgp/setup.scm (make-test-data): New function.
++	* tests/openpgp/verify.scm: Avoid 'mk-tdata'.
++	* tools/Makefile.am (noinst_PROGRAMS): Drop 'mk-tdata'.
++	* tools/mk-tdata.c: Drop file.
++
++	gpgscm,w32: Provide schemish file handling for binary files.
++	* tests/gpgscm/lib.scm (call-with-binary-input-file): New function.
++	(call-with-binary-output-file): Likewise.
++
++	gpgscm: Add support for pseudo-random numbers.
++	* tests/gpgscm/ffi.c (do_getpid): New function.
++	(do_srandom): Likewise.
++	(random_scaled): Likewise.
++	(do_random): Likewise.
++	(do_make_random_string): Likewise.
++	(ffi_init): Expose the new functions.
++	* tests/gpgscm/lib.scm: Document the new functions.
++
++	g10: Fix crash.
++	* g10/getkey.c (get_best_pubkey_byname): If 'get_pubkey_byname' does
++	not return a getkey context, then it can return at most one key,
++	therefore there is nothing to rank.  Also, always initialize '*retctx'
++	to be on the safe side.
++
++	GnuPG-bug-id: 2828
++	Fixes: ab89164be02012f1bf159c971853b8610e966301
++
++2016-11-04  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Fix printing strings containing zero bytes.
++	* tests/gpgscm/scheme.c (atom2str): Fix computing the length of Scheme
++	strings.  Scheme strings can contain zero bytes.
++
++	gpgscm: Implement 'atexit'.
++	* tests/gpgscm/ffi.scm (throw): Run *run-atexit-handlers* when
++	terminating the interpreter.
++	(*atexit-handlers*): New variable.
++	(*run-atexit-handlers*): New function.
++	(atexit): Likewise.
++	* tests/gpgscm/main.c (main): Run *run-atexit-handlers* at normal
++	interpreter shutdown.
++
++2016-11-04  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Fix length error for READKEY.
++	* scd/app-openpgp.c (do_readkey): Decrement the length.
++
++	scd: Add --advanced option for READKEY.
++	* scd/command.c (cmd_readkey) : Support ADVANCED arg.
++	* scd/app.c (app_readcert): Add ADVANCED arg.
++	* scd/app-openpgp.c (do_readkey): Implement ADVANCED arg.
++	* scd/app-nks.c (do_readkey): Error return with GPG_ERR_NOT_SUPPORTED.
++
++2016-11-03  Werner Koch  <wk at gnupg.org>
++
++	agent: Extend the PINENTRY_LAUNCHED inquiry and status.
++	* agent/call-pinentry.c (start_pinentry): Get flavor and version and
++	pass it to agent_inq_pinentry_launched.
++	* agent/command.c (agent_inq_pinentry_launched): Add arg EXTRA.
++	* g10/server.c (gpg_proxy_pinentry_notify): Print a new diagnostic.
++
++2016-11-03  Justus Winter  <justus at g10code.com>
++
++	g10: Improve and unify key selection for -r and --locate-keys.
++	* g10/getkey.c (struct pubkey_cmp_cookie): New type.
++	(key_is_ok, uid_is_ok, subkey_is_ok): New functions.
++	(pubkey_cmp): Likewise.
++	(get_best_pubkey_byname): Likewise.
++	* g10/keydb.h (get_best_pubkey_byname): New prototype.
++	* g10/keylist.c (locate_one): Use the new function.
++	* g10/pkclist.c (find_and_check_key): Likewise.
++	* tests/openpgp/Makefile.am (XTESTS): Add new test.
++	(TEST_FILES): Add new files.
++	* tests/openpgp/key-selection.scm: New file.
++	* tests/openpgp/key-selection/0.asc: Likewise.
++	* tests/openpgp/key-selection/1.asc: Likewise.
++	* tests/openpgp/key-selection/2.asc: Likewise.
++	* tests/openpgp/key-selection/3.asc: Likewise.
++	* tests/openpgp/key-selection/4.asc: Likewise.
++
++	gpgscm,tests: Add new functions to the test environment.
++	* tests/gpgscm/lib.scm (first, last, powerset): New functions.
++	* tests/gpgscm/tests.scm (interactive-shell): New function.
++	* tests/openpgp/Makefile.am (EXTRA_DIST): Add new file.
++	* tests/openpgp/README: Document 'interactive-shell'.
++	* tests/openpgp/shell.scm: New file.
++
++2016-11-03  Werner Koch  <wk at gnupg.org>
++
++	gpgconf: Add a new field to the --query-swdb output.
++	* tools/gpgconf.c (query_swdb): Insert new field with the installed
++	version.  Check that the supplied version does not contain a colon.
++
++2016-11-02  Werner Koch  <wk at gnupg.org>
++
++	gpgconf: Add command --query-swdb.
++	* tools/gpgconf.c (aQuerySWDB): New.
++	(opts): Add --query-swdb.
++	(valid_swdb_name_p): New.
++	(query_swdb): New.
++	(main): Implement command --query-swdb.
++
++	common: Improve compare_string_versions.
++	* common/stringhelp.c: Include limits.h.
++	(compare_version_strings): Change semantics to behave like strcmp.
++	Include the patch lebel in the comparison.  Allow checking a single
++	version string.
++	* common/t-stringhelp.c (test_compare_version_strings): Adjust test
++	vectors and a few new vectors.
++	* g10/call-agent.c (warn_version_mismatch): Adjust to new sematics.
++	* g10/call-dirmngr.c (warn_version_mismatch): Ditto.
++	* sm/call-agent.c (warn_version_mismatch): Ditto.
++	* sm/call-dirmngr.c (warn_version_mismatch): Ditto.
++
++2016-11-02  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Fix inclusion of readline header.
++	* tests/gpgscm/ffi.c: Define magic macro to prevent the completion
++	function from redefined.
++
++	GnuPG-bug-id: 2824
++
++2016-11-02  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	build: Fix misspelled dirmngr.
++
++	Spelling: correct spelling of "passphrase".
++	There were several different variant spellings of "passphrase".  This
++	should fix them all for all English text.
++
++	I did notice that po/it.po contains multiple instances of
++	"passhprase", which also looks suspect to me, but i do not know
++	Italian, so i did not try to correct it.
++
++2016-11-02  Justus Winter  <justus at g10code.com>
++
++	g10,w32: Fix build on Windows.
++	* g10/tofu.c (begin_transaction): Use the new 'gnupg_usleep'.
++
++2016-10-31  Werner Koch  <wk at gnupg.org>
++
++	common: New function gnupg_usleep.
++	* configure.ac (HAVE_NANOSLEEP): Test for nanosleep.
++	* common/sysutils.c: Always include time.h.
++	(gnupg_usleep): New.
++
++2016-10-31  Andre Heinecke  <aheinecke at intevation.de>
++
++	w32: Fix PKG_CONFIG_LIBDIR in --build-w32.
++	* autogen.sh: Point pkg-config to the right location.
++
++2016-10-31  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Avoid gratuitious SQLite aborts and starving writers.
++	* g10/tofu.c: Include <time.h>, <utime.h>, <fcntl.h> and <unistd.h>.
++	(tofu_dbs_s): Add fields want_lock_file and want_lock_file_ctime.
++	(begin_transaction): Only yield if DBS->WANT_LOCK_FILE_CTIME has
++	changed since we took the lock.  Don't use gpgrt_yield to yield, but
++	sleep for 100ms.  After taking the batch lock, update
++	DBS->WANT_LOCK_FILE_CTIME.  Also take the batch lock the first time we
++	take the real lock.  When taking the real lock, use immediate not
++	deferred mode to avoid gratuitious aborts.
++	(end_transaction): When dropping the outermost real lock, drop the
++	batch lock.
++	(busy_handler): New function.
++	(opendbs): Set the busy handler to it when opening the DB.  Initialize
++	CTRL->TOFU.DBS->WANT_LOCK_FILE.
++	(tofu_closedbs): Free DBS->WANT_LOCK_FILE.
++
++2016-10-30  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Avoid reading in keys when possible.
++	* g10/tofu.c (build_conflict_set): If CONFLICT_SET contains a single
++	element, don't bother to check for cross sigs.  Add parameter PK.
++	Update callers.
++
++	g10: Fix bit setting.
++	* g10/tofu.c (build_conflict_set): Fix bit setting.
++
++2016-10-28  Werner Koch  <wk at gnupg.org>
++
++	gpg: Enable the Issuer Fingerprint from rfc4880bis.
++	* g10/build-packet.c (build_sig_subpkt_from_sig): Always write the new
++	Issuer Fingerprint sub-packet.
++	* g10/mainproc.c (check_sig_and_print): Always consider that
++	sub-packet.
++
++2016-10-27  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Fix signature checking.
++	* dirmngr/server.c: Include cpparray.h.
++	(verify_swdb_parm_s): New.
++	(verify_swdb_status_cb): New.
++	(cmd_versioncheck): Use gpgv to correclty verify the signature.
++	Rename some variable to comply with GNU standards.
++
++	gpg: Verify multiple detached signatures with different hash algos.
++	* g10/mainproc.c (proc_tree): Loose check.  Enable all algos.
++
++	common: Add GNUPG_MODULE_NAME_GPGV.
++	* common/util.h (GNUPG_MODULE_NAME_GPGV): New.
++	* common/homedir.c (gnupg_module_name): Implement.
++
++2016-10-27  Justus Winter  <justus at g10code.com>
++
++	g10: Fix iteration over getkey results.
++	* g10/getkey.c (getkey_next): Return the public key in PK even if
++	RET_KEYBLOCK is NULL.
++
++	g10: Assert preconditions.
++	* g10/getkey.c (get_pubkey_byname): Assert preconditions.
++
++2016-10-27  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Do not implement --supervised in Windows.
++	* dirmngr/dirmngr.c (opts) [W32]: Remove --supervised.
++	(main) [W32]: Ditto.
++
++	common: Remove debug output from gnupg_get_socket_name.
++	* common/sysutils.c (gnupg_get_socket_name): Remove debug message and
++	use my_error_from_syserror.
++
++2016-10-27  NIIBE Yutaka  <gniibe at fsij.org>
++
++	dirmngr: ADNS error handling fix.
++	* dirmngr/dns-stuff.c (resolve_name_adns, get_dns_cert, get_dns_cname):
++	Use gpg_error and gpg_err_code_from_errno to compose the error value.
++
++2016-10-27  Werner Koch  <wk at gnupg.org>
++
++	gpg: Convey --quick option to dirmngr for --auto-key-retrieve.
++	* g10/call-dirmngr.c (gpg_dirmngr_ks_get): Add arg 'quick'.
++	(gpg_dirmngr_wkd_get): Ditto.
++	* g10/keyserver.c (keyserver_get): Add arg 'quick'.
++	(keyserver_get_chunk): Add arg 'quick'.
++	(keyserver_import_fprint): Ditto.  Change callers to pass 0 for it.
++	(keyserver_import_keyid): Ditto.
++	(keyserver_import_wkd): Ditto.
++	* g10/mainproc.c (check_sig_and_print): Call the 3 fucntions with
++	QUICK set.
++
++2016-10-27  NIIBE Yutaka  <gniibe at fsij.org>
++
++	common: Fix gnupg_inotify_has_name, differently.
++	* common/sysutils.c (gnupg_inotify_has_name): Use void * to stop the
++	warning.
++
++	dirmngr: More ADNS error fix.
++	* dirmngr/dns-stuff.c (get_dns_cert, getsrv, get_dns_cname): Fix return
++	value.
++
++	dirmngr: Fix error return for ADNS.
++	* dirmngr/dns-stuff.c (resolve_name_adns): Use RET for return value.
++
++	g10: Fix ECDH, clarifying the format.
++	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Returns error when
++	it's short.  Clarify the format.  Handle other prefixes correctly.
++
++	scd: Add 0x41 prefix for x-coordinate only result.
++	* scd/app-openpgp.c (do_decipher): When it's x-coordinate only, add the
++	prefix 0x41.
++
++2016-10-27  Arnaud Fontaine  <arnaud.fontaine at ssi.gouv.fr>
++
++	g10: ECDH shared point format.
++	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Improve handling of
++	ECDH shared point format.
++
++2016-10-27  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	dirmngr: Implement --supervised command (for systemd, etc).
++	* dirmngr/dirmngr.c (main): Add new --supervised command, which is a
++	mode designed for running under a process supervision system like
++	systemd or runit.
++	* doc/dirmngr.texi: document --supervised option.
++
++	agent,common: move get_socket_name() into common.
++	* agent/gpg-agent.c (get_socket_name): move to ...
++	* common/sysutils.c (gnupg_get_socket_name): ... here.
++
++	dirmngr: report actual socket name.
++	* dirmngr/dirmngr.[ch] (dirmngr_get_current_socket_name): new function
++	to report known socket name.
++	* dirmngr/server.c (cmd_getinfo): use dirmngr_get_current_socket_name
++	to report correct socket name.
++
++2016-10-27  NIIBE Yutaka  <gniibe at fsij.org>
++
++	common: Fix gnupg_inotify_has_name.
++	* common/sysutils.c (gnupg_inotify_has_name): Take care of the
++	alignment.
++
++	dirmngr: Fix help string and argument.
++	* dirmngr/server.c (hlp_versioncheck): Add a newline.
++	(cmd_versioncheck): Fix argument.
++
++2016-10-26  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Fix hang due to deferred thread initialization.
++	* dirmngr/dirmngr.c (main): Call ldap_wrapper_launch_thread after
++	thread_init.
++
++	agent: Avoid double error message.
++	* agent/gpg-agent.c (map_supervised_sockets): Shorten error message.
++	Remove unneeded diagnostic.
++
++	common: Use GPG_ERR_INV_VALUE instead of GPG_ERR_EINVAL.
++	* common/sysutils.c (gnupg_inotify_watch_socket): Return
++	GPG_ERR_INV_VALUE for a missing socket name and set proper error
++	source.
++
++	tests: Improve portability of fake-pinentry.
++	* tests/openpgp/fake-pinentry.c: Make all functions static.
++	(get_passphrase): s/unlink/remove/ because that is standard C.
++	(spacep): Rename to whitespace and change all callers.
++	(main): Move macro out of if-then chain.
++
++2016-10-26  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	agent: --supervised mode improvements.
++	* agent/gpg-agent.c (map_supervised_socket): if the agent is running
++	  in --supervised mode and is not actually given LISTEN_FDNAMES
++	  directives, require at least fd 3 to be open for listening.
++
++	common: avoid segfault.
++	* common/sysutils.c (gnupg_inotify_watch_socket): return EINVAL if
++	  socket_name is NULL, rather than segfaulting
++
++2016-10-25  Justus Winter  <justus at g10code.com>
++
++	agent,tests,w32: Fix relaying pinentry user data, fix fake-pinentry.
++	* agent/call-pinentry.c (start_pinentry): Also send the user data
++	using an Assuan 'OPTION' command.
++	* tests/openpgp/fake-pinentry.c (get_passphrase): Fix updating
++	passphrase file.
++	(spacep): Include newline characters.
++	(rstrip): New function.
++	(main): Handle Windows line endings.  Handle the userdata option, and
++	restart with the new options.
++
++	tests: Do not autostart gpg-agents on teardown.
++	* tests/openpgp/defs.c (stop-agent): Use '--no-autostart' when calling
++	gpg-connect-agent.
++
++2016-10-25  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Allow command VERSIONCHECK to handle 3 part version numbers.
++	* dirmngr/server.c (parse_version_string): Add arg MICRO and set it.
++	(cmp_version): Extend to handle the MICRO part.
++	(confucius_mktmpdir): Rename to my_mktmpdir.
++	(my_mktmpdir): xstrconcat does not fail; use strconcat.
++	(fetch_into_tmpdir): Improve error checking.
++
++	common: Use strconcat in gnupg_setenv.
++	* common/sysutils.c (gnupg_setenv): Replace malloc+stpcpy by
++	strconcat.  Indent cpp conditionals.
++	(gnupg_unsetenv): Indent cpp conditionals.
++
++2016-10-24  Werner Koch  <wk at gnupg.org>
++
++	gpg: Replace two sprintf calls.
++	* g10/keygen.c (print_status_key_created): Use snprintf for now.
++	(ask_expire_interval): Replace xmalloc and sprintf by xasprintf.
++
++	agent: Minor cleanup for recent change in findkey.c.
++	* agent/findkey.c (agent_write_private_key): Avoid label name error.
++
++	agent: Slightly change structure of cmd_readkey.
++	* agent/command.c (cmd_readkey): Avoid a leave label in the middle of
++	the code.  Remove the special return.
++
++2016-10-24  Kai Michaelis  <kai at gnupg.org>
++
++	dirmngr: Fix segfault in VERSIONCHECK.
++	* dirmngr/server.c (cmd_versioncheck): The VERSIONCHECK command crashes
++	when called without program version.
++
++2016-10-24  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Use canonical curve name of libgcrypt.
++	* scd/app-openpgp.c (send_key_attr): Use curve instead of OID.
++	(ecdh_params): New.
++	(ecc_read_pubkey): Use ecdh_params.  Use curve name.
++	(ecc_writekey): Likewise.
++	(ecc_curve): Rename from ecc_oid.
++	(parse_algorithm_attribute): Use ecc_curve.
++	* g10/call-agent.c (learn_status_cb): Use openpgp_is_curve_supported to
++	intern the curve name string.
++	* g10/card-util.c (card_status): Conver curve name to alias for print.
++
++	common: Fix openpgp_is_curve_supported.
++	* common/openpgp-oid.c (openpgp_is_curve_supported): Support both of
++	canonical name of the curve and alias.
++
++	g10: Fix card keygen for decryption.
++	* g10/keygen.c (do_generate_keypair): Fix arguments.
++
++2016-10-22  NIIBE Yutaka  <gniibe at fsij.org>
++
++	g10: More card key generation change.
++	* g10/keygen.c (gen_card_key): Add back ALGO as the second argument.
++	Don't get ALGO by KEY-ATTR by this function.  It's caller to provide
++	ALGO.  Don't do that by both of caller and callee.
++	(generate_keypair): Only put paramerters needed.  Use parameters
++	for ALGO to call gen_card_key.
++	(generate_card_subkeypair): Get ALGO and call gen_card_key with it.
++
++2016-10-21  Andre Heinecke  <aheinecke at intevation.de>
++
++	g10: Write first keybox record in binary mode.
++	* g10/keydb.c (maybe_create_keyring_or_box): Open in binary mode.
++
++2016-10-21  NIIBE Yutaka  <gniibe at fsij.org>
++
++	g10,scd: Fix ECC keygen.
++	* g10/keygen.c (generate_keypair): For card key generation, fill
++	parameters by KEY-ATTR.
++
++	* scd/app-openpgp.c (ecc_read_pubkey): OID should be freed at last,
++	after its reference by OIDBUF is finished.
++	(ecc_writekey): Likewise.
++
++	scd: Fix segfault changing key attr.
++	* asc/app-openpgp.c (change_keyattr_from_string): Release after
++	allocated.
++
++2016-10-21  NIIBE Yutaka  <gniibe at fsij.org>
++	    Arnaud Fontaine  <arnaud.fontaine at ssi.gouv.fr>
++
++	g10: Don't ask keysize for for non-RSA card.
++	* g10/card-util.c (card_status): Bug fix for keyno.
++	(ask_card_rsa_keysize, do_change_rsa_keysize): Rename.
++	(generate_card_keys): Only ask keysize when RSA.
++	(card_generate_subkey): Likewise.
++
++	g10: Support ECC for gen_card_key.
++	* g10/keygen.c (gen_card_key): Remove the first argument of ALGO.
++	(do_generate_keypair, generate_card_subkeypair): Follow the change.
++
++2016-10-21  NIIBE Yutaka  <gniibe at fsij.org>
++
++	Fix use cases of snprintf.
++	* agent/call-pinentry.c, agent/call-scd.c, agent/command.c,
++	build-aux/speedo/w32/g4wihelp.c, common/get-passphrase.c,
++	dirmngr/dirmngr.c, g10/call-agent.c, g10/cpr.c, g10/keygen.c,
++	g10/openfile.c, g10/passphrase.c, scd/app-openpgp.c, scd/scdaemon.c,
++	sm/call-agent.c, sm/call-dirmngr.c, sm/certreqgen.c: Fix assuming C99.
++
++	agent: Fix saving with FORCE=1.
++	* agent/findkey.c (agent_write_private_key): Recover from an error of
++	GPG_ERR_ENOENT when FORCE=1 and it is opened with "rb+".
++
++2016-10-20  Justus Winter  <justus at g10code.com>
++
++	tests: Simplify test.
++	* tests/openpgp/quick-key-manipulation.scm: Avoid creating a temporary
++	home directory, just make the uids unique.
++
++	tests: Flush stdout in the fake pinentry.
++	* tests/openpgp/fake-pinentry.c (reply): Flush stdout.
++
++	Fixes-commit: 94504b3d5af126abb591dedda1ca0f0970822f55
++
++	common,w32: Fix setting environment variables on Windows.
++	* common/sysutils.c (gnupg_setenv): Also update the environment block
++	maintained by the C runtime.
++	(gnupg_unsetenv): Likewise.
++	* tests/gpgscm/ffi.c (do_setenv): Fix error handling.
++
++	tests,w32: Cope with Windows line endings.
++	* tests/openpgp/issue2015.scm: Rstrip line before comparison.
++
++	tests: Create and remove socket directories.
++	* tests/openpgp/defs.scm (start-agent): Move function here and create
++	the socket directory prior to starting the agent.
++	(stop-agent): Move function here and remove the socket directory.
++	* tests/openpgp/finish.scm: Adapt.
++	* tests/openpgp/setup.scm: Likewise.
++
++2016-10-20  NIIBE Yutaka  <gniibe at fsij.org>
++
++	agent, g10: Fix keygen.
++	* agent/command.c (cmd_readkey): Get length after card_readkey.
++	* g10/keygen.c (gen_card_key): Fix off-by-one error.
++
++	scd: GENKEY updates the public key in APP.
++	* scd/app-openpgp.c (rsa_read_pubkey, ecc_read_pubkey): New.
++	(read_public_key): New.
++	(get_public_key, do_genkey): Use read_public_key.
++
++	g10: smartcard keygen change.
++	* g10/call-agent.c (scd_genkey_cb_append_savedbytes): Remove.
++	(scd_genkey_cb): Only handle KEY-CREATED-AT and PROGRESS.
++	(agent_scd_genkey): Remove INFO argument.  CREATETIME is now in/out
++	argument.
++	(agent_readkey): Use READKEY --card instead of SCD READKEY.
++	* g10/keygen.c (gen_card_key): Use READKEY --card command of the agent
++	to retrieve public key information from card and let the agent make
++	a file for private key with shadow info.
++
++	agent: Add --card option for READKEY.
++	* agent/findkey.c (agent_write_shadow_key): New.
++	* agent/command-ssh.c (card_key_available): Use agent_write_shadow_key.
++	* agent/learncard.c (agent_handle_learn): Likewise.
++	* agent/command.c (cmd_readkey): Add --card option.
++
++2016-10-19  Kai Michaelis  <kai at gnupg.org>
++
++	dirmngr: improve VERSIONCHECK.
++	Replace strtok_r() and code formatting. Use code from libgpg-error for
++	version comparison.
++
++2016-10-18  Justus Winter  <justus at g10code.com>
++
++	common: Fix copying data to estreams.
++	* common/exectool.c (copy_buffer_do_copy): Correctly account for
++	partially written data in the event of errors.
++
++	common,w32: Communicate with child in non-blocking mode.
++	* common/exechelp-w32.c (gnupg_spawn_process): Open streams in
++	non-blocking mode if requested.
++
++	Fixes-commit: 83811e3f1f0c615b2b63bafdb49a35a0fc198088
++
++	common,w32: Extend gnupg_create_inbound_pipe et al.
++	* common/exechelp-w32.c (do_create_pipe): Rename, add arguments, and
++	create a stream if reqested.
++	(gnupg_create_inbound_pipe): Use the extended function to open the
++	stream if requested.
++	(gnupg_create_outbound_pipe): Likewise.
++	(gnupg_create_pipe): Update call site.
++
++	Fixes-commit: 5d991e333a1885adc40abd9d00c01fec4bd5d9d7
++
++	common,w32: Make use of default_errsource in exechelp.
++	* common/exechelp-posix.c (my_error_from_syserror, my_error): New.
++	Use them instead of gpg_error and gpg_error_from_syserror.
++
++	Fixes-commit: 96c7901ec1c79be732570811223d3ea54875abfe
++
++2016-10-18  NIIBE Yutaka  <gniibe at fsij.org>
++	    Arnaud Fontaine  <arnaud.fontaine at ssi.gouv.fr>
++
++	scd: Support ECC key generation.
++	* scd/app-openpgp.c (get_public_key): Fix a message.
++	(change_keyattr_from_string, ecc_writekey): Call mpi_release sooner.
++	(do_genkey): Add ECC support.
++
++2016-10-18  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: minor cleanup to merge other works.
++	* scd/iso7816.c (do_generate_keypair): Use const char * for DATA.
++	(iso7816_generate_keypair, iso7816_read_public_key): Likewise.
++	* scd/app-openpgp.c (get_public_key): Follow the change.
++	(do_genkey): Ditto.  Use ERR instead of RC.  Use u32 for CREATED_AT.
++
++2016-10-17  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Initialize nesting stack.
++	* tests/gpgscm/scheme.c (scheme_init_custom_alloc): Initialize nesting
++	stack.
++
++	Fixes-commit: f2249b737055f84842778285bbeff5e61fa55225
++
++2016-10-17  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	doc: Document how to manually shut down gpg-agent.
++	* doc/gpg-agent.texi: document "gpgconf --kill gpg-agent" for manual
++	  agent termination.
++
++	This was requested in a side-comment in https://bugs.debian.org/840669
++
++	doc: Point gpg-agent(1) at the right gpg manpage in SEE ALSO.
++	* doc/gpg-agent.texi (SEE ALSO): refer to @gpgname, instead of
++	  hard-coding "gpg2".
++
++2016-10-17  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Fix keytocard for ECC.
++	* scd/app-openpgp.c (build_ecc_privkey_template): Size can be greater
++	than 128 when it comes with public key for curve of larger field.
++
++	gpgconf: Fix for --homedir.
++	* tools/gpgconf-comp.c (gpg_agent_runtime_change,
++	scdaemon_runtime_change, dirmngr_runtime_change): Provide the homedir
++	arguments by --homedir when it's not default.
++
++2016-10-16  Werner Koch  <wk at gnupg.org>
++
++	agent: Use straightforward names for the default socket names.
++	* configure.ac (GPG_AGENT_SOCK_NAME): Change name to *.extra.
++	(GPG_AGENT_EXTRA_SOCK_NAME): Change name to *browser.
++
++2016-10-15  Werner Koch  <wk at gnupg.org>
++
++	agent: Move inotify code to common and improve it.
++	* common/sysutils.c: Include sys/inotify.h.
++	(my_error_from_syserror, my_error): New.
++	(gnupg_inotify_watch_socket): New.
++	(gnupg_inotify_has_name): New.
++	* agent/gpg-agent.c: Do not include sys/inotify.h.
++	(my_inotify_is_name): Remove.
++	(handle_connections): Remove HAVE_INOTIFY_INIT protected code and use
++	the new functions.
++
++2016-10-14  Kai Michaelis  <kai at gnupg.org>
++
++	dirmngr: use gnupg_mkdtemp instead of mkstemp.
++	MinGW on debian does not support mkstemp.
++
++	dirmngr: add VERSIONCHECK command.
++	Given an application name and version VERSIONCHECK fetches the software
++	version list from version.gnupg.org, verifies the signature and returns
++	whenever the given version is older (UPDATE), current (CURRENT) or newer
++	(ROLLBACK).
++
++2016-10-13  Neal H. Walfield  <neal at g10code.com>
++
++	tests: Use shorter filenames.
++	* tests/openpgp/tofu/cross-sigs/
++	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg: Rename from this...
++	* tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt: Rename from this...
++	* tests/openpgp/tofu/cross-sigs/EC38277E-1.txt: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg: Rename from this...
++	* tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt: Rename from this...
++	* tests/openpgp/tofu/cross-sigs/EC38277E-2.txt: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt: Rename from this...
++	* tests/openpgp/tofu/cross-sigs/EC38277E-3.txt: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg: Rename from
++	  this...
++	* tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg: Rename from this...
++	* tests/openpgp/tofu/cross-sigs/871C2247-1.gpg: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt: Rename from this...
++	* tests/openpgp/tofu/cross-sigs/871C2247-1.txt: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg: Rename from this...
++	* tests/openpgp/tofu/cross-sigs/871C2247-2.gpg: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt: Rename from this...
++	* tests/openpgp/tofu/cross-sigs/871C2247-2.txt: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg: Rename from this...
++	* tests/openpgp/tofu/cross-sigs/871C2247-3.gpg: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt: Rename from this...
++	* tests/openpgp/tofu/cross-sigs/871C2247-3.txt: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg: Rename from this...
++	* tests/openpgp/tofu/cross-sigs/871C2247-4.gpg: .. to this.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg: Rename from
++	  this...
++	* tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg: .. to this.
++	* tests/openpgp/Makefile.am (TEST_FILES): Update accordingly.
++
++	g10: Be more careful when checking if a binding is signed by a UTK.
++	* g10/tofu.c (signed_by_utk): When checking if a key is signed by an
++	ultimately trusted key, only consider the signatures on the specified
++	user id.
++	* tests/openpgp/tofu.scm: Add test for the above.
++
++	tests: Add test data to TEST_FILES.
++	* tests/openpgp/Makefile.am (TEST_FILES): Add new test data.
++
++	g10: Be more careful when checking cross signatures.
++	* g10/tofu.c (cross_sigs): When checking cross signatures, only
++	consider the signatures on the specified user id.
++	* tests/openpgp/tofu.scm: Add test for the above.
++	* tests/openpgp/tofu/cross-sigs/
++	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg:
++	  New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt: New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg: New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt: New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt: New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg: New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg: New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt: New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg: New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt: New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg: New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt: New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg: New file.
++	* tests/openpgp/tofu/cross-sigs/
++	  DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg: New file.
++	* tests/openpgp/tofu/cross-sigs/README: New file.
++
++	g10: Still check if the key is an UTK or cross signed in batch mode.
++	* g10/tofu.c (get_trust): If POLICY is ask, but we can't ask, don't
++	bail immediately.  Instead, check if the key in question is an
++	ultimately trusted key or cross signed.
++
++	g10: If an sqlite operation fails, map the error code to GPG_ERR_GENERAL
++	* g10/tofu.c (get_policy): If an sqlite operation fails, map the error
++	  code to GPG_ERR_GENERAL.
++	(ask_about_binding): Likewise.
++	(build_conflict_set): Likewise.
++	(get_trust): Likewise.
++	(show_statistics): Likewise.
++	(tofu_register_signature): Likewise.
++	(tofu_register_encryption): Likewise.
++
++	tests: Remove support for deprecated functionality.
++	* tests/openpgp/tofu.scm: Don't remove tofu.d.  It's deprecated.
++
++2016-10-12  Neal H. Walfield  <neal at g10code.com>
++
++	g10: When changing a TOFU binding's policy, update the conflict info.
++	* g10/tofu.c (record_binding): Take an additional argument, CONFLICT.
++	Set the binding's conflict accordingly.  Update callers.
++
++	g10: Make a singular string singular.
++	* g10/tofu.c (ask_about_binding): Make the singular string singular.
++
++	g10: Correctly determine whether a binding has a conflict.
++	* g10/tofu.c (build_conflict_set): A binding has a conflict is
++	conflict is *not* NULL, not if it is NULL.
++
++	g10: Fix a column's type in TOFU DB.
++	* g10/tofu.c (initdb): Change policy from a boolean to an integer.
++
++2016-10-07  Justus Winter  <justus at g10code.com>
++
++	tests: Rework test environment setup.
++	* tests/openpgp/setup.scm: Import one keyring at a time.  This works
++	around a yet to be investigated hang on Windows.  It is also much
++	prettier.
++
++	tests: Improve handling of Windows newlines.
++	* tests/gpgscm/lib.scm (string-split-newlines): New function.
++	* tests/openpgp/default-key.scm: Use new function.
++	* tests/openpgp/defs.scm: Likewise.
++	* tests/openpgp/export.scm: Likewise.
++	* tests/openpgp/import.scm: Likewise.
++
++	gpgscm: Improve test of low-level functions.
++	* tests/gpgscm/t-child.c: Print large amounts of data.
++	* tests/gpgscm/t-child.scm: Test that this works.
++
++	gpgscm: Improve path handling.
++	* tests/gpgscm/ffi.c (ffi_init): New Scheme variable '*win32*'.
++	* tests/gpgscm/tests.scm (canonical-path): Correctly handle paths with
++	drive letter on Windows.  Use 'path-join'.
++	(path-expand): Use 'path-join'.
++
++	tools: Fix error handling.
++	* tools/gpgtar-create.c (gpgtar_create): Do not crash if opening the
++	tarball failed.
++
++2016-10-07  NIIBE Yutaka  <gniibe at fsij.org>
++
++	agent: Fix get_socket_name.
++	* agent/gpg-agent.c (get_socket_name): Fix the size of copying.
++
++2016-10-07  Werner Koch  <wk at gnupg.org>
++
++	gpg: Put extra parens around bit tests.
++	* g10/options.h (DBG_MPI): New.
++	* g10/gpg.c (set_debug): Use macro or extra parens for binary operator.
++	* g10/parse-packet.c (set_packet_list_mode): Use dbg macro.
++
++2016-10-07  NIIBE Yutaka  <gniibe at fsij.org>
++
++	agent, dirmngr, scd: Fix init_common_subsystems.
++	* common/init.c (_init_common_subsystems): Don't call
++	gpgrt_set_syscall_clamp in this function.
++	* agent/gpg-agent.c, dirmngr/dirmngr.c, scd/scdaemon.c: Call
++	gpgrt_set_syscall_clamp after npth_init.
++
++2016-10-06  Justus Winter  <justus at g10code.com>
++
++	common: Avoid pointer arithmetic on string literals.
++	* common/gettime.c (rfctimestamp): Use indexing instead.
++	* common/signal.c (got_fatal_signal): Likewise.
++
++	g10: Fix singular term.
++	* g10/tofu.c (ask_about_binding): Fix singular message.
++
++	g10: Use appropriate variant of 'abs'.
++	* g10/tofu.c (ask_about_binding): Use 'labs' instead of 'abs'.
++
++	sm: Remove statement without effect.
++	* sm/call-dirmngr.c (gpgsm_dirmngr_isvalid): Remove statement without
++	effect.
++
++	g10: Fix testing for debug flag.
++	* g10/parse-packet.c (set_packet_list_mode): Fix testing for debug
++	flag.
++
++	tools: Improve error handling.
++	* tools/gpg-wks-server.c (copy_key_as_binary): Initialize 'argv'.
++
++	gpgscm: Update callsite of 'gnupg_spawn_process'.
++	* tests/gpgscm/ffi.c (do_spawn_process): Adapt to the changes to
++	'gnupg_spawn_process'.
++
++	Fixes-commit: 44a32455
++	Fixes-commit: 96c7901e
++
++2016-10-05  Werner Koch  <wk at gnupg.org>
++
++	wks: Send key encrypted as required by draft -02.
++	* tools/gpg-wks-client.c (get_key): Encrypt.
++	(encrypt_response): Take care of --fake-submission-addr.
++
++	wks: Add option --fake-submission-addr to gpg-wks-client.
++	* tools/gpg-wks-client.c (oFakeSubmissionAddr): New.
++	(opts): Add option --fake-submission-addr.
++	(fake_submission_addr): New variable.
++	(parse_arguments): Set it.
++	(command_send): Use --fake-submission-addr.
++
++	agent: Another minor fix to map_supervised_sockets.
++	* agent/gpg-agent.c (map_supervised_sockets): Remove debug message.
++	Provide correct fd in the second error case.
++
++	agent: Fix npth + supervised mode problem.
++	* agent/gpg-agent.c (main): Initialize modules in supervised mode.
++
++2016-10-05  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	agent: Fix error handling in map_supervised_sockets.
++	* agent/gpg-agent.c (map_supervised_sockets): the file descriptor to
++	  close on error is fd, not i.
++
++2016-10-04  Werner Koch  <wk at gnupg.org>
++
++	agent: Streamline the supervised mode code.
++	* agent/gpg-agent.c (get_socket_path): Rename to ...
++	(get_socket_name): this.  This is to comply with the GNU coding guide.
++	Use xtrymalloc instead of malloc.  Do not build for W32.
++	(map_supervised_sockets): Use strtokenize and set the the socket names
++	here.
++	(main): Adjust for above change.  Do not close the socket.
++
++	agent: Adjust cleanup for supervised mode.  Fix for W32.
++	* agent/gpg-agent.c (opts) [W32]: Remove option --supervised.
++	(is_supervised): Move from main() to global.
++	(inhibit_socket_removal): New.
++	(cleanup): Take care of supervise mode and INHIBIT_SOCKET_REMOVAL.
++	(check_own_socket_thread): Set INHIBIT_SOCKET_REMOVAL instead of
++	seting the socket names to empty.
++
++	agent: Adjust supervised mode for the new default socket names.
++	* agent/gpg-agent.c (main): In supervised mode do not provide default
++	socket names.  Unset DISPLAY and INSIDE_EMACS.  Use log_error and
++	agent_exit.
++
++2016-10-04  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	agent: Implement --supervised command (for systemd, etc).
++	* agent/gpg-agent.c (get_socket_path): New function for POSIX systems
++	to return the path for a provided unix-domain socket.
++	(map_supervised_sockets): New function to inspect $LISTEN_FDS and
++	$LISTEN_FDNAMES and map them to the specific functionality offered by
++	the agent.
++	(main): Add --supervised command.  When used, listen on already-open
++	file descriptors instead of opening our own.
++	* doc/gpg-agent.texi: Document --supervised option.
++
++2016-10-04  Justus Winter  <justus at g10code.com>
++
++	build,w32: Unconditionally build tests.
++	* configure.ac (run_tests, RUN_TESTS, RUN_GPG_TESTS): Remove
++	variables.  They are misleadingly named, as they inhibit building the
++	tests.  There is no reason not to build the tests even when
++	cross-compiling, as they are only run if one does 'make check'.
++	* Makefile: Adapt accordingly.
++	* tests/Makefile.am: Adapt accordingly.  Avoid building 'asschk' on
++	Windows as it uses non-portable functions.
++
++	tests,w32: Do not expose 'glob' to gpgscm.
++	* tests/gpgscm/ffi.c (do_glob): Remove function.
++	(ffi_init): Likewise.
++
++	tests,w32: Avoid using 'glob'.
++	* tests/openpgp/setup.scm: Avoid 'glob' which is not available on
++	mingw.
++
++	tools: Ignore existing directories in gpgtar.
++	* tools/gpgtar-extract.c (extract_directory): Ignore existing
++	directories now that we have '--directory'.
++
++2016-10-04  NIIBE Yutaka  <gniibe at fsij.org>
++
++	agent, dirmngr, scd: npth_init must be after fork.
++	* agent/gpg-agent.c (thread_init_once, initialize_modules): New.
++	(main): Make sure no daemonizing-fork call after npth_init, and no npth
++	calls before npth_init, with care of npth calls by assuan hooks.
++	* dirmngr/dirmngr.c (thread_init): New.
++	(main): Make sure npth_init must not be called before daemonizing fork.
++	* scd/scdaemon.c (main): Likewise.
++
++2016-09-30  Werner Koch  <wk at gnupg.org>
++
++	agent: Remove the warning for the GKR hijacking.
++	* g10/call-agent.c (check_hijacking): Remove.
++	(start_agent): Remove call.
++
++	agent: Create the extra sockets in the standard socket dir.
++	* agent/gpg-agent.c (main): Take the socketdir in account for the
++	default sockets.
++	* tools/gpgconf.c (list_dirs): Add "agent-extra-socket" and
++	"agent-browser-socket".
++
++	agent: Kludge to allow disabling of the extra sockets.
++	* agent/gpg-agent.c (main): Check for special socket names.
++
++	wks: Avoid long trustdb checks.
++	* tools/wks-receive.c (verify_signature): Use --always-trust.
++
++2016-09-30  Justus Winter  <justus at g10code.com>
++
++	build: Fix build against libiconv.
++	* agent/Makefile.am: Add INCICONV and LIBICONV.
++	* common/Makefile.am: Likewise.
++	* tools/Makefile.am: Likewise.
++
++	agent: Enable restricted, browser, and ssh socket by default.
++	* agent/gpg-agent.c (main): Provide defaults for 'extra-socket' and
++	'browser-socket', enable ssh socket by default, but do not emit the
++	'SSH_AUTH_SOCK' variable unless it has been explicitly requested.
++	* configure.ac (GPG_AGENT_{EXTRA,BROWSER}_SOCK_NAME): New definitions.
++	* doc/gpg-agent.texi: Update documentation.
++
++	w32: Fix STARTTLS on LDAP connections.
++	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Fix build against
++	<winldap.h>.
++
++	GnuPG-bug-id: 1338
++	Debian-bug-id: 623526
++	Fixes-commit: 9e6f8a55
++
++2016-09-29  Werner Koch  <wk at gnupg.org>
++
++	wks: Partly implement draft-koch-openpgp-webkey-service-02.
++	* tools/gpg-wks.h (WKS_RECEIVE_DRAFT2): New.
++	* tools/wks-receive.c: Include rfc822parse.h.
++	(struct receive_ctx_s): Add fields PARSER, DRAFT_VERSION_2, and
++	MULTIPART_MIXED_SEEN.
++	(decrypt_data): Add --no-options.
++	(verify_signature): Ditto.
++	(new_part): Check for Wks-Draft-Version header.  Take care of text
++	parts.
++	(wks_receive): Set Parser and pass a flag value to RESULT_CB.
++	* tools/gpg-wks-client.c (read_confirmation_request): New.
++	(main) <aRead>: Call read_confirmation_request instead of
++	process_confirmation_request.
++	(command_receive_cb): Ditto.  Add arg FLAGS..
++	(decrypt_stream_status_cb, decrypt_stream): New.
++	(command_send): Set header Wks-Draft-Version.
++	* tools/gpg-wks-server.c (struct server_ctx_s): Add field
++	DRAFT_VERSION_2.
++	(sign_stream_status_cb, sign_stream): New.
++	(command_receive_cb): Set draft flag.
++	(send_confirmation_request): Rework to implement protocol draft
++	version 2.
++
++	* tools/gpg-wks.h (DBG_MIME_VALUE, DBG_PARSER_VALUE): New.
++	(DBG_MIME, DBG_PARSER, DBG_CRYPTO): New.  Use instead of a plain
++	opt.debug where useful.
++	* tools/gpg-wks-client.c (debug_flags): Add "mime" and "parser".
++	* tools/gpg-wks-server.c (debug_flags): Ditto.
++
++	tools: Convey signeddata also to the part_data callback in mime-parser.
++	* tools/mime-parser.c (mime_parser_parse): Factor some code out to ...
++	(process_part_data): new.
++	((mime_parser_parse): Also call process_part_data for signed data.
++
++	tools: Allow retrieval of signed data from mime-maker.
++	* tools/mime-maker.c (find_part): New.
++	(mime_maker_get_part): New.
++
++	tools: Change mime-maker to write out CR,LF.
++	* tools/mime-maker.c (struct part_s): Add field PARTID.
++	(struct mime_maker_context_s): Add field PARTID_COUNTER.
++	(dump_parts): Print part ids.
++	(mime_maker_add_header): Assign PARTID.
++	(mime_maker_add_container): Ditto.
++	(mime_maker_get_partid): New.
++	(write_ct_with_boundary): Remove.
++	(add_header): Strip trailing white spaces.
++	(write_header): Remove trailing spaces trimming.  Add arg BOUNDARY.
++	Handle emdedded LFs.
++	(write_gap, write_boundary, write_body): New.
++	(write_tree): Use new functions.
++
++	tools: Simplify the mime-maker container creation.
++	* tools/mime-maker.c (struct part_s): Remove field MEDIATYPE.
++	(release_parts): Ditto.
++	(dump_parts): Print a body line only if tehre is a body.
++	(mime_maker_add_header): Check for body or container.
++	(mime_maker_add_container): Remove arg MEDIATYPE.  Change all callers.
++	(mime_maker_end_container): New.
++
++	tools: Give mime parser callbacks access to the rfc822 parser.
++	* tools/mime-parser.c (mime_parser_context_s): Add field MSG.
++	(parse_message_cb): Set it.
++	(mime_parser_rfc822parser): New.
++	* tools/mime-parser.h: Declare rfc822parse_t for the new prototype.
++
++2016-09-29  Justus Winter  <justus at g10code.com>
++
++	dirmngr: Fix STARTTLS on LDAP connections.
++	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Fix unfortunate typo.
++
++2016-09-28  Werner Koch  <wk at gnupg.org>
++
++	gpg: Improve WKD by importing only the requested UID.
++	* g10/keyserver.c: Include mbox-util.h.
++	(keyserver_import_wkd): Do not use the global import options but
++	employ an import filter.
++
++	gpg: Reject import if an import filter removed all user ids.
++	* g10/import.c (any_uid_left): New.
++	(import_one): Check that a UID is left.
++
++	gpg: Make import filter data object more flexible.
++	* g10/main.h (import_filter_t): New.
++	* g10/import.c (struct import_filter_s): Declare struct.
++	(import_keep_uid, import_drop_sig): Replace by ...
++	(import_filter): new.  Adjust all users.
++	(cleanup_import_globals): Move code to ...
++	(release_import_filter): new.
++	(save_and_clear_import_filter): New.
++	(restore_import_filter): New.
++
++	gpg: Make sure that internal key import is done with a binary stream.
++	* g10/import.c (import_keys_internal): Open stream in binary mode.
++
++2016-09-27  Justus Winter  <justus at g10code.com>
++
++	build: Do not link gpg-connect-agent against npth.
++	* tools/Makefile.am: Do not link gpg-connect-agent against npth.
++
++	build: Fix check for resolver library on macOS.
++	* configure.ac: Check for the mangled name of 'dn_skipname' first.
++
++	common: Correctly handle modules relying on npth.
++	* common/Makefile.am (common_sources): Drop 'call-gpg.{c,h}'.
++	(with_npth_sources): New variable.
++	(libcommonpth_a_SOURCES): Use the new variable.
++
++2016-09-27  NIIBE Yutaka  <gniibe at fsij.org>
++
++	agent, sm: Set CTX after start_agent.
++	* g10/call-agent.c (agent_keytocard): Assign parm.ctx after start_agent.
++	* sm/call-agent.c (gpgsm_agent_pksign, gpgsm_scd_pksign)
++	(gpgsm_agent_readkey, gpgsm_agent_scd_serialno)
++	(gpgsm_agent_scd_keypairinfo, gpgsm_agent_marktrusted)
++	(gpgsm_agent_passwd, gpgsm_agent_get_confirmation)
++	(gpgsm_agent_ask_passphrase, gpgsm_agent_keywrap_key)
++	(gpgsm_agent_export_key): Likewise.
++
++	dirmngr: Removal of no-libgcrypt.o.
++	* dirmngr/Makefile.am (dirmngr_ldap_LDADD): Remove no-libgcrypt.o.
++
++	agent: Allow only specific digest size for ECDSA.
++	* agent/pksign.c (do_encode_dsa): Fix validation of digest size.
++
++2016-09-22  Neal H. Walfield  <neal at g10code.com>
++
++	g10: When adding a user id, make sure the keyblock has been prepared.
++	* g10/keyedit.c (keyedit_quick_adduid): Call merge_keys_and_selfsig on
++	KEYBLOCK before adding the user id.
++	* tests/openpgp/quick-key-manipulation.scm: Make sure that the key
++	capabilities don't change when adding a user id.
++	(key-data): New function.
++
++2016-09-20  Justus Winter  <justus at g10code.com>
++
++	tests: Add documentation, make interactive debugging possible.
++	* tests/openpgp/README: Add documentation about debugging and
++	interfacing with GnuPG.
++	* tests/openpgp/run-tests.scm (test::run-sync): Hand stdin to the
++	child so that we can use a repl in the tests.
++
++	tests: Port the quick key manipulation test to Scheme.
++	* tests/openpgp/Makefile.am (XTESTS): Add new test.
++	* tests/openpgp/quick-key-manipulation.scm: New file.
++
++	tests: Remove list of tests from the test runner.
++	* tests/openpgp/run-tests.scm: Drop hardcoded list.
++
++	tests: Reduce runtime of excessive test.
++	* tests/openpgp/conventional-mdc.scm: Use only two plaintexts when
++	iterating over all cipher algorithms.
++
++	dirmngr: Fix type.
++	* dirmngr/dns-stuff.c (get_dns_cert): Fix type in fallback code.
++
++2016-09-20  Andre Heinecke  <aheinecke at intevation.de>
++
++	dirmngr: Open file CRL's in binary mode.
++	* dirmngr/crlcache.c (crl_cache_load): Open file in binary mode.
++
++2016-09-20  NIIBE Yutaka  <gniibe at fsij.org>
++
++	doc: Fix a xref usage.
++
++2016-09-20  Ineiev  <ineiev at gnu.org>
++
++	doc: Do not end section names with "."
++
++2016-09-20  NIIBE Yutaka  <gniibe at fsij.org>
++
++	doc: minor fix for @xref.
++	* doc/yat2m.c (proc_texi_cmd): Captalize "see" for xref.
++
++2016-09-20  Justus Winter  <justus at g10code.com>
++
++	doc: Implement simple '@ref'erences.
++	* doc/yat2m.c (proc_texi_cmd): Handle '@ref'.
++
++2016-09-20  Ineiev  <ineiev at gnu.org>
++
++	doc: Fix full stops.
++	* doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
++	doc/instguide.texi, doc/scdaemon.texi, doc/specify-user-id.texi,
++	doc/tools.texi: Fix.
++
++	doc: Fix spacings.
++	* doc/debugging.texi, doc/dirmngr.texi, doc/gpg-agent.texi,
++	doc/gpg.texi, doc/tools.texi: Fix.
++
++	doc: Improve markup.
++	* doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
++	doc/howto-create-a-server-cert.texi, doc/scdaemon.texi,
++	doc/specify-user-id.texi, doc/tools.texi: Fix.
++
++	doc: Replace rfc0123 with RFC-0123.
++	* doc/gpg.texi, doc/gpgsm.texi, doc/specify-user-id.texi: Fix.
++
++	doc: Add missing description of datafile.
++	* doc/gpg.texi: Fix.
++
++	doc: Replace UTF8 with UTF-8.
++	* doc/gpg.texi: Fix.
++
++	doc: Fix mistakes.
++	* doc/dirmngr.texi, doc/gpg.texi, doc/gpgsm.texi,
++	doc/howto-create-a-server-cert.texi,
++	doc/scdaemon.texi, doc/tools.texi: Fix.
++
++	doc: Eliminate inconsistent UK English.
++	* doc/dirmngr.texi, doc/gpg-agent.texi, doc/scdaemon.texi,
++	doc/tools.texi: Fix.
++
++	doc: Use the right reference commands.
++	* doc/debugging.texi, doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
++	doc/tools.texi: Fix.
++
++	doc: Fix "Not(e) that you can(not) abbreviate".
++	* doc/dirmngr.texi, doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
++	doc/scdaemon.texi, doc/tools.texi: Fix.
++
++	doc: Fix typos.
++	* doc/debugging.texi, doc/dirmngr.texi, doc/glossary.texi
++	* doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi
++	* doc/instguide.texi, doc/opt-homedir.texi, doc/scdaemon.texi
++	* doc/specify-user-id.texi, doc/tools.texi: Fix.
++
++	doc: Fix Martin Hellman's name.
++	* doc/contrib.texi: Fix.
++
++2016-09-19  Justus Winter  <justus at g10code.com>
++
++	tests: Refine the repl function.
++	* tests/gpgscm/repl.scm (repl): Add an argument 'environment'.
++	(interactive-repl): Add an optional argument 'environment'.
++
++	tests: Implement interpreter shutdown using exceptions.
++	* tests/gpgscm/ffi.c (ffi_init): Rename 'exit' to '_exit'.
++	* tests/gpgscm/ffi.scm (*interpreter-exit*): New variable.
++	(throw): New function.
++	(exit): New function.
++
++	tests: Correctly handle exceptions in resource handling macros.
++	* tests/gpgscm/tests.scm (letfd): Correctly release resources when an
++	exception is thrown.
++	(with-working-directory): Likewise.
++	(with-temporary-working-directory): Likewise.
++	(lettmp): Likewise.
++
++	tests: Refine exception handling.
++	* tests/gpgscm/init.scm (catch): Bind all arguments to '*error*' in
++	the error handler, update and fix comment.
++	(*error-hook*): Revert to original definition.
++	* tests/gpgscm/tests.scm (tr:do): Adapt accordingly.
++	* tests/openpgp/issue2419.scm: Likewise.
++
++	tests: Use descriptive temporary file names.
++	* tests/gpgscm/ffi.c (do_get_isotime): New function.
++	(ffi_init): Add parameter 'scriptname', bind new function and
++	scriptname.
++	* tests/gpgscm/ffi.h (ffi_init): Update prototype.
++	* tests/gpgscm/main.c (main): Hand in the script name.
++	* tests/gpgscm/tests.scm (mkdtemp): Use current time and script name
++	for the names of temporary directories.
++
++2016-09-19  Werner Koch  <wk at gnupg.org>
++
++	gpg: Fix regression in fingerprint printing.
++	* g10/keylist.c (list_keyblock_print): Do not depend calling
++	print_fingerprint on opt.keyid_format.
++
++	dirmngr: Silence diagnostics about starting housekeeping.
++	* dirmngr/dirmngr.c (housekeeping_thread): Print info only in very
++	verbose mode.
++
++2016-09-19  Justus Winter  <justus at g10code.com>
++
++	g10: Fix memory leak.
++	* g10/tofu.c (build_conflict_set): Free 'kb_all'.
++
++2016-09-19  Werner Koch  <wk at gnupg.org>
++
++	doc: Update license information.
++	* tests/fake-pinentries/COPYING: Rename to  ...
++	* COPYING.CC0: this.  Add a note on the scope of this license.
++	* COPYING.LIB: Add a note on the scope of this license.
++	* AUTHORS (License): Mention CC) license.
++
++	gpgscm: Fix gcrypt version check.
++	* tests/gpgscm/main.c (main): Check against required and not installed
++	version.
++
++	gpg: Avoid malloc failure due to no key signatures.
++	* g10/keyedit.c (check_all_keysigs): Check early for no key
++	signatures.  Use xtrycalloc.
++
++2016-09-17  NIIBE Yutaka  <gniibe at fsij.org>
++
++	Fix comment and format.
++	* agent/protect-tool.c (main): Fix comment.
++	* doc/DETAILS (colon listings): Fix list.
++	* tests/openpgp/multisig.test: Fix comment.
++
++2016-09-17  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	Fix more spelling.
++	* NEWS, acinclude.m4, agent/command-ssh.c, agent/command.c,
++	  agent/gpg-agent.c, agent/keyformat.txt, agent/protect-tool.c,
++	  common/asshelp.c, common/b64enc.c, common/recsel.c, doc/DETAILS,
++	  doc/HACKING, doc/Notes, doc/TRANSLATE, doc/dirmngr.texi,
++	  doc/faq.org, doc/gpg-agent.texi, doc/gpg.texi, doc/gpgsm.texi,
++	  doc/instguide.texi, g10/armor.c, g10/gpg.c, g10/keyedit.c,
++	  g10/mainproc.c, g10/pkclist.c, g10/tofu.c, g13/sh-cmd.c,
++	  g13/sh-dmcrypt.c, kbx/keybox-init.c, m4/pkg.m4, sm/call-dirmngr.c,
++	  sm/gpgsm.c, tests/Makefile.am, tests/gpgscm/Manual.txt,
++	  tests/gpgscm/scheme.c, tests/openpgp/gpgv-forged-keyring.scm,
++	  tests/openpgp/multisig.test, tests/openpgp/verify.scm,
++	  tests/pkits/README, tools/applygnupgdefaults,
++	  tools/gpg-connect-agent.c, tools/mime-maker.c, tools/mime-parser.c:
++	  minor spelling cleanup.
++
++	move some file encodings to UTF-8.
++	* dirmgnr/cdblib.c: comment used unnecesary hyphenation
++	* dirmngr/crlcache.h: comment was iso-8859-1
++	* doc/contrib.text: list contributors using UTF-8 (now we can
++	  acknowledge many more people using their preferred orthography)
++
++	At least one other files remains in a non-UTF-8 encoding, which i'm
++	not sure what to do with:
++
++	 - build-aux/speedo/w32/inst.nsi is ISO-8859-1, but maybe Windows needs
++	   it that way?
++
++2016-09-16  Neal H. Walfield  <neal at g10code.com>
++
++	g10: On failure, propagate the return code.
++	* g10/tofu.c (tofu_register_encryption): If get_trust fails, set RC.
++
++	g10: Don't ignore failure.  On failure, rollback.
++	* g10/tofu.c (tofu_set_policy): If record_binding fails, fail.  If the
++	function fails, rollback the transaction.
++
++	g10: Load the key block if the supplied user id list is NULL.
++	* g10/tofu.c (tofu_register_encryption): Load the key block if
++	USER_ID_LIST is NULL.
++
++	g10: Use the accessor functions for accessing and comparing key ids.
++	* g10/tofu.c (get_trust): Use the pk_main_keyid accessor function.
++	(tofu_register_signature): Likewise.
++	(tofu_register_encryption): Likewise.
++	(tofu_set_policy): Likewise and also use pk_keyid and keyid_cmp.
++
++2016-09-16  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	po: convert localizations to UTF-8.
++	* po/{it,et,pl,ro,gl,es,el,sk,pt,eo,hu}.po: convert to UTF-8
++
++	This was an automated conversion process, using:
++
++	   for x in po/{it,et,pl,ro,gl,es,el,sk,pt,eo,hu}.po; do
++	       cs=$(grep charset= $x | cut -f2 -d= | cut -f1 -d\\)
++	       iconv -f $cs -t UTF-8 < $x >$x.tmp
++	       sed "s/$cs/UTF-8/" < $x.tmp > $x
++	       rm -f $x.tmp
++	   done
++
++2016-09-16  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Add support of ECC pubkey attribute.
++	* scd/app-openpgp.c (ECC_FLAG_PUBKEY): New.
++	(send_key_attr, get_public_key, ecc_writekey, do_auth, do_decipher)
++	(parse_algorithm_attribute): Check ECC_FLAG_DJB_TWEAK.
++	(build_ecc_privkey_template): Add ECC_Q and ECC_Q_LEN.
++	Support offering public key when ECC_FLAG_PUBKEY sets.
++	(ecc_writekey): Supply ECC_Q and ECC_Q_LEN.
++	(parse_algorithm_attribute): Parse pubkey-required byte.
++
++2016-09-15  Justus Winter  <justus at g10code.com>
++
++	g10: Add missing header.
++	* g10/trustdb.c: Include 'mbox-util.h'.
++
++2016-09-15  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Only consider bindings matching the signer's user id.
++	* g10/trustdb.c (tdb_get_validity_core): If the signer's user id
++	subpacket is present, only consider matching user ids.
++
++	g10: Don't include the signature when printing a binding's validity.
++	* g10/mainproc.c (check_sig_and_print): When printing information
++	about a binding don't include the current signature.
++
++2016-09-15  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	tests/fake-pinentries: fake pinentries for downstream developers.
++	* tests/fake-pinentries/README.txt and
++	  tests/fake-pinentries/fake-pinentry.{sh,py,pl,php}}: New public
++	  domain (CC0) files to encourage better test suite practices from
++	  downstream developers.
++	* tests/fake-pinentries/COPYING (new): a copy of
++	  https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt
++
++	spelling: conenction should be connection.
++	* dirmngr/server.c, sm/server.c: s/conenction/connection/
++
++	spelling: correct achived to achieved.
++
++2016-09-15  NIIBE Yutaka  <gniibe at fsij.org>
++
++	tests/gpgscm: Fix use of pointer.
++	* tests/gpgscm/scheme-private.h (struct scheme): Use (void *) for
++	alloc_seg.
++	* tests/gpgscm/scheme.c (alloc_cellseg): Use (void *) for cp.  Use
++	(void *) for coercion of address calculation.
++
++2016-09-14  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Fix whitespace.
++	* g10/tofu.c (show_statistics): Fix whitespace.
++
++	g10: Correctly compute the euclidean distance.
++	* g10/tofu.c (write_stats_status): Correctly compute the euclidean
++	distance.
++	(show_statistics): Likewise.
++
++	g10: Change the default TOFU policy for UTKs to good.
++	* g10/tofu.c (get_trust): Change the default TOFU policy for UTKs to
++	good.
++
++	g10: Add missing static qualifier.
++	* g10/tofu.c (cross_sigs): Add missing static qualifier.
++
++	g10: Default to the "good" TOFU policy for keys signed by a UTK.
++	* g10/tofu.c (signed_by_utk): New function.
++	(get_trust): If a key is signed by an ultimately trusted key, then
++	set any bindings to good.
++
++2016-09-14  Werner Koch  <wk at gnupg.org>
++
++	gpg: Emit a new error status line in --quick-adduid.
++	* g10/keyedit.c (menu_adduid): Emit an ERROR status for an existsing
++	user id.
++
++	gpg: Allow use of "default" algo for--quick-addkey.
++	* g10/keygen.c (quick_generate_keypair): Write a status error.
++	(parse_algo_usage_expire): Set a default curve.
++
++2016-09-13  Werner Koch  <wk at gnupg.org>
++
++	gpg: Improve usability of --quick-gen-key.
++	* g10/keygen.c (FUTURE_STD_): New constants.
++	(parse_expire_string): Handle special keywords.
++	(parse_algo_usage_expire): Allow "future-default".  Simplify call to
++	parse_expire_string.
++	(quick_generate_keypair): Always allow an expiration date.  Replace
++	former "test-default" by "future-default".
++
++2016-09-12  Werner Koch  <wk at gnupg.org>
++
++	gpg: Avoid mixing up status and colon line output.
++	* g10/keylist.c (list_keyblock_colon): Avoid calling functions which
++	trigger a status line output before having printed a LF.
++
++2016-09-12  Justus Winter  <justus at g10code.com>
++
++	tests: Simplify tofu test.
++	* tests/openpgp/tofu.scm: Simplify now that we only have one db
++	format.
++
++2016-09-10  Ben Kibbey  <bjk at luxsci.net>
++
++	Portability build fix.
++	* kbx/Makefile.am: Add NETLIBS.
++	* dirmngr/Makefile.am: Ditto for dirmngr_ldap.
++
++	Fix symbol conflict.
++	* g10/gpgcompose.c: Rename struct siginfo to signinfo.
++
++2016-09-09  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
++
++	gpg: print fingerprint regardless of keyid-format.
++	* g10/keylist.c (print_fingerprint): use compact format independent of
++	  keyid-format; (print_key_line): always print the fingerprint
++
++2016-09-08  Werner Koch  <wk at gnupg.org>
++
++	gpg: Remove option --yes from gpgv.
++	* g10/gpgv.c (opts): Remove --yes.
++	(main): Always set opt.ANSWER_YES.
++
++	gpg: Add options --output and --yes to gpgv.
++	* g10/gpgv.c (oOutput, oAnswerYes): New.
++	(opts): Add --output and --yes.
++	(main): Implement options.
++
++	gpg: Make --output work with --verify.
++	* g10/mainproc.c (proc_plaintext): Handle opt.output.
++
++2016-09-07  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Terminate on deletion of the socket file (Linux only).
++	* dirmngr/dirmngr.c [HAVE_INOTIFY_INIT]: Include sys/inotify.h.
++	(oDisableCheckOwnSocket): New.
++	(opts): Add --disable-check-own-socket.
++	(disable_check_own_socket): New var.
++	(parse_rereadable_options): Set that var.
++	(my_inotify_is_name) [HAVE_INOTIFY_INIT]: New.
++	(handle_connections) [HAVE_INOTIFY_INIT]: New.
++
++2016-09-07  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Use the time a signature was seen, not the embedded time, for stats
++	* g10/tofu.c (ask_about_binding): Use the time that a signature was
++	seen, not allegedly generated, when generating statistics.
++
++	tests: Don't use --tofu-db-format.
++	* tests/openpgp/tofu.scm: Remove use of --tofu-db-format, which is
++	deprecated.
++
++	g10: Check for a new binding a bit later.
++	* g10/tofu.c (build_conflict_set): Check for the current key after
++	looking for conflicts and removing any '!'.
++
++	g10: Change TOFU code to respect --faked-system-time.
++	* g10/tofu.c (record_binding): New parameter now.  Update callers.
++	Don't use SQLite's strftime('%s','now') to get the current time, use
++	NOW.
++	(ask_about_binding): Likewise.
++	(get_trust): New parameter now.  Update callers.
++	(show_statistics): Likewise.
++	(tofu_register_signature): Don't use SQLite's strftime('%s','now') to
++	get the current time, use gnupg_get_time().
++	(tofu_register_encryption): Likewise.
++
++	g10: Use the correct conversion function.
++	* g10/tofu.c (show_statistics): Use string_to_ulong, not
++	string_to_long.
++
++2016-09-07  Werner Koch  <wk at gnupg.org>
++
++	gpg: Fix format string issues in tofu.
++	* g10/tofu.c (write_stats_status): Use ulong for MESSSAGES.  Fix
++	format strings.  Simplify by using the new write_status_printf.
++
++2016-09-06  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Make sure some functions are passed a primary key.
++	* g10/tofu.c (get_trust): Make sure the caller provides a primary key.
++	(tofu_register_signature): Likewise.
++
++	g10: Tweak TOFU's verbosity.
++	* g10/tofu.c (time_ago_str): Only show the most significant unit.
++	* g10/tofu.c (show_statistics): Tweak the output.
++
++	g10: Only show the TOFU warning once per key.
++	* g10/tofu.c (show_statistics): Return whether to call show_warning.
++	Move the warning from here...
++	(show_warning): ... to this new function.
++	(tofu_get_validity): If show_statistics returns a non-zero value, call
++	show_warning.
++
++	g10: Record and show statistics for encrypted messages when using TOFU.
++	* g10/tofu.c: Include "sqrtu32.h".
++	(struct tofu_dbs_s.s): Rename get_trust_gather_other_keys to
++	get_trust_gather_signature_stats.  Add new field
++	get_trust_gather_encryption_stats.
++	(initdb): Create the encryptions table.
++	(ask_about_binding): Show the encryption statistics too.
++	(tofu_register): Rename from this...
++	(tofu_register_signature): ... to this and update callers.
++	(tofu_register_encryption): New function.
++	(write_stats_status): Add parameters encryption_count,
++	encryption_first_done and encryption_most_recent.  Update callers.
++	Compute the trust using the euclidean distance of the signature and
++	signature count.  Compare with twice the threshold.  Include
++	encryption count information in the TFS and TOFU_STATS lines.
++	(show_statistics): Also get information about the encrypted messages.
++	* g10/trustdb.c (tdb_get_validity_core): Use it.
++
++	g10: Simplify the binding statistics shown for a TOFU conflict.
++	* g10/tofu.c (ask_about_binding): Simplify binding statistics.
++
++2016-09-06  Justus Winter  <justus at g10code.com>
++
++	gpgscm: Fix detection of unbalanced parenthesis.
++	* tests/gpgscm/main.c (load): Print error message.
++	* tests/gpgscm/scheme.c (opexe_0): Correctly report nesting level when
++	loading files.
++
++	tests: Fix test.
++	* tests/openpgp/multisig.scm: Add missing parenthesis.
++
++2016-09-06  Werner Koch  <wk at gnupg.org>
++
++	agent: Terminate on deletion of the socket file (Linux only).
++	* configure.ac (AC_CHECK_FUNCS): Chec for inotify_init.
++	* agent/gpg-agent.c [HAVE_INOTIFY_INIT]: Include sys/inotify.h.
++	(my_inotify_is_name) [HAVE_INOTIFY_INIT]: New.
++	(handle_connections) [HAVE_INOTIFY_INIT]: New.
++
++2016-09-05  Justus Winter  <justus at g10code.com>
++
++	tests: Speed up the test suite.
++	* tests/openpgp/run-tests.scm (test::run-sync): Pass additional
++	arguments to the test.
++	(test::run-sync-quiet): Likewise.
++	(test::run-async): Likewise.
++	(run-tests-{parallel,sequential}-isolated): Create a tarball of the
++	gnupghome, then extract it for each test.
++	* tests/openpgp/setup.scm: Refactor into functions, add an interface
++	to tar-up the created environment, and untar it multiple times.
++
++	common: Restore a simpler variant of 'gnupg_wait_process'.
++	* common/exechelp-posix.c (gnupg_wait_process): Use the code prior to
++	5ba4f604.
++
++	common: Fix error handling.
++	* common/exechelp-posix.c (store_result): Use xtrymalloc.
++	(gnupg_wait_processes): Likewise, and check result.
++
++2016-09-05  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Don't add user attributes to the TOFU DB.
++	* g10/trustdb.c (tdb_get_validity_core): Skip user attributes.
++
++2016-09-05  Werner Koch  <wk at gnupg.org>
++
++	agent: Silence --debug IPC output for connections from self.
++	* agent/command.c (server_local_s): Add fields 'greeting_seen' and
++	'connect_from_self'.
++	(io_monitor): Do not log connections from self.
++	(start_command_handler): Set flag 'connect_from_self'.
++	* agent/gpg-agent.c (check_own_socket_thread): Disable logging.
++	(do_start_connection_thread): Do not log conection start and
++	termination if IPC debugging is enabled.
++
++	agent: Small improvement of the server's local state.
++	* agent/command.c (sserver_local_s): Change flags to use only one bit.
++	(option_handler): Make an atoi return 1 or 0.
++
++2016-09-05  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Refactor cross sig check code.
++	* g10/tofu.c (BINDING_NEW): New enum value.
++	(BINDING_CONFLICT): Likewise.
++	(BINDING_EXPIRED): Likewise.
++	(BINDING_REVOKED): Likewise.
++	(ask_about_binding): Move cross sig check from here...
++	(get_trust): ... and the conflict set building from here...
++	(build_conflict_set): ... to this new function.
++	(format_conflict_msg_part1): Replace parameter conflict with
++	conflict_set.  Drop parameter fingerprint.  Update callers.
++	(ask_about_binding): Drop unused parameter conflict and redundant
++	parameter bindings_with_this_email_count.  Rename parameter
++	bindings_with_this_email to conflict_set.  Update callers.
++
++2016-09-05  Justus Winter  <justus at g10code.com>
++
++	tests: Update README.
++	* tests/openpgp/README: Update.
++
++	tests: Pass flags to test driver.
++	* tests/openpgp/Makefile.am (xcheck): Pass flags to 'run-tests.scm'.
++
++	common: Improve waiting for processes on POSIX.
++	* common/exechelp-posix.c (struct terminated_child): New definition.
++	(terminated_children): New variable.
++	(store_result): New function.
++	(get_result): Likewise.
++	(gnupg_wait_process): Store results that were not requested and
++	consider previously stored results.
++
++	waitpid(2) may return information about terminated children that we
++	did not yet request, and there is no portable way to wait for a
++	specific set of children.  As a workaround, we store the results of
++	children for later use.
++
++2016-09-05  Werner Koch  <wk at gnupg.org>
++
++	dirmngr: Exclude D lines from the IPC debug output.
++	* dirmngr/dirmngr.h: Include asshelp.h.
++	* dirmngr/server.c (server_local_s): Add inhibit_dara_logging fields.
++	(data_line_write): Implement logging inhibit.
++	(data_line_cookie_close): Print non-logged D lines.
++	(cmd_wkd_get, cmd_ks_get, cmd_ks_fetch): Do not log D lines.
++	(dirmngr_assuan_log_monitor): New.
++	* dirmngr/dirmngr.c (main): Register monitor function.
++
++	common: Add an assuan logging monitor.
++	* common/asshelp.c (my_log_monitor): New var.
++	(my_libassuan_log_handler): Run that monitor.
++	(setup_libassuan_logging): Add arg to set a log monitor and change all
++	callers.
++
++	gpg: New export filter drop-subkey.
++	* g10/import.c (impex_filter_getval): Add properties for key packets.
++	* g10/export.c (export_drop_subkey): New var.
++	(cleanup_export_globals): Release that var.
++	(parse_and_set_export_filter): Add filter "drop-subkey".
++	(apply_drop_subkey_filter): New.
++	(do_export_stream): Run that filter.
++
++	common: Add string operator gt,ge,le,lt to recsel.
++	* common/recsel.c (recsel_parse_expr): Add them.
++	(recsel_dump): Print them.
++	(recsel_select): Evaluate them.
++
++	gpg: Use a common filter_getval for import and export.
++	* g10/import.c (filter_getval): Rename to ...
++	(impex_filter_getval): this.  Make global.
++	(apply_keep_uid_filter, apply_drop_sig_filter): Adjust.
++	* g10/export.c (filter_getval): Remove.
++	(apply_drop_sig_filter): Use impex_filter_getval.
++
++2016-09-03  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Fix an action after card removal.
++	* scd/command.c (update_card_removed): Call apdu_close_reader here.
++
++2016-09-02  Werner Koch  <wk at gnupg.org>
++
++	wks: Add framework for policy flags.
++	* tools/call-dirmngr.c (wkd_get_policy_flags): New.
++	* tools/gpg-wks.h (struct policy_flags_s, policy_flags_t): New.
++	* tools/wks-util.c (wks_parse_policy): New.
++	* tools/gpg-wks-client.c (command_send): Get the policy flags to show
++	a new info line.
++	* tools/gpg-wks-server.c (get_policy_flags): New.
++	(process_new_key): get policy flag and add a stub for "auth-submit".
++	(command_list_domains): Check policy flags.
++
++	dirmngr: Add --policy-flags option to WKD_GET.
++	* dirmngr/server.c (cmd_wkd_get): Add new option.
++
++	common: Check read errors in name-value.c.
++	* common/name-value.c: Check for read errors.
++
++2016-09-02  NIIBE Yutaka  <gniibe at fsij.org>
++
++	scd: Release the card reader after card removal.
++	* scd/command.c (update_reader_status_file): Call apdu_close_reader.
++
++	scd: Clean up unused shutdown method.
++	* scd/apdu.c (shutdown_ccid_reader, apdu_shutdown_reader): Remove.
++	(reset_ccid_reader): Don't set shutdown_reader.
++	* scd/ccid-driver.c (ccid_shutdown_reader): Remove.
++
++	agent: invoke scdaemon with --homedir.
++	* agent/call-scd.c (start_scd): Supply --homedir option when it's not
++	default homedir.
++
++	po: Update Japanese translation.
++
++2016-09-01  Neal H. Walfield  <neal at g10code.com>
++
++	g10: End transaction earlier.
++	* g10/tofu.c (ask_about_binding): End the transaction earlier.
++
++	g10: Don't consider cross-signed keys to be in conflict.
++	* g10/tofu.c (cross_sigs): New function.
++	(ask_about_binding): If apparently conflicting keys are cross signed,
++	then don't mark them as conflicting.
++
++2016-09-01  Werner Koch  <wk at gnupg.org>
++
++	gpg: Avoid homedir creation by --list-config.
++	* g10/gpg.c (main): Do not register a key for the list config
++	commands.
++
++	gpg: Simplify code to print VALIDSIG.
++	* g10/mainproc.c (check_sig_and_print): Use hexfingerprint and
++	write_status_printf.
++
++	gpg: Add new function write_status_printf.
++	* g10/cpr.c (write_status_printf): New.
++
++	gpg: Fix printing of pubkey algo in --verbose signature verify.
++	* g10/sig-check.c (check_signature2): Replace arg PK by R_PK and
++	change the semantics.  Also clear the other R_ args on function entry,
++	use gpg_error() and change retturn type to gpg_error_t.
++	* g10/mainproc.c (do_check_sig): Add arg R_PK.
++	(list_node): Pass NULL for new arg.
++	(check_sig_and_print): Rework to make use of the returned PK.
++
++2016-09-01  Neal H. Walfield  <neal at g10code.com>
++
++	g10: When asking about a TOFU binding conflict, default to unknown.
++	* g10/tofu.c (ask_about_binding): Default to unknown.
++
++	g10: Add support for TRUST_NEVER.
++	* g10/pkclist.c (do_we_trust): Handle TRUST_NEVER, which can be
++	returned by the TOFU trust model.
++	(do_we_trust_pre): Print a different message if TRUSTLEVEL is
++	TRUST_NEVER.
++	(check_signatures_trust): Improve comment.
++
++	g10: Improve text.
++	* g10/tofu.c (show_statistics): Improve the text (key and user id, not
++	just key).
++
++	g10: Remove unused parameter.
++	* g10/tofu.c (show_statistics): Remove unused parameter sig_exclude.
++	Update callers.
++
++2016-09-01  Werner Koch  <wk at gnupg.org>
++
++	gpg: Copy the correct digest for use by TOFU.
++	* g10/mainproc.c (do_check_sig): Use the current digest algo.
++
++2016-09-01  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Be careful to not be in a transaction during long operations.
++	* g10/tofu.c (begin_transaction): New parameter only_batch.  If set,
++	only start a batch transaction if there is none and one has been
++	requested.  Update callers.
++	(tofu_suspend_batch_transaction): New function.
++	(tofu_resume_batch_transaction): Likewise.
++	(ask_about_binding): Take a ctrl_t, not a tofu_dbs_t.  Update
++	callers.  Gather statistics within a transaction.  Suspend any batch
++	transaction when getting user input.
++	(get_trust): Take a ctrl_t, not a tofu_dbs_t.  Update callers.
++	Enclose in a transaction.
++	(tofu_get_validity): Use a batch transaction, not a normal
++	transaction.
++
++2016-09-01  Werner Koch  <wk at gnupg.org>
++
++	tests: Run test requiring the network only in maintainer-mode.
++	* dirmngr/Makefile.am (noinst_PROGRAMS, TESTS): Add module_net_tests.
++	(module_tests): Move t-dns-test to ...
++	(module_net_tests): here.
++
++2016-08-31  Werner Koch  <wk at gnupg.org>
++
++	wks: Send a final message to the user.
++	* tools/gpg-wks-server.c (send_congratulation_message): New.
++	(check_and_publish): Call it.
++
++	wks: Relax permission check for the top directory.
++	* tools/gpg-wks-server.c: Allow S_IXOTH for the top directory.
++
++2016-08-31  Neal H. Walfield  <neal at g10code.com>
++
++	g10: On a TOFU conflict, show whether the uids are expired or revoked.
++	* g10/tofu.c (struct signature_stats): Add fields is_expired and
++	is_revoked.
++	(signature_stats_prepend): Clear *stats when allocating it.
++	(ask_about_binding): Also show whether the user ids are expired or
++	revoked.
++
++	doc: Add a help text for tofu.conflict.
++	* doc/help.txt (.gpg.tofu.conflict): New help text.
++
++	g10: Always trust ultimately trusted keys.
++	* g10/tofu.c (get_trust): Always return TRUST_ULTIMATE for ultimately
++	trusted keys.
++
++	g10: Fix error detection.
++	* g10/tofu.c: first_seen == 0 is not an error.
++
++	g10: Update a key's TOFU policy in a transaction.
++	* g10/tofu.c (tofu_set_policy): Do the update in a transaction.
++	* g10/gpg.c (main): Do a TOFU policy update in a batch transaction.
++
++	g10: Fix the show old policy functionality when changing a TOFU policy.
++	* g10/tofu.c (record_binding): Fix the show old policy functionality.
++
++	g10: Drop unused argument.
++	* g10/tofu.c (begin_transaction): Remove unused option only_batch.
++
++	gpg: Move state local to tofu.c to a private structure.
++	* g10/gpg.h (struct server_control_s.tofu): Move fields in_transaction
++	and batch_update_started from here...
++	* g10/tofu.c (struct tofu_dbs_s): ... to here.
++
++	gpg: Avoid name spaces clash with future sqlite versions (2).
++	* g10/gpgsql.h (gpgsql_arg_type): Rename SQLITE_ARG_END to
++	GPGSQL_ARG_END, SQLITE_ARG_INT to GPGSQL_ARG_INT, SQLITE_ARG_LONG_LONG
++	to GPGSQL_ARG_LONG_LONG, SQLITE_ARG_STRING to GPGSQL_ARG_STRING, and
++	SQLITE_ARG_BLOB to GPGSQL_ARG_BLOB.
++
++2016-08-31  Werner Koch  <wk at gnupg.org>
++
++	gpg: Fix regression in gpgv's printing of the keyid.
++	* g10/keyid.c (keystr): Take care of KF_NONE != KF_DEFAULT.
++
++2016-08-30  Neal H. Walfield  <neal at g10code.com>
++
++	g10: Improve TOFU batch update code.
++	* g10/gpg.h (tofu): Rename field batch_update_ref to
++	batch_updated_wanted.
++	* g10/tofu.c (struct tofu_dbs_s): Rename field batch_update to
++	in_batch_transaction.
++	(begin_transaction): Only end an extant batch transaction if we are
++	not in a normal transaction.  When ending a batch transaction, really
++	end it.  Update ctrl->tofu.batch_update_started when starting a batch
++	transaction.
++	(end_transaction): Only release a batch transaction if ONLY_BATCH is
++	true.  When releasing a batch transaction, assert that there is no
++	open normal transaction.  Only allow DBS to be NULL if ONLY_BATCH is
++	true.
++	(tofu_begin_batch_update): Don't update
++	ctrl->tofu.batch_update_started.
++	(opendbs): Call end_transaction unconditionally.
++
++	g10: If a key has no valid user ids, change TOFU to return TRUST_NEVER.
++	* g10/tofu.c (tofu_get_validity): If a key has no valid (non-expired)
++	user ids, change TOFU to return TRUST_NEVER.
++
++	g10: Change tofu_register & tofu_get_validity to process multiple uids.
++	* g10/tofu.c (tofu_register): Take a list of user ids, not a single
++	user id.  Only register the bindings, don't compute the trust.  Thus,
++	change return type to an int and remove the may_ask parameter.  Update
++	callers.
++	(tofu_get_validity): Take a list of user ids, not a single user id.
++	Update callers.  Observe signatures made by expired user ids, but
++	don't include them in the trust calculation.
++
++	g10: Support nested transactions on the TOFU DB.
++	* g10/gpg.h (struct server_control_s): New field in_transaction.
++	* g10/tofu.c (struct tofu_dbs_s): Remove fields savepoint_inner and
++	savepoint_inner_commit.
++	(begin_transaction): Increment CTRL->TOFU.IN_TRANSACTION.  Name the
++	savepoint according to the nesting level.
++	(end_transaction): Name the savepoint according to the nesting level.
++	Decrement CTRL->TOFU.IN_TRANSACTION.
++	(rollback_transaction): Likewise.  Only ever rollback a non-batch
++	transaction.
++	(opendbs): Assert that there are no outstanding transactions.
++
++	g10: Print the info text in more situations.
++	* g10/tofu.c (ask_about_binding): Print the info text when the policy
++	is ask and there are multiple bindings with the email address.
++
++	g10: Print the formatted text.
++	* g10/tofu.c (ask_about_binding): Print the formatted text, not the
++	unformatted text.
++
++	g10: When showing a user id's trust, pass the current signature.
++	* g10/mainproc.c (check_sig_and_print): Consistently pass SIG to
++	get_validity.
++
++2016-08-29  Werner Koch  <wk at gnupg.org>
++
++	w32: Fix build regression due to 2aa0701.
++	* common/logging.c (fun_writer): Always declare 'name_for_err'.
++
++	gpgconf: Print the plain socket directory with --list-dirs.
++	* tools/gpgconf.c (list_dirs): Add plain socketdir out.
++
++	common: Add a default socket name feature.
++	* common/logging.c (log_set_socket_dir_cb): New.
++	(socket_dir_cb): New.
++	(set_file_fd): Allow "socket://".
++	(fun_writer): Implement default socket name.
++	* common/init.c (_init_common_subsystems): Register default socket.
++
++	gpg: Make decryption of -R work w/o --try-secret-key or --default-key.
++	* g10/getkey.c (enum_secret_keys): At state 3 enumerate the keys in all
++	cases not just when --try-all-secrets is used.
++
++2016-08-25  Werner Koch  <wk at gnupg.org>
++
++	gpg: Fix false negatives in Ed25519 signature verification.
++	* g10/pkglue.c (pk_verify): Fix Ed25519 signatrue values.
++	* tests/openpgp/verify.scm (msg_ed25519_rshort): New
++	(msg_ed25519_sshort): New.
++	("Checking that a valid Ed25519 signature is verified as such"): New.
++
++	common: Rename an odd named function.
++	* common/openpgp-oid.c (oid_crv25519): Rename to oid_cv25519.
++	(openpgp_oid_is_crv25519): Rename to openpgp_oid_is_cv25519.  Change
++	callers.
++
++	gpg: New option --with-tofu-info.
++	* g10/gpg.c (oWithTofuInfo): New.
++	(opts): Add --with-tofu-info.
++	(main): Set opt.with_tofu_info.
++	* g10/options.h (struct opt): Add field WITH_TOFU_INFO.
++	* g10/tofu.c (show_statistics): Add optional arg OUTFP and enter
++	special mode if not NULL.  Change all callers.
++	(tofu_write_tfs_record): New.
++	* g10/keylist.c (list_keyblock_colon): Do not print the tofu policy as
++	part of the "uid" record.  Print a new "tfs" record if the new option
++	is set.
++	* tests/openpgp/tofu.scm (getpolicy): Change from UID to TFS record.
++
++2016-08-24  Werner Koch  <wk at gnupg.org>
++
++	gpg: Change TOFU_STATS to return timestamps.
++	* g10/tofu.c (write_stats_status): Add arg FP to print a colon
++	formated line.  Adjust for changed TOFU_STATS interface.
++	(show_statistics): Let the query return timestamps and use
++	gnupg_get-time to compute the "time ago" values.
++
++	common: Guarantee that gnupg_get_time does not return an error.
++	* common/gettime.c (gnupg_get_time): Abor if time() failed.
++	(gnupg_get_isotime): Remove now useless check.
++	(make_timestamp): Remove check becuase we already checked this modulo
++	the faked time thing.
++
++	wks: Add command --supported to gpg-wks-client.
++	* tools/gpg-wks-client.c (aSupported): New.
++	(opts): Add --supported.
++	(parse_arguments): Ditto.
++	(main): Call command_supported.
++	(command_supported): New.
++
++2016-08-22  Werner Koch  <wk at gnupg.org>
++
++	wks: Install gpg-wks-client under libexec.
++	* tools/Makefile.am (bin_PROGRAMS): Move gpg-wks-client to ...
++	(libexec_PROGRAMS): ...here.
++
++	common: Remove unused vars in simple-pwquery.
++	* common/simple-pwquery.c (agent_send_option): Remove unused vars.
++	(simple_query): Ditto.
++	(agent_open): Ditto.  Return RC on error.
++	(simple_pwquery): Remove unused vars.  Remove shadowing of 'p'.
++
 +2016-08-18  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.15.
 +
 +	po: Update German translation.
 +
 +2016-08-18  Åka Sikrom  <a4 at hush.com>
 +
 +	po: Update Norwegian translation.
 +
 +2016-08-18  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update Russian translation.
 +
 +2016-08-18  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add import filter "drop-sig".
 +	* g10/import.c (import_drop_sig): New variable.
 +	(cleanup_import_globals): Release that.
 +	(parse_and_set_import_filter): Add filter "drop-sig".
 +	(filter_getval): Implement properties for drop-sig.
 +	(apply_drop_sig_filter): New.
 +	(import_one): Apply that filter.
 +
 +	dirmngr: Remove all system daemon features.
 +	* dirmngr/dirmngr.h (opts): Remove fields 'system_service' and
 +	'system_daemon'.
 +	* common/homedir.c (dirmngr_sys_socket_name): Remove.
 +	(dirmngr_user_socket_name): Rename to ...
 +	(dirmngr_socket_name): this.  Change call callers.
 +	* common/asshelp.c (start_new_dirmngr): Remove the system socket
 +	feature.
 +	* tools/gpgconf.c (list_dirs): Do not print "dirmngr-sys-socket".
 +	* sm/server.c (gpgsm_server): Adjust for removed system socket feature.
 +	* dirmngr/server.c (cmd_getinfo): Ditto.
 +	(cmd_killdirmngr): Remove check for system daemon.
 +	(cmd_reloaddirmngr): Ditto.
 +	* dirmngr/dirmngr.c (USE_W32_SERVICE): Remove macro.
 +	(aService): Remove.
 +	(opts): Remove --service.
 +	(w32_service_control): Remove.
 +	(real_main, call_real_main) [W32]: Remove wrapper.
 +	(main): Remove Windows system service feature.  Remove system dameon
 +	feature.  Use only the "~/.gnupg/dirmngr_ldapservers.conf" file.
 +	* dirmngr/certcache.c (load_certs_from_dir): Remove warning in the
 +	system dameon case.
 +	* dirmngr/crlcache.c (DBDIR_D): Always use "~/.gnupg/crls.d".
 +	* dirmngr/ocsp.c (validate_responder_cert): Do not call
 +	validate_cert_chain which was used only in system daemon mode.
 +	* dirmngr/validate.c (validate_cert_chain): Always use the code.
 +
 +	gpg: New option --sender.
 +	* g10/options.h (struct opt): Add field 'sender_list'.
 +	* g10/gpg.c: Include mbox-util.h.
 +	(oSender): New.
 +	(opts): Add option "--sender".
 +	(main): Parse option.
 +
 +2016-08-16  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Allow import of overly large keys.
 +	* agent/command.c (MAXLEN_KEYDATA): Double the size.
 +
 +2016-08-14  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Allow the use of a g13tab label for --mount.
 +	* g13/mount.c (g13_mount_container): Do not run the first access check
 +	if syshelp is required.
 +
 +	g13: Implement --umount for dm-crypt.
 +	* g13/g13.c (main): Implement command --umount.
 +	* g13/mount.c (g13_umount_container): use the syshelper if needed.
 +	* g13/backend.c (be_umount_container): New.
 +	* g13/be-dmcrypt.c (be_dmcrypt_umount_container): New.
 +	* g13/call-syshelp.c (call_syshelp_run_umount): New.
 +	* g13/sh-cmd.c (cmd_umount): New.
 +	(register_commands): Register UMOUNT.
 +	* g13/sh-dmcrypt.c (sh_dmcrypt_umount_container): New.
 +
 +2016-08-13  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Fix double free bug.
 +	* g13/sh-cmd.c (cmd_mount, cmd_resume): Do not xfree TIUPLES.
 +
 +	g13: Consider g13tab for a mount command.
 +	* g13/sh-cmd.c (cmd_getkeyblob): New.
 +	(register_commands): Register it.
 +	* g13/call-syshelp.c (getkeyblob_data_cb): New.
 +	(call_syshelp_get_keyblob): New.
 +	* g13/mount.c: Include callsyshelp.h.
 +	(g13_mount_container): Ask syshelp whether the filename is managed by
 +	g13tab.  Call syshelp to get the encrypted keyblob in this case.
 +
 +	g13: Move some function around.
 +	* g13/keyblob.c (g13_keyblob_decrypt): Move to ...
 +	* g13/server.c: to here.
 +	* g13/suspend.c, g13/mount.c: Include server.h.
 +	* g13/Makefile.am (g13_syshelp_SOURCES): Add keyblob.c
 +
 +	g13: New command --find-device.
 +	* common/status.h (STATUS_BLOCKDEV: New.
 +	* g13/call-syshelp.c: Include "call-syshelp.h".
 +	(finddevice_status_cb, call_syshelp_find_device): New.
 +	* g13/g13.c (aFindDevice): New.
 +	(opts): Add "--find-device".
 +	(main): Implement --find-device.
 +	* g13/sh-cmd.c (cmd_finddevice): New.
 +	(register_commands): Register new command.
 +
 +2016-08-12  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	Avoid leading ": " in the log output when there are no prefixes.
 +	* common/logging.c (do_logv): When no prefixes have been requested,
 +	omit the ": " separator, since there is nothing on the left-hand
 +	side of it.
 +
 +	Call log_set_prefix() with human-readable labels.
 +	* agent/preset-passphrase.c, agent/protect-tool.c, dirmngr/dirmngr.c
 +	* dirmngr/t-http.c, g10/gpg.c, g10/gpgv.c, g13/g13-syshelp.c
 +	* g13/g13.c, kbx/kbxutil.c, scd/scdaemon.c, sm/gpgsm.c
 +	* tests/gpgscm/main.c, tools/gpg-check-pattern.c
 +	* tools/gpg-connect-agent.c, tools/gpgconf.c, tools/gpgtar.c
 +	* tools/symcryptrun.c: Invoke log_set_prefix() with
 +	human-readable labels.
 +
 +2016-08-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New option --input-size-hint.
 +	* g10/options.h: Include stdint.h.
 +	(struct opt): Add field 'input_size_hint'.
 +	* g10/gpg.c (oInputSizeHint): New.
 +	(opts): Add --input-size-hint.
 +	(main): Set opt.input_size_hint.
 +	* g10/progress.c (write_status_progress): Use the hint.
 +
 +	common: New function string_to_u64.
 +	* common/stringhelp.c (string_to_u64): New.
 +	* dirmngr/http.c (longcounter_t): Remove.
 +	(struct cookie_s): Change content_length to uint64_t.
 +	(parse_response): Use string_to_u64.
 +
 +2016-08-11  Justus Winter  <justus at g10code.com>
 +
 +	common: Remove compatibility code.
 +	* common/Makefile.am: Drop deleted files.
 +	* common/w32-afunix.c: Delete file.
 +	* common/w32-afunix.h: Likewise.
 +
 +	GnuPG-bug-id: 2408
 +
 +	common: Rework the simple password query module.
 +	* common/simple-pwquery.c (writen, readline): Drop.
 +	(agent_send_option, agent_send_all_options, agent_open): Just use
 +	libassuan.
 +	(simple_pw_set_socket): Simplify.
 +	(default_inq_cb): New function.
 +	(simple_pwquery, simple_query): Just use libassuan.
 +	* agent/Makefile.am (gpg_preset_passphrase_LDADD): Add libassuan.
 +	* tools/Makefile.am (symcryptrun_LDADD): Likewise.
 +
 +	common: Remove simple password query error codes.
 +	* common/simple-pwquery.h: Remove mapping function.  Move all
 +	definitions of status codes...
 +	* common/simple-pwquery.c: ... here, and define them to meaningful gpg
 +	error values.
 +	* agent/preset-passphrase.c (preset_passphrase): Use error code as-is.
 +	(forget_passphrase): Likewise.
 +	* tools/symcryptrun.c (confucius_get_pass): Likewise.
 +
 +2016-08-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print the signer's UID during verification.
 +	* g10/parse-packet.c (parse_signature): Sanitize the value stored in
 +	SIGNERS_UID.
 +	* g10/mainproc.c (issuer_fpr_string): New.
 +	(check_sig_and_print): Print the signers' UID.  Print the issuer
 +	fingerprint in --rfc4880bis mode.
 +
 +	common: New function try_make_printable_string.
 +	* common/stringhelp.c (sanitize_buffer): Remove.  Move code to ...
 +	* common/miscellaneous.c (try_make_printable_string): new.
 +	(make_printable_string): Call try_make_printable_string.
 +
 +2016-08-10  Justus Winter  <justus at g10code.com>
 +
 +	tests: Fix distcheck.
 +	* tests/openpgp/issue2417.scm: Copy configuration.
 +
 +2016-08-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove tofu database format "split".
 +	* g10/options.h (struct opt): Remove field tofu_db_format.
 +	* g10/gpg.h (server_control_s): Add fields tofu.batch_update_ref and
 +	tofu.batch_update_started.
 +	* g10/gpg.c (parse_tofu_db_format): Remove.
 +	(main): Make option --tofu-db-format obsolete.
 +	* g10/tofu.c: Major rework.  Remove the pretty complicated and slower
 +	split format and with that all the caching.  Use the dbs struct
 +	directly.  Move global vars for batch update into CTRL.  Change
 +	calling conventions of some function to take CTRL or DBS pointers
 +	instead of  the former low-level database pointer.
 +
 +2016-08-10  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix opening of trust database.
 +	* g10/tdbio.c (tdbio_set_dbname): This function explicitly checks for
 +	the file size, but handled the case of a zero-sized file incorrectly
 +	by returning success.  Fix this by initializing the database in that
 +	case.
 +	* tests/openpgp/Makefile.am (XTESTS): Add new test.
 +	* tests/openpgp/issue2417.scm: New file.
 +
 +	GnuPG-bug-id: 2417
 +
 +	tests: Fix distcheck.
 +	* tests/openpgp/Makefile.am (EXTRA_DIST): Explicitly add setup and
 +	teardown scripts now that they no longer are included in the list of
 +	tests.
 +
 +	tests: Improve temporary directory handling.
 +	* tests/gpgscm/ffi.c (ffi_init): Rename 'mkdtemp'.
 +	* tests/gpgscm/tests.scm (mkdtemp): New function that uses a sensible
 +	location and template if no arguments are given.
 +	(with-temporary-working-directory): Simplify accordingly.
 +	(make-temporary-file): Likewise.
 +	* tests/openpgp/run-tests.scm (run-tests-parallel-isolated): Likewise.
 +	(run-tests-sequential-isolated): Likewise.
 +
 +	gpgscm: Make the name of foreign functions more unique.
 +	* tests/gpgscm/ffi-private.h (ffi_define_function_name): Add another
 +	underscore.
 +
 +	tests: Run each test in a clean environment.
 +	* tests/openpgp/Makefile.am (TESTS_ENVIRONMENT): Drop obsolete
 +	variables, add 'srcdir', use absolute paths.
 +	(TESTS): Rename to 'XTESTS' to avoid emitting the automake test
 +	runner.  Drop 'setup.scm' and 'finish.scm'.
 +	(xcheck): New target that runs 'run-tests.scm', our Scheme test suite
 +	runner.  It will run each test in a clean environment, isolated from
 +	the other tests.
 +	(EXTRA_DIST): Adapt accordingly.
 +	* tests/openpgp/README: Likewise.
 +
 +	tests: Make ssh test more robust.
 +	* tests/openpgp/ssh.scm: Drop the 'MD5:' which was not printed by
 +	previous ssh versions.
 +
 +2016-08-10  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: SSH support fix.
 +	* agent/command-ssh.c (ssh_handler_request_identities): Keep error
 +	message same.
 +
 +2016-08-09  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Fix regression in recent ssh changes.
 +	* agent/command-ssh.c (sexp_key_construct): Lowercase the algo name.
 +
 +	gpg: Extend the PROGRESS line to give the used unit.
 +	* g10/progress.c (write_status_progress): Print the units parameter.
 +
 +2016-08-09  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Cleanup initialization of libgcrypt.
 +	* common/init.c (init_common_subsystems): Initialize libgcrypt.
 +	* dirmngr/Makefile.am (dirmngr_ldap): Link with libgcrypt.
 +
 +2016-08-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: SSH support improvement.
 +	* agent/command-ssh.c (ssh_handler_request_identities): Skip a key with
 +	error, not giving up to handle the request itself.
 +	* agent/cvt-openpgp.c (extract_private_key): Support "ecdsa" key.
 +
 +2016-08-08  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Cleanup of dek_to_passphrase function (part 2).
 +	* g10/passphrase.c (passphrase_get): Remove arg KEYID.  Change arg
 +	MODE to NOCACHE.
 +	(passphrase_to_dek): Remove args KEYID and PUBKEY_ALGO.  Split arg
 +	MODE into CREATE and NOCACHE.  Change all callers and adjust stubs.
 +	(passphrase_clear_cache): Remove args KEYID and ALGO.  They are not
 +	used.  Change caller.
 +
 +	gpg: Cleanup of dek_to_passphrase function (part 1).
 +	* g10/passphrase.c (passphrase_to_dek_ext): Remove args CUSTDESC and
 +	CUSTPROMPT.  Merge into the passphrase_to_dek wrapper.
 +	(passphrase_get): Remove args CUSTOM_DESCRIPTION and CUSTOM_PROMPT.
 +
 +2016-08-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: More clean up of SSH support.
 +	* common/util.h (get_pk_algo_from_key): New.
 +	* common/sexputil.c (get_pk_algo_from_key): The implementation.
 +	* agent/gpg-agent.c: Remove include of openpgpdefs.h.
 +	* agent/command-ssh.c (struct ssh_key_type_spec): Use integer ALGO.
 +	(ssh_key_types): Update with GCRY_PK_*.
 +	(make_cstring, sexp_extract_identifier): Remove.
 +	(sexp_key_construct): Use gcry_pk_algo_name to get ALGO string.
 +	(ssh_key_to_blob): Use cadr to get value list.
 +	(ssh_key_type_lookup): Lookup with integer ALGO.
 +	(ssh_receive_key): Follow the change of ssh_key_type_lookup.
 +	(ssh_send_key_public): Likewise.  Use get_pk_algo_from_key to get ALGO.
 +
 +	tests: Add openpgp/gpgv-forged-keyring.scm.
 +	* tests/openpgp/gpgv-forged-keyring.scm: New.
 +	* tests/openpgp/forged-keyring.gpg: New.
 +	* tests/openpgp/Makefile.am (TESTS): Add gpgv-forged-keyring.scm.
 +	* tests/openpgp/defs.scm (tools): Add GPGV.
 +	(GPGV): New.
 +
 +2016-08-06  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Fix long standing regression tracking the connection count.
 +	* agent/gpg-agent.c (get_agent_active_connection_count): New.
 +	(do_start_connection_thread, start_connection_thread_ssh): Bump
 +	ACTIVE_CONNECTIONS up and down.
 +	* agent/command.c (cmd_getinfo): Add subcommand "connections".
 +
 +2016-08-06  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Clean up SSH support.
 +	* agent/command-ssh.c (file_to_buffer): Remove.
 +	(ssh_handler_request_identities): Use agent_public_key_from_file.
 +
 +2016-08-05  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: Avoid publishing the GnuPG version by default.
 +	* g10/gpg.c (main): initialize opt.emit_version to 0
 +	* doc/gpg.texi: document different default for --emit-version
 +
 +2016-08-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make sure that keygrips are printed for each subkey.
 +	* g10/keylist.c (list_keyblock_colon): Print an emprty grip in case of
 +	an error.
 +
 +	gpg: Always print the fingerprint in colons mode.
 +	* g10/keylist.c (list_keyblock_colon): Remove arg FPR.  Always print
 +	fingerprint records.  For secret keys always print keygrip records.
 +
 +	tests: Use gpgconf to set the ssh socket envvar.
 +	* tests/openpgp/ssh.scm ("SSH_AUTH_SOCK"): Use gpgconf.
 +
 +	gpgconf: Add limited support for -0.
 +	* tools/gpgconf.h (opt): Add field 'null'.
 +	* tools/gpgconf.c: Add option --null/-0.
 +	(list_dirs): Use it here.
 +
 +2016-08-04  Justus Winter  <justus at g10code.com>
 +
 +	tests: Update list of tests in Scheme test runner.
 +	* tests/openpgp/run-tests.scm: Add missing tests.
 +
 +	tests: Fix path to fake-pinentry.
 +	* tests/openpgp/defs.scm: Correctly compute the path to fake-pinentry.
 +
 +2016-08-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +	po: update Japanese translation.
 +
 +	g10: Fix checking key for signature validation.
 +	* g10/sig-check.c (check_signature2): Not only subkey, but also primary
 +	key should have flags.valid=1.
 +
 +2016-08-03  Justus Winter  <justus at g10code.com>
 +
 +	kbx: Add missing header file.
 +	* kbx/keybox-update.c: Add missing header file.
 +
 +2016-08-03  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	More cleanup of "allow to".
 +	* README, agent/command.c, agent/keyformat.txt, common/i18n.c,
 +	  common/iobuf.c, common/keyserver.h, dirmngr/cdblib.c,
 +	  dirmngr/ldap-wrapper.c, doc/DETAILS, doc/TRANSLATE,
 +	  doc/announce-2.1.txt, doc/gpg.texi, doc/gpgsm.texi,
 +	  doc/scdaemon.texi, doc/tools.texi, doc/whats-new-in-2.1.txt,
 +	  g10/export.c, g10/getkey.c, g10/import.c, g10/keyedit.c, m4/ksba.m4,
 +	  m4/libgcrypt.m4, m4/ntbtls.m4, po/ca.po, po/cs.po, po/da.po,
 +	  po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fi.po,
 +	  po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po,
 +	  po/nb.po, po/pl.po, po/pt.po, po/ro.po, po/ru.po, po/sk.po,
 +	  po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po,
 +	  scd/app-p15.c, scd/ccid-driver.c, scd/command.c, sm/gpgsm.c,
 +	  sm/sign.c, tools/gpgconf-comp.c, tools/gpgtar.h: replace "Allow to"
 +	  with clearer text.
 +
 +	In standard English, the normal construction is "${XXX} allows ${YYY}
 +	to" -- that is, the subject (${XXX}) of the sentence is allowing the
 +	object (${YYY}) to do something.  When the object is missing, the
 +	phrasing sounds awkward, even if the object is implied by context.
 +	There's almost always a better construction that isn't as awkward.
 +
 +	These changes should make the language a bit clearer.
 +
 +	dirmngr: Emit correct spelling of "superseded".
 +	* dirmngr/crlcache.c (list_one_crl_entry): Spell superseded correctly.
 +	* dirmngr/ocsp.c (ocsp_invalid): Likewise.
 +
 +	This might break some tools which parse the existing output and expect
 +	misspellings, but i'm not sure there are many such tools, and we
 +	should use standardized orthography going forward.
 +
 +	Fix spelling and grammar.
 +	* agent/learncard.c: s/coccured/occurred/
 +	* doc/dirmngr.texi: s/ommitted/omitted/, s/orginally/originally/,
 +	  s/reponses/responses/i
 +	* doc/gpg-agent.texi, doc/dirmngr.texi, doc/gpg.texi: Fix "allows
 +	  to" to more conventional english usage.
 +	* doc/tools.texi, g10/gpgcommpose.c, tests/openpgp/armor.scm,
 +	  tests/openpgp/armor.test: s/occured/occurred/
 +	* tools/gpgsplit.c: s/calcualting/calculating/
 +	* sm/server.c: s/formated/formatted/
 +
 +2016-08-03  Werner Koch  <wk at gnupg.org>
 +
 +	gpg,gpgsm: Block signals during keyring/keybox update.
 +	* kbx/keybox-util.c (keybox_file_rename): Add arg BLOCK_SIGNALS.
 +	* kbx/keybox-update.c (rename_tmp_file): Block all signals when doing
 +	a double rename.
 +	* g10/keyring.c (rename_tmp_file): Block all signals during the double
 +	rename.
 +
 +	common: New file utilproto.c.
 +	* common/util.h: Factor prototypes from signal.c out to ...
 +	* common/utilproto.h: new.
 +	* common/Makefile.am (common_sources): Add new file.
 +
 +2016-08-01  Justus Winter  <justus at g10code.com>
 +
 +	gpgsm: Fix machine-readable key listing.
 +	* sm/keylist.c (list_cert_colon): Drop superfluous colon.
 +
 +	GnuPG-bug-id: 2432
 +
 +	tests: Distribute standalone test runner.
 +	* tests/openpgp/Makefile.am (EXTRA_DIST): Add missing file
 +	'run-tests.scm'.
 +
 +	GnuPG-bug-id: 2431
 +
 +2016-07-28  Justus Winter  <justus at g10code.com>
 +
 +	tests: Fix distcheck.
 +	* tests/openpgp/Makefile.am (sample_msgs): New variable.
 +	(EXTRA_DIST): Also ship the sample msgs.
 +
 +2016-07-27  Fredrik Fornwall  <fredrik at fornwall.net>
 +
 +	build: Fix check for Android.
 +	* configure.ac: Match other Android targets as well.
 +
 +2016-07-26  Justus Winter  <justus at g10code.com>
 +
 +	common: Fix iobuf_peek corner case.
 +	Previously, iobuf_peek on a file smaller than 'buflen' would hang.
 +
 +	* common/iobuf.c (underflow): Generalize by adding a target parameter.
 +	(iobuf_peek): Use this to prevent looping here.
 +	* tests/openpgp/Makefile.am (TESTS): Add new test.
 +	* tests/openpgp/setup.scm (dearmor): Move function...
 +	* tests/openpgp/defs.scm (dearmor): ... here.
 +	* tests/openpgp/issue2419.scm: New file.
 +	* tests/openpgp/samplemsgs/issue2419.asc: Likewise.
 +
 +	GnuPG-bug-id: 2419
 +
 +	gpgscm: Do not shadow common function name in catch macro.
 +	* tests/gpgscm/init.scm (catch): Do not shadow 'exit'.
 +
 +	tests: Fix distcheck.
 +	* tests/openpgp/Makefile.am (samplekeys): Add missing key.
 +
 +	Fixes-commit: 4ba11251
 +
 +	gpgscm: Make the verbose setting more useful.
 +	* tests/gpgscm/ffi.c (do_get_verbose): New function.
 +	(do_set_verbose): Likewise.
 +	(ffi_init): Turn *verbose* into a function, add *set-verbose!*.
 +	* tests/gpgscm/tests.scm (call): Adapt accordingly.
 +	(call-with-io): Dump output if *verbose* is high.
 +	(pipe-do): Adapt accordingly.
 +	* tests/openpgp/defs.scm: Set verbosity according to environment.
 +	* tests/openpgp/run-tests.scm (test): Adapt accordingly.
 +
 +	common: Avoid excessive stack use.
 +	* common/exectool.c (copy_buffer_shred): Make passing NULL a nop.
 +	(gnupg_exec_tool_stream): Allocate copy buffers from the heap.
 +
 +	common: Rework resource cleanup when handling errors.
 +	* common/exectool.c (gnupg_exec_tool_stream): Rework error handling.
 +
 +	common: Add unit test for exectool.
 +	* common/Makefile.am: Build new test.
 +	* common/t-exectool.c: New file.
 +
 +2016-07-25  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix key import statistics.
 +	'transfer_secret_keys' collects statistics on a subkey-basis, while
 +	the other code does not.  This leads to inflated numbers when
 +	importing secret keys.  E.g. 'count' is incremented by the main
 +	parsing loop in 'import', and again in 'transfer_secret_keys', leading
 +	to a total of 3 if one key with two secret subkeys is imported.
 +
 +	* g10/import.c (import_secret_one): Adjust to the fact that
 +	'transfer_secret_keys' collects subkey statistics.
 +	* tests/openpgp/Makefile.am (TESTS): Add new test.
 +	* tests/openpgp/issue2346.scm: New file.
 +	* tests/openpgp/samplekeys/issue2346.gpg: Likewise.
 +
 +	GnuPG-bug-id: 2346
 +
 +2016-07-22  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Make function more general.
 +	* tests/gpgscm/tests.scm (in-srcdir): Accept more path fragments.
 +
 +	g10: Properly ignore legacy keys in the keyring cache.
 +	* g10/keyring.c (keyring_rebuild_cache): Properly ignore legacy keys
 +	in the keyring cache.
 +	* tests/migrations/Makefile.am (TESTS): Add new test.
 +	* tests/migrations/common.scm (GPG-no-batch): New variable.
 +	(run-test): New function.
 +	* tests/migrations/issue2276.scm: New file.
 +	* tests/migrations/issue2276.tar.asc: Likewise.
 +
 +	GnuPG-bug-id: 2276
 +
 +2016-07-21  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix error handling.
 +	* g10/tofu.c (show_statistics): Fix error handling, 0 is a valid
 +	duration.
 +
 +	g10: Drop superfluous begin transaction.
 +	* g10/tofu.c (record_binding): We only need a transaction for the
 +	split format.
 +
 +	gpgscm: Make assert macro more accurate.
 +	* tests/gpgscm/lib.scm (assert): Print the representation of the
 +	failed expression.
 +
 +	gpgscm: Make error message more useful.
 +	* tests/gpgscm/scheme.c (opexe_0): Include names of missing function
 +	parameters in the error message.
 +
 +	g10: Fix crash.
 +	* g10/tofu.c (tofu_closedbs): Fix freeing database handles up to the
 +	cache limit.  Previously, this would crash if db_cache_count == count.
 +
 +	Reported-by: Ben Kibbey <bjk at luxsci.net>
 +
 +2016-07-20  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix card removal/reset on multiple contexts.
 +	* scd/app.c (application_notify_card_reset): Add message for debug.
 +	*scd/command.c (update_card_removed): Call release_application and set
 +	SLOT -1 here.
 +	(struct server_local_s): Remove app_ctx_marked_for_release.
 +	(do_reset): Don't mark release but call release_application here.
 +	(open_card): Remove app_ctx_marked_for_release handling.
 +	(update_reader_status_file): Don't set SLOT here, so that it can be
 +	released the APP by application_notify_card_reset in
 +	update_card_removed.
 +
 +2016-07-19  Justus Winter  <justus at g10code.com>
 +
 +	agent: Add known keys to sshcontrol.
 +	* agent/command-ssh.c (ssh_identity_register): Add a key to sshcontrol
 +	even if it is already in the private key store.
 +	* tests/openpgp/ssh.scm: Test this.
 +
 +	GnuPG-bug-id: 2316
 +
 +	tests: Add test for ssh support.
 +	* tests/gpgscm/tests.scm (path-expand): New function.
 +	* tests/openpgp/Makefile.am (TESTS): Add new test.
 +	(sample_keys): Add new keys.
 +	(CLEANFILES): Clean ssh socket and control file.
 +	* tests/openpgp/fake-pinentry.c (main): Add a default passphrase.
 +	* tests/openpgp/gpg-agent.conf.tmpl: Enable ssh support.
 +	* tests/openpgp/samplekeys/ssh-dsa.key: New file.
 +	* tests/openpgp/samplekeys/ssh-ecdsa.key: Likewise.
 +	* tests/openpgp/samplekeys/ssh-ed25519.key: Likewise.
 +	* tests/openpgp/samplekeys/ssh-rsa.key: Likewise.
 +	* tests/openpgp/ssh.scm: Likewise.
 +
 +2016-07-19  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix race conditions for release_application.
 +	* scd/command.c (do_reset, cmd_restart): Reset app_ctx before calling
 +	release_application.
 +
 +2016-07-18  Justus Winter  <justus at g10code.com>
 +
 +	agent: Fix passphrase cache lookups.
 +	CACHE_MODE_ANY is supposed to match any cache mode except
 +	CACHE_MODE_IGNORE, but the code used '==' to compare cache modes.
 +
 +	* agent/cache.c (cache_mode_equal): New function.
 +	(agent_set_cache): Use the new function to compare cache modes.
 +	(agent_get_cache): Likewise.
 +	* tests/openpgp/Makefile.am (TESTS): Add new test.
 +	* tests/openpgp/issue2015.scm: New file.
 +
 +	GnuPG-bug-id: 2015
 +
 +2016-07-15  Justus Winter  <justus at g10code.com>
 +
 +	build: Always build gpgtar.
 +	We use gpgtar to unpack test data, hence we always build it.  If the
 +	user opts out, we simply don't install it.
 +
 +	* configure.ac: Add comment.
 +	* tests/migrations/Makefile.am (required_pgms): Make sure gpgtar is
 +	built.
 +	* tools/Makefile.am: Always build gpgtar, but do not install it if the
 +	user used '--disable-gpgtar'.
 +
 +2016-07-15  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Publish as binary file.
 +	* tools/gpg-wks-server.c (copy_key_as_binary): New.
 +	(check_and_publish): Use new function instead of rename.
 +
 +2016-07-15  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Fix linking.
 +	* tests/gpgscm/Makefile.am: Add -lintl.
 +
 +	g10: Fix building without trust models.
 +	* g10/pkclist.c (write_trust_status): Fall back to the previous
 +	behavior.
 +
 +	Fixes-commit: ae188932
 +
 +	tests: Check for gpgtar.
 +	* tests/migrations/extended-pkf.scm: Skip test if gpgtar is not built.
 +	* tests/migrations/from-classic.scm: Likewise.
 +	* tests/openpgp/gpgtar.scm: Fix check for gpgtar.
 +
 +2016-07-14  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.14.
 +
 +	po: Update the German translation.
 +
 +2016-07-14  Damien Goutte-Gattat  <dgouttegattat at incenp.org>
 +
 +	dirmngr: fix handling of HTTP redirections.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Reinitialize HTTP session
 +	when following a HTTP redirection.
 +
 +2016-07-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove options --print-dane-records and --print-pka-records.
 +	* g10/gpg.c (main): Remove options but print a dedicated warning.
 +	* g10/options.h (struct opt): Remove fields 'print_dane_records' and
 +	'print_pka_records'.
 +	* g10/keylist.c (list_keyblock): Do not call list_keyblock_pka.
 +	(list_keyblock_pka): Remove.
 +
 +2016-07-14  Åka Sikrom  <a4 at hush.com>
 +
 +	po: Complete update of the Norwegian translation.
 +
 +2016-07-14  Yuri Chornoivan  <yurchor at ukr.net>
 +
 +	Update Ukrainian translation.
 +
 +2016-07-14  Ineiev  <ineiev at gnu.org>
 +
 +	Update Russian translation.
 +
 +2016-07-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix regression since 2.1 in --search-key with a fingerprint.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_search): Prefix fingerprint with 0x.
 +
 +	gpgscm: Use kludge to avoid improper use of ffi_schemify_name.
 +	* tests/gpgscm/ffi.c (ffi_schemify_name): Use xstrdup instead of
 +	strdup for now.
 +
 +	build: Require latest released libraries.
 +	* agent/protect.c (OCB_MODE_SUPPORTED): Remove macro.
 +	(do_encryption): Always support OCB.
 +	(do_decryption): Ditto.
 +	(agent_unprotect): Ditto.
 +	* dirmngr/server.c (is_tor_running): Unconditionally build this.
 +
 +2016-07-13  Werner Koch  <wk at gnupg.org>
 +
 +	build: Update config.{guess,sub} to {2016-05-15,2016-06-20}.
 +	* build-aux/config.guess: Update.
 +	* build-aux/config.sub: Update.
 +
 +	gpg: Fix regression due to the new --mimemode options.
 +	* g10/gpg.c (opts): Re-add oTextmodeShort.
 +
 +2016-07-13  Daiki Ueno  <ueno at gnu.org>
 +
 +	gpg: Make --try-all-secrets work for hidden recipients.
 +	* g10/getkey.c (enum_secret_keys): Really enumerate all secret
 +	keys if --try-all-secrets is specified.
 +
 +2016-07-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Do not print a the short keyid if the high word is zero.
 +	* g10/keyid.c (format_keyid): Always returh long keyid ifor KF_LONG.
 +
 +	gpg: New option --mimemode.
 +	* g10/gpg.c (oMimemode): New.
 +	(opts): Add --mimemode.
 +	(main): Use --mimemode only in rfc4880bis compliance mode.
 +	* g10/options.h (struct opt): Add field "mimemode".
 +	* g10/build-packet.c (do_plaintext): Allow for mode 'm'.
 +	* g10/encrypt.c (encrypt_simple, encrypt_crypt): Use 'm' if requested.
 +	* g10/plaintext.c (handle_plaintext): Handle 'm' mode.
 +	* g10/sign.c (write_plaintext_packet): Handle 'm' mode.
 +	(sign_file, sign_symencrypt_file): Use 'm' if requested.
 +
 +	wks: Use correct key for the confirmation.
 +	* tools/gpg-wks-client.c (send_confirmation_response): Actually
 +	encrypt to the recipient.
 +
 +	wks: New server command --list-domains.
 +	* tools/gpg-wks-server.c (aListDomains): New.
 +	(opts): Add --list-domains.
 +	(parse_arguments): Implement.
 +	(main): Ditto.  Use only one final diagnostic message.
 +	(command_list_domains): New.
 +	(check_and_publish): Remove directory creation.
 +	(get_domain_list): New.
 +	(expire_pending_confirmations): Rewrite using a list of directories.
 +	(command_cron): Get domain list and pass to
 +	expire_pending_confirmations.
 +
 +2016-07-13  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix envvars for UPDATESTARTUPTTY.
 +	agent/command.c (cmd_updatestartuptty): Use session_env_list_stdenvnames
 +	to get the list.
 +
 +2016-07-12  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Fix memleak.
 +	* g13/g13tuple.c (create_tupledesc): Init refcount to 1.
 +
 +	wks: Add --cron command to gpg-wks-server.
 +	* tools/gpg-wks-server.c (PENDING_TTL): New.
 +	(expire_one_domain, expire_pending_confirmations): New.
 +	(command_cron): New.
 +	(main): Implement --cron.
 +
 +	wks: Try to send an encrypted confirmation back.
 +	* tools/gpg-wks-client.c (encrypt_response_status_cb): New.
 +	(encrypt_response): New.
 +	(send_confirmation_response): Encrypt the response.
 +
 +	* tools/gpg-wks-server.c (send_confirmation_request): Use freeing of
 +	BODY and BODYENC.
 +
 +	wks: Also create DANE record.
 +	* tools/gpg-wks-server.c (copy_key_as_dane): New.
 +	(check_and_publish): Also publish as DANE record.
 +
 +	gpg: Extend import-option import-export to print PKA or DANE.
 +	* g10/export.c (do_export_stream): Move PKA and DANE printing helper
 +	code to ...
 +	(print_pka_or_dane_records): this fucntion.
 +	(write_keyblock_to_output): Add arg OPTIOSN and call
 +	print_pka_or_dane_records if requested.
 +
 +	gpg: Move a function from import.c to export.c.
 +	* g10/import.c (write_keyblock_to_output): Move to ...
 +	* g10/export.c (write_keyblock_to_output): here.  Add arg WITH_ARMOR.
 +	Also make sure never to export ring trust packets.
 +
 +2016-07-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpgconf: Enhance --list-dirs.
 +	* tools/gpgconf.c (main) <aListDir>: Factor code out to ...
 +	(list_dirs): new.  Rewrite to use a table.  Allow selection of a
 +	items.  Add "agent-ssh-socket".
 +
 +2016-07-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	gpgv: Tweak default options for extra security.
 +	* g10/gpgv.c (main): Set opt.no_sig _cache, so that it doesn't depend on
 +	cached status.  Similarly, set opt.flags.require_cross_cert for backsig
 +	validation for subkey signature.
 +
 +2016-07-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add export options "export-pka" and "export-dane".
 +	* g10/options.h (EXPORT_PKA_FORMAT): New.
 +	* g10/keylist.c (list_keyblock_pka): Do not use DANE flag.
 +	* g10/export.c: Include zb32.h.
 +	(parse_export_options): Add options "export-pka" and "export-dane".
 +	(do_export): Do not armor if either of these option is set.
 +	(print_pka_or_dane_records): New.
 +	(do_export_stream): Implement new options.
 +
 +	gpg: Split a too large export function.
 +	* g10/export.c (do_export_stream): Factor some code out to ...
 +	(do_export_one_keyblock): new.
 +
 +2016-07-07  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Capture output of spawned processes.
 +	* tests/gpgscm/tests.scm (call-check): Capture stdout and stderr, and
 +	return stdout if the child exited successfully, or include stderr in
 +	the error.
 +	* tests/openpgp/version.scm: Demonstrate this by checking the stdout.
 +
 +2016-07-06  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Escape file names in generated macros.
 +	* doc/mkdefsinc.c (print_filename): New.
 +	(main): Use it here.
 +
 +	wks: Let the server take the encrytion key from the file.
 +	* tools/gpg-wks-server.c (encrypt_stream): Change arg 'fingerprint' to
 +	'keyfile'.
 +	(store_key_as_pending): Add arg 'r_fname' to make of the keyfile.
 +	(send_confirmation_request): Add arg 'keyfile'.
 +	(process_new_key): Pass on the name of the keyfile.
 +
 +	gpg: New options --recipient-file and --hidden-recipient-file.
 +	* g10/gpg.c (oRecipientFile, oHiddenRecipientFile): New.
 +	(opts): Add options --recipient-file and --hidden-recipient-file.
 +	(main): Implement them.  Also remove duplicate code from similar
 +	options.
 +	* g10/keydb.h (PK_LIST_FROM_FILE): New.
 +	(PK_LIST_SHIFT): Bump up.
 +	* g10/pkclist.c (expand_group): Take care of PK_LIST_FROM_FILE.
 +	(find_and_check_key): Add and implement arg FROM_FILE.
 +	(build_pk_list): Pass new value for new arg.
 +	* g10/getkey.c (get_pubkey_fromfile): New.
 +	* g10/gpgv.c (read_key_from_file): New stub.
 +	* g10/test-stubs.c (read_key_from_file): New stub.
 +	* g10/server.c (cmd_recipient): Add flag --file.
 +	* g10/import.c (read_key_from_file): New.
 +
 +	* tests/openpgp/defs.scm (key-file1): New.
 +	(key-file2): New.
 +	* tests/openpgp/setup.scm: Add their private keys and import the
 +	key-file1.
 +	* tests/openpgp/encrypt.scm: Add new test.
 +
 +	gpg: New option --no-keyring.
 +	* g10/gpg.c (oNoKeyring): New.
 +	(opts): Add "--no-keyring".
 +	(main): Do not register any keyring if the option is used.
 +
 +	gpg: Document use of node flags in import.c and remove unused args.
 +	* g10/import.c (NODE_GOOD_SELFSIG): New.  Use instead of 1.
 +	(NODE_BAD_SELFSIG): New.  Use instead of 2.
 +	(NODE_DELETION_MARK): New.  Use instead of 4.
 +	(NODE_FLAG_A): New.  Use to mark new nodes in merge_blocks.
 +	(chk_self_sigs): Remove unused args FNAME and PK.
 +	(import_one): Adjust call.  Simplify error return because
 +	chk_self_sigs does not return an error code.
 +	(append_uid, append_key, merge_sigs, merge_keysigs): Remove unsued
 +	args FNAME and KEYID.
 +	(merge_blocks, import_one, import_secret_one)
 +	(import_revoke_cert): Remove unused arg FNAME.
 +
 +	gpg: Get rid of an unused arg in a function in getkey.c.
 +	* g10/getkey.c (pk_from_block): Remove unused arg CTX.  Change all
 +	callers.
 +
 +	gpg: Change calling convention for a function in getkey.c.
 +	* g10/getkey.c (merge_selfsigs): Remove arg CTX.  Add args REQ_USAGE
 +	and WANT_EXACT.
 +	(finish_lookup): Adjust caller.  Set LOOKUP_NOT_SELECTED here...
 +	(lookup): and not here.
 +
 +2016-07-05  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix possible out-of-bounds read in is_armored.
 +	* g10/armor.c (check_input): Call is_armored only if LEN >= 2.
 +	(unarmor_pump): Use a 2 byte buffer for is_armored.
 +
 +2016-07-05  Justus Winter  <justus at g10code.com>
 +
 +	tests: Honor environment variable 'TMP'.
 +	This fixes problems with long socket names, e.g. when doing distcheck.
 +
 +	* tests/gpgscm/tests.scm (path-join): New function.
 +	(with-temporary-working-directory): Honor 'TMP'.
 +	(make-temporary-file): Likewise.
 +	* tests/migrations/Makefile.am (TMP): Default to '/tmp'.
 +	(TESTS_ENVIRONMENT): Set 'TMP'.
 +	* tests/openpgp/Makefile.am (TMP): Default to '/tmp'.
 +	(TESTS_ENVIRONMENT): Set 'TMP'.
 +
 +	gpgscm: Improve robustness and compatibility.
 +	* tests/gpgscm/ffi.c (do_getenv): Avoid gccism.
 +	(do_mkdtemp): Handle errors.
 +
 +	tests/migrations: Fix distcheck.
 +	* tests/migrations/Makefile.am (TESTS): Rename test.
 +	(TEST_FILES): Update list.
 +	(EXTRA_DIST): Add common.scm.
 +	* tests/migrations/common.scm (GPGTAR): New variable.
 +	(dearmor): Rename and untar archive.
 +	* tests/migrations/extended-private-key-format.scm: Rename.
 +	(setup): Update.
 +	* tests/migrations/extended-pkf.tar.asc: New file.
 +	* tests/migrations/extended-private-key-format.gpghome: Delete.
 +	* tests/migrations/from-classic.gpghome: Likewise.
 +	* tests/migrations/from-classic.scm (setup): Update.
 +	* tests/migrations/from-classic.tar.asc: New file.
 +
 +	tools/gpgtar: Provide --create and --extract.
 +	* tools/gpgtar.c (cmd_and_opt_values): New values.
 +	(opts): New actions.
 +	(parse_arguments): Handle new actions.
 +	* tests/openpgp/gpgtar.scm: Test new interface.
 +
 +	g10: Fix out-of-bounds read.
 +	* g10/armor.c (use_armor_filter): We need two bytes for 'is_armored'.
 +
 +2016-07-04  Werner Koch  <wk at gnupg.org>
 +
 +	wks: Add command --read to gpg-wks-client.
 +	* tools/gpg-wks-client.c (aRead): New.
 +	(opts): Add command "--read".
 +	(main): Implement that.
 +
 +	tests: Add a gettime test for sizeof (time_t) > 4.
 +	* common/t-gettime.c (test_isotime2epoch): Add 4 more tests.
 +
 +2016-07-03  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid spurious failures on keyblocks with no or only deleted nodes.
 +	* g10/import.c (write_keyblock_to_output): Clear ERR on success.
 +
 +	wks: Let the client only export the requested UID.
 +	* tools/gpg-wks-client.c (get_key): Export only the requested uid.
 +
 +	tools: Call sendmail directly from the wks tools.
 +	* tools/send-mail.c, tools/send-mail.h: New.
 +	* tools/wks-util.c: New.
 +	* tools/Makefile.am (gpg_wks_server_SOURCES): Add them.
 +	(gpg_wks_client_SOURCES): Ditto.
 +	* tools/gpg-wks.h (opt): Add fields use_sendmail and output.
 +	* tools/gpg-wks-client.c: Add options --send and --output.  Rename
 +	command --send to --create.
 +	(command_send, send_confirmation_response): Output via wks_send_mime.
 +	* tools/gpg-wks-server.c:  Add options --send and --output.
 +	(send_confirmation_request): Output via wks_send_mime.
 +	(check_and_publish): Add hack for name-value bug.
 +
 +2016-07-02  Werner Koch  <wk at gnupg.org>
 +
 +	tools: Add options to gpg-wks-server.
 +	* tools/gpg-wks.h (opt): Add 'default_from' and 'extra_headers'.
 +	* tools/gpg-wks-server.c (oFrom, oHeader): New.
 +	(parse_arguments): Set them and check args.
 +	(get_submission_address): New.
 +	(send_confirmation_request): Set correct From address.  Add extra
 +	headers.
 +	(process_new_key): Return an error code.
 +
 +	tools: Extend mime-maker.c:mime_maker_add_header.
 +	* tools/mime-maker.c (add_header): Check header name and allow
 +	name-value syntax.
 +	(mime_maker_add_header): Add mode for a syntax check.
 +
 +	doc: Describe filter expressions.
 +	* doc/gpg.texi: Remove some superfluous .E.
 +	(FILTER EXPRESSIONS): New.
 +
 +	yat2m: Fix table formatting.
 +	* doc/yat2m.c (proc_texi_cmd): Use .TQ for @itemx.  Print a .P at the
 +	end of a level 0 table.
 +
 +2016-07-01  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New option --export-filter.
 +	* g10/gpg.c (oExportFilter): New.
 +	(opts): Add --export-filter.
 +	(main): Handle option.
 +	* g10/export.c: Include recsel.h, init.h, and mbox-util.h.
 +	(export_keep_uid): New global var.
 +	(cleanup_export_globals): New.
 +	(parse_and_set_export_filter): New.
 +	(filter_getval): New.
 +	(apply_keep_uid_filter): New.
 +	(do_export_stream): Apply filter if set.
 +
 +	gpg: New option --import-filter.
 +	* g10/gpg.c (oImportFilter): New.
 +	(opts): Add --import-filter.
 +	(main): Handle option.
 +	* g10/import.c: Include recsel.h, init.h, and mbox-util.h.
 +	(import_keep_uid): New global var.
 +	(cleanup_import_globals): New.
 +	(parse_and_set_import_filter): New.
 +	(filter_getval): New.
 +	(apply_keep_uid_filter): New.
 +	(import_one): Apply filter if set.
 +
 +	gpg: Allow to cache the mbox in a user id struct.
 +	* g10/packet.h (PKT_user_id): Add field 'mbox'.
 +	* g10/free-packet.c (free_user_id): Free that.
 +
 +	gpg: Make sure a user ID packet has always a terminating Nul in memory.
 +	* g10/keygen.c (write_uid): Avoid overflow.
 +
 +	common: Add function to select records etc.
 +	* common/recsel.c, common/recsel.h: New.
 +	* common/t-recsel.c: New.
 +
 +	common: Smart up register_mem_cleanup_func.
 +	* common/init.c (register_mem_cleanup_func): Avoid double registration.
 +
 +2016-07-01  Justus Winter  <justus at g10code.com>
 +
 +	common: Annotate semi-static allocation.
 +	* common/argparse.c (optfile_parse): Allow string arguments to leak.
 +
 +	g10: Fix memory leak.
 +	* g10/keyserver.c (parse_keyserver_uri): Free URI.
 +
 +	tools/gpgtar: Annotate semi-static allocation.
 +	* tools/gpgtar.c (shell_parse_argv): Annotate argument vector as
 +	leaked.
 +
 +	g10: Fix memory leak.
 +	* g10/import.c (transfer_secret_keys): Release curve from the previous
 +	iteration.
 +
 +	g10: Fix build with disabled kbnode cache.
 +	* g10/kbnode.c (release_unused_nodes): Fix build with disabled kbnode
 +	cache.
 +
 +	g10: Fix memory leak.
 +	* g10/trustdb.c (tdb_get_validity_core): Fix kbnode leak.
 +
 +	g10: Fix memory leak.
 +	* g10/keygen.c (keygen_set_std_prefs): Fix memory leak.
 +
 +	Fix trivial memory leaks in tests.
 +	* dirmngr/t-ldap-parse-uri.c (check_ldap_escape_filter): Free result.
 +	* g10/t-stutter.c (main): Free file name.
 +
 +2016-06-30  Justus Winter  <justus at g10code.com>
 +
 +	tools: Fix trivial memory leak.
 +	* tools/gpg-connect-agent.c (main): Fix trivial memory leak.
 +
 +	g10: Fix memory leak.
 +	* g10/export.c (do_export_stream): Free secret parameters.
 +
 +	g10: Fix memory leak.
 +	* g10/keygen.c (read_parameter_file): Free 'line'.
 +
 +	g10: Fix memory leak.
 +	* g10/sign.c (mk_notation_policy_etc): Free 'mbox'.
 +
 +	common: Fix memory leak.
 +	* g10/textfilter.c (copy_clearsig_text): Free buffer.
 +
 +	common: Fix memory leak.
 +	* common/iobuf.c (iobuf_set_partial_body_length_mode): Only create
 +	context if necessary.
 +
 +	common: Fix memory leak.
 +	* common/simple-pwquery.c (agent_open): Free socket path.
 +
 +	g10: Fix keybox-related memory leaks.
 +	* g10/keydb.c (keydb_release): Clear keyblock cache.
 +	(keydb_get_keyblock): Revert previous change.
 +	* kbx/keybox-blob.c (create_blob_finish): Free previous buffer, free
 +	fixups after applying them.
 +	(_keybox_release_blob): Free buffer.  Currently, the buffer has been
 +	extracted before the keybox is released, but this is the right thing
 +	to do here.
 +
 +	Fixes-commit: c57501cc
 +
 +	g10: Fix memory leak.
 +	* g10/compress.c (release_context): Free buffers.
 +
 +	g10: Fix memory leak.
 +	* g10/sign.c (write_plaintext_packet): Free packet.
 +
 +	g10: Fix memory leak.
 +	* g10/mainproc.c (release_list): Do not exit early if list is NULL,
 +	there are other resources that must be released.
 +
 +	gpgscm: Fix reallocating string ports.
 +	* tests/gpgscm/scheme.c (realloc_port_string): Use memcpy because
 +	Scheme strings may contain 0s.
 +
 +	gpgscm: Free memory backing string ports.
 +	* tests/gpgscm/scheme.c (finalize_cell): Free memory backing string
 +	ports.
 +
 +	gpgscm: Use the allocator from libgcrypt.
 +	* tests/gpgscm/main.c (main): Use the allocator from libgcrypt.
 +
 +	w32: Fix build.
 +	* g10/keyedit.c (keyedit_quick_revuid): Fix call to
 +	'check_trustdb_stale'.
 +
 +	Fixes-commit: 55d112ee
 +
 +2016-06-30  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	g10: Implement gpg --quick-revuid.
 +	* g10/revoke.c (get_default_uid_revocation_reason): New.
 +	* g10/keyedit.c (menu_revuid): Break out creation of uid revocation
 +	into new function core_revuid.
 +	* g10/keyedit.c (keyedit_quick_revuid): New. Selects key and
 +	uid, invokes core_revuid.
 +	* g10/gpg.c (main): Handle --quick-revuid argument.
 +	* doc/gpg.texi: Document --quick-revuid.
 +
 +2016-06-29  Werner Koch  <wk at gnupg.org>
 +
 +	tools: Add gpg-wks-client and gpg-wks-server.
 +	* configure.ac: Add option --enable-wks-tools
 +	* tools/gpg-wks-client.c: New.
 +	* tools/gpg-wks-server.c: New.
 +	* tools/gpg-wks.h: new.
 +	* tools/wks-receive.c: New.
 +	* tools/call-dirmngr.c, tools/call-dirmngr.h: New.
 +
 +	build: Improve GNUPG_BUILD_PROGRAM macro.
 +	* acinclude.m4 (GNUPG_BUILD_PROGRAM): Allow for dash in options.
 +
 +	tools: Add modules for MIME parsing and creating.
 +	* tools/mime-maker.c: New.
 +	* tools/mime-maker.h: New.
 +	* tools/mime-parser.c: New.
 +	* tools/mime-parser.h: New.
 +
 +2016-06-28  Justus Winter  <justus at g10code.com>
 +
 +	gpgscm: Fix memory leaks.
 +	* tests/gpgscm/ffi-private.h (ffi_schemify_name): Fix prototype.
 +	(ffi_define_function_name): Free schemified name.
 +	(ffi_define_function): Likewise.
 +	(ffi_define_constant): Likewise.
 +	(ffi_define_variable_pointer): Likewise.
 +	* tests/gpgscm/ffi.c (do_wait_processes): Free arrays.
 +	(ffi_schemify_name): Fix type.
 +	* tests/gpgscm/main.c (main): Free 'sc'.
 +
 +	gpgscm: Free file names.
 +	* tests/gpgscm/scheme.c (scheme_load_named_file): Free file name.
 +
 +	gpgscm: Fix buffer overflow.
 +	* tests/gpgscm/scheme.c (store_string): Avoid writing past allocated
 +	buffer.
 +
 +	g10: Fix memory leaks.
 +	* g10/keydb.c (keydb_get_keyblock): Free 'sigstatus' and 'iobuf'.
 +	* g10/t-keydb-get-keyblock.c: Fix trivial memory leaks.
 +	* g10/t-keydb.c: Likewise.
 +
 +	common: Fix memory leaks.
 +	* common/ccparray.c (ccparray_put): Free old array.
 +	* common/stringhelp.c (do_make_filename): Free 'home'.
 +	* common/t-convert.c: Fix trivial memory leaks.
 +	* common/t-iobuf.c: Likewise.
 +	* common/t-mbox-util.c: Likewise.
 +	* common/t-name-value.c: Likewise.
 +	* common/t-stringhelp.c: Likewise.
 +	* common/t-strlist.c: Likewise.
 +
 +2016-06-28  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: add option to retrieve extra WKS info.
 +	* dirmngr/server.c (cmd_wkd_get): Add option --submission-address.
 +
 +	gpg: Add hack to --quick-gen-key to create Curve25519 keys.
 +	* g10/keygen.c (quick_generate_keypair): Add special algo string
 +	"test-default".
 +
 +	common: New function rfctimestamp.
 +	* common/gettime.c (rfctimestamp): New.
 +
 +	common: Add missing header file for clarity.
 +	* common/zb32.c: Include zb32.h.
 +
 +2016-06-28  Justus Winter  <justus at g10code.com>
 +
 +	tools/gpgtar: Fix handling of '-'.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Use stdin if file is '-'.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +
 +	common: Close input stream.
 +	* common/exechelp-posix.c (gnupg_spawn_process): Also close the input
 +	stream in the child.
 +
 +	common: Fix copying data from the spawned child.
 +	Fixes intermittent gpgtar failures.
 +
 +	* common/exectool.c (copy_buffer_do_copy): Initialize 'nwritten'.
 +	(gnupg_exec_tool_stream): Loop until all data is copied.
 +
 +2016-06-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix --list-packets.
 +	* g10/gpg.c (main): Call set_packet_list_mode after assignment of
 +	opt.list_packets.
 +	* g10/mainproc.c (do_proc_packets): Don't stop processing with
 +	--list-packets as the comment says.
 +	* g10/options.h (list_packets): Fix the comment.
 +	* g10/parse-packet.c: Fix the condition for opt.list_packets.
 +
 +2016-06-25  Werner Koch  <wk at gnupg.org>
 +
 +	build: Add aclocal macro from pkg-config.
 +	* m4/pkg.m4: New.
 +
 +	yat2m: Silence lint warnings and fix a printf format bug.
 +	* doc/yat2m.c (ATTR_PRINTF, ATTR_NR_PRINTF, ATTR_MALLOC): New.
 +	(die, err, inf, xmalloc, xcalloc): New prototypes with attributes.
 +	(get_section_buffer): Take care of !N_SECTIONS.
 +	(proc_texi_cmd): Cast precision format arg.
 +	(proc_texi_buffer): Do not set IN_CMD when not used afterwards.
 +
 +2016-06-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New import option "import-export".
 +	* g10/import.c (parse_import_options): Add option "import-export".
 +	(write_keyblock_to_output): New.
 +	(import_one): Implement option.
 +
 +2016-06-23  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New import option "import-show".
 +	* g10/options.h (IMPORT_SHOW): New.
 +	* g10/import.c (parse_import_options): Add "import-show".
 +	(import_one): Implement that.
 +
 +	gpg: Do not print the validity after key generation.
 +	* g10/keylist.c (struct keylist_context): Add field NO_VALIDITY.
 +	(list_keyblock_print): Take care of it.
 +	(list_keyblock_direct): Add arg NO_VALIDITY.
 +	* g10/keygen.c (do_generate_keypair): Merge keyblock and print w/o
 +	validity.
 +
 +	common: Fix possible small memory leak in b64dec.c.
 +	* common/b64dec.c (b64dec_finish): Always release TITLE.
 +
 +2016-06-23  Justus Winter  <justus at g10code.com>
 +
 +	tests/openpgp: Fake the system time for the tofu test.
 +	The keys in the tofu test are set to expire on 2016-09-17.  Fake the
 +	system time for this test.
 +
 +	This commit includes changes to the old test as well, for those who
 +	need to backport it.
 +
 +	* tests/openpgp/gpg-agent.conf.tmpl: Drop trailing newlines.
 +	* tests/openpgp/tofu.scm: Fake system time.
 +	* tests/openpgp/tofu.test: Likewise.
 +
 +	GnuPG-bug-id: 2393
 +
 +	gpgscm: Handle exceptions in the transformation monad.
 +	* tests/gpgscm/tests.scm (pipe:do): Raise errors.
 +	(tr:spawn): Catch and return errors.
 +	(tr:call-with-content): Likewise.
 +	(tr:{open,write-to,pipe-do,assert-identity,assert-weak-identity}):
 +	Adapt.
 +
 +	tests/openpgp: Improve tests.
 +	* tests/openpgp/multisig.scm: Simplify test.
 +	* tests/openpgp/setup.scm (dearmor): Use pipe.
 +
 +	gpgscm: Add types for special objects.
 +	* tests/gpgscm/scheme.c (enum scheme_types): Add types for boolean,
 +	nil, eof, and the sink object.
 +	(type_to_string): Handle new types.
 +	(scheme_init_custom_alloc): Give special objects a type.
 +
 +	gpgscm: Fix Scheme initialization.
 +	This potentially causes a crash if the garbage collector marks an eof
 +	object.
 +
 +	* tests/gpgscm/scheme.c (scheme_init_custom_alloc): Initialize
 +	'EOF_OBJ'.
 +
 +2016-06-23  Werner Koch  <wk at gnupg.org>
 +
 +	common: Add dedicated private key functions to name-value.c.
 +	* common/name-value.c (struct name_value_container): Add field
 +	'private_key_mode'.
 +	(my_error): New.  Use instead of gpg_error.
 +	(nvc_new_private_key): New.
 +	(nve_release): Add arg 'private_key_mode'.
 +	(nvc_release): Call nve_release with private_key_mode flag.
 +	(nvc_delete): Ditto.
 +	(_nvc_add): Do no special case "Key:" in non-private_key_mode.
 +	(nvc_get_private_key): Return error in non-private_key_mode.
 +	(nvc_set_private_key): Ditto.
 +	(nvc_parse):  Factor all code out to ...
 +	(do_nvc_parse): new.  Add arg 'for_private_key'.
 +	(nvc_parse_private_key): New.
 +	* agent/findkey.c (write_extended_private_key): Replace nvc_parse by
 +	nvc_parse_private_key.
 +	(read_key_file): Ditto.
 +
 +	* common/t-name-value.c (private_key_mode): New variable.
 +	(my_nvc_new): New.  Replace all callers.
 +	(test_key_extraction): Take mode in account.
 +	(run_tests): Ditto.
 +	(run_modification_tests): Ditto.
 +	(parse): Ditto.
 +	(main): Add option --parse and rename --parse to --parse-key.
 +
 +	common: Rename external symbols in name-value.c.
 +	* common/name-value.c, common/name-value.h: Rename symbol prefixes
 +	from "pkc_" to "nvc_" and from "pke_" to "nve_".  Change all callers.
 +
 +	common: Rename private-keys.c to name-value.c.
 +	* common/private-keys.c: Rename to name-value.c.
 +	* common/private-keys.h: Rename to name-value.h.  Chage all users.
 +	* common/t-private-keys.c: Rename to t-name-value.c.
 +	* common/Makefile.am: Adjust accordingly.
 +
 +	common: Add PGP armor decoding to b64dec.
 +	* common/b64dec.c (decoder_states): Add new states.
 +	(b64dec_proc): Handle PGP armored format.
 +
 +2016-06-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix regression of card-edit/fetch.
 +	* g10/card-util.c (fetch_url): Call keyserver_fetch instead of
 +	keyserver_import_fprint.
 +
 +2016-06-21  Justus Winter  <justus at g10code.com>
 +
 +	tests/migrations: Convert to Scheme and re-enable.
 +	* configure.ac: Re-enable.
 +	* tests/Makefile.am: Likewise.
 +	* tests/migrations/Makefile.am (TESTS): Use Scheme tests.
 +	* tests/migrations/common.scm: New file.
 +	* tests/migrations/extended-private-key-format.scm: Likewise.
 +	* tests/migrations/from-classic.scm: Likewise.
 +	* tests/migrations/extended-private-key-format.test: Drop file.
 +	* tests/migrations/from-classic.test: Drop file.
 +
 +	gpgscm: Add more file handling functions.
 +	* tests/gpgscm/ffi.c (do_glob): New function.
 +	(ffi_init): Define new function.
 +	* tests/gpgscm/tests.scm (basename-suffix): New function.x
 +
 +	tests/openpgp: Port the remaining tests to Scheme.
 +	* tests/openpgp/Makefile.am (TESTS): Add new tests.
 +	* tests/openpgp/defs.scm (gpg-with-colons): New function.
 +	(get-config): Use new function.
 +	* tests/openpgp/export.scm: New file.
 +	* tests/openpgp/tofu.scm: Likewise.
 +
 +	gpgscm: Improve test framework.
 +	* tests/gpgscm/lib.scm (echo): Move...
 +	* tests/gpgscm/tests.scm (echo): ... here.
 +	(info, error, skip): And use echo here.
 +	(file-exists?): New function.
 +	(tr:spawn): Check that source exists and if the sink has been created.
 +	(tr:call-with-content): Hand in optional arguments.
 +
 +	gpgscm: Use native string searching functions.
 +	* tests/gpgscm/ffi-private.h: Handle character arguments.
 +	* tests/gpgscm/ffi.c (do_string_index): New function.
 +	(do_string_rindex): Likewise.
 +	(do_string_contains): Likewise.
 +	(ffi_init): Define new functions.
 +	* tests/gpgscm/ffi.scm (ffi-define): New macro.
 +	* tests/gpgscm/lib.scm (string-index): Use native function,
 +	demonstrate behavior.
 +	(string-rindex): Likewise.
 +	(string-contains?): Likewise.
 +	Demonstrate behavior of various other functions.
 +	(read-all): Rework so that it can handle large files.
 +
 +	gpgscm: Improve error reporting.
 +	* tests/gpgscm/scheme.c (type_to_string): New function.
 +	(Eval_Cycle): Include actual type in error message.
 +
 +	gpgscm: Make memory allocation failures fatal.
 +	* tests/gpgscm/scheme.c (Eval_Cycle): Exit if we run out of memory.
 +
 +2016-06-21  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Do not install cacert and other root certificates.
 +	* doc/Makefile.am (dist_pkgdata_DATA): Move qualified.txt and
 +	com-certs.pem to ...
 +	(EXTRA_DIST): here.
 +
 +2016-06-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add experimental support for an issuer fpr.
 +	* common/openpgpdefs.h (SIGSUBPKT_ISSUER_FPR): New.
 +	* g10/build-packet.c (build_sig_subpkt_from_sig): Add arg PKSK and
 +	insert the issuer fpr if needed.
 +	* g10/sign.c (write_signature_packets): Pass signing key.
 +	(make_keysig_packet): Ditto.
 +	(update_keysig_packet): Ditto.
 +	* g10/parse-packet.c (dump_sig_subpkt): Print issuer fpr.
 +	(parse_one_sig_subpkt): Detect issuer fpr.
 +	(can_handle_critical): Add issuer fpr.
 +	* g10/mainproc.c (check_sig_and_print): Try to get key via fingerprint.
 +	* g10/gpgv.c (keyserver_import_fprint): New stub.
 +	* g10/test-stubs.c (keyserver_import_fprint): New stub.
 +
 +	gpg: New option --rfc4880bis.
 +	* g10/options.h (struct opt): Add field flags.rfc4880bis.
 +	* g10/gpg.c (oRFC4880bis): new.
 +	(opts): add --rfc4880bis.
 +	(main): Implement that and print a warning.
 +
 +2016-06-19  Niibe Yutaka  <gniibe at fsij.org>
 +
 +	scd: Reset nonnull_nad to zero for VENDOR_GEMPC.
 +	* (parse_ccid_descriptor): nonnull_nad = 0 for all GEMPC device.
 +
 +2016-06-17  Werner Koch  <wk at gnupg.org>
 +
 +	tests: Make make distcheck work again.
 +	* Makefile.am (tests): Remove test code which would led to doubling
 +	calls to for e.g. "make distclean".
 +	* tests/Makefile.am: Typo fixes.
 +	* tests/gpgscm/Makefile.am (EXTRA_DIST): Fix name of License file.
 +	Add repl.scm.
 +	(check): Replace by check-local because check is a standard automake
 +	target.
 +	* tests/openpgp/Makefile.am (TESTS_ENVIRONMENT): Replace gmake0sim by
 +	automake generated macro.
 +	(EXTRA_DIST): Add defs.scm
 +
 +	gpgscm: Silence compiler warnings.
 +	* tests/gpgscm/scheme.c (mk_integer): Rename arg NUM to N.
 +	(fill_vector): Ditto.
 +	(mark): Rename var NUM to N.
 +	(set_slot_in_env): Mark SC as unused.
 +	(is_any): Mark P as unused.
 +
 +	Add license notices for TinySCHEME.
 +	* tests/gpgscm/COPYING: Rename to ...
 +	* tests/gpgscm/LICENSE.TinySCHEME: this.
 +	* AUTHORS: Add a note about TinySCHEME.
 +	* build-aux/speedo/w32/pkg-copyright.txt: Add TinySCHEME notice.
 +
 +2016-06-17  Justus Winter  <justus at g10code.com>
 +
 +	tests/openpgp: Reimplement tests in Scheme.
 +	* Makefile.am: Build the test infrastructure on Windows.
 +	* tests/openpgp/Makefile.am (required_pgms): Add gpgscm.
 +	(TESTS_ENVIRONMENT): Make sure gpgscm and the libraries are found.
 +	(TESTS): Replace tests with the new Scheme implementations.
 +	* tests/openpgp/4gb-packet.scm: New file.
 +	* tests/openpgp/README: Likewise.
 +	* tests/openpgp/armdetach.scm: Likewise.
 +	* tests/openpgp/armdetachm.scm: Likewise.
 +	* tests/openpgp/armencrypt.scm: Likewise.
 +	* tests/openpgp/armencryptp.scm: Likewise.
 +	* tests/openpgp/armor.scm: Likewise.
 +	* tests/openpgp/armsignencrypt.scm: Likewise.
 +	* tests/openpgp/armsigs.scm: Likewise.
 +	* tests/openpgp/clearsig.scm: Likewise.
 +	* tests/openpgp/conventional-mdc.scm: Likewise.
 +	* tests/openpgp/conventional.scm: Likewise.
 +	* tests/openpgp/decrypt-dsa.scm: Likewise.
 +	* tests/openpgp/decrypt.scm: Likewise.
 +	* tests/openpgp/default-key.scm: Likewise.
 +	* tests/openpgp/defs.scm: Likewise.
 +	* tests/openpgp/detach.scm: Likewise.
 +	* tests/openpgp/detachm.scm: Likewise.
 +	* tests/openpgp/ecc.scm: Likewise.
 +	* tests/openpgp/encrypt-dsa.scm: Likewise.
 +	* tests/openpgp/encrypt.scm: Likewise.
 +	* tests/openpgp/encryptp.scm: Likewise.
 +	* tests/openpgp/finish.scm: Likewise.
 +	* tests/openpgp/genkey1024.scm: Likewise.
 +	* tests/openpgp/gpgtar.scm: Likewise.
 +	* tests/openpgp/import.scm: Likewise.
 +	* tests/openpgp/mds.scm: Likewise.
 +	* tests/openpgp/multisig.scm: Likewise.
 +	* tests/openpgp/run-tests.scm: Likewise.
 +	* tests/openpgp/seat.scm: Likewise.
 +	* tests/openpgp/setup.scm: Likewise.
 +	* tests/openpgp/signencrypt-dsa.scm: Likewise.
 +	* tests/openpgp/signencrypt.scm: Likewise.
 +	* tests/openpgp/sigs-dsa.scm: Likewise.
 +	* tests/openpgp/sigs.scm: Likewise.
 +	* tests/openpgp/use-exact-key.scm: Likewise.
 +	* tests/openpgp/verify.scm: Likewise.
 +	* tests/openpgp/version.scm: Likewise.
 +
 +	tests/gpgscm: Add a TinySCHEME-based test driver.
 +	* configure.ac: Add new component.
 +	* tests/Makefile.am: Likewise.
 +	* tests/gpgscm/Makefile.am: New file.
 +	* tests/gpgscm/ffi-private.h: Likewise.
 +	* tests/gpgscm/ffi.c: Likewise.
 +	* tests/gpgscm/ffi.h: Likewise.
 +	* tests/gpgscm/ffi.scm: Likewise.
 +	* tests/gpgscm/lib.scm: Likewise.
 +	* tests/gpgscm/main.c: Likewise.
 +	* tests/gpgscm/private.h: Likewise.
 +	* tests/gpgscm/repl.scm: Likewise.
 +	* tests/gpgscm/scheme-config.h: Likewise.
 +	* tests/gpgscm/t-child.c: Likewise.
 +	* tests/gpgscm/t-child.scm: Likewise.
 +	* tests/gpgscm/tests.scm: Likewise.
 +
 +	tests/gpgscm: Foreign objects support for TinySCHEME.
 +	* tests/gpgscm/scheme-private.h (struct cell): Add 'foreign_object'.
 +	(is_foreign_object): New prototype.
 +	(get_foreign_object_{vtable,data}): Likewise.
 +	* tests/gpgscm/scheme.c (enum scheme_types): New type.
 +	(is_foreign_object): New function.
 +	(get_foreign_object_{vtable,data}): Likewise.
 +	(mk_foreign_object): Likewise.
 +	(finalize_cell): Free foreign objects.
 +	(atom2str): Pretty-print foreign objects.
 +	(vtbl): Add new functions.
 +	* tests/gpgscm/scheme.h (struct foreign_object_vtable): New type.
 +	(mk_foreign_object): New prototype.
 +	(struct scheme_interface): Add new functions.
 +
 +	Patch from Thomas Munro,
 +	https://sourceforge.net/p/tinyscheme/patches/13/
 +
 +	tests/gpgscm: Dynamically allocate string buffer.
 +	* tests/gpgscm/scheme-config.h (strbuff{,_size}): Make buffer dynamic.
 +	* tests/gpgscm/scheme.c (expand_strbuff): New function.
 +	(putcharacter): Adapt length test.
 +	(readstrexp): Expand buffer if necessary.
 +	(scheme_init_custom_alloc): Initialize buffer.
 +	(scheme_deinit): Free buffer.
 +
 +	Patch from Thomas Munro,
 +	https://sourceforge.net/p/tinyscheme/patches/11/
 +
 +	tests/gpgscm: Make exception value available.
 +	* tests/gpgscm/init.scm (throw): Hand exception value to the handler.
 +	(catch): And bind it to *error*.
 +
 +	tests/gpgscm: Add package macro.
 +	* tests/gpgscm/init.scm: Add package macro from manual.
 +
 +	tests/gpgscm: Expose function to open streams as Scheme ports.
 +	* tests/gpgscm/scheme.c (vtbl): Add 'port_from_file' to the vtable.
 +	* tests/gpgscm/scheme.h (struct scheme_interface): New field
 +	'mk_port_from_file'.
 +
 +	tests/gpgscm: Nicer error message.
 +	* tests/gpgscm/scheme.c (opexe_0): Include the value that we tried to
 +	evaluate as function-like in the error message.
 +
 +	tests/gpgscm: Fix error hook.
 +	* tests/gpgscm/init.scm (*error-hook*): Fix error hook so that the
 +	whole error message is displayed.
 +
 +	tests/gpgscm: Handle unhandled enumeration values.
 +	* tests/gpgscm/scheme.c (opexe_{3,4}): Handle unhandled enumeration
 +	values in the opcode dispatching code.
 +
 +	tests/gpgscm: Verbatim import of latest TinySCHEME.
 +	Revision 110 from svn://svn.code.sf.net/p/tinyscheme/code/trunk
 +
 +	* tests/gpgscm/COPYING: New file.
 +	* tests/gpgscm/Manual.txt: Likewise.
 +	* tests/gpgscm/init.scm: Likewise.
 +	* tests/gpgscm/opdefines.h: Likewise.
 +	* tests/gpgscm/scheme-private.h: Likewise.
 +	* tests/gpgscm/scheme.c: Likewise.
 +	* tests/gpgscm/scheme.h: Likewise.
 +
 +2016-06-17  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Make option --homedir work.
 +	* scd/scdaemon.c (opts): Add --homedir.
 +
 +2016-06-16  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.13.
 +
 +2016-06-16  Yuri Chornoivan  <yurchor at ukr.net>
 +
 +	po: Update Ukrainian translation.
 +
 +2016-06-16  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update Russian translation.
 +
 +2016-06-16  Werner Koch  <wk at gnupg.org>
 +
 +	po: Update German translation.
 +
 +	Add missing files so that make distcheck works again,
 +	* tests/openpgp/Makefile.am (CLEANFILES): Add created file
 +	"passphrases".
 +	* tools/Makefile.am (EXTRA_DIST): Add no-libgcrypt.c.
 +
 +	tools: Fix typo in function name of symcryptrun.
 +	* tools/symcryptrun.c (main): Fix typo.
 +
 +2016-06-15  Niibe Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix another race condition for trustdb access.
 +	* g10/tdbio.c (create_version_record): Call create_hashtable to always
 +	make hashtable, together with the version record.
 +	(get_trusthashrec): Remove call to create_hashtable.
 +
 +2016-06-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print the subkey's curve and not the primary key curve.
 +	* g10/keylist.c (list_keyblock_colon): Use PK2 for the subkey's curve.
 +
 +	ldap: Improve info output for v3 fallback.
 +	* dirmngr/dirmngr_ldap.c (fetch_ldap): Do not use log_debug in an
 +	unprotected section.  Replace log_debug by log_info in verbose mode.
 +
 +2016-06-14  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	dirmngr: Try ldap protocol V3 as fallback.
 +	* dirmngr/dirmngr_ldap.c (fetch_ldap): Try V3 Protocol in case
 +	default Protocol gives error.
 +
 +	dirmngr: Print ldap error if bind fails.
 +	* dirmngr/dirmngr_ldap.c (fetch_ldap): Use ldap_err2string on bind
 +	return.
 +
 +2016-06-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpgsm: Allow ciphers AES192 and SERPENT256.
 +	* sm/gpgsm.c (main): Add AES192 cipher.  Allow SERPENT256.
 +
 +	doc: Add files and envvars to a new index.
 +	* doc/gnupg.texi: Define new index "ef".
 +	(Environment Index): New.
 +
 +	gpg: Avoid endless loop in a tofu error case.
 +	* g10/tofu.c (get_trust): Do not jump to out.
 +
 +	gpg: Split tofu's get_trust function into several smaller ones.
 +	* g10/tofu.c (get_trust): Factor code out to ...
 +	(format_conflict_msg_part1): new and to ...
 +	(ask_about_binding): new.
 +
 +2016-06-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Un-deprecate option --auto-key-retrieve.
 +	* g10/gpg.c (main): Remove deprecation warning.
 +
 +	gpg: New option --disable-signer-uid, create Signer's UID sub-packet.
 +	* g10/gpg.c (oDisableSignerUID): New.
 +	(opts): New option '--disable-signer-uid'.
 +	(main): Set option.
 +	* g10/options.h (opt): Add field flags.disable_signer_uid.
 +	* g10/sign.c: Include mbox-util.h.
 +	(mk_notation_policy_etc): Embed the signer's uid.
 +	* g10/mainproc.c (check_sig_and_print): Do not use WKD for auto key
 +	retrieval if --disable-signer-uid is used.
 +
 +	gpg: Try Signer's User ID sub-packet with --auto-key-retrieve.
 +	* g10/packet.h (PKT_signature): Add field 'signers_uid'.
 +	* g10/parse-packet.c (parse_signature): Set this field.
 +	* g10/free-packet.c (free_seckey_enc): Free field.
 +	(copy_signature): Copy field.
 +	* g10/mainproc.c (akl_has_wkd_method): New.
 +	(check_sig_and_print): Extend NEWSIG status.  If WKD is enabled try to
 +	locate a missing key via the signature's Signer's User ID sub-packet.
 +	Do this right before trying a keyserver lookup.
 +
 +2016-06-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove C-99ism, re-indent, and simplify one function.
 +	* g10/call-agent.c (struct keyinfo_data): Rename to
 +	keyinfo_data_parm_s.
 +	(agent_get_keyinfo): Replace C-99 style init.
 +	(keyinfo_status_cb): Use new fucntion split_fields.
 +	* g10/export.c (match_curve_skey_pk): Add missings returns error
 +	cases.
 +	(cleartext_secret_key_to_openpgp): Better clear PK->PKEY first.
 +
 +	common: New function split_fields.
 +	* common/stringhelp.c (split_fields): New.
 +	* common/t-stringhelp.c: Include assert.h.
 +	(test_split_fields): New.
 +	(main): Call test.
 +
 +2016-06-11  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	g10: Export cleartext keys as cleartext.
 +	* g10/export.c (do_export_stream): If a key is stored by the agent in
 +	cleartext, then try to export it as cleartext.
 +	* tests/openpgp/export.test: For secret keys that are stored in
 +	cleartext, test should try to export without pinentry interaction.
 +
 +	g10: Allow receiving cleartext secret keys from agent.
 +	* g10/export.c (match_curve_skey_pk): New function, testing whether an
 +	OpenPGP public key and an S-expression use the same curve.
 +	* g10/export.c (cleartext_secret_key_to_openpgp): New function,
 +	filling in the secret key parameters of a PKT_public_key object from
 +	a corresponding cleartext S-expression.
 +	* g10/export.c, g10/main.h (receive_seckey_from_agent): Add cleartext
 +	parameter, enabling retrieval of the secret key, unlocked.
 +	* g10/export.c (do_export_stream): Send cleartext as 0, keeping current
 +	behavior.
 +	* g10/keygen.c (card_store_key_with_backup): Use cleartext=0 to ensure
 +	that smartcard backups are all passphrase-locked.
 +
 +	g10: Add openpgp_protected flag to agent secret key export functions.
 +	* g10/call-agent.c, g10/call-agent.h (agent_export_key): Add
 +	openpgp_protected flag.
 +	* g10/export.c (receive_seckey_from_agent): Request openpgp_protected
 +	secret keys from agent.
 +	* agent/command.c (hlp_export_key): EXPORT_KEY help text: add a
 +	brief description of the effect of --openpgp.
 +
 +	g10: report whether key in agent is passphrase-protected or not.
 +	* g10/call-agent.c, g10/call-agent.h (agent_get_keyinfo): add
 +	  r_cleartext parameter to report whether a key is stored without
 +	  passphrase protection.
 +	* g10/gpgv.c, g10/test-stubs.c: augment dummy agent_get_keyinfo to
 +	  match new API.
 +	* g10/export.c, g10/keyedit.c, g10/keygen.c, g10/keylist.c,
 +	  g10/sign.c: pass NULL to agent_get_keyinfo since we do not yet
 +	  need to know whether agent is passphrase-protected.
 +
 +2016-06-08  Werner Koch  <wk at gnupg.org>
 +
 +	Explicitly restrict socket permissions.
 +	* agent/gpg-agent.c (create_server_socket): Call chmod before listen.
 +	* scd/scdaemon.c (create_server_socket): Ditto.
 +	* dirmngr/dirmngr.c (main): Ditto.
 +
 +	w32: Fix recent build regression.
 +	* common/homedir.c (_gnupg_socketdir_internal) [W32]: Add definition
 +	for NAME.
 +	* g10/gpg.c (main) [W32]:  Fix use og gnupg_homedir.
 +
 +	* agent/gpg-agent.c (remove_socket): Remove unused var P.
 +	* scd/scdaemon.c (cleanup): Ditto.
 +
 +	gpgconf: New commands --create-socketdir and --remove-socketdir.
 +	* tools/gpgconf.c: Include unistd.h.
 +	(aCreateSocketDir, aRemoveSocketDir): New.
 +	(opts): Add --create-socketdir and --remove-socketdir.
 +	(main): Implement them.
 +
 +	Implement /run/user/UID/gnupg based sockets.
 +	* common/homedir.c: Include sys/stat.h and zb32.h.
 +	(w32_portable_app, w32_bin_is_bin): Change type from int to byte.
 +	(non_default_homedir): New.
 +	(is_gnupg_default_homedir): New.
 +	(default_homedir): Set non_default_homedir.
 +	(gnupg_set_homedir): Set non_default_homedir and make
 +	the_gnupg_homedir and absolute directory name.
 +	(gnupg_homedir): Return an absolute directory name.
 +	(_gnupg_socketdir_internal): New.
 +	(gnupg_socketdir): Implement /run/user/ based sockets.
 +	* tools/gpg-connect-agent.c (get_var_ext): Replace now obsolete
 +	make_filename by xstrdup.
 +	* tools/gpgconf.c (main): Sue gnupg_homedir for the "homedir:" output.
 +
 +	gpgconf: Add option --homedir.
 +	* tools/gpgconf.c (opts): Add --homedir.
 +	(main): Set homedir.
 +
 +	Do not use no-libgcrypt dummy for tools.
 +	* tools/Makefile.am (gpgconf_SOURCES): Remove no-libgcrypt.c.
 +	(gpgconf_LDADD): Add LIBGCRYPT_LIBS.
 +	(gpg_connect_agent_LDADD): Ditto.
 +	(gpgtar_LDADD): Ditto.
 +	* dirmngr/Makefile.am (dirmngr_client_LDADD): Ditto.
 +	(t_common_ldadd): Ditto.  Remove no-libgcrypt.o.
 +
 +	Do not try to remove the enclosing directory of sockets.
 +	* agent/gpg-agent.c (remove_socket): Do not remove the enclosing
 +	directory.
 +	* scd/scdaemon.c (cleanup): Ditto.
 +
 +2016-06-07  Werner Koch  <wk at gnupg.org>
 +
 +	common: New function gnupg_socketdir.
 +	* common/homedir.c (gnupg_socketdir): New.
 +	* agent/gpg-agent.c (create_socket_name): Use new function instead of
 +	gnupg_homedir.
 +	(check_own_socket): Ditto.
 +	(check_for_running_agent): Ditto.
 +	* agent/preset-passphrase.c (main): Ditto.
 +	* common/asshelp.c (start_new_gpg_agent): Ditto.
 +	* scd/scdaemon.c (create_socket_name): Ditto.
 +	* tools/gpgconf.c (main): Ditto.
 +	* tools/symcryptrun.c (main): Ditto.
 +
 +	common: Remove homedir arg from start_new_{dirmngr,gpg_agent}.
 +	* common/asshelp.c (start_new_gpg_agent): Remove arg 'homedir' in
 +	favor of gnupg_homedir ().  Change all callers.
 +	(start_new_dirmngr): Ditto.
 +	* common/get-passphrase.c (gnupg_prepare_get_passphrase): Remove arg
 +	'homedir'.
 +
 +	Replace use of opt.homedir by accessor functions.
 +	* common/homedir.c (the_gnupg_homedir): New var.
 +	(gnupg_set_homedir): New.
 +	(gnupg_homedir): New.
 +	* g10/options.h (struct opt): Remove 'homedir' and replace all users
 +	by the new accessor functions.
 +	* g13/g13-common.h (struct opt): Ditto.
 +	* scd/scdaemon.h (struct opt): Ditto.
 +	* sm/gpgsm.h (struct opt): Ditto.
 +	* dirmngr/dirmngr.h (struct opt): Ditto.
 +	* agent/preset-passphrase.c (opt_homedir): Ditto.
 +	* agent/protect-tool.c (opt_homedir): Ditto.
 +
 +2016-06-07  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +	gpg: Fix command line parsing of --quick-addkey and --quick-gen-key.
 +	* g10/gpg.c (main): Compose a block by curly braces.
 +
 +2016-06-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Use --keyid-format=none by default.
 +	* g10/gpg.c (main): Init keyid_format to KF_NONE.
 +	* g10/keyid.c (format_keyid): Ditto.
 +	(keystrlen): Ditto.
 +
 +	gpg: Add option --with-subkey-fingerprint.
 +	* g10/gpg.c (oWithSubkeyFingerprint): New.
 +	(opts): Add --with-subkey-fingerprint[s].
 +	(main): Set that option.
 +	* g10/options.h (struct opt): Add 'with_subkey_fingerprint'.
 +	* g10/keylist.c (list_keyblock_print): Print subkey fingerprint.
 +	(print_fingerprint): Tweak printing to use compact format if
 +	desirable.
 +
 +	gpg: Implement --keyid-format=none.
 +	* g10/gpg.c (main): Add option "none" to --keyid-format.
 +	* g10/options.h (KF_NONE): New.
 +	* g10/keyid.c (format_keyid): Implement that.
 +	(keystr): Use format "long" is KF_NONE is in use.
 +	(keystr_with_sub): Ditto.
 +	* g10/keylist.c (list_keyblock_print): Adjust indentaion for KF_NONE.
 +	Factor some code out to ...
 +	(print_key_line): new.
 +	(print_fingerprint): Add mode 20.
 +	* g10/mainproc.c (list_node): Use print_key_line.  Replace MAINKEY by
 +	flags.primary in the PK.  Fix putting a " revoked..." string into the
 +	colons format.
 +	* g10/pkclist.c (do_edit_ownertrust): Use print_key_line.  This
 +	slightly changes the putput format.
 +	* g10/revoke.c (gen_standard_revoke): Use print_key_line.  This may
 +	also put "expires: " into the output.
 +
 +2016-06-04  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Require --enable-build-timestamp for the BUILD_HOSTNAME.
 +	* configure.ac (BUILD_HOSTNAME): Set to "<anon>" bey default.
 +	* build-aux/speedo.mk (speedo_pkg_gnupg_configure): Add
 +	  --enable-build-timestamp.
 +
 +2016-06-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add the fingerprint to KEY_CREATED for subkeys.
 +	* g10/keygen.c (print_status_key_created): Make more robust by
 +	allowing a NULL for PK.
 +	(generate_subkeypair): Use print_status_key_created.
 +	(generate_card_subkeypair): Ditto.
 +
 +	gpg: Try to use the passphrase from the primary for --quick-addkey.
 +	* agent/command.c (cmd_genkey): Add option --passwd-nonce.
 +	(cmd_passwd): Return a PASSWD_NONCE in verify mode.
 +	* g10/call-agent.c (agent_genkey): Add arg 'passwd_nonce_addr' and do
 +	not send a RESET if given.
 +	(agent_passwd): Add arg 'verify'.
 +	* g10/keygen.c (common_gen): Add optional arg 'passwd_nonce_addr'.
 +	(gen_elg, gen_dsa, gen_ecc, gen_rsa, do_create): Ditto.
 +	(generate_subkeypair): Use sepeare hexgrip var for the to be created
 +	for hexgrip feature.  Verify primary key first.  Make use of the
 +	passwd nonce.  Allow for a static passphrase.
 +
 +	gpg: Extend the --quick-gen-key command.
 +	* g10/keygen.c (quickgen_set_para): Add arg 'use'.
 +	(quick_generate_keypair): Add args 'algostr', 'usagestr', and
 +	'expirestr'.  Implement primary only key mode.
 +	(parse_algo_usage_expire): Set NBITS for the default algo.
 +	* g10/gpg.c (main): Extend --quick-gen-key command.
 +
 +	gpg: Improve the new parse_subkey_algostr_usagestr fucntion.
 +	* g10/keygen.c (parse_usagestr): Allow "cert".
 +	(generate_subkeypair): Factor expire parsing out to ...
 +	(parse_subkey_algostr_usagestr): here.  Rename to ...
 +	(parse_algo_usage_expire): this.  Add arg 'for_subkey'.  Set CERT for
 +	primary key and check that it is not set for subkeys.
 +
 +	gpg: New command --quick-addkey.
 +	* g10/keygen.c (DEFAULT_STD_SUBKEYUSE): New.
 +	(ask_keysize): Factor code out to ...
 +	(get_keysize_range, fixup_keysize): new.
 +	(parse_parameter_usage): Factor parsing out to  ...
 +	(parse_usagestr): new.  Allow use of "encr" as alias for "encrypt".
 +	(parse_subkey_algostr_usagestr): New.
 +	(generate_subkeypair): Add new args.  Implement unattended mode.
 +
 +	* g10/keyedit.c (keyedit_quick_sign): Factor some code out to ...
 +	(find_by_primary_fpr): new.
 +	(keyedit_quick_addkey): New.
 +	* g10/gpg.c (aQuickAddKey): New.
 +	(opts): Add --quick-addkey.
 +	(main): Implement.
 +
 +	gpg: Do not abort on certain invalid packets.
 +	* g10/build-packet.c (write_fake_data): Check for non-opaque data.
 +	* g10/seskey.c (do_encode_md): Return NULL instead of abort.
 +
 +	common: New function openpgp_is_curve_supported.
 +	* common/openpgp-oid.c: Include openpgpdefs.h.
 +	(oidtable): Add field pubkey_algo.
 +	(openpgp_is_curve_supported): New.
 +
 +2016-06-01  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Allow User ID length >= 256.
 +	* build-packet.c (do_user_id): Call write_header2 with HDRLEN not set.
 +
 +2016-05-31  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New status code NOTATION_FLAGS.
 +	* common/status.h (STATUS_NOTATION_FLAGS: New.
 +	* g10/packet.h (struct notation): Add flags.human.
 +	(notation_t): New typedef.
 +	* g10/build-packet.c (sig_to_notation): Set flags.human.
 +	* g10/keylist.c (show_notation): Write STATUS_NOTATION_FLAGS.
 +
 +2016-05-28  Werner Koch  <wk at gnupg.org>
 +
 +	common: Add a status callback to gnupg_exec_tool_stream.
 +	* common/exectool.h (exec_tool_status_cb_t): New.
 +	* common/exectool.c: Include missing exectool.h.
 +	(read_and_log_buffer_t): Replace array by pointer.
 +	(gnupg_exec_tool_stream): Add args 'status_cb' and 'status_cb_value'.
 +	Change all callers to pass NULL for them.  Malloc buffer for
 +	FDERRSTATE.
 +	(read_and_log_stderr): Implement status_fd feature.
 +
 +2016-05-27  Werner Koch  <wk at gnupg.org>
 +
 +	common: Allow a second input stream for gnupg_exec_tool_stream.
 +	* common/exechelp-posix.c (do_exec): Add arg 'except' and pass to
 +	close_all_fds.
 +	(gnupg_spawn_process): Add arg 'except'.  Change callers to pass NULL
 +	for it.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Add dummy arg 'except'.
 +	* common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
 +	* common/exectool.c (copy_buffer_do_copy): Allow NULL for SINK.
 +	(gnupg_exec_tool_stream): Add arg 'inextra'. Change callers to pass
 +	NULL for it.  Allow NULL for OUTPUT.
 +
 +	common: Simplify the fd closing patch 512c56a.
 +	* common/exechelp-posix.c (get_max_fds): Use /proc/self.
 +
 +	common: Speedup closing fds before an exec.
 +	* common/exechelp-posix.c [__linux__]: Include dirent.h.
 +	(get_max_fds) [__linux__]: Return the actual used highest fd.
 +
 +	tools: Improve debug output of rfc822parse.
 +	* tools/rfc822parse.c (show_event): Add missing events.
 +
 +	build: Remove obsolete tests for funopen and fopencookie.
 +	* configure.ac (AC_CHECK_FUNCS): Remove tests for funopen.
 +
 +	common: Extend gnupg_create_inbound_pipe et al.
 +	* common/exechelp-posix.c (gnupg_create_inbound_pipe): Add args 'r_fp'
 +	and 'nonblock'.
 +	(gnupg_create_outbound_pipe): Ditto.
 +	* common/exechelp-w32.c (gnupg_create_inbound_pipe): Add non yet
 +	functional args 'r_fp' and 'nonblock'.
 +	(gnupg_create_outbound_pipe): Ditto.
 +	* common/exechelp-w32ce.c (gnupg_create_inbound_pipe): Ditto.
 +	(gnupg_create_outbound_pipe): Ditto.
 +
 +	common: Make use of default_errsource in exechelp.
 +	* common/exechelp-posix.c (my_error_from_syserror, my_error): New.
 +	Use them instead of gpg_error and gpg_error_from_syserror.
 +	(create_pipe_and_estream): Remove arg ERRSOURCE and fix use of
 +	OUTBOUND which has a wrong name.  Adjust callers.
 +	(gnupg_spawn_process): Remove arg ERRSOURCE and replace by use of
 +	DEFAULT_ERRSOURCE.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Ditto.
 +	* common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
 +	* common/exectool.c (gnupg_exec_tool_stream):  Do not pass
 +	GPG_ERROR_FROM_SYSERROR.
 +	* tools/gpgconf-comp.c (gc_component_check_options): Ditto.
 +	(retrieve_options_from_program): Ditto.
 +
 +	gpg: Keep current and total of PROGESS status lines small enough.
 +	* g10/progress.c (progress_filter): Factor status wrote out to...
 +	(write_status_progress): New.  Scale values down.
 +
 +2016-05-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	configure: Detection of libusb on FreeBSD.
 +	* configure.ac (LIBUSB_LIBS): Use LIBUSB_NAME for AC_CHECK_LIB.
 +
 +2016-05-25  Werner Koch  <wk at gnupg.org>
 +
 +	build: Switch to new URL for swdb.lst.
 +
 +2016-05-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpgtar: Simplify code by using ccparray.
 +	* tools/gpgtar-create.c (gpgtar_create): Use ccparray functions.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
 +	* tools/gpgtar-list.c (gpgtar_list): Ditto.
 +
 +	common: Add simple dynamic array function.
 +	* common/ccparray.c: New.
 +	* common/ccparray.h: New.
 +	* common/t-ccparray.c: New.
 +	* common/Makefile.am (common_sources): Add files.
 +	(module_tests): Add test file.
 +	(t_ccparray_LDADD): New.
 +
 +2016-05-23  Justus Winter  <justus at g10code.com>
 +
 +	tests: Test the pinentry interactions when exporting keys.
 +	* tests/openpgp/export.test: Test pinentry interactions.
 +
 +	tests: Add support for a passphrase queue to fake pinentry.
 +	* tests/openpgp/fake-pinentry.c (get_passphrase): New function.
 +	(main): Add option --passphrasefile and read passphrases from it.
 +
 +	tests: Add logging to fake pinentry.
 +	* tests/openpgp/fake-pinentry.c (log_stream): New variable.
 +	(reply): New function.
 +	(spacep,skip_options,option_value): Copy from common.
 +	(main): Parse arguments, add --logfile option, write logfile.
 +
 +	tests: Add export test.
 +	* tests/openpgp/Makefile.am (TESTS): Add new file.
 +	* tests/openpgp/export.test: New file.
 +
 +2016-05-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Speed up key listing in Tofu mode.
 +	* g10/tofu.c (get_trust): Add arg PK.  Uses this instead of a an extra
 +	lookup of the public key by fingerrpint.
 +	(tofu_register): Pass PK to get_trust.
 +	(tofu_get_validity): Ditto.
 +
 +	*g10/tofu.c (tofu_register): Remove unused FINGERPRINT_PP.
 +
 +	gpg: Avoid name spaces clash with future sqlite versions.
 +	* g10/sqlite.c: Rename to gpgsql.c.  Change function prefixes to
 +	gpgsql_.
 +	* g10/sqlite.h: Rename to gpgsql.h.
 +	* g10/tofu.c: Adjust for changes.
 +
 +	gpg: Explicitly close a combined Tofu DB.
 +	* g10/tofu.c (tofu_closedbs): Close combined DB.
 +
 +	gpg: Store the Tofu meta handle for databases in CTRL.
 +	* g10/gpg.h (struct tofu_dbs_s, tofu_dbs_t): New declarations.
 +	(struct server_control_s): Add field tofu.dbs.
 +	* g10/tofu.c (struct dbs): Rename to tofu_dbs_s.  Replace all users by
 +	by tofu_dbs_t.
 +	(opendbs):  Add arg CTRL.  Cache the DBS in CTRL.
 +	(closedbs): Rename to tofu_closedbs and make global.  Add arg CTRL.
 +	(tofu_register): Add arg CTRL.  Change all callers.  Do not call
 +	closedbs.
 +	(tofu_get_validity): Ditto.
 +	(tofu_set_policy): Ditto.
 +	(tofu_get_policy): Ditto.
 +	(tofu_set_policy_by_keyid): Add arg CTRL.
 +	* g10/gpg.c (gpg_deinit_default_ctrl): Call tofu_closedbs.
 +
 +	gpg: Pass CTRL object down to the trust functions.
 +
 +	gpg: Fix the TOFU_STATS_LONG status.
 +	* g10/tofu.c (show_statistics): Print TOFU STATS with formatting
 +	characters.
 +
 +2016-05-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print "[  never ]" instead of err for validity.
 +	* g10/trust.c (uid_trust_string_fixed): Handle NEVER.
 +
 +2016-05-18  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Adjust the WKD lookup to specs version -01.
 +	* dirmngr/server.c (cmd_wkd_get): Remove second occurrence of the
 +	domain part.
 +
 +2016-05-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Emit new status line KEY_CONSIDERED.
 +	* common/status.h (STATUS_KEY_CONSIDERED): New.
 +	* g10/getkey.c: Include status.h.
 +	(LOOKUP_NOT_SELECTED, LOOKUP_ALL_SUBKEYS_EXPIRED): New.
 +	(finish_lookup): Add arg R_FLAGS.  Count expired and revoked keys and
 +	set flag.  Check a requested usage before checking for expiraion or
 +	revocation.
 +	(print_status_key_considered): New.
 +	(lookup): Print new status.
 +
 +2016-05-11  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix signature checking.
 +	* g10/sig-check.c (check_signature_over_key_or_uid): Fix call to
 +	walk_kbnode.
 +
 +2016-05-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Allow unattended deletion of secret keys.
 +	* agent/command.c (cmd_delete_key): Make the --force option depend on
 +	--disallow-loopback-passphrase.
 +	* g10/call-agent.c (agent_delete_key): Add arg FORCE.
 +	* g10/delkey.c (do_delete_key): Pass opt.answer_yes to
 +	agent_delete_key.
 +
 +2016-05-09  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix buglet in the check_all_keysigs function.
 +	* g10/keyedit.c (sig_comparison): Actually compare the pubkey
 +	algorithms.
 +
 +	gpg: Request a "save" after cmd "check" fixed something.
 +	* g10/keyedit.c (keyedit_menu) <cmdCHECK>: Set modified.
 +
 +2016-05-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +2016-05-04  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.12.
 +
 +	speedo,w32: Remove the installation directory page.
 +	* build-aux/speedo/w32/inst.nsi (MUI_PAGE_DIRECTORY): Remove.
 +
 +	gpg: Fix const char pointer mismatch with gettext.
 +	* g10/tofu.c (get_trust): Use const char *.
 +
 +	speedo: Build sqlite with static-libgcc.
 +	* build-aux/speedo/patches/sqlite.patch: New.
 +	* Makefile.am (EXTRA_DIST): Add file.
 +
 +	speedo: Also try patch files w/o version number.
 +	* build-aux/speedo.mk (SPKG_template): Try such a patch file.
 +
 +2016-05-04  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	speedo,w32: Install sqlite.
 +	* build-aux/speedo/w32/inst.nsi (-sqlite, -un.sqlite): New.
 +
 +	speedo,w32: Fix uninstallation.
 +	* build-aux/speedo/w32/inst.nsi (-un.gnupg): Delete distsigkey and
 +	dirmngr-conf.skel
 +
 +	speedo,w32: Install localisation.
 +	* build-aux/speedo/w32/inst.nsi (-libgpg-error, GnuPG): Install l10n.
 +	(-un.libgpg-error, -un.gnupg): Uninstall l10n files.
 +
 +2016-05-04  Werner Koch  <wk at gnupg.org>
 +
 +	tests: Disable the migrations tests.
 +	* tests/Makefile.am (SUBDIRS): Remove migrations.
 +	* configure.ac (AC_CONFIG_FILES): Remove migrations Makefile.
 +
 +2016-05-04  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update Russian translation.
 +
 +2016-05-04  Werner Koch  <wk at gnupg.org>
 +
 +	po: Update German translation.
 +
 +	Some minor string changes and fixed a printf format.
 +	* g10/build-packet.c (notation_value_to_human_readable_string): Use
 +	%zu for size_t.
 +
 +	build: Update config.{guess,sub} to 2016-04-02 and 2016-03-30.
 +	* build-aux/config.guess: Update.
 +	* build-aux/config.sub: Update.
 +
 +	agent: Make --allow-loopback-pinentry the default.
 +	* agent/gpg-agent.c (oNoAllowLoopbackPinentry): New.
 +	(opts): Add --no-allow-loopback-pinentry.  Hide
 +	description of --allow-loopback-pinentry.
 +	(parse_rereadable_options): Set opt.allow_loopback_pinentry by
 +	default.
 +	(main): Replace allow-loopback-pinentry by no-allow-loopback-pinentry
 +	in the gpgconf list.
 +	* tools/gpgconf-comp.c (gc_options_gpg_agent): Ditto.
 +
 +2016-05-03  Werner Koch  <wk at gnupg.org>
 +
 +	common: Print https URLs in help messages.
 +	* common/argparse.c (strusage): Print https URLS.
 +
 +	tests: Silence output of some tests.
 +	* common/t-exechelp.c (print_open_fds): Silence non-verbose output.
 +	(test_close_all_fds): Ditto.
 +	* common/t-session-env.c (show_stdnames): Indent output.
 +	* g10/test.c (TEST): Silence non-verbose okay output.
 +	(exit_tests): Ditto.
 +	* tools/gpg-zip.in (tar_verbose_opt): Add option --quiet.
 +	* tests/openpgp/gpgtar.test (GPGZIP): Pass option --quiet.
 +	* tests/openpgp/mds.test: Indent MD5 notice.
 +	* tests/openpgp/version.test: Indent --version output.
 +
 +	gpg: Emit status lines TOFU_STATS and TOFU_STATS_LONG.
 +	* g10/tofu.c (NO_WARNING_THRESHOLD): Rename to BASIC_TRUST_THRESHOLD.
 +	(FULL_TRUST_THRESHOLD): New.
 +	(write_stats_status): New.
 +	(show_statistics): Call new function.  Print TOFU_STATS_LONG.
 +
 +2016-05-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Extend TRUST_foo status lines with the trust model.
 +	* g10/trustdb.h (TRUST_FLAG_TOFU_BASED): New.
 +	* g10/trustdb.c (trust_model_string): Lowercase the strings.  Add arg
 +	"model" and change callers to call with OPT.TRUST_MODEL.
 +	* g10/tofu.c (tofu_wot_trust_combine): Set TRUST_FLAG_TOFU_BASED.
 +	* g10/pkclist.c (write_trust_status): New.
 +	(check_signatures_trust): Call new function.
 +
 +	gpg: Improve line wrapping for a tofu message.
 +	* g10/tofu.c (time_ago_str): Mark non-breakable spaces.
 +	(show_statistics): Remove marks.
 +
 +	gpg: Re-format some tofu messages.
 +	* common/status.h (STATUS_TOFU_USER, STATUS_TOFU_STATS)
 +	(STATUS_TOFU_STATS_SHORT, STATUS_TOFU_STATS_LONG): New.
 +	* g10/tofu.c (NO_WARNING_THRESHOLD): New.
 +	(record_binding, tofu_register): Take care of --dry-run.
 +	(show_statistics): Print STATUS_TOFU_USER.  Reformat some messages.
 +	Fix the ngettext/strcmp thing.  Use log_string instead of log_info.
 +	Use NO_WARNING_THRESHOLD constant.
 +	(get_trust): Use format_text and print a compact fingerprint.
 +
 +2016-05-02  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: More fix of error return path.
 +	* scd/command.c (open_card): Return GPG_ERR_ENODEV on the failure of
 +	apdu_connect.
 +
 +2016-04-29  Werner Koch  <wk at gnupg.org>
 +
 +	common: Extend log_string to indent lines.
 +	* common/logging.c (do_logv): Add indentation when called via
 +	log_string.
 +
 +	gpg: Factor some code code out of tofu.c.
 +	* g10/tofu.c (string_to_long): New.
 +	(string_to_ulong): New.
 +	(get_single_unsigned_long_cb): Replace strtol/strtoul by new function.
 +	(get_single_long_cb): Ditto.
 +	(signature_stats_collect_cb):  Ditto.
 +	(get_policy): Ditto.
 +	(show_statistics): Ditto.  Uese es_free instead of free.
 +
 +	gpg: Remove all assert.h and s/assert/log_assert/.
 +
 +	common: Improve log_assert.
 +	* common/logging.c (bug_at): Do not i18n the string.
 +	(_log_assert): New.
 +	* common/logging.h (log_assert): Use new function and pass line
 +	information.
 +
 +2016-04-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix error return path.
 +	* scd/ccid-driver.c (bulk_in): Remove EAGAIN handling.
 +	Handle LIBUSB_ERROR_NO_DEVICE to return CCID_DRIVER_ERR_NO_READER.
 +
 +2016-04-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix memory leaks.
 +	* scd/ccid-driver.c (scan_or_find_usb_device): Return on
 +	LIBUSB_ERROR_NO_MEM.  Free CONFIG before return except on error.
 +	(scan_or_find_devices): Free device list.
 +
 +2016-04-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add experimental AKL method "wkd" and option --with-wkd-hash.
 +	* g10/getkey.c (parse_auto_key_locate): Add method "wkd".
 +	(get_pubkey_byname): Implement that method.  Also rename a variable.
 +	* g10/call-dirmngr.c (gpg_dirmngr_wkd_get): New.
 +	* g10/keyserver.c (keyserver_import_wkd): New.
 +	* g10/test-stubs.c (keyserver_import_wkd): Add stub.
 +	* g10/gpgv.c (keyserver_import_wkd): Ditto.
 +	* g10/options.h (opt):  Add field 'with_wkd_hash'.
 +	(AKL_WKD): New.
 +
 +	* g10/gpg.c (oWithWKDHash): New.
 +	(opts): Add option --with-wkd-hash.
 +	(main): Set that option.
 +	* g10/keylist.c (list_keyblock_print): Implement that option.
 +
 +	dirmngr: Add experimental command WKD_GET.
 +	* dirmngr/server.c (cmd_wkd_get): New.
 +	(register_commands): Add command WKD_GET.
 +
 +	dirmngr: Use system provided root CAs with KS_FETCH.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Use HTTP_FLAG_TRUST_SYS.
 +
 +2016-04-26  Werner Koch  <wk at gnupg.org>
 +
 +	http: Allow to request system defined CAs for TLS.
 +	* dirmngr/http.h (HTTP_FLAG_TRUST_DEF, HTTP_FLAG_TRUST_SYS): New.
 +	* dirmngr/http.c (http_session_new): Add arg "flags".
 +	* dirmngr/ks-engine-hkp.c (send_request): Use new flag
 +	HTTP_FLAG_TRUST_DEF for the new arg of http_session_new.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
 +	* dirmngr/t-http.c (main): Ditto.
 +
 +2016-04-25  Werner Koch  <wk at gnupg.org>
 +
 +	common: Minor fixes for the new private-keys.c.
 +	* common/private-keys.c (my_error_from_syserror): New.  Use it in
 +	place of gpg_error_from_syserror.
 +	(_pkc_add, pkc_lookup, pke_next_value): Use ascii_strcasecmp.
 +	(pkc_parse): Use xtrystrdup and append_to_strlist_try as intended.
 +
 +	(_pkc_add): Add braces around if-statement.
 +
 +	common: Use new function to print a failure of xtrymalloc.
 +	* common/miscellaneous.c (xoutofcore): New.
 +	* common/strlist.c (append_to_strlist): Use instead of abort.
 +	(append_to_strlist_try): Use xtrymalloc instead of xmalloc.
 +
 +2016-04-21  Justus Winter  <justus at g10code.com>
 +
 +	common: Add support for the new extended private key format.
 +	* agent/findkey.c (write_extended_private_key): New function.
 +	(agent_write_private_key): Detect if an existing file is in extended
 +	format and update the key within if it is.
 +	(read_key_file): Handle the new format.
 +	* agent/keyformat.txt: Document the new format.
 +	* common/Makefile.am: Add the new files.
 +	* common/private-keys.c: New file.
 +	* common/private-keys.h: Likewise.
 +	* common/t-private-keys.c: Likewise.
 +	* common/util.h (alphap, alnump): New macros.
 +	* tests/migrations: Add test demonstrating that we can cope with the
 +	new format.
 +
 +	common: Add 'free_strlist_wipe' which wipes memory.
 +	* common/strlist.c (free_strlist_wipe): New function.
 +	* common/strlist.h (free_strlist_wipe): New prototype.
 +
 +	common: Add 'append_to_strlist_try' which can fail.
 +	* common/strlist.c (append_to_strlist): Use the new function.
 +	(append_to_strlist_try): New function.
 +	* common/strlist.h (append_to_strlist_try): New prototype.
 +
 +	agent: Convert key format document to org.
 +	* agent/keyformat.txt: Convert to org mode.
 +
 +	tests: Make migration test more robust and silent.
 +	* tests/migrations/from-classic.test: Fix in-tree build, silence test.
 +
 +	Fixes-commit: defbc70b
 +
 +2016-04-21  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Use --enable-gpg2-is-gpg by default.
 +	* autogen.rc: Add option also for plain Windows.
 +
 +	w32: Replace libiconv DLL by iconv feature of libgpg-error.
 +	* configure.ac: Do nor require libiconv for W32.
 +	* common/utf8conv.c [W32]: Do not incluce iconv.h.  Request
 +	libgpg-error iconv macros.
 +	(jnlib_iconv): Use ICONV_CONST macro.
 +	* build-aux/speedo/w32/inst.nsi [!WITH_GUI]: Do not install libiconv.
 +	* build-aux/speedo.mk (speedo_spkgs) [!WITH_GUI]: Likewise.
 +
 +2016-04-20  Justus Winter  <justus at g10code.com>
 +
 +	agent: Sanitize permissions of the private key directory.
 +	* agent/gpg-agent.c (create_private_keys_directory): Set permissions.
 +	* common/sysutils.c (modestr_to_mode): New function.
 +	(gnupg_mkdir): Use new function.
 +	(gnupg_chmod): New function.
 +	* common/sysutils.h (gnupg_chmod): New prototype.
 +	* tests/migrations/from-classic.test: Test migration with existing
 +	directory.
 +
 +	GnuPG-bug-id: 2312
 +
 +	tests: Test the migration from a classic GnuPG home directory.
 +	* configure.ac: Add new directory.
 +	* tests/Makefile.am (SUBDIRS): Likewise.
 +	* tests/migrations/Makefile.am: New file.
 +	* tests/migrations/from-classic.gpghome/pubring.gpg.asc: Likewise.
 +	* tests/migrations/from-classic.gpghome/secring.gpg.asc: Likewise.
 +	* tests/migrations/from-classic.gpghome/trustdb.gpg.asc: Likewise.
 +	* tests/migrations/from-classic.test: Likewise.
 +
 +2016-04-20  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Use swdb.lst to define the SQLite version.
 +	* build-aux/speedo.mk: Change sqlite to use our mirror and the
 +	swdb.lst file.
 +	* build-aux/speedo/w32/inst.nsi: gpg is now build and installed as
 +	gpg.
 +
 +2016-04-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve UID selction of --quick-sign-key.
 +	* g10/keyedit.c (keyedit_quick_sign): Improve UID selection and print
 +	error for non-found userids.
 +
 +	gpg: Avoid debug like output at start of --edit-key.
 +	* g10/keyedit.c (check_all_keysigs): Print info only after something
 +	has been modified.
 +
 +2016-04-15  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	dirmngr: Fix https never reported in general help.
 +	* dirmngr/ks-engine-http.c (ks_hkp_help): Also print https
 +	when supported and no uri provided.
 +
 +	dirmngr: Fix https incorrectly reported in help.
 +	* dirmngr/ks-engine-http.c (ks_hkp_help): Only print https if tls
 +	is supported.
 +
 +2016-04-14  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Fix regression due to recent commit 4159567.
 +	* agent/protect.c (do_encryption): Fix CBC hashing.
 +
 +	agent: Allow gpg-protect-tool to handle openpgp-native protection.
 +	* agent/protect-tool.c (read_and_unprotect): Add arg ctrl and pass to
 +	agent_unprotect.
 +	(main): Allocate a simple CTRL object and pass it to
 +	read_and_unprotect.
 +	(convert_from_openpgp_native): Remove stub.
 +	(agent_key_available, agent_get_cache): New stubs.
 +	(agent_askpin): New emulation for the one in call-pinentry.c.
 +	(agent_write_private_key): New to dump key.
 +	* agent/Makefile.am (gpg_protect_tool_SOURCES): Add cvt-openpgp.c
 +
 +	tests: Set fake-pinentry's stdout and stdin to _IOLBF.
 +	* tests/openpgp/fake-pinentry.c (main): Call setvbuf.  Show passphrase
 +	at startup.  Increase buffer.
 +
 +2016-04-12  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Implement new protection mode openpgp-s2k3-ocb-aes.
 +	* agent/protect.c (agent_protect): Add arg use_ocb.  Change all caller
 +	to pass -1 for default.
 +	* agent/protect-tool.c: New option --debug-use-ocb.
 +	(oDebugUseOCB): New.
 +	(opt_debug_use_ocb): New.
 +	(main): Set option.
 +	(read_and_protect): Implement option.
 +
 +	* agent/protect.c (OCB_MODE_SUPPORTED): New macro.
 +	(PROT_DEFAULT_TO_OCB): New macro.
 +	(do_encryption): Add args use_ocb, hashbegin, hashlen, timestamp_exp,
 +	and timestamp_exp_len.  Implement OCB.
 +	(agent_protect): Change to support OCB.
 +	(do_decryption): Add new args is_ocb, aadhole_begin, and aadhole_len.
 +	Implement OCB.
 +	(merge_lists): Allow NULL for sha1hash.
 +	(agent_unprotect): Change to support OCB.
 +	(agent_private_key_type): Remove debug output.
 +
 +	indent: Help Emacs not to get confused by conditional compilation.
 +	* agent/protect.c (calibrate_get_time) [W32]: Use separate function
 +	calls for W32 and W32CE.
 +
 +2016-04-07  Justus Winter  <justus at g10code.com>
 +
 +	g10: Fix exporting secret keys of certain sizes.
 +	* g10/build-packet.c (do_key): Do not use the header length specified
 +	by the public key packet from the keyring, but let 'write_header2'
 +	compute the required length.
 +
 +2016-04-06  Justus Winter  <justus at g10code.com>
 +
 +	Revert "g10: Support armored keyrings in gpgv."
 +	This reverts commit abb352de51bc964c06007fce43ed6f6caea87c15.
 +
 +2016-04-05  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Autodetect PEM format in dirmngr-client.
 +	* dirmngr/dirmngr-client.c (init_asctobin): New function.
 +	(main): Move the initialization code to the new function.
 +	(read_pem_certificate): Initialize base64 table.
 +	(read_certificate): Try to decode certificates given in files as PEM
 +	first.
 +
 +	GnuPG-bug-id: 1844
 +
 +2016-04-05  Werner Koch  <wk at gnupg.org>
 +
 +	build: Fix for: Build gpgcompose only in maintainer mode.
 +	* g10/Makefile.am (noinst_PROGRAMS): Always add module_tests.
 +
 +	doc: Install gpg and gpgv man pages under the correct name.
 +	* doc/mkdefsinc.c (main): Add double include guard.  Set variable
 +	gpgtwohack. Define macros gpgname and gpgvname.
 +	* doc/gpg.texi: Remove macro definition for gpgname.  Use Texinfo var
 +	gpgtwohack to prepare the man pages.  Use @gpgname everywhere.
 +	* doc/gpgv.texi: Likewise.
 +	* doc/Makefile.am (myman_pages): Remove gpg2.1 and gpgv2.1 but add
 +	them depending on USE_GPG2_HACK.
 +
 +	build: Build gpgcompose only in maintainer mode.
 +	* g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose only in maintainer
 +	mode.
 +
 +	gpg: Replace use of "gpg2" by GPG_NAME.
 +
 +2016-04-04  Werner Koch  <wk at gnupg.org>
 +
 +	Now build "gpg" binary but install as "gpg2"
 +	* configure.ac (USE_GPG2_HACK): New ac_define am_conditional.
 +	* common/homedir.c (gnupg_module_name): Replace use of macro
 +	NAME_OF_INSTALLED_GPG.
 +	* g10/keygen.c (generate_keypair): Ditto.
 +	* g10/Makefile.am (bin_PROGRAMS): Remove.
 +	(noinst_PROGRAMS): Add gpg or gpg2 and gpgv or gpg2.
 +	(gpg2_hack_list): New.
 +	(use_gpg2_hack): New.
 +	(gpg2_SOURCES): Rename to gpg_SOURCES.
 +	(gpgv2_SOURCES): Rename to gpgv_SOURCES.
 +	(gpg2_LDADD): Rename to gpg_LDADD.
 +	(gpgv2_LDADD): Rename to gpgv_LDADD.
 +	(gpg2_LDFLAGS): Rename to gpg_LDFLAGS.
 +	(gpgv2_LDFLAGS): Rename to gpgv2_LDFLAGS.
 +	(install-exec-hook): Remove WinCE specific rules and add new rules.
 +	(uninstall-local): Uninstall gpg/gpg2 and gpgv/gpgv2.
 +	* tests/openpgp/Makefile.am (required_pgms): s/gpg2/gpg/.
 +	* tests/openpgp/defs.inc: Ditto.
 +	* tests/openpgp/gpgtar.test: Ditto.
 +	* tests/openpgp/mkdemodirs: Ditto.
 +	* tests/openpgp/signdemokey: Ditto.
 +
 +	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove obsolete
 +	--enable-mailto, add --enable-gpg2-is-gpg.
 +
 +	tests: Add missing file.
 +	* tests/openpgp/Makefile.am (TEST_FILES): Add plain-largeo.asc.
 +
 +2016-04-04  Justus Winter  <justus at g10code.com>
 +
 +	g10: Support armored keyrings in gpgv.
 +	* doc/gpgv.texi: Document the feature.
 +	* g10/Makefile.am (gpgv2_SOURCES): Add dearmor.c.
 +	* g10/dearmor.c (dearmor_file): Add sink argument.
 +	* g10/gpg.c (main): Adapt accordingly.
 +	* g10/gpgv.c (make_temp_dir): New function.
 +	(main): De-armor keyrings.
 +	* g10/main.h (dearmor_file): Adapt prototype.
 +
 +	GnuPG-bug-id: 2290
 +
 +	tests: Fix default key test.
 +	* tests/openpgp/default-key.test: Avoid using the option
 +	'--trust-model' unconditionally.
 +
 +2016-04-01  Justus Winter  <justus at g10code.com>
 +
 +	build: Check for conflicting trust model options.
 +	* configure.ac: Disable TOFU if configured without trust models, and
 +	check for conflicting options.
 +
 +	g10: Remove option --always-trust if compiled without trust models.
 +	* g10/gpg.c (opts): Remove option --always-trust if compiled without
 +	trust models.
 +
 +2016-03-31  Justus Winter  <justus at g10code.com>
 +
 +	speedo,w32: Build libsqlite3.
 +	* build-aux/speedo.mk (speedo_spkgs): Add libsqlite3 on w32.
 +	(libsqlite3_ver): New variable.
 +	(speedo_pkg_libsqlite3_tar): Likewise.
 +
 +	g10: Use gpg-error abstraction of sched_yield.
 +	* g10/tofu.c (begin_transaction): Use 'gpgrt_yield'.
 +
 +2016-03-29  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix NULL-segv for missing tofu DB.
 +	* g10/tofu.c (opendb): Guard call to timeout function.
 +
 +2016-03-22  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve message when asking for key capabilities.
 +	* g10/keygen.c (ask_key_flags): Improve message.
 +
 +	gpg: Remove the extra prompt for Curve25519.
 +	* g10/keygen.c (MY_USE_ECDSADH): New macro local to ask_curve.
 +	(ask_curve): Use a fixed table of curve names and reserve a slot for
 +	Curve448.  Simplify CurveNNNN/EdNNNN switching.
 +	(ask_curve): Remove the Curve25519 is non-standard prompt.
 +
 +2016-03-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Silence trustdb computation with --quiet.
 +	* g10/trustdb.c (validate_keys): Do not print log_info stuff in quiet
 +	mode.
 +
 +2016-03-17  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Always create a keybox header when creating a new keybox.
 +	* sm/keydb.c (maybe_create_keybox): Create the header blob.
 +
 +2016-03-17  Neal H. Walfield  <neal at g10code.com>
 +
 +	doc: Improve documentation of --enable-large-rsa.
 +	* doc/gpg.texi (--enable-large-rsa): Improve text.
 +
 +2016-03-17  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: allow removal of the shadowed key.
 +	* agent/findkey.c (agent_delete_key): Remove the key when asked.
 +
 +2016-03-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Add const qualifier.
 +	* g10/gpgcompose.c (show_help): Those are strings not to be modified.
 +
 +2016-03-15  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Do not rely on a certain evaluation order.
 +	* g10/keyedit.c (print_and_check_one_sig): Call check_key_signature
 +	before derefing IS_SELFSIG.
 +
 +2016-03-14  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Add manufacturer id 0x000a.
 +	* g10/card-util.c (get_manufacturer): Add it.
 +
 +2016-03-10  Kevin J. McCarthy  <kevin at 8t8.us>
 +
 +	g10: Silence message if --quiet is given.
 +	* g10/getkey.c (parse_def_secret_key): Silence message if --quiet is
 +	given.
 +
 +2016-03-08  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Add a new test.
 +	* g10/Makefile.am (EXTRA_DIST): Add t-stutter-data.asc.
 +	(module_tests): Add t-stutter.
 +	(t_stutter_SOURCES): New variable.
 +	(t_stutter_LDADD): New variable.
 +
 +2016-03-07  Justus Winter  <justus at g10code.com>
 +
 +	sm: Implement pinentry loopback and reading passphrases from fd.
 +	* doc/gpgsm.texi: Document '--pinentry-mode' and '--passphrase-fd'.
 +	* sm/Makefile.am (gpgsm_SOURCES): Add new files
 +	* sm/call-agent.c (struct default_inq_parm_s): New definition.
 +	(start_agent): Pass in the pinentry mode.
 +	(default_inq_cb): Handle 'PASSPHRASE' and 'NEW_PASSPHRASE' inquiries.
 +	Adapt all call sites to the new callback cookie.
 +	* sm/gpgsm.c (cmd_and_opt_values): Add new values.
 +	(opts): Add new options.
 +	(main): Handle new options.
 +	* sm/gpgsm.h (struct opt): Add field 'pinentry_mode'.
 +	* sm/passphrase.c: New file.
 +	* sm/passphrase.h: Likewise.
 +
 +	GnuPG-bug-id: 1970
 +
 +	sm: Remove unused argument '--fixed-passphrase'.
 +	* doc/gpgsm.texi: Drop description.
 +	* sm/gpgsm.c (cmd_and_opt_values): Drop enum value.
 +	(opts): Drop argument.
 +	(main): Drop argument handling.
 +	* sm/gpgsm.h (struct opt): Drop field 'fixed_passphrase'.
 +
 +	kbx: Avoid undefined behavior.
 +	* kbx/keybox-file.c (_keybox_read_blob2): Cast to unsigned int before
 +	shifting.
 +
 +2016-03-07  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Bug fix for a device with multiple interfaces.
 +	* scd/ccid-driver.c (scan_or_find_usb_device): Use IFC_NO when
 +	accessing interface information.
 +
 +2016-03-04  Justus Winter  <justus at g10code.com>
 +
 +	build: Make libusb a hard requirement if the ccid driver is requested.
 +	* configure.ac: Print an error message and die if the internal ccid
 +	driver is requested but no suitable libusb is found.
 +
 +	g10: Drop superfluous declaration.
 +	* g10/main.h (disable_core_dumps): Drop declaration.
 +
 +	g10: Guard code against errors.
 +	* g10/keygen.c (do_generate_keypair): Check for errors, in which case
 +	'pri_psk' is NULL.
 +
 +	Fixes-commit: bf9d1248
 +
 +2016-03-03  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Add more missing CFLAGS.
 +	* dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
 +	'GCRYPT_CFLAGS'.
 +	(t_dns_stuff_CFLAGS): Likewise.
 +
 +	GnuPG-bug-id: 2235
 +
 +	tests/openpgp: Skip gpgtar test if it has not been built.
 +	* tests/openpgp/gpgtar.test: Check if executable exists.
 +
 +	GnuPG-bug-id: 2261
 +
 +2016-03-02  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Add new program gpgcompose.
 +	* g10/packet.h: Include "util.h".
 +	* g10/encrypt.c (encrypt_seskey): Don't mark as static.
 +	* g10/gpgcompose.c: New file.
 +	* g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose.
 +	(gpg2_SOURCES): Split everything but gpg.c into...
 +	(gpg_sources): ... this new variable.
 +	(gpgcompose_SOURCES): New variable.
 +	(gpgcompose_LDADD): Likewise.
 +	(gpgcompose_LDFLAGS): Likewise.
 +
 +	gpg: More robustly detect valid non-armored OpenPGP messages.
 +	* g10/armor.c (is_armored): More robustly detect valid non-armored
 +	OpenPGP messages.
 +
 +	common: Provide a function for mapping packet types to strings.
 +	* common/openpgpdefs.h (pkttype_str): New function.
 +
 +	gpg: Rename pop_filter to iobuf_pop_filter and export it.
 +	* common/iobuf.c (pop_filter): Rename from this...
 +	(iobuf_pop_filter): ... to this.  Don't mark it as static.
 +
 +	gpg: Split write_pubkey_enc_from_list.
 +	* g10/encrypt.c (write_pubkey_enc_from_list): Split the body of this
 +	function out into...
 +	(write_pubkey_enc): ... this new function.
 +
 +	gpg: Allow the caller to write the contents of a plaintext packet.
 +	* g10/build-packet.c (do_plaintext): Change the semantics such that if
 +	PT->BUF is NULL, it is the caller's responsibility to write the
 +	content (and disable partial body length mode, if appropriate).
 +
 +	gpg: Add a new function for creating binary notations.
 +	* g10/build-packet.c (blob_to_notation): New function.
 +
 +	gpg: Refactor the printing of binary notations.
 +	* g10/build-packet.c (sig_to_notation): Break printing of binary
 +	notations into...
 +	(notation_value_to_human_readable_string): ... this new function.
 +	Provide a small preview of the binary data substituting non-printable
 +	characters with '?'.
 +
 +2016-03-02  Uldis Anšmits  <uldis.ansmits at tieto.com>
 +
 +	tests/openpgp: Make tests more portable.
 +	* tests/openpgp/default-key.test: Avoid 'grep -q'.
 +	* tests/openpgp/gpgtar.test: Avoid 'grep -qe' and 'diff -q'.
 +	* tests/openpgp/use-exact-key.test: Avoid 'grep -q'.
 +
 +	GnuPG-bug-id: 2262
 +
 +2016-03-02  Justus Winter  <justus at g10code.com>
 +
 +	common: Consolidate Assuan server argument handling.
 +	* common/Makefile.am (common_sources): Add new files.
 +	* common/server-help.c: New file.
 +	* common/server-help.h: Likewise.
 +	* agent/command.c: Drop argument handling primitives in favor of using
 +	the consolidated ones.
 +	* dirmngr/server.c: Likewise.
 +	* g10/server.c: Likewise.
 +	* g13/server.c: Likewise.
 +	* scd/command.c: Likewise.
 +	* sm/server.c: Likewise.
 +
 +2016-03-01  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Add missing CFLAGS.
 +	* dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
 +	'GPG_ERROR_CFLAGS'.
 +	(t_dns_stuff_CFLAGS): Likewise.
 +
 +	tools: Drop superfluous include.
 +	* tools/gpgtar.c: Do not include unused 'npth.h'.
 +
 +2016-02-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Prettify a 2 octet hex output.
 +	* g10/sig-check.c (check_key_signature2): Wrap line and use %02x.
 +
 +2016-02-25  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Show debugging info if a sig with an unsupported sig class is used.
 +	* g10/sig-check.c (check_key_signature2): If SIG->CLASS is
 +	unsupported, show some debugging information.  Don't use BUG to fail.
 +	Just return GPG_ERR_BAD_SIGNATURE.
 +
 +	gpg: More carefully encode a packet's length.
 +	* g10/build-packet.c (write_header2): Make sure the length bits are
 +	cleared.  Fail if HDRLEN is set and the specified length can't be
 +	encoded in the available space.
 +
 +	gpg: Avoid directly twiddling bits.
 +	* g10/build-packet.c (do_plaintext): Use ctb_new_format_p to check the
 +	packet's format.
 +	(write_header2): Likewise.
 +
 +	gpg: Add some asserts.
 +	* g10/build-packet.c (ctb_new_format_p): New function.
 +	(ctb_pkttype): New function.
 +	(do_user_id): Add some asserts.
 +	(do_key): Likewise.
 +	(do_symkey_enc): Likewise.
 +	(do_pubkey_enc): Likewise.
 +	(do_plaintext): Likewise.
 +	(do_encrypted): Likewise.
 +	(do_encrypted_mdc): Likewise.
 +	(do_compressed): Likewise.
 +	(do_signature): Likewise.
 +	(do_signature): Likewise.
 +	(write_header2): Likewise.
 +
 +	gpg: Avoid an unnecessary copy.
 +	* g10/build-packet.c (sig_to_notation): Avoid an unnecessary copy of
 +	the data: the size of the packet is fixed.
 +
 +2016-02-23  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Reduce buffer size.
 +	* common/iobuf.c (iobuf_copy): Change buffer size from 1 MB to 32 KB.
 +
 +	common: Improve a function's documentation and comments.
 +	* common/iobuf.c (iobuf_set_partial_body_length_mode): Fix
 +	documentation and comment.  Add an assert.
 +
 +	common: Add log_assert.
 +	* common/logging.h (log_assert): New macro.
 +
 +	gpg: Use higher-level functions.
 +	* g10/build-packet.c (do_symkey_enc): Use iobuf_write instead of
 +	iobuf_put in a loop.  Use iobuf_copy instead of iobuf_read and
 +	iobuf_write in a loop.  Move the memory wiping from here...
 +	* common/iobuf.c (iobuf_copy): ... to here.
 +
 +	common: Check for an error before reading.
 +	* common/iobuf.c (iobuf_copy): If DEST has a pending error, don't
 +	start copying.
 +
 +	common: More accurately name function.
 +	* common/iobuf.c (iobuf_set_partial_block_mode): Rename from this...
 +	(iobuf_set_partial_body_length_mode): ... to this.  Update callers.
 +
 +2016-02-23  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Add commands --suspend and --remove.
 +	* g13/g13.c (aSuspend, aResume): New.
 +	(opts): Add commands --suspend and --resume.
 +	(main): Implement dummy command aUmount.  Implement commands aResume
 +	and aSuspend.
 +	* g13/sh-cmd.c (cmd_suspend): New.
 +	(cmd_resume): New.
 +	(register_commands): Add commands RESUME and SUSPEND.
 +	* g13/server.c (cmd_suspend): New.
 +	(cmd_resume): New.
 +	(register_commands): Add commands RESUME and SUSPEND.
 +	* g13/be-dmcrypt.c (be_dmcrypt_suspend_container): New.
 +	(be_dmcrypt_resume_container): New.
 +	* g13/backend.c (be_suspend_container): New.
 +	(be_resume_container): New.
 +	* g13/suspend.c, g13/suspend.h: New.
 +	* g13/mount.c (parse_header, read_keyblob_prefix, read_keyblob)
 +	(decrypt_keyblob, g13_is_container): Move to ...
 +	* g13/keyblob.c: new file.
 +	(keyblob_read): Rename to g13_keyblob_read and make global.
 +	(keyblob_decrypt): Rename to g13_keyblob_decrypt and make global.
 +	* g13/sh-dmcrypt.c (check_blockdev): Add arg expect_busy.
 +	(sh_dmcrypt_suspend_container): New.
 +	(sh_dmcrypt_resume_container): New.
 +	* g13/call-syshelp.c (call_syshelp_run_suspend): New.
 +	(call_syshelp_run_resume): New.
 +
 +	g13: Run mount after dmsetup.
 +	* g13/g13-syshelp.c (main): Reject userids with a slash.
 +	* g13/sh-dmcrypt.c (sh_dmcrypt_mount_container): Run mount if a
 +	mountpoint is known.
 +
 +2016-02-23  Justus Winter  <justus at g10code.com>
 +
 +	tests/openpgp: Qualify executables with extension.
 +	* tests/openpgp/Makefile.am (required_pgms): Qualify executables with
 +	'$EXEEXT'.
 +
 +	tests/openpgp: Reimplement 'pinentry.sh' in c.
 +	* tests/openpgp/Makefile.am: Build new program.
 +	* tests/openpgp/defs.inc: Use the new program.
 +	* tests/openpgp/fake-pinentry.c: New file.
 +
 +	tests/openpgp: Avoid dependency on source files.
 +	* tests/openpgp/plain-largeo.asc: New file.
 +	* tests/openpgp/version.test: Dearmor the new file instead of relying
 +	on the source being present.
 +
 +	tests/openpgp: Fix file removal.
 +	* tests/openpgp/version.test: Fix file removal.
 +
 +	common/exechelp: Provide a way to wait for multiple processes.
 +	* common/exechelp-posix.c (gnupg_wait_process): Generalize to
 +	'gnupg_wait_processes'.
 +	* common/exechelp-w32.c (gnupg_wait_process): Likewise.
 +	* common/exechelp-w32ce.c (gnupg_wait_process): New function stub.
 +	* common/exechelp.h (gnupg_wait_process): New prototype.
 +
 +	common/exechelp: Add general pipe function.
 +	* common/exechelp-posix.c (gnupg_create_pipe): New function.
 +	* common/exechelp-w32.c (INHERIT_{READ,WRITE,BOTH}): New macros.
 +	(create_inheritable_pipe): Generalize so that both ends can be
 +	inherited.
 +	(do_create_pipe): Rename argument accordingly.
 +	(gnupg_create_{in,out}bound_pipe): Use new flags.
 +	(gnupg_create_pipe): New function.
 +	(gnupg_spawn_process): Use new flags.
 +	* common/exechelp-w32ce.c (gnupg_create_pipe): New stub.
 +	* common/exechelp.h (gnupg_create_pipe): New prototype.
 +
 +	common/exechelp: Mute the Windows version.
 +	* common/exechelp-w32.c (gnupg_wait_process): Do not print an error if
 +	the exit code can be returned.  This makes the Windows version behave
 +	like the POSIX version.
 +
 +	common/exechelp: Avoid magic numbers.
 +	* common/exechelp-w32.c (do_create_pipe): Use symbolic names.
 +
 +	common/exechelp: Disable debugging by default.
 +	* common/exechelp-w32.c (DEBUG_W32_SPAWN): Set to 0.
 +
 +	common/exechelp: Fix handle leak.
 +	* common/exechelp-w32.c (gnupg_spawn_process_detached): Close process
 +	handle.
 +
 +	common/exechelp: Fix opening the 'nul' device.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Fix opening the 'nul'
 +	device.
 +
 +	common/exechelp: Fix error handling.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Close the right handle.
 +
 +	common/exechelp: Fix pipe creation.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Fix the creation of the
 +	input pipe.
 +
 +	tools/mk-tdata: Fix data generation on Windows.
 +	* tools/mk-tdata.c (main): Set stdout to binary mode to avoid newline
 +	conversion.
 +
 +2016-02-19  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Systematically detect and fix signatures that are out of order.
 +	* g10/keyedit.c (sig_comparison): New function.
 +	(fix_key_signature_order): Merge functionality into...
 +	(check_all_keysigs): ... this function.  Rewrite to eliminate
 +	duplicates and use a systematic approach to detecting and moving
 +	signatures that are out of order instead of a heuristic.
 +	(fix_keyblock): Don't call fix_key_signature_order.  Call
 +	check_all_keysigs instead after collapsing the uids.
 +
 +	gpg: Split check_key_signature2.
 +	* g10/sig-check.c (hash_uid_node): Rename from this...
 +	(hash_uid_packet): ... to this.  Take a PKT_user_id instead of a
 +	KBNODE.
 +	(check_key_signature2): Split the basic signature checking
 +	functionality into...
 +	(check_signature_over_key_or_uid): ... this new function.
 +
 +	gpg: Split print_and_check_one_sig.
 +	* g10/keyedit.c (print_and_check_one_sig): Split the print
 +	functionality into...
 +	(print_one_sig): ... this new function.
 +
 +	gpg: Split the function check_signature_end.
 +	* g10/sig-check.c (check_signature_end): Break the basic signature
 +	check into...
 +	(check_signature_end_simple): ... this new function.
 +
 +	gpg: Use format_keyid rather than manually formatting the keyid.
 +	* g10/keyedit.c (menu_addrevoker): Use format_keyid rather than
 +	manually formatting the keyid.
 +	* g10/keygen.c (card_write_key_to_backup_file): Likewise.
 +
 +	gpg: Initialize the primary key when generating a key.
 +	* g10/keygen.c (do_generate_keypair): Initialize
 +	pri_psk->flags.primary, pri_psk->keyid and pri_psk->main_keyid.
 +
 +	gpg: Add accessor & utility functions for pk->keyid and pk->main_keyid.
 +	* g10/keydb.h (keyid_cmp): New function.
 +	* g10/keyid.c (pk_keyid): New function.
 +	(pk_main_keyid): New function.
 +	(keyid_copy): New function.
 +	(pk_keyid_str): New function.
 +	* g10/packet.h (PKT_public_key): Update comments for main_keyid and
 +	keyid.
 +
 +2016-02-18  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpgparsemail: Allow weirdly-mixed pkcs7 signatures.
 +	* tools/gpgparsemail.c: Add and check info->signing_protocol_2.
 +
 +	gpg: Clean up dangling agent_open and agent_closed declarations.
 +	* g10/keydb.h: Remove agent_open, agent_close declarations/
 +	* g10/migrate.c: #include <unistd.h> for access()
 +
 +2016-02-16  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Make scdaemon build again due to libusb problem.
 +	* configure.ac: Add hack to disable libusb for Windows.  Also use
 +	$host instead of $target in the switch
 +	 --
 +
 +	The new test for libusb does not support cross-compiling.  As a quick
 +	workaround we disable libusb for Windows because we can't use it anyway.
 +
 +	w32: Do not error out if gpgconf is not installed.
 +	* common/homedir.c (check_portable_app): Remove error message.
 +
 +2016-02-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Make ASCII armor decoding more robust to encoding errors.
 +	* g10/armor.c (radix64_read): If the = is followed by the string "3D",
 +	check if the following four characters are valid radix 64 and are
 +	followed by a new line.  If so, warn and ignore the '3D'.
 +
 +2016-02-16  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Add a gnupg-module-overview picture.
 +	* doc/gnupg-module-overview.svg: New.
 +	* doc/debugging.texi (Component interaction): New.
 +	* doc/Makefile.am (EXTRA_DIST): Add PNG and PDF versions of
 +	gnupg-module-overview.svg.  Remove two eps files.
 +	(BUILT_SOURCES): Add gnupg-module-overview.pdf and .png.  Remove
 +	gnupg-card-architecture.epsl
 +	(gnupg_TEXINFOS): Add gnupg-module-overview.svg
 +	(gnupg.dvi): New.
 +	(DISTCLEANFILES): Remove build eps files.
 +
 +2016-02-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	common, g10: Fix indentation to silence GCC-6.
 +	* common/iobuf.c (iobuf_ioctl): Fix.
 +	* g10/encrypt.c (encrypt_filter): Likewise.
 +	* g10/keyring.c (prepare_search): Likewise.
 +
 +	dirmngr: fix for memory alignment.
 +	* dirmngr/dns-stuff.c (get_dns_cert): Cast through void *.
 +	(getsrv, get_dns_cname): Make sure it's aligned for HEADER.
 +
 +2016-02-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add hidden key-edit subcommand "change-usage".
 +	* g10/keyedit.c (cmdCHANGEUSAGE): New.
 +	(cmds): Add command "change-usage".
 +	(keyedit_menu): Handle that command.
 +	(menu_changeusage): New.
 +	* g10/keygen.c (keygen_add_key_flags): New.
 +	(ask_key_flags): Add optional arg current.
 +
 +2016-02-14  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Improve API documentation.
 +	* g10/seskey.c (make_session_key): Improve documentation.
 +	(encode_session_key): Improve documentation.
 +	* g10/encrypt.c (encrypt_seskey): Remove gratuitous initialization.
 +	* g10/dek.h (DEK): Improve documenation.
 +
 +	gpg: Fix calc_header_length when LEN is 0 and improve documentation.
 +	* g10/build-packet.c (calc_header_length): Return the correct haeder
 +	size when LEN is 0.  Fix documentation.
 +
 +	gpg: Fix format_keyid when dynamically allocating the buffer.
 +	* g10/keyid.c (format_keyid): Return a char *, not a const char *.  If
 +	BUFFER is NULL, then set LEN to the static buffer's size.
 +
 +	common: Fix comment.
 +	* common/iobuf.c (iobuf_flush_temp): Fix comment.
 +
 +2016-02-13  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Require a confirmation before g13 is used for DM-Crypt.
 +	* g13/g13-syshelp.c (g13_syshelp_i_know_what_i_am_doing):
 +	* g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Call it.
 +	(sh_dmcrypt_mount_container): Call it.
 +
 +	g13: Second chunk of code to support dm-crypt.
 +	* g13/be-dmcrypt.c, g13/be-dmcrypt.h: New.
 +	* g13/Makefile.am (g13_SOURCES): Add them.
 +	* g13/backend.c: Include be-dmcrypt.h and call-syshelp.h.
 +	(no_such_backend): Rename to _no_such_backend and provide replacement
 +	macro.
 +	(be_is_supported_conttype): Support DM-Crypt.
 +	(be_take_lock_for_create): Call set_segvice for DM-Crypt.
 +	(be_create_new_keys): Make it a dummy for DM-Crypt.
 +	(be_create_container): Call be_dmcrypt_create_container.
 +	(be_mount_container): call be_dmcrypt_mount_container.
 +	* g13/g13-syshelp.c (main): Enable verbose mode.
 +	* g13/g13tuple.c (get_tupledesc_data): New.
 +	* g13/g13tuple.h (unref_tupledesc): New.
 +	* g13/g13.h (server_control_): Add field "recipients".
 +	* g13/g13.c (main): Fix setting of recipients via cmdline.
 +	(g13_deinit_default_ctrl): Release recipients list.
 +	(g13_request_shutdown): New.  Replace all direct update of
 +	shutdown_pending by calls this function.
 +	* g13/server.c (server_local_s): Remove field recipients which is now
 +	part of CTRL.
 +	(reset_notify, cmd_recipient, cmd_create): Adjust for this change.
 +	* g13/create.c (encrypt_keyblob): Rename to g13_encrypt_keyblob.
 +	(g13_create_container): Support DM-Crypt.
 +	* g13/mount.c (parse_header): Allow for meta data copies.
 +	(g13_mount_container): Support DM-Crypt.
 +	* g13/sh-cmd.c (cmd_create): Make it work.
 +	(cmd_mount): New.
 +	* g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Make it work.
 +	(sh_dmcrypt_mount_container): New.
 +
 +	g13: Improve dump_keyblob.
 +	* g13/g13tuple.c: Include keyblob.h.
 +	(find_tuple_uint): Factor code out to ...
 +	(convert_uint): new.
 +	(all_printable): New.
 +	* g13/mount.c (dump_keyblob: Move and rename to ...
 +	* g13/g13tuple.c (dump_tupledesc): here.  Revamp and pretyy print uint
 +	values.
 +
 +	g13: Define 3 new tags.
 +	* g13/keyblob.h (KEYBLOB_TAG_CONT_NSEC): New.
 +	(KEYBLOB_TAG_ENC_NSEC): New.
 +	(KEYBLOB_TAG_ENC_OFF): New.
 +
 +	g13: Rename utils.c to g13tuple.c.
 +	* g13/utils.c: Rename to g13tuple.c.
 +	* g13/utils.h: Rename to g13tuple.h.  Change all users.
 +	* g13/Makefile.am: Adjust accordingly
 +
 +	g13: Add functions to handle uint in a keyblob.
 +	* g13/utils.c (append_tuple_uint): New.
 +	(find_tuple_uint): New.
 +	* g13/t-utils.c: New.
 +	* g13/Makefile.am (noinst_PROGRAMS, TESTS): New.
 +	(module_tests, t_common_ldadd): New.
 +	(t_utils_SOURCES, t_utils_LDADD): New.
 +
 +	g13: Re-factor high level create code.
 +	* g13/create.c (g13_create_container): Factor some code out to ...
 +	* g13/backend.c (be_take_lock_for_create): new.
 +
 +	g13: Return an error for non-existing device.
 +	* g13/sh-cmd.c (cmd_device): Set ERR.
 +
 +	g13: Fix releasing of a syshelp context.
 +	* g13/call-syshelp.c (call_syshelp_release): Allow a NULL arg.
 +
 +	g13: Switch over to common/exectool.c.
 +	* g13/sh-exectool.c: Remove.  It has been replaced by common/exectool.c.
 +	* g13/Makefile.am (g13_syshelp_SOURCES): Remove sh-exectool.c
 +	* g13/sh-blockdev.c: Include exectool.h.  Change sh_exec_tool to
 +	gnupg_exec-tool.
 +	* g13/sh-dmcrypt.c: Ditto.
 +
 +	common: Make gnupg_exec_tool conform to spec.
 +	* common/exectool.c (gnupg_exec_tool): Allocate extra byte.  Allow
 +	zero length read.  Append hidden byte.  Release memory on error.
 +
 +	g13: First chunk of code to support dm-crypt.
 +	* g13/call-syshelp.c, g13/call-syshelp.h: New.
 +	* g13/g13-syshelp.c, g13/g13-syshelp.h: New.
 +	* g13/sh-cmd.c: New.
 +	* g13/sh-blockdev.c: New.
 +	* g13/sh-exectool.c: New.
 +	* g13/sh-dmcrypt.c: New.
 +	* g13/Makefile.am (sbin_PROGRAMS): Add g13-syshelp.c
 +	(g13_syshelp_SOURCES): New.
 +	(g13_syshelp_LDADD): New.
 +
 +	* g13/g13.c (opts): Add option --type.
 +	(g13_deinit_default_ctrl): New.
 +	(main): Implement that option.  Call g13_deinit_default_ctrl.
 +	* g13/g13.h (struct call_syshelp_s): New declaration.
 +	(server_control_s): Add field syshelp_local.
 +	* g13/keyblob.h (KEYBLOB_TAG_CREATED): New.
 +	(KEYBLOB_TAG_ALGOSTR): New.
 +	(KEYBLOB_TAG_HDRCOPY): New.
 +	* g13/backend.c (be_parse_conttype_name): New.
 +	(be_get_detached_name): Add CONTTYPE_DM_CRYPT.
 +
 +	tests: Remove some harmless warnings in regression tests.
 +	* tests/openpgp/gpg-agent.conf.tmpl: Remove --use-standard-socket.
 +
 +2016-02-12  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Change simple_query to ignore status messages.
 +	* common/simple-pwquery.c (simple_query): Ignore status messages.
 +
 +2016-02-12  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Make sure to have the directory for trustdb.
 +	* g10/tdbio.c (tdbio_set_dbname): Return earlier if !CREATE.  Check
 +	the directory and create it if none before calling take_write_lock.
 +
 +2016-02-02  Neal H. Walfield  <neal at g10code.com>
 +
 +	doc: Note that rngd can also be used to quickly generate insecure keys.
 +	* doc/gpg-agent.texi (Agent Options): Add comment to the description
 +	of --debug-quick-random that rngd can also be used to quickly generate
 +	key.
 +
 +2016-01-27  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Fix size_t/int mismatch in libusb.
 +	* scd/ccid-driver.c (bulk_in, abort_cmd, ccid_poll): Change msglen to
 +	int.
 +
 +	scd: Fix detection of libusb.
 +	* configure.ac (HAVE_LIBUSB): Clear if no header file was found.
 +	(LIBUSB_LIBS): Ditto.
 +
 +	dirmngr: Build fix for FreeBSD (EAI macros)
 +	* dirmngr/dns-stuff.c (map_eai_to_gpg_error): Map EAI_NODATA and
 +	EAI_ADDRFAMILY only if defined.
 +
 +2016-01-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Migrate to new API of libusb 1.0.
 +	* configure.ac (LIBUSB_CPPFLAGS): New.
 +	* scd/Makefile.am (AM_CPPFLAGS): Add LIBUSB_CPPFLAGS.
 +	* scd/ccid-driver.c: Use libusb 1.0 API.
 +
 +2016-01-26  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.11.
 +
 +2016-01-26  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	gpgtar,w32: Fix gpgtar 8 bit encoding handling on W32.
 +	* common/utf8conv.c (wchar_to_utf8): Factor code out to ...
 +	(wchar_to_cp): new.
 +	(utf8_to_wchar): Factor code out to ...
 +	(cp_to_wchar): new.
 +	(wchar_to_native): New.
 +	(native_to_wchar): New.
 +	* tools/gpgtar-create.c (fillup_entry_w32): Use native_to_wchar.
 +	(scan_directory): Use wchar_to_native.
 +
 +2016-01-26  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix segfault on unsupported curve.
 +	* g10/call-agent.c (learn_status_cb): Don't use NULL for strcmp.
 +
 +	sm: small fix for GCC 6.
 +	* sm/export.c (insert_duptable): Use unsigned 0.
 +
 +2016-01-25  Werner Koch  <wk at gnupg.org>
 +	    Daiki Ueno  <ueno at gnu.org>
 +
 +	gpg: Print PROGRESS status lines during key generation.
 +	* g10/call-agent.c (cache_nonce_status_cb): Rewrite by using
 +	has_leading_keyword.  Handle PROGRESS lines.
 +
 +2016-01-25  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Send PROGRESS status lines to the client.
 +	* agent/gpg-agent.c (struct progress_dispatch_s): New.
 +	(progress_dispatch_list): New.
 +	(main): Register libgcrypt pogress handler.
 +	(agent_libgcrypt_progress_cb): New.
 +	(agent_set_progress_cb): New.
 +	(unregister_progress_cb): New.
 +	(agent_deinit_default_ctrl): Call unregister.
 +	* agent/command.c (progress_cb): New.
 +	(start_command_handler): Register progress callback.
 +
 +	speedo: Allow use of SHA-256 checksums.
 +	* build-aux/getswdb.sh: Add option --find-sha256sum.
 +	* build-aux/speedo.mk (libgpg_error_sha2): New var.  Also for all
 +	other packages.
 +	(SHA2SUM): New.
 +	(SETVARS, SETVARS_W64): Prefer sha256sum over sha1sum.
 +	(installer-from-source): Create swdb fragment.
 +
 +2016-01-22  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Indicate that serial numbers are hexadecimal.
 +	* dirmngr/misc.c (hexify_data): Add arg with_prefix.  Adjust all
 +	callers.
 +	* dirmngr/crlcache.c (cache_isvalid): Print "0x" in front of the S/N.
 +
 +	dirmngr: Provide the keyserver pool name even if there is no CNAME.
 +	* dirmngr/ks-engine-hkp.c (map_host): Fix setting of r_poolname.
 +
 +2016-01-22  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +	    wk at gnupg.org
 +
 +	dirmngr: Use sks-keyservers CA by default for the hkps pool.
 +	* dirmngr/Makefile.am (dist_pkgdata_DATA): Add sks-keyservers.netCA.pem.
 +	* dirmngr/http.c (http_session_new): Add optional arg
 +	intended_hostname and set a default cert.
 +	* dirmngr/ks-engine-hkp.c (send_request): Pass httphost to
 +	http_session_new.
 +
 +2016-01-22  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Allow new user ids with only the mail address.
 +	* g10/keygen.c (ask_user_id): Allow empty name.
 +
 +2016-01-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve header text of the auto-created revocations.
 +	* g10/revoke.c (gen_standard_revoke): Improve header text for the
 +	file.  Add info output.
 +
 +	gpg: Make --auto-key-retrieve work with dirmngr configured server.
 +	* g10/call-dirmngr.c (gpg_dirmngr_ks_list): Make R_KEYSERVER optional.
 +	* g10/keyserver.c (keyserver_any_configured): New.
 +	(keyserver_put): Remove arg keyserver because this will always receive
 +	opt.keyserver which is anyway used when connecting dirmngr.  Do not
 +	check opt.keyserver.
 +	(keyserver_import_cert): Replace opt.keyserver by
 +	keyserver_any_configured.
 +	* g10/mainproc.c (check_sig_and_print): Ditto.
 +	* g10/import.c (revocation_present): Ditto.
 +	* g10/getkey.c (get_pubkey_byname): Ditto.
 +	* g10/gpgv.c (keyserver_any_configured): Add stub.
 +	* g10/test-stubs.c (keyserver_any_configured): Add stub.
 +
 +2016-01-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Silence message about ignoring revoked user ids.
 +	* g10/trustdb.c (tdb_get_validity_core): Print message only in debug
 +	mode.
 +
 +	agent: New option --pinentry-timeout.
 +	* agent/gpg-agent.c (oPinentryTimeout): New.
 +	(opts): Add new option.
 +	(parse_rereadable_options): PArse that option.
 +	(main): Tell gpgconf about this option.
 +	* agent/call-pinentry.c (start_pinentry): Send option to Pinentry.
 +	* tools/gpgconf-comp.c (gc_options_gpg_agent): Add Option.
 +
 +2016-01-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Streamline use of error messages in tofu.c.
 +	* g10/tofu.c: Make use of print_further_info to reduce the number of
 +	different error messages to be translated.  Also streamline some
 +	messages.
 +
 +	common: Add substitute code for libgpg-error < 1.22.
 +	* common/util.h (GPG_ERR_DB_CORRUPTED): New.
 +
 +	gpg: Add function print_further_info.
 +	* g10/misc.c (print_further_info): New.
 +
 +2016-01-18  Werner Koch  <wk at gnupg.org>
 +
 +	g10: Improve strings printed by tofu.c.
 +	* g10/tofu.c: Include ttyio.h.  Change many strings to help
 +	translating.  Make use of ngettext wehere needed.
 +	(CONTROL_L): New.
 +	(TIME_AGO_UNIT_SMALL_NAME): Remove this and all similar *_NAME macros.
 +	(time_ago_unit): Remove.
 +	(get_trust): Use tty_prints and cpr_get only for the actual prompt.
 +	Add Ctrl-L hack.
 +	(show_statistics): Use two English strings for singular and plural.
 +
 +	* po/POTFILES.in: Add tofu.c.
 +
 +	gpg: Use "days" in "...newer than..." diagnostics.
 +	* g10/sig-check.c (check_signature_metadata_validity): Use days if
 +	useful.
 +
 +	Use ngettext for some strings.
 +	* scd/app-openpgp.c (build_enter_admin_pin_prompt): Use ngettext for
 +	some diagnostics.
 +	(do_genkey): Ditto.
 +	* g10/keyedit.c (check_all_keysigs, menu_delsig, menu_clean): Ditto.
 +	* g10/keylist.c (print_signature_stats): Ditto.
 +	* g10/keyserver.c (keyserver_refresh): Ditto.
 +	* g10/sig-check.c (check_signature_metadata_validity): Ditto.
 +	* g10/sign.c (do_sign): Ditto.
 +	* g10/trustdb.c (reset_trust_records): Ditto.
 +	(validate_keys): Use a table like diagnostic output.
 +
 +2016-01-15  Werner Koch  <wk at gnupg.org>
 +
 +	kbx,w32: Use shorter retry intervals for keybox_file_rename.
 +	* kbx/keybox-util.c (keybox_file_rename): Restart retry intervals
 +	after 800ms.
 +
 +2016-01-14  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Fix deadlock introduced by keybox_file_rename.
 +	* g10/keyring.c (keyring_lock) [W32]: Flush the close cache before
 +	locking.
 +	* kbx/keybox-init.c (keybox_lock) [W32]: Close the file before
 +	locking.
 +
 +	gpg: Detect race between pubring.gpg and pubring.kbx use.
 +	* g10/keydb.c (maybe_create_keyring_or_box): Detect race condition.
 +
 +	kbx: New function keybox_file_rename to replace rename.
 +	* kbx/keybox-util.c: Include windows.h.
 +	(keybox_file_rename): New.
 +	* kbx/keybox-update.c (rename_tmp_file): Replace remove+rename by
 +	keybox_file_rename.
 +	* g10/keyring.c (rename_tmp_file): Ditto.
 +
 +	kbx: Add function keybox_tmp_names to avoid code duplication.
 +	* kbx/keybox-update.c (create_tmp_file): Move some code to...
 +	* kbx/keybox-util.c (keybox_tmp_names): new.
 +	* g10/keyring.c: Include keybox.h.
 +	(create_tmp_file): Replace parts by keybox_tmp_names.
 +
 +	gpg: Make --list-options show-usage the default.
 +	* g10/gpg.c (main): Add LIST_SHOW_USAGE.
 +
 +2016-01-13  Werner Koch  <wk at gnupg.org>
 +
 +	kbx: Change return type of search functions to gpg_error_t.
 +	* kbx/keybox-search.c (keybox_search_reset): Change return type to
 +	gpg_error_t.
 +	(keybox_search): Ditto.  Also handle GPG_ERR_EOF.
 +	* sm/keydb.c (keydb_search_reset): Ditto.
 +
 +	gpg: Improve error code from lock_all.
 +	* g10/keydb.c (lock_all): Do not clobber RC during failur cleanup.
 +
 +	kbx: Improve and fix keybox_lock.
 +	* kbx/keybox-init.c (keybox_lock): Make sure ERR is initialized.  Get
 +	error codes from dotlock functions.
 +
 +	common: Make sure dotlock functions set a proper ERRNO.
 +	* common/dotlock.c (map_w32_to_errno): New.
 +	(read_lockfile): Return a proper ERRNO.
 +	(dotlock_create_unix): Do not let log functions clobber ERRNO.
 +	(dotlock_take_unix): Ditto.
 +	(dotlock_release_unix): Ditto.
 +	(dotlock_create_w32): Set proper ERRNO.
 +	(dotlock_take_w32): Ditto.
 +	(dotlock_release_w32): Ditto.
 +
 +	kbx: Implement keybox_lock for use by gpg.
 +	* kbx/keybox-defs.h: Include dotlock.h and logging.h.
 +	(CONST_KB_NAME): Remove.  Replace usage by KB_NAME.
 +	(struct keybox_name): Add field "lockhd".
 +	* kbx/keybox-init.c (keybox_register_file): Init LOCKHD.
 +	(keybox_lock): Chnage to return gpg_error_t.  Implement locking.
 +
 +	gpg: Make sure to mark a duplicate registered keybox as primary.
 +	* kbx/keybox-init.c (keybox_register_file): Change interface to return
 +	the token even if the file has already been registered.
 +	* g10/keydb.c (primary_keyring): Rename to primary_keydb.
 +	(maybe_create_keyring_or_box): Change return type to gpg_error_t.
 +	(keydb_add_resource): Ditto. s/rc/err/.
 +	(keydb_add_resource): Mark an already registered as primary.
 +	* sm/keydb.c (maybe_create_keybox): Change return type to gpg_error_t.
 +	(keydb_add_resource): Ditto. s/rc/err/.
 +	(keydb_add_resource): Adjust for changed keybox_register_file.
 +
 +2016-01-13  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Fix to support git worktree.
 +	* autogen.sh, Makefile.am, doc/Makefile.am: Use -e for testing .git.
 +
 +2016-01-12  Werner Koch  <wk at gnupg.org>
 +
 +	ssh: Accept OpenSSH *cert-v01 key variants.
 +	* agent/command-ssh.c (SPEC_FLAG_WITH_CERT): New.
 +	(ssh_key_types): Add OpenSSH cert types.
 +	(stream_read_string): Allow a dummy read.
 +	(ssh_receive_mpint_list): Pass SPEC by reference.
 +	(ssh_receive_mpint_list): New arg CERT and use it.
 +	(ssh_receive_key): Read certificate into an estream object and modify
 +	parser to make use of that object.
 +
 +2016-01-12  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	common: Fix iobuf API of filter function for alignment.
 +	* common/iobuf.h: Fix comment.
 +
 +	common: Fix iobuf API of filter function for alignment.
 +	* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
 +	* common/iobuf.c (iobuf_desc): Add the second argument DESC.
 +	(print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
 +	(iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
 +	of iobuf_desc.
 +	(file_filter, file_es_filter, sock_filter, block_filter): Fill the
 +	description.
 +	* common/t-iobuf.c (every_other_filter, double_filter): Likewise.
 +	* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
 +	g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
 +	g10/textfilter.c: Likewise.
 +
 +2016-01-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix NULL de-ref for ambiguous key check in --export-ssh-keys.
 +	* g10/getkey.c: Allow arg RET_KEYBLOCK to be NULL.
 +
 +2016-01-09  Werner Koch  <wk at gnupg.org>
 +
 +	tools: Remove gpgkey2ssh.
 +	* tools/gpgkey2ssh.c: Remove.
 +	* tools/Makefile.am (bin_PROGRAMS): Ditto.
 +
 +2016-01-08  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Support ECDSA keys with --export-ssh-key.
 +	* g10/export.c (key_to_sshblob): Add hack for ECDSA.
 +
 +	gpg: New command --export-ssh-key.
 +	* g10/export.c: Include membuf.h and host2net.h.
 +	(key_to_sshblob): New.
 +	(export_ssh_key): New.
 +	* g10/gpg.c (aExportSshKey): New.
 +	(opts): Add command.
 +	(main): Implement that command.
 +
 +	gpg: Add an exact search flag to the PK struct.
 +	* g10/getkey.c (merge_selfsigs_subkey): Clear exact flag.
 +	(finish_lookup): Set exact flag.
 +	* g10/packet.h (PKT_public_key): Add field flags.exact.
 +
 +	Print warnings if old daemon versions are used.
 +	* common/status.h (STATUS_WARNING): New.
 +	* g10/call-agent.c (warn_version_mismatch): New.
 +	(start_agent): Call warn function.
 +	* g10/call-dirmngr.c: Include status.h.
 +	(warn_version_mismatch): New.
 +	(create_context): Call warn function.
 +	* sm/call-agent.c (warn_version_mismatch): New.
 +	(start_agent): Call warn function.
 +	(gpgsm_agent_learn): Call warn function.
 +	* sm/call-dirmngr.c (warn_version_mismatch): New.
 +	(prepare_dirmngr): Call warn function.
 +
 +	common: New function compare_version_strings.
 +	* common/stringhelp.c (parse_version_number): New.
 +	(parse_version_string): New.
 +	(compare_version_strings): New.
 +	* common/t-stringhelp.c (test_compare_version_strings): New.
 +	(main): Call test.  Return ERRCOUNT instead of 0.
 +
 +	common: New function get_assuan_server_version.
 +	* common/asshelp.c: Include membuf.h.
 +	(get_assuan_server_version): New.
 +	* g10/call-agent.c (agent_get_version): Use new function.
 +
 +	common: New put_membuf_cb to replace static membuf_data_cb.
 +	* common/membuf.c (put_membuf_cb): New.
 +	* agent/call-scd.c (membuf_data_cb): Remove.  Change callers to use
 +	put_membuf_cb.
 +	* common/get-passphrase.c (membuf_data_cb): Ditto.
 +	* g10/call-agent.c (membuf_data_cb): Ditto.
 +	* sm/call-agent.c (membuf_data_cb): Ditto.
 +
 +2016-01-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Return an error code from keygrip_from_pk.
 +	* g10/keyid.c (keygrip_from_pk): Return an error code.
 +
 +	gpg: Avoid warnings about possible NULL deref.
 +	* g10/getkey.c (cache_public_key): Protect deref of CE which actually
 +	can't happen.
 +	* g10/keygen.c (quickgen_set_para): s/sprintf/snprintf/.
 +	* g10/tofu.c (end_transaction, rollback_transaction): Allow NULL for
 +	DB.
 +	* g10/trustdb.c (update_min_ownertrust): Remove useless clearling of
 +	ERR.
 +
 +	gpg: Fix warnings about useless assignments.
 +	* g10/armor.c (parse_hash_header): Remove duplicate var assignment.
 +	* g10/getkey.c (cache_user_id): Ditto.
 +	* g10/keygen.c (ask_curve): Ditto.  This also fixes a small memory
 +	leak.
 +
 +	* g10/keygen.c (proc_parameter_file): Remove useless assignment or
 +	pointer increment.
 +	(generate_keypair): Ditto.
 +	* g10/getkey.c (finish_lookup, lookup): Ditto.
 +	* g10/card-util.c (change_pin): Ditto.
 +	* g10/gpg.c (main) <aVerify>: Ditto.
 +	* g10/import.c (import): Ditto.
 +	(print_import_check): Ditto
 +	* g10/keyring.c (do_copy): Ditto.
 +	* g10/tdbio.c (tdbio_read_record): Ditto.
 +	* g10/trustdb.c (tdb_update_ownertrust): Ditto.
 +	(update_validity): Ditto.
 +
 +	* g10/server.c (cmd_passwd): Remove useless call to skip_options.
 +
 +	sm: Avoid warnings about useless assignments.
 +	* sm/call-dirmngr.c (prepare_dirmngr): Remove setting of ERR.
 +	(unhexify_fpr): Remove useless computation on N.
 +	* sm/certchain.c (do_validate_chain): Remove clearing of RC.  Remove
 +	useless setting of RC.
 +	* sm/fingerprint.c (gpgsm_get_keygrip): Remove setting of RC.
 +	* sm/gpgsm.c (build_list): Replace final stpcpy by strcpy.
 +	* sm/keydb.c (keydb_clear_some_cert_flags): Remove clearing of RC.
 +	* sm/server.c (cmd_getauditlog): Comment unused skip_options.
 +
 +	kbx: Avoid warnings about useless assignments.
 +	* kbx/keybox-dump.c (_keybox_dump_blob): Remove setting of IN_RANGE
 +	and the last increment of P.
 +
 +	gpg: Fix DNS cert lookup returning an URL.
 +	* g10/call-dirmngr.c (dns_cert_status_cb): Store URL status in the URL
 +	param.  The old code was entirely buggy (c+p error).
 +
 +2016-01-06  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	Fix keystrlen to work when OPT.KEYID_FORMAT is KF_DEFAULT.
 +	* g10/keyid.c (keystrlen): If opt.keyid_format is KF_DEFAULT unset,
 +	default to KF_SHORT.
 +	(format_keyid): Default to KF_SHORT, not KF_0xLONG.
 +
 +2016-01-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Silence some regression tests.
 +	* g10/test.c (TEST): Print diagnostics only in verbose mode.
 +
 +	gpg: Avoid using an uninitialized SALT on premature EOF.
 +	* g10/parse-packet.c (parse_key): Check for premature end of salt.
 +
 +	gpg: Silence warnings found by static analyzer.
 +	* g10/keyedit.c (change_passphrase): Remove useless init of ANY.
 +	(keyedit_quick_adduid): Remove useless setting of ERR.
 +	* g10/parse-packet.c (parse_key): Remove PKTLEN from condition because
 +	it has been checked before the loop.
 +	(parse_plaintext): Remove useless init of PKTLEN.
 +
 +	kbx: Avoid faulty fclose in an error case.
 +	* kbx/keybox-update.c (blob_filecopy): Do not close an uninitialized
 +	file pointer after a failure to create a temp file.
 +	* kbx/keybox-openpgp.c (next_packet): Remove duplicate assignment of
 +	PKTLEN.
 +
 +	dirmngr: Silence one regression test.
 +	* dirmngr/t-dns-stuff.c (main): Do not print info during standard
 +	"make check".
 +
 +	common: Avoid warnings about useless assignments.
 +	* common/b64enc.c (b64enc_finish): Remove var assignment which is not
 +	used later.
 +	* common/iobuf.c (file_filter): Ditto.
 +	* common/tlv.c (do_find_tlv): Ditto.
 +	* common/userids.c (classify_user_id): Ditto.
 +
 +	tests: Use info and error instead of a plain echo.
 +	* tests/openpgp/4gb-packet.test: Use error and info.
 +
 +	common: Do not deref vars in tests after a fail().
 +	* common/t-convert.c (test_bin2hex): Turn if conditions into if-else
 +	chains to avoid accessing unchecked data.
 +	(test_bin2hexcolon): Ditto.
 +	* common/t-mapstrings.c (test_map_static_macro_string): Ditto.
 +	* common/t-stringhelp.c (test_percent_escape): Ditto.
 +	(test_make_filename_try): Ditto.
 +	(test_make_absfilename_try): Ditto.
 +	* common/t-timestuff.c (test_timegm): Ditto.
 +
 +2016-01-05  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Align notes about minimal keysize with actual checks.
 +	* g10/keygen.c (ask_keysize): Use 768 for the minimal value for DSA in
 +	export mode.  Improve readability.
 +
 +2016-01-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix RSA verification for card.
 +	* agent/pksign.c (agent_pksign_do): Use S-exp of public key, instead
 +	of shadowed key.
 +
 +2016-01-04  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix double free.
 +	* g10/getkey.c (get_pubkeys): Fix double free.
 +
 +2015-12-24  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: IMPORT_KEY with --force option fix.
 +	* agent/cvt-openpgp.c (convert_from_openpgp_main): Add an option not
 +	to check existing key.
 +	(convert_from_openpgp): Ditto.
 +	(convert_from_openpgp_native): Call convert_from_openpgp_main with
 +	dontcare_exist=0.
 +	* agent/command.c (cmd_import_key): Call with dontcare_exist=force.
 +
 +	g10: Use --force when importing key for bkuptocard.
 +	* g10/call-agent.c (agent_import_key): Add an argument FORCE.
 +	* g10/import.c (transfer_secret_keys): Likewise.
 +	(import_secret_one): Call transfer_secret_keys with FORCE=0.
 +	* g10/keyedit.c (keyedit_menu): Call with FORCE=1.
 +
 +	g10: Remove subcommand checkbkupkey for --key-edit.
 +	* g10/keyedit.c (keyedit_menu): Remove cmdCHECKBKUPKEY support.
 +
 +	g10: Allow relative path for specifying the file for bkuptocard.
 +	* g10/keyedit.c (keyedit_menu): Assume the file is under GNUPGHOME.
 +	Also support tilda expansion.
 +
 +	g10: fix regression of bkuptocard subcommand in --edit-key.
 +	* g10/keyedit.c (keyedit_menu): Call transfer_secret_keys.
 +	* g10/import.c (transfer_secret_keys): Make it global function.
 +	Allow stats==NULL.
 +
 +	agent: Support --force option for IMPORT_KEY.
 +	* agent/command.c (cmd_keywrap_key): New option --force.
 +
 +2015-12-23  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Rename struct pubkey to pukey_s and add pubkey_t.
 +	* g10/keydb.h (struct pubkey): Rename to pubkey_s.
 +	(pubkey_t): New.  Change all struct pubkey_s to use this type.
 +	* g10/getkey.c (get_pubkeys): Rename arg keys to r_keys.
 +
 +	gpg: Simplify status message code from commit b30c15bf.
 +	* g10/keygen.c (card_write_key_to_backup_file): Simplify by using
 +	hexfingerprint.
 +
 +	gpg: Add standard free() semantic to pubkey_free.
 +	* g10/getkey.c (pubkey_free): Check for NULL arg.
 +
 +	gpg: Fix use of assert from commit dc417bf0.
 +	* g10/keydb.c (keydb_update_keyblock): De-ref after the assert.  Use
 +	%zu for size_t.
 +
 +	gpg: Do not translate debug output.
 +	* g10/getkey.c (parse_def_secret_key): Do not make strings passed to
 +	log_debug translatable.
 +
 +2015-12-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix commit b30c15bf (again).
 +	* g10/keygen.c (do_generate_keypair): Clear the variable S.
 +
 +2015-12-22  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix type.
 +	* g10/keygen.c (card_write_key_to_backup_file): Change n to a size_t.
 +
 +	gpg: Fix error message.
 +	* g10/getkey.c (parse_def_secret_key): Fix error message.
 +
 +	gpg: Don't check for ambiguous keys.
 +	* g10/gpg.c (struct result): Move from here...
 +	* g10/keydb.h (struct pubkey): ... to here.  Update users.
 +	* g10/gpg.c (check_user_ids): Move from here...
 +	* g10/getkey.c (get_pubkeys): ... to here.  Update users.  Use
 +	get_pubkey_byname to look up the keys (this also prunes invalid keys).
 +	(pubkey_free): New function.
 +	(pubkeys_free): New function.
 +	* g10/gpg.c (main): Don't check for ambiguous key specifications.
 +
 +	gpg: Lazily evaluate --default-key.
 +	* g10/gpg.c (main): If --encrypt-to-default-key is specified, don't
 +	add --default-key's value to REMUSR here...
 +	* g10/pkclist.c (build_pk_list): ... do it here.
 +	* tests/openpgp/Makefile.am (TESTS): Add default-key.test.
 +	* tests/openpgp/default-key.test: New file.
 +
 +	gpg: Remove unused parameter.
 +	* g10/pkclist.c (build_pk_list): Remove parameter use, which is always
 +	called set to PUBKEY_USAGE_ENC.  Update callers.
 +
 +	gpg: Improve check for ambiguous keys.
 +	* g10/gpg.c (check_user_ids): When checking for ambiguous keys, ignore
 +	encryption-only keys when a signing key is needed and vice-versa.
 +
 +	gpg: Fix TOCTTOU when updating keyblocks.
 +	* g10/keydb.c (keydb_update_keyblock): Don't replace the record at the
 +	current offset.  After taking the lock, extract the fingerprint from
 +	the keyblock, find it and then replace it.
 +
 +	Only add the user supplied CFLAGS after running any autoconf tests.
 +	* configure.ac: Only add the user supplied CFLAGS after running any
 +	autoconf tests.
 +
 +	gpg: Suppress a warning.
 +	* dirmngr/dns-stuff.c (enable_dns_tormode): Reference new_circuit to
 +	avoid a warning when ADNS is not available.
 +
 +	gpg: Remove dead code.
 +	* kbx/keybox-defs.h (struct keybox_found_s): Remove unused fields
 +	offset and n_packets.
 +
 +	gpg: Display the key that is invalid, not the search description.
 +	* g10/getkey.c (parse_def_secret_key): Display the key that is
 +	invalid, not the search description.
 +
 +	gpg: Mark more options as coming from the config file (when this holds)
 +	* g10/gpg.c (main): When --default-key or --encrypt-to-default-key is
 +	taken from the config file, note this.
 +
 +	gpg: Use enums instead of defines.
 +	* g10/keydb.h (PK_LIST_ENCRYPT_TO): Change from a macro to an enum.
 +	(PK_LIST_HIDDEN): Likewise.
 +	(PK_LIST_CONFIG): Likewise.
 +	(PK_LIST_SHIFT): Likewise.n
 +
 +2015-12-21  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +	g10: clean up of headers for card.
 +	* g10/main.h (save_unprotected_key_to_card): Remove.
 +	* g10/options.h (ctapi_driver, pcsc_driver, disable_ccid): Remove.
 +
 +2015-12-21  Werner Koch  <wk at gnupg.org>
 +
 +	common: New file fwddecl.h.
 +	* common/util.h (server_control_s, ctrl_t): Move to ...
 +	* common/fwddecl.h: New file.
 +	* common/call-gpg.h: Replace typedef by fwddecl.h.  Change include
 +	protection macro name.
 +	* common/Makefile.am (common_sources): Add fwddecl.h.
 +
 +2015-12-18  Werner Koch  <wk at gnupg.org>
 +
 +	build: Add required macro for pkg-config.
 +	* configure.ac (PKG_PROG_PKG_CONFIG): New.
 +
 +2015-12-18  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Remove deprecated internal functions.
 +	* g10/keygen.c (do_ask_passphrase, generate_raw_key)
 +	(gen_card_key_with_backup, save_unprotected_key_to_card): Remove.
 +
 +	g10: Fix a regression for generating card key with backup.
 +	* g10/main.h (receive_seckey_from_agent): Declare.
 +	* g10/keygen.c (card_write_key_to_backup_file): New.
 +	(card_store_key_with_backup): New.
 +	(do_generate_keypair): Create a key on host for encryption key when
 +	backup is requested.  Then, call card_store_key_with_backup.
 +
 +2015-12-17  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: factor out a function for secret key retrieval.
 +	* g10/export.c (receive_seckey_from_agent): New.
 +	(do_export_stream): Use it.
 +
 +2015-12-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: When checking for ambiguous keys, ignore invalid keys.
 +	* g10/gpg.c (check_user_ids): When checking for ambiguous keys, ignore
 +	disabled, revoked and expired keys (if appropriate for the provided
 +	option).
 +
 +2015-12-15  Werner Koch  <wk at gnupg.org>
 +
 +	common: Use default_errsource for call-gpg and exectool.
 +	* common/call-gpg.c (my_error_from_syserror, my_error_from_errno): New.
 +	Use these wrappers.
 +	* common/exectool.c (my_error_from_syserror): New.  Use these
 +	wrappers.
 +
 +	gpg: Reduce number of strings to translate.
 +	* g10/getkey.c (parse_def_secret_key): Do not make debug messages
 +	translatable.  Make use of print_reported_error.
 +
 +	gpg: New function to printed a detailed error code.
 +	* g10/misc.c (print_reported_error): New.
 +
 +2015-12-15  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Improve the keyblock cache's transparency.
 +	* kbx/keybox-search.c (keybox_seek): New function.
 +	* g10/keydb.c (keydb_search): When reading from the cache, seek to
 +	just after the cached record.
 +
 +	gpg: Improve the keyblock cache's transparency.
 +	* kbx/keybox-search.c (keybox_offset): New function.
 +	* g10/keydb.c (struct keyblock_cache): Add fields resource and offset.
 +	(keyblock_cache_clear): Reset HD->KEYBLOCK_CACHE.RESOURCE and
 +	HD->KEYBLOCK_CACHE.OFFSET.
 +	(keydb_search): Don't use the cached result if it comes before the
 +	current file position.  When caching an entry, also record the
 +	position at which it was found.
 +
 +	gpg: Use more descriptive names.
 +	* g10/keyring.c (KR_NAME): Rename this...
 +	(KR_RESOURCE): ... to this.  Update users.
 +	(struct keyring_name): Rename this...
 +	(struct keyring_resource): ... to this.  Update users.
 +	(struct off_item): Rename this...
 +	(struct key_present): ... to this.  Update users.
 +	(OffsetHashTable): Rename this...
 +	(key_present_hash_t): ... to this.  Update users.
 +	(kr_offtbl): Rename this...
 +	(key_present_hash): ... to this.  Update users.
 +	(kr_offtbl_ready): Rename this...
 +	(key_present_hash_ready): ... to this.  Update users.
 +	(KEY_PRESENT_HASH_BUCKETS): New define.  Replace use of literals
 +	with this.
 +	(new_offset_item): Rename this...
 +	(key_present_value_new): ... to this.  Update users.
 +	(release_offset_items): Drop dead code.
 +	(new_offset_hash_table): Rename this...
 +	(key_present_hash_new): ... to this.  Update users.
 +	(release_offset_hash_table): Drop dead code.
 +	(lookup_offset_hash_table): Rename this...
 +	(key_present_hash_lookup): ... to this.  Update users.
 +	(update_offset_hash_table): Rename this...
 +	(key_present_hash_update): ... to this.  Drop unused parameter off.
 +	Update users.
 +	(update_offset_hash_table_from_kb): Rename this...
 +	(key_present_hash_update_from_kb): ... to this.  Drop unused parameter
 +	off.  Update users.
 +
 +2015-12-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	sm: Handle gcry_pk_encrypt return value.
 +	* sm/encrypt.c (encrypt_dek): Don't ignore failure of gcry_pk_encrypt.
 +
 +2015-12-14  Werner Koch  <wk at gnupg.org>
 +
 +	common: Change license of isascii.c to all-premissive,
 +	* common/isascii.c: Change.
 +
 +	common: Change license of some modules to LGPLv3+/GPLv2+.
 +	* common/status.c: Change from GPLv3 to LGPLv3+/GPLv2+.
 +	* common/status.h: Ditto.
 +	* common/yesno.c: Ditto.
 +	* common/common-defs.h: Ditto.
 +	* common/gettime.h: Ditto.
 +	* common/keyserver.h: Ditto.
 +
 +	common: Change license for exectool to LGPLv3+/GPLv2+.
 +	* common/exectool.c, common/exectool.h: Change license.
 +
 +	common: Rename sh-exectool to exectool.
 +	* common/sh-exectool.c: Rename to exectool.c.
 +	* common/sh-exectool.h: Rename to exectool.h.
 +	* common/Makefile.am (common_sources): Adjust for rename.
 +	* common/exectool.c (sh_exec_tool_stream): Rename to
 +	gnupg_exec-tool-stream.
 +	(sh_exec_tool): Rename to gnupg_exec_tool.
 +	* tools/gpgtar-create.c (gpgtar_create): Adjust for changes.
 +	* tools/gpgtar-extract.c: Adjust for changes.
 +	* tools/gpgtar-list.c: Adjust for changes.
 +
 +2015-12-14  Damien Goutte-Gattat  <dgouttegattat at incenp.org>
 +
 +	gpg: Print ownertrust in TOFU+PGP trust model.
 +	* g10/keyedit.c: Print ownertrust in TOFU+PGP trust model.
 +
 +2015-12-14  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix --default-key checks.
 +	* g10/getkey.c (parse_def_secret_key): Don't just check if a secret
 +	key is available for the public key, also consider subkeys.  Also
 +	check that the key has the signing capability, is not revoked, is not
 +	expired and is not disabled.  Print a warning if there was a least one
 +	value passed to --default-key and all were ignored.
 +
 +2015-12-14  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix regression for generating RSA keys on card.
 +	* scd/app-openpgp.c (do_genkey): Strip leading zeros for fingerprint
 +	computation.
 +
 +2015-12-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Use a regular type instead of a void* for import stats.
 +	* g10/import.c (struct stats_s): Rename to import_stats_s.  Change all
 +	users.
 +	* g10/main.h (import_stats_t): New.  Change fucntions to use this
 +	instead of a void pointer.
 +
 +	Remove replacements for libgpg-error < 1.21.
 +	* common/util.h: Remove replacement macros for libgpg-error<1.21.
 +	* common/types.h: Ditto.
 +	* common/mischelp.h: Ditto.
 +	* common/t-mapstrings.c: Include t-support.h before stringhelp.h
 +	* common/t-stringhelp.c: Ditto.
 +	* common/t-support.h: Always include gpg-error.h.
 +	* kbx/keybox-search.c: Do not include stringhelp.h so that keybox-defs
 +	comes first.
 +
 +2015-12-11  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix buffer overflow.
 +	* g10/keydb.c (keydb_search_desc_dump): Fix buffer overflow.
 +
 +2015-12-11  Justus Winter  <justus at g10code.com>
 +
 +	agent: Improve error handling.
 +	* agent/pksign.c (agent_pksign_do): Improve error handling.
 +
 +	Fix required libgpg-error version.
 +	* configure.ac (NEED_GPG_ERROR_VERSION): We need version 1.21 for the
 +	poll interface.
 +
 +2015-12-11  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Don't error out if a key occurs multiple times in the keyring.
 +	* g10/gpg.c (check_user_ids): Don't error out if a key occurs multiple
 +	times in the keyring.  Instead, print a warning.  When printing out
 +	fingerprint prints, use format_hexfingerprint to format them.
 +
 +2015-12-10  Daniel Hoffend  <dh at dotlan.net>
 +
 +	scd: Fix removal of unplugged usb readers on Windows.
 +	* scd/apdu.c (pcsc_error_to_sw): map PCSC_E_NO_SERVICE and
 +	PCSC_E_SERVICE_STOPPED to the internal SW_HOST_NO_READER error code.
 +
 +2015-12-07  Justus Winter  <justus at g10code.com>
 +
 +	tests: Add some more gpgtar tests.
 +	* tests/openpgp/gpgtar.test: Add more tests.
 +
 +	dirmngr: Initialize http status code.
 +	* dirmngr/ks-action.c (ks_action_search): Initialize 'http_status' as
 +	it is unused if LDAP is used to search for keys.
 +
 +2015-12-04  Daiki Ueno  <ueno at gnu.org>
 +
 +	gpg: Write ERROR status on delete-key cancellation.
 +	* g10/delkey.c (do_delete_key): Write ERROR status code with the error
 +	location "delete_key.secret", when the user cancelled the operation on
 +	Pinentry.
 +
 +2015-12-04  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Stricter handling of http error codes.
 +	* dirmngr/ks-action.c (ks_action_search): Only retry if the keyserver
 +	responded with a '404 Not Found'.
 +	* dirmngr/ks-engine-hkp.c (send_request): Return http status code.
 +	(ks_hkp_search): Likewise.
 +	(ks_hkp_{get,put}): Adapt call to 'send_request'.
 +	* dirmngr/ks-engine.h (ks_hkp_search): Update prototype.
 +
 +	dirmngr: Really search all keyservers for patterns.
 +	* dirmngr/ks-action.c (ks_action_search): Search all configured
 +	keyservers for the given patterns.
 +
 +	GnuPG-bug-id: 1038
 +
 +	dirmngr: Handle http status '501 Not Implemented'.
 +	* dirmngr/ks-engine-hkp.c (send_request): Handle status 501 and return
 +	GPG_ERR_NOT_IMPLEMENTED.
 +
 +	GnuPG-bug-id: 1221
 +
 +	tools/gpgtar: Implement symmetric encryption.
 +	* tests/openpgp/gpgtar.test: Add test case.
 +	* tools/gpgtar-create.c (gpgtar_create): Pass '--symmetric' flag to
 +	gpg.
 +	* tools/gpgtar.c (parse_arguments): We do handle the argument now.
 +
 +	tools/gpgtar: Implement signing.
 +	* tests/openpgp/gpgtar.test: Test signing.
 +	* tools/gpgtar-create.c (gpgtar_create): Add 'sign' option, add the
 +	appropriate gpg arguments to implement signing and selecting the local
 +	user.
 +	* tools/gpgtar.c (parse_options): We do handle '--local-user' now.
 +	(main): Handle signing, encrypting, and doing both when creating an
 +	archive.
 +	* tools/gpgtar.h (gpgtar_create): Update prototype.
 +
 +	tools/gpgtar: Use the new exectool helper.
 +	* tools/Makefile.am: gpgtar now requires neither npth nor libassuan.
 +	* tools/gpgtar-create.c (gpgtar_create): Use the new 'sh-exectool'
 +	helper.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +	* tools/gpgtar.c (main): Set default gpg program.  Drop the
 +	initialization of npth and libassuan.
 +
 +	common: Add a stream interface to 'sh-exectool'.
 +	* common/sh-exectool.c (struct copy_buffer): Add infrastructure for
 +	copying between streams.
 +	(copy_buffer_{init,shred,do_copy,flush}): New functions.
 +	(sh_exec_tool_stream): Rework 'sh_exec_tool' to operate on streams.
 +	(nop_free): New function.
 +	(sh_exec_tool): Express this in terms of 'sh_exec_tool_stream'.
 +	* common/sh-exectool.h (sh_exec_tool_stream): New prototype.
 +
 +	common: Add header file and build the new code.
 +	* common/Makefile.am (common_sources): Add new files.
 +	* common/sh-exectool.h: New file.
 +
 +2015-12-04  Werner Koch  <wk at gnupg.org>
 +
 +	common: Add code to execute a helper.
 +	* common/sh-exectool.c: New file.
 +
 +	Release 2.1.10.
 +
 +2015-12-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Japanese translation.
 +
 +2015-12-04  Werner Koch  <wk at gnupg.org>
 +
 +	speedo,w32: Improve installer.
 +	* build-aux/speedo/w32/inst.nsi (SEC_gnupg): Install dirmngr.conf and
 +	distsigkey.gpg.
 +	(un.gnupglast): Stop dirmngr.
 +
 +	gpg: Do not pre-check keys given on the command line.
 +	* g10/keydb.h (PK_LIST_ENCRYPT_TO, PK_LIST_HIDDEN, PK_LIST_CONFIG)
 +	(PK_LIST_SHIFT): New.
 +	* g10/pkclist.c (build_pk_list): Use them here.
 +	* g10/gpg.c (check_user_ids, main): Ditto.
 +
 +	* g10/gpg.c (main): Set PK_LIST_CONFIG for REMUSR and LOCUSR.
 +	(check_user_ids): Skip check for command line specified options.
 +
 +	dirmngr: Add command to print the resolver version.
 +	* dirmngr/server.c (cmd_getinfo): Add sub-command "dnsinfo".
 +
 +	gpg: Allow "help" as value for --tofu-policy.
 +	* g10/gpg.c (parse_tofu_policy): Add keyword "help".
 +	(parse_tofu_db_format): Ditto.
 +
 +	Do not translate messages printed with log_debug.
 +	* common/asshelp.c (start_new_gpg_agent): Do not i18n string.
 +	(start_new_dirmngr): Ditto.
 +	* g10/mainproc.c (proc_encrypted): Ditto.  Print only if debug is
 +	enabled.
 +
 +2015-12-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix for removing the prefix.
 +	* scd/app-openopg.c (do_decipher): Fix the condition.
 +
 +	scd: Simplify saving application context.
 +	* scd/app.c (lock_table): Remove LAST_APP field.
 +	(lock_reader, app_dump_state, application_notify_card_reset)
 +	(release_application): Follow the change.
 +	(check_conflict): New.
 +	(check_application_conflict): Lock the slot and call check_conflict.
 +	(select_application): Call check_conflict and not use LAST_APP.
 +
 +	scd: More fix for Curve25519 prefix handling.
 +	* scd/app-openpgp.c (do_decipher): Handle trancated cipher text.
 +	Also fix xfree bug introduced.
 +
 +2015-12-03  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Another fix for Curve25519 prefix handling.
 +	* scd/app-openpgp.c (do_decipher): Check 0x02 also for 16+1 byte long
 +	INDATA.
 +	(do_decipher): Fix integer arithmetic in void pointer.
 +	(do_decipher): Add missing memcpy.
 +
 +	build: Avoid dependecy problems in "make distcheck".
 +	* doc/Makefile.am (gnupg.texi): Depend on defs.inc.
 +
 +	build: Change how caller provided CFLAGS are used by configure.
 +	* configure.ac: Append instead of prepend caller provided CFLAGS.
 +
 +	gpg: Add variant of 'key "%s" not found: %s' error message.
 +	* g10/gpg.c (check_user_ids): Change error message.
 +	* g10/delkey.c (do_delete_key): Ditto.
 +
 +	gpg: Make keyidlist more robust in case of errors.
 +	* g10/keyserver.c (keyidlist): Clear *KLIST on error.
 +
 +	gpg: Take care of keydb_new returning NULL.
 +	* g10/keydb.c (keydb_new): Print an error message if needed.  Also use
 +	xtrycalloc because we return an error anyway.
 +	* g10/delkey.c (do_delete_key): Handle error retruned by keydb_new.
 +	* g10/export.c (do_export_stream): Ditto.
 +	* g10/getkey.c (get_pubkey): Ditto.
 +	(get_pubkey_fast): Ditto.
 +	(get_pubkeyblock): Ditto.
 +	(get_seckey): Ditto.
 +	(key_byname): Ditto.
 +	(get_pubkey_byfprint): Ditto.
 +	(get_pubkey_byfprint_fast): Ditto.
 +	(parse_def_secret_key): Ditto.
 +	(have_secret_key_with_kid): Ditto.
 +	* g10/import.c (import_one): Ditto.
 +	(import_revoke_cert): Ditto.
 +	* g10/keyedit.c (keyedit_quick_adduid): Ditto.
 +	* g10/keygen.c (quick_generate_keypair): Ditto.
 +	(do_generate_keypair): Ditto.
 +	* g10/trustdb.c (validate_keys): Ditto.
 +	* g10/keyserver.c (keyidlist): Ditto.
 +	* g10/revoke.c (gen_desig_revoke): Ditto.
 +	(gen_revoke): Ditto.
 +	* g10/gpg.c (check_user_ids): Ditto.
 +	(main): Do not print an error message for keydb_new error.
 +	* g10/keylist.c (list_all): Use actual error code returned by
 +	keydb_new.
 +
 +	* g10/t-keydb-get-keyblock.c (do_test): Abort on keydb_new error.
 +	* g10/t-keydb.c (do_test): Ditto.
 +
 +	* g10/keyring.c (keyring_new): Actually return an error so that the
 +	existing keydb_new error checking makes sense for a keyring resource.
 +	(keyring_rebuild_cache): Take care of keyring_new returning an error.
 +
 +	gpg: Change some error messages.
 +	* g10/getkey.c (parse_def_secret_key): Change error message.  Replace
 +	log_debug by log_info.
 +	* g10/gpg.c (check_user_ids): Make function static.  Change error
 +	messages.
 +	(main): Change error messages.
 +	* g10/revoke.c (gen_revoke): Ditto.
 +
 +2015-12-03  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix "Conflicting usage" bug.
 +	* scd/apdu.c (apdu_close_reader): Call CLOSE_READER method even if we
 +	  got an error from apdu_disconnect.
 +	* scd/app-common.h (no_reuse): Remove.
 +	* scd/app.c (application_notify_card_reset): Deallocate APP here.
 +	(select_application, release_application): Don't use NO_REUSE.
 +
 +	scd: Fix for Curve25519 prefix handling.
 +	* scd/app-openpgp.c (do_decipher): More condition for AES decipher.
 +	  Handle the prefix in cipher text.  Always add the prefix in result.
 +
 +2015-12-03  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Use the matching key if the search description is exact.
 +	* g10/gpg.c (check_user_ids): If the search description is for an
 +	exact match (a keyid or fingerprint that ends in '!'), then use the
 +	matching key, not the primary key.
 +	* tests/openpgp/Makefile.am (TESTS): Add use-exact-key.test.
 +	(priv_keys): Add privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc,
 +	privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc,
 +	privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc,
 +	privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc and
 +	privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc.
 +	(sample_keys): Add
 +	samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc.
 +	* tests/openpgp/privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc:
 +	New file.
 +	* tests/openpgp/privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc:
 +	New file.
 +	* tests/openpgp/privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc:
 +	New file.
 +	* tests/openpgp/privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc:
 +	New file.
 +	* tests/openpgp/privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc:
 +	New file.
 +	* tests/openpgp/samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc:
 +	New file.
 +	* tests/openpgp/use-exact-key.test: New file.
 +	* tests/openpgp/version.test: Install the new private keys.
 +
 +2015-12-02  Werner Koch  <wk at gnupg.org>
 +
 +	build: Require at least Libassuan 2.4.1.
 +	* configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.4.1.
 +	* agent/gpg-agent.c (create_server_socket): Remove check for
 +	libassuan >= 2.3.0 and >= 2.1.4.
 +	(main): Remove check for libassuan >= 2.1.4.
 +	* scd/scdaemon.c (create_server_socket): Remove check for
 +	libassuan >= 2.1.4.
 +	* dirmngr/dirmngr.c (set_tor_mode): Remove check for
 +	libassuan >= 2.3.0.
 +	* dirmngr/http.c (http_raw_connect, send_request): Remove checks for
 +	libassuan >= 2.3.0.
 +
 +2015-12-02  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Improve documentation.
 +	* g10/tofu.c (initdb): Improve documentation.
 +
 +	gpg: Fix type mismatch resulting in a buffer overflow.
 +	* g10/tofu.c (record_binding): Change policy_old's type from an enum
 +	tofu_policy to a long: this variable is passed by reference and a long
 +	is expected.
 +
 +2015-12-02  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Switch to an onion address if Tor is running.
 +	* dirmngr/dirmngr.h (opt): Turn field 'keyserver' into an strlist.
 +	* dirmngr/dirmngr.c (parse_rereadable_options): Allow multiple
 +	--keyserver options.
 +	* dirmngr/server.c (server_local_s): Add field 'tor_state'.
 +	(release_uri_item_list): New.
 +	(release_ctrl_keyservers): Use it.
 +	(start_command_handler): Release list of keyservers.
 +	(is_tor_running): New.
 +	(cmd_getinfo): Re-implement "tor" subcommand using new fucntion.
 +	(ensure_keyserver): Rewrite.
 +	* g10/dirmngr-conf.skel: Add two keyserver options.
 +
 +	http: Enhance parser to detect .onion addresses.
 +	* dirmngr/http.h (parsed_uri_s): Add flag 'onion'.
 +	* dirmngr/http.c (do_parse_uri): Set that flag.
 +	* dirmngr/t-http.c (main): Print flags.
 +
 +2015-12-02  Neal H. Walfield  <neal at g10code.com>
 +
 +	common,gpg: Fix processing of search descriptions ending in '!'.
 +	* g10/gpg.c (check_user_ids): If the search description describes a
 +	keyid or fingerprint and ends in a '!', include the '!' in the
 +	rewritten description.
 +	* common/userids.c (classify_user_id): Accept keyids and fingerprints
 +	ending in '!'.
 +
 +2015-12-01  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Improve error handling.
 +	* dirmngr/dns-stuff.c (getsrv): Avoid looking at 'header' before
 +	checking for errors, but silently ignore errors when looking up SRV
 +	records.
 +
 +2015-12-01  Werner Koch  <wk at gnupg.org>
 +
 +	build: Let configure show the the status of Tor support.
 +	* configure.ac (show_tor_support): New
 +
 +2015-11-30  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Make make distcheck work again.
 +	* doc/Makefile.am (DISTCLEANFILES): Add gpgkey2ssh.1
 +
 +	yat2m: Add keyword @url.
 +	* doc/yat2m.c (proc_texi_cmd): Add keyword @url.
 +
 +	doc: Build man pages with the same date as the info files.
 +	* doc/Makefile.am (yat2m-stamp): Use option --date.
 +
 +	yat2m: New option --date.
 +	* doc/yat2m.c (opt_date): new.
 +	(isodatestring): Use it if set.
 +	(main): New option --date.
 +
 +2015-11-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid extra translation strings.
 +	* g10/keyedit.c (menu_expire): Use only one prompt.
 +
 +	kbx: Include gpg-error prior to mischelp.h.
 +	* kbx/keybox-init.c: Change order of includes.
 +
 +	gpg,w32: Fix a format string error.
 +	* g10/keyring.c (keyring_search): Fix format string for off_t.
 +
 +	Silence compiler warnings related to not using assuan_fd_t.
 +	* common/call-gpg.c (start_gpg): Use assuan_fd_t.  Note that the
 +	declaration was already fixed by a previous change.
 +	* dirmngr/server.c (cmd_getinfo): Use assuan_fd_t.
 +
 +	Avoid incompatible pointer assignment warnings on Windows.
 +	* common/logging.c (fun_writer): Use gpgrt_ssize_t instead of ssize_t.
 +	* dirmngr/server.c (data_line_cookie_write): Ditto.
 +	* sm/certdump.c (format_name_writer): Ditto.
 +	* sm/server.c (data_line_cookie_write): Ditto.
 +	* dirmngr/http.c (cookie_read, cookie_write): Ditto.
 +
 +	dirmngr: Avoid a declarations after statements.
 +	* tools/gpgtar.c (parse_arguments): Use a block for a local varibale
 +	definition.
 +
 +	dirmngr: Avoid casting away a const from an char**.
 +	* dirmngr/ldap.c (start_cert_fetch_ldap): Do not use pointers from
 +	global variables.
 +
 +	dirmngr: Allow testing for a running Tor via "getinfo tor".
 +	* dirmngr/server.c (cmd_getinfo): Print an S line if Tor is not
 +	running.
 +
 +2015-11-26  Werner Koch  <wk at gnupg.org>
 +
 +	g13: Fix commit 1a045b13.
 +	* g13/g13.c (main): Use existsing function.
 +
 +	common: Fix off-by-one access in the new format_text.
 +	* common/stringhelp.c (format_text): Use existsing fucntion to trim
 +	trailing spaces.  Fix off-by-one access.
 +
 +	dirmngr: Improve output of "getinfo tor".
 +	* dirmngr/server.c (cmd_getinfo): Print a message along with OK.
 +
 +	dirmngr: Let Libassuan employ nPth wrappers for connect.
 +	* dirmngr/http.c (my_unprotect, my_protect): Remove.
 +	(connect_server): Do not use these wrappers.
 +
 +2015-11-26  Justus Winter  <justus at g10code.com>
 +
 +	tools/gpgtar: Add '--dry-run'.
 +	* tools/gpgtar-extract.c (extract_{regular,directory}): Honor
 +	'--dry-run'.
 +	* tools/gpgtar.c (enum cmd_and_opt_values): New value.
 +	(opts): Add '--dry-run'.
 +	(parse_arguments): Handle '--dry-run'.
 +	* tools/gpgtar.h (opt): Add field 'dry_run'.
 +
 +	tools/gpgtar: Handle '--gpg-args'.
 +	* tools/gpgtar-create.c (gpgtar_create): Use given arguments.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +	* tools/gpgtar.c (enum cmd_and_opt_values): New value.
 +	(opts): Add 'gpg-args'.
 +	(parse_arguments): Handle arguments.
 +	* tools/gpgtar.h (opt): Add field 'gpg_arguments'.
 +	* tests/openpgp/gpgtar.test: Simplify accordingly.
 +
 +	common: Make the GPG arguments configurable in call-gpg.
 +	* common/call-gpg.c (start_gpg): Add parameter 'gpg_arguments'.
 +	(_gpg_encrypt, gpg_encrypt_blob, gpg_encrypt_stream): Likewise.
 +	(_gpg_decrypt, gpg_decrypt_blob, gpg_decrypt_stream): Likewise.
 +	* common/call-gpg.h: Adapt prototypes.
 +	* g13/create.c (encrypt_keyblob): Adapt callsite.
 +	* g13/g13-common.h (opt): Add field 'gpg_arguments'.
 +	* g13/g13.c (main): Construct default arguments.
 +	* g13/mount.c (decrypt_keyblob): Adapt callsite.
 +	* tools/gpgtar-create.c (gpgtar_create): Likewise.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +
 +	tools/gpgtar: Handle '--tar-args' for compatibility with gpg-zip.
 +	* tools/gpgtar.c (enum cmd_and_opt_values): New value.
 +	(opts): Add new group for tar options, rearrange a little, add
 +	'--tar-args'.
 +	(tar_opts): New variable.
 +	(shell_parse_stringlist): New function.
 +	(shell_parse_argv): Likewise.
 +	(parse_arguments): Add option argument, handle '--tar-args'.
 +	(main): Fix invokation of 'parse_arguments'.
 +	* tests/openpgp/gpgtar.test: Simplify decryption.
 +
 +	tools/gpgtar: Rework argument parsing.
 +	* tools/gpgtar.c (main): Move argument parsing into its own function.
 +
 +2015-11-25  Justus Winter  <justus at g10code.com>
 +
 +	tests: Add tests for gpgtar and gpg-zip.
 +	* tests/openpgp/Makefile.am (TESTS): Add new file.
 +	* tests/openpgp/gpgtar.test: New file.
 +
 +	tools/gpgtar: Handle '--directory' argument.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Only generate a directory
 +	name if none is given via arguments.
 +	* tools/gpgtar.c (enum cmd_and_opt_values): New constant.
 +	(opts): Add argument.
 +	(main): Parse argument.
 +	* tools/gpgtar.h (opt): New field 'directory'.
 +
 +	tools/gpgtar: Handle '--gpg' argument.
 +	* tools/gpgtar-create.c (gpgtar_create): Use given gpg program.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +	* tools/gpgtar.c (enum cmd_and_opt_values): New constant.
 +	(opts): Add argument.
 +	(main): Handle argument.
 +	* tools/gpgtar.h (opt): Add field 'gpg_program'.
 +
 +	tools/gpgtar: Improve error handling.
 +	* tools/gpgtar-create.c (gpgtar_create): Return an error code, fix
 +	error handling.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
 +	* tools/gpgtar-list.c (read_header): Return an error code.
 +	(gpgtar_list): Return an error code, fix error handling.
 +	(gpgtar_read_header): Return an error code.
 +	* tools/gpgtar.c: Add missing include.
 +	(main): Print an generic error message if a command failed and no
 +	error has been printed yet.
 +	* tools/gpgtar.h (gpgtar_{create,extract,list,read_header}): Fix the
 +	prototypes accordingly.
 +
 +	tools: Add encryption and decryption support to gpgtar.
 +	* tools/Makefile.am: Amend CFLAGS and LDADD.
 +	* tools/gpgtar-create.c (gpgtar_create): Add encrypt flag and encrypt
 +	stream if requested.
 +	* tools/gpgtar-extract.c (gpgtar_extract): Likewise for decryption.
 +	* tools/gpgtar-list.c (gpgtar_list): Likewise.
 +	* tools/gpgtar.c (main): Initialize npth and assuan.  Parse recipient
 +	and local user, and note which flags are currently ignored.  Adapt
 +	calls to gpgtar_list and friends.
 +	(tar_and_encrypt): Drop stub function and prototype.
 +	(decrypt_and_untar): Likewise.
 +	(decrypt_and_list): Likewise.
 +	* tools/gpgtar.h (gpgtar_{create,extract,list}): Add encryption or
 +	decryption argument.
 +
 +	common: Add stream interface to call-pgp.
 +	* common/call-gpg.c (struct writer_thread_parms): Add field 'stream'.
 +	(writer_thread_main): Support reading from a stream.
 +	(start_writer): Add stream argument.
 +	(struct reader_thread_parms): Add field 'stream'.
 +	(reader_thread_main): Support writing to a stream.
 +	(start_reader): Add stream argument.
 +	(_gpg_encrypt): Add stream api.
 +	(gpg_encrypt_blob): Adapt accordingly.
 +	(gpg_encrypt_stream): New function.
 +	(_gpg_decrypt): Add stream api.
 +	(gpg_decrypt_blob): Adapt accordingly.
 +	(gpg_decrypt_stream): New function.
 +	* common/call-gpg.h (gpg_encrypt_stream): New prototype.
 +	(gpg_decrypt_stream): Likewise.
 +
 +	common: Refactor the call-gpg code.
 +	* common/call-gpg.c (gpg_{en,de}crypt_blob): Move most of the code
 +	into two new functions, _gpg_encrypt and _gpg_decrypt.
 +
 +	g13: Move 'call-gpg.c' to common.
 +	* common/Makefile.am (common_sources): Add files.
 +	* g13/call-gpg.c: Move to 'common' and adapt slightly.  Add a
 +	parameter to let callees override the gpg program to execute.
 +	* g13/call-gpg.h: Likewise.
 +	* g13/Makefile.am (g13_SOURCES): Drop files.
 +	* g13/create.c (encrypt_keyblob): Hand in the gpg program to execute.
 +	* g13/mount.c (decrypt_keyblob): Likewise.
 +
 +2015-11-24  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: When comparing keyids, use the keyid, not the fingerprint's suffix.
 +	* g10/keyedit.c (menu_select_key): Use spacep and hexdigitp instead of
 +	inline tests.  Don't compare P to the suffix of the fingerprint.  If P
 +	appears to be a keyid, do an exact compare against the keyid.  If it
 +	appears to be a fingerprint, do an exact compare against the
 +	fingerprint.
 +
 +2015-11-23  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Reflow long texts.
 +	* common/stringhelp.c (format_text): New function.
 +	* common/t-stringhelp.c (stresc): New function.
 +	(test_format_text): New function.  Test format_text.
 +	* g10/tofu.c (get_trust): Use format_text to reflow long texts.
 +	(show_statistics): Likewise.
 +
 +	common: Extend utf8_charcount to include the string's length.
 +	* common/stringhelp.c (utf8_charcount): Take additional parameter,
 +	len.  Process at most LEN bytes.
 +
 +2015-11-23  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Fix http lookups when libadns is used.
 +	* dirmngr/dns-stuff.c (resolve_name_adns): Fill in the port.
 +
 +	dirmngr: Fix SRV record lookups when using the system resolver.
 +	* dirmngr/dns-stuff.c (getsrv): Fix error handling.
 +
 +	dirmngr: Honor ports specified in SRV records.
 +	* dirmngr/ks-engine-hkp.c (struct hostinfo_s): New field 'port'.
 +	(create_new_hostinfo): Initialize 'port'.
 +	(add_host): Add host parameter and update the hosttable entry.
 +	(map_host): Return port if known, adjust calls to 'add_host'.
 +	(make_host_part): Let 'map_host' specify the port if known.
 +
 +	dirmngr: Support hkp server pools using SRV records.
 +	* dirmngr/ks-engine-hkp.c (map_host): Handle SRV records.
 +
 +	dirmngr: Refactor 'map_host'.
 +	* dirmngr/ks-engine-hkp.c (add_host): New function.
 +	(map_host): Use the new function.
 +
 +	dirmngr: Fix pool detection.
 +	* dirmngr/ks-engine-hkp (arecords_is_pool): Fix counting IP addresses.
 +
 +	dirmngr: Refactor 'map_host'.
 +	* dirmngr/ks-engine-hkp.c (arecords_is_pool): New function.
 +	(map_host): Use the new function.
 +
 +	dirmngr: Start dirmngr on demand.
 +	* common/asshelp.h: Include 'util.h'.
 +	* dirmngr/dirmngr-client.c (main): Use 'start_new_dirmngr' to connect
 +	to the dirmngr.
 +	(start_dirmngr): Drop now unused declaration and function.
 +
 +2015-11-23  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: If sqlite is not available, don't build things depending on it.
 +	* configure.ac: Define the automake conditional SQLITE3.
 +	* tests/openpgp/Makefile.am (TESTS): Move the sqlite3 dependent tests
 +	to...
 +	(sqlite3_dependent_tests): ... this new variable.  If SQLITE3 is not
 +	defined, then clear this variable.
 +
 +	gpg: Allow updating the expiration time of multiple subkeys at once.
 +	* g10/keyedit.c (menu_expire): Allow updating the expiration time of
 +	multiple subkeys at once.
 +
 +	gpg: Don't crash if key is not passed an argument.
 +	* g10/keyedit.c (menu_select_key): Don't crash if P is NULL.
 +
 +2015-11-20  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fail if the search description passed to --gen-revoke is ambiguous.
 +	* g10/revoke.c (gen_revoke): Error out if the search description is
 +	ambiguous.
 +
 +	gpg: Refactor print_seckey_info.
 +	* g10/keylist.c (print_seckey_info): Break formatting functionality
 +	into...
 +	(format_seckey_info): ... this new function.
 +
 +	gpg: Improve an error message.
 +	* g10/revoke.c (gen_revoke): Provide a more descriptive error message
 +	if searching for a key fails.
 +
 +2015-11-19  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Improve error handling.
 +	* dirmngr/crlcache.c (crl_cache_cert_isvalid): Add missing break.
 +
 +	dirmngr: Fix memory leak.
 +	* dirmngr/ldap.c (start_cert_fetch_ldap): Avoid leaking all malloc'ed
 +	arguments.
 +
 +	agent: Improve error handling.
 +	* agent/trustlist.c (istrusted_internal): Initialize 'err'.
 +
 +	common: Avoid undefined behavior.
 +	* common/iobuf.c (iobuf_esopen): Initialize 'len' as 'file_es_filter'
 +	will make use of it.
 +
 +	g10: Avoid undefined behavior.
 +	* g10/trust.c (clean_one_uid): Avoid a computation involving an
 +	uninitialized value.
 +
 +	scd: Improve error handling.
 +	* scd/app-openpgp.c (get_public_key): Improve error handling.
 +
 +2015-11-18  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Gracefully handle premature termination of TLS streams.
 +	* dirmngr/http.c (close_tls_session): New function.
 +	(session_unref): Use the new function to close the TLS stream.
 +	(cookie_read): If the stream terminated prematurely, close it and
 +	return a short read.
 +
 +2015-11-17  Neal H. Walfield  <neal at g10code.com>
 +	    Michael Mönch  <michael.moench at marktjagd.de>
 +
 +	tools: Fix option parsing for gpg-zip.
 +	* tools/gpg-zip.in: Correctly set GPG when --gpg is specified.
 +	Correctly set TAR when --tar is specified.  Pass TAR_ARGS to tar.
 +
 +2015-11-17  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Allow selecting subkeys using a keyid.
 +	* g10/keyedit.c (menu_select_key): Take an additional argument, p.
 +	Update callers.  If P is a hex string, then assume that P is a key id
 +	or fingerprint and select subkeys with matching key ids or
 +	fingerprints.
 +	* doc/gpg.texi: Update documentation for the key subcommand.
 +
 +2015-11-17  Justus Winter  <justus at g10code.com>
 +
 +	dirmngr: Fix specifying keyservers by IP address.
 +	* dirmngr/ks-engine-hkp.c (map_host): Update the original 'hosttable'
 +	entry instead of creating another one.
 +
 +2015-11-17  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Change keydb_search to not return legacy keys.
 +	* g10/keyring.c (keyring_search): Take new argument, ignore_legacy.
 +	If set, skip any legacy keys.  Update callers.
 +	* g10/keydb.c (keydb_search): Skip any legacy keys.
 +	(keydb_search_first): Don't skip legacy keys.  Treat them
 +	as an error.
 +	(keydb_search_next): Likewise.
 +	(keydb_search_fpr): Likewise.
 +	* g10/export.c (do_export_stream): Likewise.
 +	* g10/getkey.c (lookup): Likewise.
 +	(have_secret_key_with_kid): Likewise.
 +	* g10/keylist.c (list_all): Likewise.
 +	(keyring_rebuild_cache): Likewise.
 +	* g10/keyserver.c (keyidlist): Likewise.
 +	* g10/trustdb.c (validate_key_list): Likewise.
 +
 +	gpg: Correctly handle an error.
 +	* g10/keyring.c (keyring_search): If a compare function returns an
 +	error, treat it as an error.
 +
 +	gpg: Correctly handle keyblocks followed by legacy keys.
 +	* g10/keyring.c (keyring_get_keyblock): If we encounter a legacy
 +	packet after already having some non-legacy packets, then treat the
 +	legacy packet as a keyblock boundary, not as part of the keyblock.
 +	* g10/t-keydb-get-keyblock.c: New file.
 +	* g10/t-keydb-get-keyblock.gpg: New file.
 +	* g10/Makefile.am (EXTRA_DIST): Add t-keydb-get-keyblock.gpg.
 +	(module_tests): Add t-keydb-get-keyblock.
 +	(t_keydb_get_keyblock_SOURCES): New variable.
 +	(t_keydb_get_keyblock_LDADD): Likewise.
 +
 +	gpg: Make debugging search descriptors easier.
 +	* g10/keydb.c (dump_search_desc): Rename from this...
 +	(keydb_search_desc_dump): ... to this.  Only process a single search
 +	descriptor.  Improve output.  Don't mark as static.  Update callers.
 +
 +	gpg: Add function format_keyid.
 +	* g10/options.h (opt.keyid_format): Add new value KF_DEFAULT.
 +	* g10/keyid.c (format_keyid): New function.
 +	(keystr): Use it.
 +
 +	gpg: Use a more appropriate error code.
 +	* g10/gpg.c (check_user_ids): Return a more appropriate error code if
 +	a user id is ambiguous.
 +
 +2015-11-17  Justus Winter  <justus at g10code.com>
 +
 +	Fix typos found using codespell.
 +	* agent/cache.c: Fix typos.
 +	* agent/call-pinentry.c: Likewise.
 +	* agent/call-scd.c: Likewise.
 +	* agent/command-ssh.c: Likewise.
 +	* agent/command.c: Likewise.
 +	* agent/divert-scd.c: Likewise.
 +	* agent/findkey.c: Likewise.
 +	* agent/gpg-agent.c: Likewise.
 +	* agent/w32main.c: Likewise.
 +	* common/argparse.c: Likewise.
 +	* common/audit.c: Likewise.
 +	* common/audit.h: Likewise.
 +	* common/convert.c: Likewise.
 +	* common/dotlock.c: Likewise.
 +	* common/exechelp-posix.c: Likewise.
 +	* common/exechelp-w32.c: Likewise.
 +	* common/exechelp-w32ce.c: Likewise.
 +	* common/exechelp.h: Likewise.
 +	* common/helpfile.c: Likewise.
 +	* common/i18n.h: Likewise.
 +	* common/iobuf.c: Likewise.
 +	* common/iobuf.h: Likewise.
 +	* common/localename.c: Likewise.
 +	* common/logging.c: Likewise.
 +	* common/openpgp-oid.c: Likewise.
 +	* common/session-env.c: Likewise.
 +	* common/sexputil.c: Likewise.
 +	* common/sysutils.c: Likewise.
 +	* common/t-sexputil.c: Likewise.
 +	* common/ttyio.c: Likewise.
 +	* common/util.h: Likewise.
 +	* dirmngr/cdblib.c: Likewise.
 +	* dirmngr/certcache.c: Likewise.
 +	* dirmngr/crlcache.c: Likewise.
 +	* dirmngr/dirmngr-client.c: Likewise.
 +	* dirmngr/dirmngr.c: Likewise.
 +	* dirmngr/dirmngr_ldap.c: Likewise.
 +	* dirmngr/dns-stuff.c: Likewise.
 +	* dirmngr/http.c: Likewise.
 +	* dirmngr/ks-engine-hkp.c: Likewise.
 +	* dirmngr/ks-engine-ldap.c: Likewise.
 +	* dirmngr/ldap-wrapper.c: Likewise.
 +	* dirmngr/ldap.c: Likewise.
 +	* dirmngr/misc.c: Likewise.
 +	* dirmngr/ocsp.c: Likewise.
 +	* dirmngr/validate.c: Likewise.
 +	* g10/encrypt.c: Likewise.
 +	* g10/getkey.c: Likewise.
 +	* g10/gpg.c: Likewise.
 +	* g10/gpgv.c: Likewise.
 +	* g10/import.c: Likewise.
 +	* g10/keydb.c: Likewise.
 +	* g10/keydb.h: Likewise.
 +	* g10/keygen.c: Likewise.
 +	* g10/keyid.c: Likewise.
 +	* g10/keylist.c: Likewise.
 +	* g10/keyring.c: Likewise.
 +	* g10/mainproc.c: Likewise.
 +	* g10/misc.c: Likewise.
 +	* g10/options.h: Likewise.
 +	* g10/packet.h: Likewise.
 +	* g10/parse-packet.c: Likewise.
 +	* g10/pkclist.c: Likewise.
 +	* g10/pkglue.c: Likewise.
 +	* g10/plaintext.c: Likewise.
 +	* g10/server.c: Likewise.
 +	* g10/sig-check.c: Likewise.
 +	* g10/sqlite.c: Likewise.
 +	* g10/tdbio.c: Likewise.
 +	* g10/test-stubs.c: Likewise.
 +	* g10/tofu.c: Likewise.
 +	* g10/trust.c: Likewise.
 +	* g10/trustdb.c: Likewise.
 +	* g13/create.c: Likewise.
 +	* g13/mountinfo.c: Likewise.
 +	* kbx/keybox-blob.c: Likewise.
 +	* kbx/keybox-file.c: Likewise.
 +	* kbx/keybox-init.c: Likewise.
 +	* kbx/keybox-search-desc.h: Likewise.
 +	* kbx/keybox-search.c: Likewise.
 +	* kbx/keybox-update.c: Likewise.
 +	* scd/apdu.c: Likewise.
 +	* scd/app-openpgp.c: Likewise.
 +	* scd/app-p15.c: Likewise.
 +	* scd/app.c: Likewise.
 +	* scd/ccid-driver.c: Likewise.
 +	* scd/command.c: Likewise.
 +	* scd/iso7816.c: Likewise.
 +	* sm/base64.c: Likewise.
 +	* sm/call-agent.c: Likewise.
 +	* sm/call-dirmngr.c: Likewise.
 +	* sm/certchain.c: Likewise.
 +	* sm/gpgsm.c: Likewise.
 +	* sm/import.c: Likewise.
 +	* sm/keydb.c: Likewise.
 +	* sm/minip12.c: Likewise.
 +	* sm/qualified.c: Likewise.
 +	* sm/server.c: Likewise.
 +	* tools/gpg-check-pattern.c: Likewise.
 +	* tools/gpgconf-comp.c: Likewise.
 +	* tools/gpgkey2ssh.c: Likewise.
 +	* tools/gpgparsemail.c: Likewise.
 +	* tools/gpgtar.c: Likewise.
 +	* tools/rfc822parse.c: Likewise.
 +	* tools/symcryptrun.c: Likewise.
 +
 +2015-11-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix error checking and improve error reporting.
 +	* g10/gpg.c (check_user_ids): Differentiate between a second result
 +	and an error.  If the key specification is ambiguous or an error
 +	occurs, set RC appropriately.
 +
 +2015-11-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Use only one fingerprint formatting function.
 +	* g10/gpg.h (MAX_FORMATTED_FINGERPRINT_LEN): New.
 +	* g10/keyid.c (hexfingerprint): Add optional args BUFFER and BUFLEN.
 +	Change all callers.
 +	(format_hexfingerprint): New.
 +	* g10/keylist.c (print_fingerprint): Change to use hexfingerprint.
 +	* g10/tofu.c (fingerprint_format): Remove.  Replace calls by
 +	format_hexfingerprint.
 +
 +2015-11-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Simplify the tofu interface by using the public key packet.
 +	* g10/tofu.c (fingerprint_str): Remove.
 +	(tofu_register): Take a public key instead of a fingerprint as arg.
 +	Use hexfingerprint() to get a fpr from the PK.
 +	(tofu_get_validity): Ditto.
 +	(tofu_set_policy, tofu_get_policy): Simplify by using hexfingerprint.
 +	* g10/trustdb.c (tdb_get_validity_core): Pass the primary key PK to
 +	instead of the fingerprint to the tofu functions.
 +
 +	gpg: Make trusted-key override for Tofu robust against swapped tofu.db.
 +	* g10/tofu.c (get_trust): For the UTK check lookup the key by
 +	fingerprint.
 +
 +	gpg: Fix regression in --locate-keys (in 2.1.9).
 +	* g10/getkey.c (getkey_ctx_s): Add field "extra_list".
 +	(get_pubkey_byname): Store strings in the context.
 +	(getkey_end): Free EXTRA_LIST.
 +
 +2015-11-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print a new EXPORTED status line.
 +	* common/status.h (STATUS_EXPORTED): New.
 +	* g10/export.c (print_status_exported): New.
 +	(do_export_stream): Call that function.
 +
 +	gpg: Print export statistics to the status-fd.
 +	* common/status.h (STATUS_EXPORT_RES): New.
 +	* g10/main.h (export_stats_t): New.
 +	* g10/export.c (export_stats_s): New.
 +	(export_new_stats, export_release_stats): New.
 +	(export_print_stats): New.
 +	(export_pubkeys, export_seckeys, export_secsubkeys)
 +	(export_pubkey_buffer, do_export): Add arg "stats".
 +	(do_export_stream): Add arg stats and update it.
 +	* g10/gpg.c (main) <aExport, aExportSecret, aExportSecretSub>: Create,
 +	pass, and print a stats object to the export function calls.
 +
 +	* g10/export.c (export_pubkeys_stream): Remove unused function.
 +
 +	dirmngr: Do not block during ADNS calls.
 +	* dirmngr/dns-stuff.c: Include npth.h
 +	(my_unprotect, my_protect): New wrapper.
 +	(resolve_name_adns): Put unprotect/protect around adns calls.
 +	(get_dns_cert): Ditto.
 +	(getsrv): Ditto.
 +	(get_dns_cname): Ditto.
 +
 +	dirmngr: New option --nameserver.
 +	* dirmngr/dirmngr.c (oNameServer): New.
 +	(opts): Add --nameserver.
 +	(parse_rereadable_options): Act upon oNameServer.
 +	* dirmngr/dns-stuff.c (DEFAULT_NAMESERVER): New.
 +	(tor_nameserver): New.
 +	(set_dns_nameserver): New.
 +	(my_adns_init): Make name server configurable.
 +
 +2015-11-11  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix cache consistency problem.
 +	g10/keyring.c (keyring_search): Only mark the cache as completely
 +	filled if we start the scan from the beginning of the keyring.
 +
 +2015-11-10  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Default to the the PGP trust model.
 +	* g10/trustdb.c (init_trustdb): If we can't read the trust model from
 +	the trust DB, default to TM_PGP, not TM_TOFU_PGP.
 +
 +	gpg: Default to the flat TOFU DB format.
 +	* g10/tofu.c (opendbs): If the TOFU DB format is set to auto and there
 +	is no TOFU DB, default to the flat format.
 +
 +2015-11-09  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Change to new ADNS Tor mode init scheme.
 +	* dirmngr/dns-stuff.c (tor_credentials): New.
 +	(enable_dns_tormode): Add arg new_circuit and update tor_credentials.
 +	(my_adns_init): Rework to set Tor mode using a config file options and
 +	always use credentials.
 +	* dirmngr/server.c (cmd_dns_cert): Improve error message.
 +	* dirmngr/t-dns-stuff.c (main): Add option --new-circuit.
 +
 +	dirmngr: Improve detection of ADNS.
 +	* configure.ac (HAVE_ADNS_FREE): New ac_define.
 +
 +2015-11-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Add reder information to --card-status.
 +	* g10/call-agent.h, g10/call-agent.c (agent_release_card_info)
 +	g10/card-util.c (card_status): Add READER.
 +	* scd/apdu.c (close_ccid_reader, open_ccid_reader): Handle RDRNAME.
 +	(apdu_get_reader_name): New.
 +	* scd/ccid-driver.c (ccid_open_reader): Add argument to RDRNAME_P.
 +	* scd/command.c (cmd_learn): Return READER information.
 +
 +2015-11-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid new strings.
 +	* g10/decrypt-data.c (decrypt_data): Use already translated strings.
 +
 +	common: Fix commit f99830b.
 +	* common/userids.c (classify_user_id): Avoid underflow.  Use spacep to
 +	also trim tabs.
 +
 +2015-11-06  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix formatting string.
 +	* g10/decrypt-data.c (decrypt_data): Fix formatting string.
 +
 +	gpg: Add new option --only-sign-text-ids.
 +	* g10/options.h (opt): Add field only_sign_text_ids.
 +	* g10/gpg.c (enum cmd_and_opt_values): Add value oOnlySignTextIDs.
 +	(opts): Handle oOnlySignTextIDs.
 +	(main): Likewise.
 +	* g10/keyedit.c (sign_uids): If OPT.ONLY_SIGN_TEXT_IDS is set, don't
 +	select non-text based IDs automatically.
 +	(keyedit_menu): Adapt the prompt asking to sign all user ids according
 +	to OPT.ONLY_SIGN_TEXT_IDS.
 +	* doc/gpg.texi: Document the new option --only-sign-text-ids.
 +
 +	common: When classifying keyids and fingerprints, reject trailing junk.
 +	* common/userids.c (classify_user_id): Trim any trailing whitespace.
 +	Before assuming that a hexstring corresponds to a key id or
 +	fingerprint, make sure that it is NUL terminated.
 +
 +	gpg: Check for ambiguous or non-matching key specs.
 +	* g10/gpg.c (check_user_ids): New function.
 +	(main): Check that any user id specifications passed to --local-user
 +	and --remote-user correspond to exactly 1 user.  Check that any user
 +	id specifications passed to --default-key correspond to at most 1
 +	user.  Warn if any user id specifications passed to --local-user or
 +	--default-user are possible ambiguous (are not specified by long keyid
 +	or fingerprint).
 +	* g10/getkey.c (parse_def_secret_key): Don't warn about possible
 +	ambiguous key descriptions here.
 +
 +	common: Add new function strlist_rev.
 +	* common/strlist.c (strlist_rev): New function.
 +	* common/t-strlist.c: New file.
 +	* common/Makefile.am (common_sources): Add strlist.c and strlist.h.
 +	(module_tests): Add t-strlist.
 +	(t_strlist_LDADD): New variable.
 +
 +	common: Include required, but not included headers in t-support.h.
 +	* common/t-support.h: Include <stdlib.h> and <stdio.h>.
 +
 +2015-11-05  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Indicate which characters are invalid.
 +	* g10/keygen.c (ask_user_id): Indicate which characters are invalid.
 +
 +	gpg: Add support for unwrapping the outer level of encryption.
 +	* g10/decrypt-data.c (decrypt_data): If OPT.UNWRAP_ENCRYPTION is set,
 +	copy the data to the output file instead of continuing to process it.
 +	* g10/gpg.c (enum cmd_and_opt_values): Add new value oUnwrap.
 +	(opts): Handle oUnwrap.
 +	(main): Likewise.
 +	* g10/options.h (opt): Add field unwrap_encryption.
 +	* g10/plaintext.c (handle_plaintext): Break the output file selection
 +	functionality into ...
 +	(get_output_file): ... this new function.
 +
 +	common: Add a function for copying data from one iobuf to another.
 +	* common/iobuf.c (iobuf_copy): New function.
 +
 +	doc: Note that gpgkey2ssh is deprecated.
 +	* doc/tools.texi (gpgkey2ssh): Note that gpgkey2ssh is deprecated.
 +
 +	tools: Fix gpgkey2ssh's most gratuitous errors.  Use gpg2, not gpg.
 +	* tools/gpgkey2ssh.c (main): Add support for --help.  Replace the most
 +	gratuitous asserts with error messages.  Invoke gpg2, not gpg.
 +
 +2015-11-05  Neal H. Walfield  <neal at g10code.com>
 +	    Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	doc: Add documentation for gpgkey2ssh.
 +	* doc/tools.texi: Add documentation for gpgkey2ssh.
 +
 +2015-11-04  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Print a better error message for --multifile --sign --encrypt.
 +	* g10/gpg.c (main): Print a better error message for --multifile
 +	--sign --encrypt.
 +
 +	gpg: Add --encrypt-to-default-key.
 +	* g10/getkey.c (parse_def_secret_key): Drop the static qualifier and
 +	export the function.
 +	* g10/gpg.c (enum cmd_and_opt_values): Add value oEncryptToDefaultKey.
 +	(opts): Handle oEncryptToDefaultKey.
 +	(main): Likewise.
 +	* g10/options.h (opt): Add field encrypt_to_default_key.
 +
 +	gpg: Allow multiple --default-key options.  Take the last available key.
 +	* g10/getkey.c (parse_def_secret_key): New function.
 +	(get_seckey_default): Add parameter ctrl.  Update callers.  Use
 +	parse_def_secret_key to get the default secret key, if any.
 +	(getkey_byname): Likewise.
 +	(enum_secret_keys): Likewise.
 +	* g10/options.h (opt): Change def_secret_key's type from a char * to a
 +	strlist_t.
 +	* g10/gpg.c (main): When processing --default-key, add the key to
 +	OPT.DEF_SECRET_KEY.
 +	* g10/gpgv.c (get_session_key): Add parameter ctrl.  Update callers.
 +	* g10/mainproc.c (proc_pubkey_enc): Likewise.
 +	(do_proc_packets): Likewise.
 +	* g10/pkclist.c (default_recipient): Likewise.
 +	* g10/pubkey-enc.c (get_session_key): Likewise.
 +	* g10/sign.c (clearsign_file): Likewise.
 +	(sign_symencrypt_file): Likewise.
 +	* g10/skclist.c (build_sk_list): Likewise.
 +	* g10/test-stubs.c (get_session_key): Likewise.
 +
 +2015-11-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix error handling with libusb-compat library.
 +	* scd/ccid-driver.c (bulk_out): Use LIBUSB_ERRNO_NO_SUCH_DEVICE.
 +
 +	scd: fix change_keyattr.
 +	* scd/app-openpgp.c (change_keyattr_from_string): Fix parsing.
 +
 +2015-11-03  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change out of core error message.
 +	* g10/tofu.c (fingerprint_str): Die with the error code returned by
 +	the failed function.
 +	(time_ago_str): Ditto.  Do not make a comma translatable.
 +	(fingerprint_format): Use "%zu" for a size_t.
 +
 +	gpg: Make translation easier.
 +	* g10/import.c (import_secret_one): Split info string for easier
 +	translation.
 +
 +2015-11-03  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Also show when the most recently signed message was observed.
 +	* g10/tofu.c (show_statistics): Also show when the most recently
 +	signed message was observed.
 +
 +	gpg: Split a utility function out of a large function.
 +	* g10/tofu.c (show_statistics): Break the time delta to string code
 +	into...
 +	(time_ago_str): ... this new function.
 +
 +	gpg: Fix message formatting.
 +	* g10/tofu.c (get_trust): Fix message formatting.
 +
 +	gpg: Don't store formatting fingerprints in the TOFU DB.
 +	* g10/tofu.c (fingerprint_pp): Split this function into...
 +	(fingerprint_str): ... this function...
 +	(fingerprint_format): ... and this function.
 +	(record_binding): Store the unformatted fingerprint in the DB.  Only
 +	use the formatting fingerprint when displaying a message to the user.
 +	(get_trust): Likewise.
 +	(show_statistics): Likewise.
 +	(tofu_register): Likewise.
 +	(tofu_get_validity): Likewise.
 +	(tofu_set_policy): Likewise.
 +	(tofu_get_policy): Likewise.
 +
 +2015-11-02  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: notify a user when importing stub is skipped.
 +	* g10/import.c (transfer_secret_keys): Return GPG_ERR_NOT_PROCESSED
 +	when stub_key_skipped.
 +	(import_secret_one): Notify a user, suggesting --card-status.
 +
 +2015-10-31  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Consider newlines to be whitespace in an SQL statement.
 +	* g10/sqlite.c (sqlite3_stepx): When making sure that there is no
 +	second SQL statement, ignore newlines.
 +
 +2015-10-30  Werner Koch  <wk at gnupg.org>
 +
 +	common: Improve t-zb32 to be used for manual encoding.
 +	* common/t-support.h (no_exit_on_fail, errcount): New.
 +	(fail): Bump errcount.
 +	* common/t-zb32.c (main): Add options to allow manual use.
 +
 +	common: Add separate header for zb32.c.
 +	* common/util.h (zb32_encode): Move prototype to ...
 +	* common/zb32.h: new.  Include this for all callers of zb32_encode.
 +
 +2015-10-29  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Display the correct error message.
 +	* g10/trustdb.c (validate_keys): If tdbio_update_version_record fails,
 +	RC does not contain the error code.  Save the error code in rc2 and
 +	use that.
 +
 +	gpg: Eliminate a memory leak.
 +	* g10/trustdb.c (validate_key_list): Don't leak the keyblocks on
 +	failure.
 +
 +	gpg: Remove unused prototype.
 +	g10/keyring.h (keyring_locate_writable): Remove unused prototype.
 +
 +	gpg: Eliminate a memory leak.
 +	* g10/gpg.c (main): Don't leak OPT.DEF_RECIPIENT.
 +
 +	gpg: Fix keyring support.
 +	* g10/keydb.c (keydb_rebuild_caches): Only mark the cached as prepared
 +	if it is actually prepared, which it only is if the resource is a
 +	keybox.
 +
 +	gpg: Change sqlite3_stepx to pass the sqlite3_stmt * to the callback.
 +	* g10/sqlite.h (enum sqlite_arg_type): Add SQLITE_ARG_BLOB.
 +	(sqlite3_stepx_callback): New declaration.
 +	(sqlite3_stepx): Change the callback's type to sqlite3_stepx_callback,
 +	which passes an additional parameter, the sqlite3_stmt *.  Update
 +	users.
 +
 +	gpg: Move sqlite helper functions into their own file.
 +	* g10/tofu.c (sqlite3_exec_printf): Move from here...
 +	* g10/sqlite.c (sqlite3_exec_printf): ... to this new file.  Don't
 +	mark as static.
 +	* g10/tofu.c (sqlite3_stepx): Move from here...
 +	* g10/sqlite.c (sqlite3_stepx): ... to this new file.  Don't
 +	mark as static.
 +	* g10/tofu.c (enum sqlite_arg_type): Move from here...
 +	* g10/sqlite.h (enum sqlite_arg_type): ... to this new file.
 +
 +2015-10-29  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	doc: Don't install gpg-zip.1.
 +	* doc/Makefile.am (myman_pages): Remove gpg-zip.1.
 +	(DISTCLEANFILES): Add gpg-zip.1.
 +
 +2015-10-28  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Allow combination of usage flags --gen-key.
 +	* sm/certreqgen.c (create_request): Re-implement building of the
 +	key-usage extension.
 +
 +2015-10-28  Damien Goutte-Gattat  <dgouttegattat at incenp.org>
 +
 +	doc: Document some changed default options.
 +	* doc/gpg.texi: Update the description of some options which are
 +	  now enabled by default.
 +
 +2015-10-28  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix NULL-deref while loading a CRL.
 +	* dirmngr/crlcache.c (crl_parse_insert): Set error before leaping to
 +	failure.
 +
 +	dirmngr: Minor cleanup of the SRV RR code.
 +	* dirmngr/dns-stuff.c: Include unistd.h.
 +	(getsrv): Run srand only once.
 +	* dirmngr/t-dns-stuff.c (main): Allow passing another name for --srv
 +	and change output format.
 +
 +	dirmngr: Add a getaddrinfo wrapper backend using ADNS.
 +	* dirmngr/dns-stuff.c: Replace all use of default_errsource.
 +	(my_adns_init): Move to top.
 +	(resolve_name_adns): New.
 +	(resolve_dns_name) [USE_ADNS]: Divert to new func.
 +
 +2015-10-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Do not call an extra get_validity if no-show-uid-validity is used.
 +	* g10/mainproc.c (check_sig_and_print): Do not call the informational
 +	get_validity if we are not going to use it.
 +
 +2015-10-26  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: Ensure all weak digest rejection notices are shown.
 +	* g10/main.h: Add rejection_shown flag to each weakhash struct
 +	* g10/misc.c (print_digest_algo_note, additional_weak_digest): Do not
 +	treat MD5 separately; (print_digest_rejected_note): Use
 +	weakhash.rejection_shown instead of static shown.
 +	* g10/options.h (opt): Change from additional_weak_digests to
 +	weak_digests.
 +	* g10/sig-check.c: Do not treat MD5 separately.
 +	* g10/gpg.c (main): Explicitly set MD5 as weak.
 +	* g10/gpgv.c (main): Explicitly set MD5 as weak.
 +
 +2015-10-26  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Make it build again if Tofu support is not available.
 +	* g10/keylist.c (public_key_list) [!USE_TOFU]: Do not call tofu
 +	functions.
 +
 +	dirmngr: Support Tor hidden services.
 +	* dirmngr/dns-stuff.c (is_onion_address): New.
 +	* dirmngr/ks-engine-hkp.c (hostinfo_s): Add field "onion".
 +	(map_host): Special case onion addresses.
 +	(ks_hkp_print_hosttable): Print an 'O' for an onion address.
 +	* dirmngr/http.c (connect_server): Special case onion addresses.
 +
 +	dirmngr,w32: Remove gethostbyname hack and make it build again.
 +	* dirmngr/http.c (connect_server) [W32]: Remove gethostbyname hack;
 +	we require getaddrinfo anyway.
 +	* dirmngr/dns-stuff.c (AI_ADDRCONFIG): Add replacement if not defined.
 +	(map_eai_to_gpg_error) [W32]: Take care of unsupported codes.
 +
 +2015-10-26  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Make sure we only have a single SQL statement.
 +	* g10/tofu.c (sqlite3_stepx): Make sure SQL only contains a single SQL
 +	statement.
 +
 +	gpg: When the TOFU DB is in batch mode, periodically drop the locks.
 +	* g10/tofu.c: Include <sched.h>.
 +	(batch_update_started): New variable.
 +	(begin_transaction): If we've been in batch mode for a while, then
 +	commit any extant batch transactions.
 +	(tofu_begin_batch_update): If we are not in batch mode, initialize
 +	batch_update_started.
 +
 +2015-10-25  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Add workaround for broken getaddrinfo.
 +	* dirmngr/dns-stuff.c (resolve_name_standard): On failure retry by
 +	first resolving the CNAME.
 +	(get_dns_cname): New.
 +
 +	* dirmngr/t-dns-stuff.c (main): Add option --cname.
 +
 +	dirmngr: Better handle systems without IPv6 or IPv4.
 +	* dirmngr/dns-stuff.c (resolve_name_standard): Use AI_ADDRCONFIG.
 +
 +	dirmngr: Replace use of getnameinfo by resolve_dns_addr.
 +	* dirmngr/ks-engine-hkp.c (my_getnameinfo): Remove.
 +	(map_host): Use resolve_dns_addr.
 +
 +	dirmngr: Implement a getnameinfo wrapper.
 +	* dirmngr/dns-stuff.h (DNS_NUMERICHOST): New.
 +	(DNS_WITHBRACKET): New.
 +	* dirmngr/dns-stuff.c (resolve_name_standard): Factor code out to...
 +	(map_eai_to_gpg_error): new.
 +	(resolve_addr_standard): New.
 +	(resolve_dns_addr): New.
 +
 +	* dirmngr/ks-engine-hkp.c (is_ip_address): Move to ...
 +	* dirmngr/dns-stuff.c (is_ip_address): here.  Add support for non
 +	bracketed v6 addresses.
 +
 +	* dirmngr/t-dns-stuff.c: Remove header netdb.h.
 +	(main): Add option --bracket.  Use resolve_dns_name instead of
 +	getnameinfo.
 +
 +2015-10-23  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Provide an interface to patch TOFU updates.
 +	* g10/tofu.c (struct db): Rename begin_transaction to savepoint_batch.
 +	Rename end_transaction to savepoint_batch_commit.  Update users.
 +	Remove field rollback.  Add fields savepoint_inner and
 +	savepoint_inner_commit.  Add field batch_update.
 +	(dump_cache): New function.
 +	(batch_update): New variable.
 +	(begin_transaction). New function.
 +	(end_transaction): New function.
 +	(rollback_transaction): New function.
 +	(tofu_begin_batch_update): New function.
 +	(tofu_end_batch_update): New function.
 +	(closedb): End any pending batch transaction.
 +	(closedbs): Assert that none of the DBs have a started batch
 +	transaction if we not in batch mode.
 +	(record_binding): Use the begin_transaction, end_transaction and
 +	rollback_transaction functions instead of including the SQL inline.
 +	Also start a batch mode transaction if we are using the flat format.
 +	(tofu_register): Use the begin_transaction, end_transaction and
 +	rollback_transaction functions instead of including the SQL inline.
 +	* g10/gpgv.c (tofu_begin_batch_update): New function.
 +	(tofu_end_batch_update): New function.
 +	* g10/test-stubs.c (tofu_begin_batch_update): New function.
 +	(tofu_end_batch_update): New function.
 +
 +	gpg: Cache prepared SQL queries and open DB connections.
 +	* g10/tofu.c: Include <stdarg.h>.
 +	(prepares_saved) [DEBUG_TOFU_CACHE]: New variable.
 +	(queries) [DEBUG_TOFU_CACHE]: New variable.
 +	(struct db): Add fields prevp, begin_transaction, end_transaction,
 +	rollback, record_binding_get_old_policy, record_binding_update,
 +	record_binding_update2, get_policy_select_policy_and_conflict,
 +	get_trust_bindings_with_this_email, get_trust_gather_other_user_ids,
 +	get_trust_gather_other_keys, register_already_seen, and
 +	register_insert.
 +	[DEBUG_TOFU_CACHE]: Add field hits.
 +	(STRINGIFY): New macro.
 +	(STRINGIFY2): New macro.
 +	(enum sqlite_arg_type): New enum.
 +	(sqlite3_stepx): New function.
 +	(combined_db): Remove variable.
 +	(opendb): Don't cache the combined db.
 +	(struct dbs): New struct.  Update users to use this as the head of the
 +	local DB list rather than overloading struct db.
 +	(unlink_db): New function.
 +	(link_db): New function.
 +	(db_cache): New variable.
 +	(db_cache_count): New variable.
 +	(DB_CACHE_ENTRIES): Define.
 +	(getdb): If the dbs specific cache doesn't include the DB, look at
 +	DB_CACHE.  Only if that also doesn't include the DB open the
 +	corresponding DB.
 +	(closedb): New function.
 +	(opendbs): Don't open the combined DB.  Just return an initialized
 +	struct dbs.
 +	(closedbs): Don't close the dbs specific dbs.  Attach them to the
 +	front of DB_CACHE.  If DB_CACHE contains more than DB_CACHE_ENTRIES,
 +	close enough dbs from the end of the DB_CACHE list such that DB_CACHE
 +	only contains DB_CACHE_ENTRIES.  Don't directly close the dbs, instead
 +	use the new closedb function.
 +	[DEBUG_TOFU_CACHE]: Print out some statistics.
 +	(record_binding): Use sqlite3_stepx instead of sqlite3_exec or
 +	sqlite3_exec_printf.
 +	(get_policy): Likewise.
 +	(get_trust): Likewise.
 +	(tofu_register): Likewise.
 +
 +	gpg: Return the DBs meta-handle rather than the sqlite3 handle.
 +	* g10/tofu.c (getdb): Return a struct db * instead of an sqlite *.
 +	Update users.
 +
 +	gpg: Use the proper type.
 +	* g10/options.h: Include "tofu.h".
 +	(opt.tofu_default_policy): Change type to enum tofu_policy.
 +	* g10/gpgv.c (enum tofu_policy): Don't redeclare.
 +	* g10/test-stubs.c (enum tofu_policy): Likewise.
 +
 +2015-10-22  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Implement Tor mode for SRV RRs.
 +	* dirmngr/dns-stuff.c (get_dns_cert): Factor adns init out to...
 +	(my_adns_init): new.
 +	(getsrv)[USE_ADNS]: Use my_adns_init.
 +	(getsrv)[!USE_ADNS]: Return an error if Tor mode is active.
 +
 +	* dirmngr/t-dns-stuff.c: Add option --use-tor.
 +
 +	dirmngr: Do not use MAXDNAME.
 +	* dirmngr/dns-stuff.c (getsrv): Replace MAXDNAME.
 +	* dirmngr/dns-stuff.h (MAXDNAME): Remove.
 +	(struct srventry): Use a fixed value instead of MAXDNAME.
 +	* dirmngr/http.c (connect_server): Use DIMof instead of MAXDNAME.
 +	Malloc a helper array.
 +
 +	Move SRV RR code from common/ to dirmngr/.
 +	* common/srv.c: Merge into dirmngr/dns-stuff.c.  Delete file.
 +	* common/srv.h: Merge into dirmngr/dns-stuff.h.  Delete file.
 +	* common/Makefile.am (common_sources): Remove srv.c and srv.h.
 +	* g10/keyserver.c: Do not include srv.h.  The code using it is anyway
 +	disabled.
 +	* dirmngr/http.c: Remove header srv.h and stubs.
 +	* dirmngr/t-dns-stuff.c: Add option --srv.
 +
 +2015-10-21  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Use the new DNS wrapper for the HTTP module.
 +	* dirmngr/t-http.c (main): Init assuan sockets.
 +	* dirmngr/http.c: Include dns-stuff.h.
 +	(connect_server)[!HAVE_GETADDRINFO]: Remove all code.
 +	(connect_server): Change to use resolve_dns_name.
 +
 +	dirmngr: Allow use of http.c if USE_NPTH is not defined.
 +	* dirmngr/http.c (send_request): Always set the gnutls pull/push
 +	functions.
 +	(my_npth_read): Rename to ...
 +	(my_gnutls_read) .. this.  Use system read if !USE_NPTH.
 +	(my_npth_write): Rename to ...
 +	(my_gnutls_write) .. this.  Use system write if !USE_NPTH.
 +
 +	dirmngr: Check that getaddrinfo is available.
 +	* dirmngr/Makefile.am (t_http_SOURCES): Add dns-stuff.c.
 +	(t_ldap_parse_uri_SOURCES): Ditto.
 +	* dirmngr/dns-stuff.c: Bail out if neither ADNS nor getaddrinfo is
 +	available.
 +
 +	dirmngr: Use the new DNS wrapper for the HKP engine.
 +	* dirmngr/ks-engine-hkp.c (my_getnameinfo): Change arg type to
 +	dns_addrinfo_t.
 +	(map_host): Replace getaddrinfo by resolve_dns_name.
 +
 +	dirmngr: Implement a getaddrinfo wrapper.
 +	* dirmngr/dns-stuff.h: Include some header files.
 +	(dns_addinfo_t, dns_addrinfo_s): New.
 +	* dirmngr/dns-stuff.c: Always include DNS related headers.
 +	(free_dns_addrinfo): New.
 +	(resolve_name_standard): New.
 +	(resolve_dns_name): New.
 +
 +	* dirmngr/t-dns-stuff.c: Include netdb.h.
 +	(main): Keep old default mode with no args but else print outout of
 +	resolve_dns_name.  Revamp option parser.
 +
 +	common: Add more replacement error codes.
 +	* common/util.h (GPG_ERR_SERVER_FAILED): New.
 +	(GPG_ERR_NO_KEY): New.
 +	(GPG_ERR_NO_NAME): New.
 +
 +2015-10-21  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: If the saved trust model is unknown, default to tofu+pgp.
 +	* g10/trustdb.c (init_trustdb): If the saved trust model is unknown,
 +	default to tofu+pgp instead of pgp.
 +
 +	gpg: Don't accidentally free UTK_LIST.
 +	* g10/trustdb.c (validate_keys): Don't free UTK_LIST.
 +
 +	gpg: When evaluating trust reg exps, treat tofu+pgp like pgp.
 +	* g10/trustdb.c (validate_one_keyblock): When checking trust regular
 +	expressions, treat the tofu+pgp trust model the same as the pgp trust
 +	model.
 +
 +	gpg: If a key is ultimate trusted, return that in the tofu model.
 +	* g10/tofu.c (get_trust): If the policy is auto or none, check if the
 +	key is ultimately trusted.  If so, return that.
 +	(tofu_register): If the key is ultimately trusted, don't show any
 +	statistics.
 +	(tofu_get_validity): Likewise.
 +
 +	gpg: Keep the trust DB up to date for the tofu and tofu+pgp models.
 +	* g10/trustdb.c (init_trustdb): Recognize tofu and tofu+pgp as
 +	possibly saved trust models.  Also register the ultimately trusted
 +	keys if the trust model is tofu or tofu+pgp.
 +	(check_trustdb): Don't skip if the trust model is tofu or tofu+pgp.
 +	(update_trustdb): Likewise.
 +	(tdb_check_trustdb_stale): Likewise.
 +	(validate_keys): If the trust model is TOFU, just write out the
 +	ultimately trusted keys.
 +
 +	gpg: Factor out code into a standalone function.
 +	* g10/trustdb.c (tdb_keyid_is_utk): New function.
 +	(add_utk): Use it.
 +
 +	dirmngr: Allow building with libassuan < 2.3.
 +	* dirmngr/http.c (send_request): Use newer assuan function only if
 +	available.
 +
 +2015-10-21  Neal H. Walfield  <neal at g10code.com>
 +	    Andre Heinecke  <aheinecke at intevation.de>
 +
 +	gpg: Make the tofu DB check and initialization atomic.
 +	* g10/tofu.c (initdb): Make the version check and the database
 +	initialization atomic.
 +
 +2015-10-21  Werner Koch  <wk at gnupg.org>
 +
 +	build: Make --disable-g13 the default.
 +	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add --enable-g13.  Remove
 +	--enable-gpgtar because that is enabled anyway.
 +	* configure.ac: Do not build g13 by default.
 +
 +	dirmngr: Rename file dns-cert.c.
 +	* dirmngr/dns-cert.c: Rename to dirmngr/dns-stuff.c.
 +	* dirmngr/dns-cert.h: Rename to dirmngr/dns-stuff.h and change
 +	includers.
 +	* dirmngr/t-dns-cert.c: Rename to dirmngr/t-dns-stuff.c.
 +	* dirmngr/Makefile.am: Adjust.
 +
 +	common: Add status code for use by g13.
 +	* common/status.h (STATUS_PLAINTEXT_FOLLOWS): New.
 +
 +2015-10-20  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Prefer ADNS over system resolver.
 +	* configure.ac (HAVE_ADNS_IF_TORMODE): New ac_define.
 +	(USE_DNS_CERT): Prefer ADNS over the system resolver.
 +	* dirmngr/dns-cert.c (tor_mode): New global var.
 +	(enable_dns_tormode): New func.
 +	(get_dns_cert): Use DNS resolver at 8.8.8.8 in tor-mode.
 +	* dirmngr/server.c (cmd_dns_cert): If supported allow DNS requests.
 +
 +	w32: Allow building again.
 +	* dirmngr/http.c (connect_server): Fix called function name.
 +
 +	build: Allow building without SQLlite support.
 +	* configure.ac: Add option --dsiable-tofu and --disable-sqlite.
 +	(NEED_SQLITE_VERSION): New var.
 +	(USE_TOFU): New ac_define and am_conditional.
 +	* autogen.sh (build-w32): Add PKG_CONFIG_LIBDIR to configure so that
 +	pkg-config find the correct .pc file.
 +
 +	* g10/Makefile.am (tofu_source): New.  Build only if enabled.
 +	* g10/gpg.c (parse_trust_model)[!USE_TOFU]: Disable tofu models.
 +	(parse_tofu_policy)[!USE_TOFU]: Disable all.
 +	(parse_tofu_db_format)[!USE_TOFU]: Disable all.
 +	(main) <aTOFUPolicy>[!USE_TOFU]: Skip.
 +	* g10/keyedit.c (show_key_with_all_names_colon)[!USE_TOFU]: Do not
 +	call tofu functions.
 +	* g10/keylist.c (list_keyblock_colon)[!USE_TOFU]: Ditto.
 +	* g10/trustdb.c (tdb_get_validity_core)[!USE_TOFU]: Skip tofu
 +	processing.
 +
 +2015-10-20  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Don't die immediately if the TOFU DB is locked.
 +	* g10/tofu.c (opendb): Don't die immediately if the DB is locked.
 +
 +	gpg: Improve output.
 +	* g10/tofu.c (get_trust): Also show the binding when indicating a
 +	conflict occurred.
 +
 +	gpg: Synchronize translation template.
 +	* g10/tofu.c (show_statistics): Synchronize translation template.
 +
 +	gpg: When showing conflicts, also show bindings with no recorded sigs.
 +	* g10/tofu.c (signature_stats_collect_cb): If the time_ago column is
 +	NULL, then both time_ago and count should be 0.
 +	(get_trust): Reverse the direction of the join so that we also get
 +	statistics about bindings without any signatures.
 +
 +	gpg: Improve text.
 +	* g10/tofu.c (show_statistics): Improve text.
 +
 +	gpg: Use the right variable to display the information.
 +	* g10/tofu.c (get_trust): Use the right variable to display the
 +	conflicting key.
 +
 +	gpg: Make failing to create a directory a soft error.
 +	* g10/tofu.c (getdb): Don't exit if we can't create the directory.
 +	Just return an error.
 +
 +	common: Make sure tilde expansion works for the mkdir functions.
 +	* common/mkdir_p.c (gnupg_amkdir_p): Use make_filename_try on the
 +	first directory component as well.
 +
 +	gpg: Remove unused prototype digest_algo_from_sig.
 +	* g10/packet.h (digest_algo_from_sig): Remove prototype without a
 +	corresponding implementation.
 +
 +2015-10-19  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Allow building with libassuan < 2.3.
 +	* dirmngr/dirmngr.c (set_tor_mode): Use newer assuan function only if
 +	available.
 +	* dirmngr/http.c (http_raw_connect): Ditto.
 +
 +2015-10-19  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix --desig-revoke.
 +	* g10/revoke.c (gen_desig_revoke): Add additional parameter ctrl.
 +	Check that the secret key is available.  If not, display an error
 +	message.
 +
 +	gpg: Improve function documentation and some comments.
 +	* g10/main.h: Improve function documentation.
 +	* g10/packet.h.h: Improve function documentation.
 +	* g10/sig-check.c: Improve function documentation and some comments.
 +
 +	gpg: Improve and regularize naming of signature checking functions.
 +	* g10/packet.h (signature_check): Rename from this...
 +	(check_signature): ... to this.  Update users.
 +	(signature_check2): Rename from this...
 +	(check_signature2): ... to this.  Update users.
 +	* g10/sig-check.c (do_check): Rename from this...
 +	(check_signature_end): ... to this.  Update users.
 +	(do_check_messages): Rename from this...
 +	(check_signature_metadata_validity): ... to this.  Update users.
 +
 +	gpg: Mark local function as static.
 +	* g10/tdbio.c (put_record_into_cache): Mark as static.
 +
 +2015-10-19  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: Print warning when rejecting weak digests.
 +	* g10/misc.c (print_md5_rejected_note): Rename to ..
 +	(print_digest_rejected_note): this.  Parameterize function to take an
 +	enum gcry_md_algos.
 +	* g10/sig-check.c: Use print_digest_rejected_note() when rejecting
 +	signatures.
 +
 +	gpg: Add option --weak-digest to gpg and gpgv.
 +	* g10/options.h: Add additional_weak_digests linked list to opts.
 +	* g10/main.h: Declare weakhash linked list struct and
 +	additional_weak_digest() function to insert newly-declared weak
 +	digests into opts.
 +	* g10/misc.c: (additional_weak_digest): New function.
 +	(print_digest_algo_note): Check for deprecated digests; use proper
 +	gcry_md_algos type.
 +	* g10/sig-check.c: (do_check): Reject weak digests in addition to MD5.
 +	* g10/gpg.c: Add --weak-digest option to gpg.
 +	* doc/gpg.texi: Document gpg --weak-digest option.
 +	* g10/gpgv.c: Add --weak-digest option to gpgv.
 +	* doc/gpgv.texi: Document gpgv --weak-digest option.
 +
 +2015-10-19  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Make --use-tor work - still leaks DNS.
 +	* dirmngr/dirmngr.c (set_tor_mode): New.
 +	(main, reread_configuration): Call it.
 +	* dirmngr/http.c (http_raw_connect, send_request): Check whether TOR
 +	mode is enabled if the FORCE_TOR flag is given.
 +
 +	dirmngr: Use Assuan socket wrappers for http.c.
 +	* dirmngr/http.c: Include assuan.h.  Changed all code taking a socket
 +	descriptor from int to assuan_fd_t.
 +	(my_unprotect, my_protect): New.
 +	(my_connect): Remove.
 +	(_my_socket_new, _my_socket_unref): use assuan_sock_close.
 +	(connect_server): Use assuan_sock_connect, assuan_sock_new, and
 +	assuan_sock_close.
 +	* dirmngr/Makefile.am (t_common_ldadd): Add LIBASSUAN_LIBS.
 +
 +2015-10-19  Neal H. Walfield  <neal at g10code.com>
 +
 +	gpg: Fix formatting.
 +	* g10/tofu.c (get_trust): Fix formatting.
 +
 +	gpg: Don't forget to free some memory.
 +	* g10/tofu.c (tofu_register): Free SIG_DIGEST before returning.
 +
 +	gpg: If a conflict occurs in batch mode, record that.
 +	* g10/tofu.c (get_trust): If a conflict occurs when MAY_ASK is false,
 +	set conflict to the key.  When prompting the user, don't show the
 +	conflicting key if the conflicting key is the current key.
 +
 +2015-10-18  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Silence two more warnings.
 +	* g10/trustdb.c (tdb_get_validity_core): Silence a warning.
 +	* g10/tofu.c (tofu_register): Move SIG_DIGEST computation to the top
 +	so that it is not uninitialized in case of an early error.
 +
 +	gpg: Fix harmless compiler warnings.
 +	* g10/tofu.h (_tofu_GET_POLICY_ERROR): New.  This avoids warnings
 +	about undefined enum values in a switch.
 +	* g10/trustdb.h (_tofu_GET_TRUST_ERROR): New.
 +	* g10/tofu.c (TIME_AGO_FUTURE_IGNORE): Move to the top.
 +	(opendbs): Avoid compiler warning (use braces).
 +	(GET_POLICY_ERROR): Replace define by enum _tofu_GET_POLICY_ERROR.
 +	(get_policy): Remove assert.
 +	(GET_TRUST_ERROR): Replace by _tofu_GET_TRUST_ERROR macro.
 +	(show_statistics): Undef MIN_SECS et al. after use.
 +
 +	common: Avoid warning about const char ** assignment.
 +	* common/mkdir_p.c (gnupg_amkdir_p): Also strdup first item.  Return
 +	an error on malloc failure.
 +	(gnupg_mkdir_p): Fix type of dirs and tmp_dirs.
 +
 +	Move http module from common/ to dirmngr/.
 +	* common/http.c: Move to ../dirmngr/.
 +	* common/http.h: Move to ../dirmngr/.
 +	* common/t-http.c: Move to ../dirmngr/.
 +	* common/tls-ca.pem: Move to ../dirmngr/.
 +	* common/Makefile.am: Do not build libcommontls.a libcommontlsnpth.a.
 +	Remove http.c related stuff.
 +	* po/POTFILES.in: Move http.c to dirmngr/.
 +	* dirmngr/Makefile.am (EXTRA_DIST): Add tls-ca.pem.
 +	(module_maint_tests): New.
 +	(noinst_PROGRAMS): Add module_maint_tests.
 +	(dirmngr_SOURCES): Add http.c and http.h.
 +	(dirmngr_LDADD): Remove libcommontlsnpth.
 +	(t_common_ldadd): Ditto.
 +	(t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
 +	(t_ldap_parse_uri_SOURCES): Add http.c.
 +	(t_ldap_parse_uri_CFLAGS): Build without npth.
 +	($(PROGRAMS)): Do not require libcommontls.a libcommontlsnpth.a.
 +	* dirmngr/dirmngr.h, dirmngr/ks-engine.h: Fix include of http.h.
 +
 +2015-10-18  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Fix assert.
 +	* g10/tofu.c (get_trust): Fix assert.
 +
 +	g10: Add TOFU support.
 +	* configure.ac: Check for sqlite3.
 +	(SQLITE3_CFLAGS): AC_SUBST it.
 +	(SQLITE3_LIBS): Likewise.
 +	* g10/Makefile.am (AM_CFLAGS): Add $(SQLITE3_CFLAGS).
 +	(gpg2_SOURCES): Add tofu.h and tofu.c.
 +	(gpg2_LDADD): Add $(SQLITE3_LIBS).
 +	* g10/tofu.c: New file.
 +	* g10/tofu.h: New file.
 +	* g10/options.h (trust_model): Define TM_TOFU and TM_TOFU_PGP.
 +	(tofu_db_format): Define.
 +	* g10/packet.h (PKT_signature): Add fields digest and digest_len.
 +	* g10/gpg.c: Include "tofu.h".
 +	(cmd_and_opt_values): Declare aTOFUPolicy, oTOFUDefaultPolicy,
 +	oTOFUDBFormat.
 +	(opts): Add them.
 +	(parse_trust_model): Recognize the tofu and tofu+pgp trust models.
 +	(parse_tofu_policy): New function.
 +	(parse_tofu_db_format): New function.
 +	(main): Initialize opt.tofu_default_policy and opt.tofu_db_format.
 +	Handle aTOFUPolicy, oTOFUDefaultPolicy and oTOFUDBFormat.
 +	* g10/mainproc.c (do_check_sig): If the signature is good, copy the
 +	hash to SIG->DIGEST and set SIG->DIGEST_LEN appropriately.
 +	* g10/trustdb.h (get_validity): Add arguments sig and may_ask.  Update
 +	callers.
 +	(tdb_get_validity_core): Add arguments sig and may_ask.  Update
 +	callers.
 +	* g10/trust.c (get_validity) Add arguments sig and may_ask.  Pass them
 +	to tdb_get_validity_core.
 +	* g10/trustdb.c: Include "tofu.h".
 +	(trust_model_string): Handle TM_TOFU and TM_TOFU_PGP.
 +	(tdb_get_validity_core): Add arguments sig and may_ask.  If
 +	OPT.TRUST_MODEL is TM_TOFU or TM_TOFU_PGP, compute the TOFU trust
 +	level.  Combine it with the computed PGP trust level, if appropriate.
 +	* g10/keyedit.c: Include "tofu.h".
 +	(show_key_with_all_names_colon): If the trust mode is tofu or
 +	tofu+pgp, then show the trust policy.
 +	* g10/keylist.c: Include "tofu.h".
 +	(public_key_list): Also show the PGP stats if the trust model is
 +	TM_TOFU_PGP.
 +	(list_keyblock_colon): If the trust mode is tofu or
 +	tofu+pgp, then show the trust policy.
 +	* g10/pkclist.c: Include "tofu.h".
 +	* g10/gpgv.c (get_validity): Add arguments sig and may_ask.
 +	(enum tofu_policy): Define.
 +	(tofu_get_policy): New stub.
 +	(tofu_policy_str): Likewise.
 +	* g10/test-stubs.c (get_validity): Add arguments sig and may_ask.
 +	(enum tofu_policy): Define.
 +	(tofu_get_policy): New stub.
 +	(tofu_policy_str): Likewise.
 +	* doc/DETAILS: Describe the TOFU Policy field.
 +	* doc/gpg.texi: Document --tofu-set-policy, --trust-model=tofu,
 +	--trust-model=tofu+pgp, --tofu-default-policy and --tofu-db-format.
 +	* tests/openpgp/Makefile.am (TESTS): Add tofu.test.
 +	(TEST_FILES): Add tofu-keys.asc, tofu-keys-secret.asc,
 +	tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and tofu-EE37CF96-1.txt.
 +	(CLEANFILES): Add tofu.db.
 +	(clean-local): Add tofu.d.
 +	* tests/openpgp/tofu.test: New file.
 +	* tests/openpgp/tofu-2183839A-1.txt: New file.
 +	* tests/openpgp/tofu-BC15C85A-1.txt: New file.
 +	* tests/openpgp/tofu-EE37CF96-1.txt: New file.
 +	* tests/openpgp/tofu-keys.asc: New file.
 +	* tests/openpgp/tofu-keys-secret.asc: New file.
 +
 +2015-10-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Prefix the mkdir functions with gnupg_.  Make args const.
 +	* common/mkdir_p.h (mkdir_p): Rename from this...
 +	(gnupg_mkdir_p): ... to this.  Change directory_component's type from
 +	char * to const char *.
 +	(amkdir_p): Rename from this...
 +	(gnupg_amkdir_p): ... to this.  Change directory_component's type from
 +	char * to const char *.
 +	* common/mkdir_p.c (mkdir_p): Rename from this...
 +	(gnupg_mkdir_p): ... to this.  Change directory_component's type from
 +	char * to const char *.
 +	(amkdir_p): Rename from this...
 +	(gnupg_amkdir_p): ... to this.  Change directory_component's type from
 +	char * to const char *.
 +
 +2015-10-14  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	cleanup: Fix confusion between gpg_error_t and gpg_err_code_t.
 +	* dirmngr/crlcache.c (hash_dbfile): Use gpg_error_t for ERR.
 +	* kbx/keybox-update.c (keybox_set_flags): Call
 +	gpg_err_code_from_syserror.
 +
 +2015-10-13  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +2015-10-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Try hard to use MDC also for sign+symenc.
 +	* g10/encrypt.c (use_mdc): Make it a global func.
 +	* g10/sign.c (sign_symencrypt_file): Use that function to decide
 +	whether to use an MDC.
 +	* tests/openpgp/conventional-mdc.test: Add a simple test case.
 +
 +2015-10-09  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.9.
 +
 +2015-10-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: simplify agent_get_passphrase.
 +	* agent/call-pinentry.c (agent_get_passphrase): Simplify.
 +
 +	agent: fix agent_askpin.
 +	* agent/call-pinentry.c (agent_askpin): Fix off-by-one error.
 +
 +	agent: Fix function return type for check_cb and agent_askpin.
 +	* agent/call-pinentry.c (unlock_pinentry): Return gpg_error_t.
 +	(start_pinentry, setup_qualitybar): Likewise.
 +	(agent_askpin): Fix return value check of check_cb.
 +	* agent/command-ssh.c (reenter_compare_cb): Return gpg_error_t.
 +	(ssh_identity_register): Fix return value check of agent_askpin.
 +	* agent/cvt-openpgp.c (try_do_unprotect_cb): Return gpg_error_t.
 +	* agent/findkey.c (try_unprotect_cb): Likewise.
 +	* agent/genkey.c (reenter_compare_cb): Return gpg_error_t.
 +	(agent_ask_new_passphrase): Fix return value check of agent_askpin.
 +
 +2015-10-08  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	dirmngr: Default to http protocol for http-proxy.
 +	* common/http.c (send_request): Fix handling for hostname:port string.
 +
 +2015-10-08  Werner Koch  <wk at gnupg.org>
 +
 +	common: Allow building of mkdir_p.c for Windows.
 +	* common/mkdir_p.c: Change license and comment debug statements.
 +	(amkdir_p, mkdir_p): Fail on malloc error and use default_errsource to
 +	build an error code.  Change return value to gpg_error_t.
 +	(amkdir_p): Use gnupg_mkdir.
 +
 +	* common/membuf.c: Include util.h first to avoid redefined macro
 +	warnings.
 +
 +	gpg: Add option --print-dane-records.
 +	* g10/options.h (opt): Add field "print_dane_records".
 +	* g10/gpg.c (oPrintDANERecords): new.
 +	(opts): Add --print-dane-records.
 +	(main): Set that option.
 +	* g10/export.c (do_export): Remove EXPORT_DANE_FORMAT handling.
 +	(do_export_stream): Add EXPORT_DANE_FORMAT handling.
 +	* g10/keylist.c (list_keyblock_pka): Implement DANE record printing.
 +
 +	* g10/gpgv.c (export_pubkey_buffer): New stub.
 +	* g10/test-stubs.c (export_pubkey_buffer): New stub.
 +
 +	gpg: Pass CTRL parameter to all key listing functions.
 +	* g10/keylist.c (public_key_list): Add arg CTRL.
 +	(secret_key_list): Ditto.
 +	(list_all, list_one): Ditto.
 +	(locate_one): Ditto.
 +	(list_keyblock_pka): Ditto.
 +	(list_keyblock): Ditto.
 +	(list_keyblock_direct): Ditto.
 +	* g10/keygen.c (proc_parameter_file): Add arg CTRL.
 +	(read_parameter_file): Ditto.
 +	(quick_generate_keypair): Ditto.
 +	(do_generate_keypair): Ditto.
 +	(generate_keypair): Pass arg CTRL.
 +	* g10/gpg.c (main): Pass arg CTRL to quick_generate_keypair.
 +
 +2015-10-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove unfinished experimental code to export as S-expressions.
 +	* g10/options.h (EXPORT_SEXP_FORMAT): Remove.
 +	(EXPORT_DANE_FORMAT): New.
 +	* g10/export.c (parse_export_options): Remove "export-sexp-format".
 +	(export_seckeys): Adjust for removed option.
 +	(export_secsubkeys): Ditto.
 +	(do_export): Prepare for DANE format.
 +	(build_sexp, build_sexp_seckey): Remove.
 +	(do_export_stream): Remove use of removed functions.
 +
 +2015-10-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add new --auto-key-locate mechanism "dane".
 +	* g10/call-dirmngr.c (gpg_dirmngr_dns_cert): Allow fetching via DANE.
 +	* g10/keyserver.c (keyserver_import_cert): Add arg "dane_mode".
 +	* g10/options.h (AKL_DANE): New.
 +	* g10/getkey.c (get_pubkey_byname): Implement AKL_DANE.
 +	(parse_auto_key_locate): Ditto.
 +
 +	dirmngr: Addlow fetching keys using OpenPGP DANE.
 +	* dirmngr/server.c (cmd_dns_cert): Add option --dane.
 +
 +	dirmngr: Improve DNS code to retrieve arbitrary records.
 +	* dirmngr/dns-cert.c (get_dns_cert): Add hack to retrieve arbitrary
 +	resource records.
 +	* dirmngr/dns-cert.h (DNS_CERTTYPE_RRBASE): New.
 +	(DNS_CERTTYPE_RR61): New.
 +
 +	dirmngr: Change DNS code to make additions easier.
 +	* dirmngr/dns-cert.c (get_dns_cert) [!USE_ADNS]: Change loop to allow
 +	adding more resource types.
 +
 +	dirmngr: Make commands RELOADDIRMNGR and KILLDIRMNGR work properly.
 +	* dirmngr/server.c (cmd_killdirmngr): Set assuan close flag.
 +	(cmd_reloaddirmngr): Use check_owner_permission.
 +
 +	dirmngr: Do tilde expansion for --hkp-cacert.
 +	* dirmngr/dirmngr.c (parse_rereadable_options): Do tilde expansion and
 +	check for cert file existance in option --hkp-cacert.
 +
 +	gpg: Fail decryption for AES etc message w/o MDC.
 +	* g10/mainproc.c (proc_encrypted): Fail for modern messages w/o MDC.
 +
 +2015-10-06  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix verification of signature for smartcard.
 +	* agent/pksign.c (agent_pksign_do): Use public key smartcard.
 +
 +	agent: Fix non-allocation for pinentry_loopback.
 +	* agent/call-pinentry.c (agent_get_passphrase): Don't allocate, it will
 +	be allocated by pinentry_loopback.
 +
 +2015-10-05  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Install a dirmngr.conf file.
 +	* g10/dirmngr-conf.skel: New.
 +	* g10/Makefile.am (EXTRA_DIST): Add file.
 +	(install-data-local, uninstall-local): Install that file.
 +	* g10/openfile.c (copy_options_file): Add arg "name", return a value,
 +	simplify with xstrconcat, and factor warning message out to:
 +	(try_make_homedir): here.  Also install dirmngr.conf.
 +	* g10/options.skel: Remove --keyserver entry.
 +
 +	gpg: Deprecate the --keyserver option.
 +	* g10/keyserver.c (keyserver_refresh): Change return type to
 +	gpg_error_t.  Use gpg_dirmngr_ks_list to print the name of the
 +	keyserver to use.
 +	(keyserver_search): Do not print the "no keyserver" error
 +	message.  The same error is anyway returned from dirmngr.
 +	* g10/call-dirmngr.c (ks_status_parm_s): Add field "keyword".
 +	(ks_status_cb): Handle other status keywords.
 +	(gpg_dirmngr_ks_list): New.
 +	* tools/gpgconf-comp.c (gc_options_gpg): Deprecate "keyserver".
 +	(gc_options_dirmngr): Add "Keyserver" group and "keyserver".
 +
 +	dirmngr: Add option --keyserver.
 +	* dirmngr/dirmngr.c (oKeyServer): New.
 +	(opts): Add "keyserver".
 +	(parse_rereadable_options): Parse that options
 +	(main): Add option to the gpgconf list.
 +	* dirmngr/dirmngr.h (opt): Add field "keyserver".
 +	* dirmngr/server.c (ensure_keyserver): New.
 +	(make_keyserver_item): New.  Factored out from
 +	(cmd_keyserver): here.  Call ensure_keyserver.
 +	(cmd_ks_search): Call ensure_keyserver.
 +	(cmd_ks_get): Ditto.
 +	(cmd_ks_fetch): Ditto.
 +	(cmd_ks_put): Ditto.
 +
 +	dirmngr: Make clear that --use-tor is not yet ready for use.
 +	* dirmngr/dirmngr.c (main): Print a warning if --use-tor has been
 +	given.
 +	* tools/gpgconf-comp.c (gc_options_dirmngr): Make --use-tor invisible.
 +
 +	gpgconf: Change displayed name of Dirmngr to "Key Acquirer".
 +	* tools/gpgconf-comp.c (gc_component): Change printed name.
 +
 +2015-10-02  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix use-after-free due to a realloc shrinking.
 +	* dirmngr/ks-engine-hkp.c (map_host): Do not use original pointer
 +	after realloc.
 +
 +	agent: Fix alignment problem with the second passphrase struct.
 +	* agent/genkey.c (agent_ask_new_passphrase): Use a separate malloc for
 +	PI2.  Check return value of the malloc function.
 +	* agent/command-ssh.c (ssh_identity_register): Use a separate malloc
 +	for PI2.  Wipe PI2.
 +
 +2015-10-01  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix a practical hang after use of --faked-system-time.
 +	* g10/sign.c (update_keysig_packet): Bail out if we would need to long
 +	for a new timestamp.
 +
 +	gpg: Print more info with "check selfsig".
 +	* g10/keyedit.c (print_and_check_one_sig): Print more Some sigsub
 +	packets.
 +
 +	gpg: Add debug helper to --edit-keys's check sub-command.
 +	* g10/keyedit.c (print_and_check_one_sig): Add arg "extended" and
 +	print an asterisk for the chosen selfsig.
 +	(check_all_keysigs): Add arg "only_selfsig"
 +	(keyedit_menu) <cmdCHECK>: Add optional arg "selfsig".
 +
 +2015-10-01  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	common: Fix strsplit.
 +	* common/stringhelp.c (strsplit): Fix arguments order.
 +
 +2015-09-30  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Add mkdir_p.
 +	* common/mkdir_p.c: New file.
 +	* common/mkdir_p.h: New file.
 +	* common/Makefile.am (common_sources): Add mkdir_p.c and mkdir_p.h.
 +
 +	common: Remove unused files.
 +	* common/xmalloc.c: Remove file.
 +	* common/xmalloc.h: Remove file.
 +
 +	common: Include <gpg-error.h>.
 +	* common/logging.h: Include <gpg-error.h>.
 +
 +2015-09-29  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Remove unused struct cmp_help_context_s.
 +	* g10/sig-check.c (struct cmp_help_context_s) Remove unused struct.
 +
 +	g10: Avoid an unnecessary copy.
 +	* g10/sig-check.c (signature_check2): Avoid copying PK to RET_PK.
 +	Instead, directly use the provided storage.  If none is provided
 +	allocate some.
 +
 +2015-09-29  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	ssh: Fix fingerprint computation for EdDSA key.
 +	* common/ssh-utils.c (get_fingerprint): Handle the prefix of 0x40.
 +	* common/t-ssh-utils.c (sample_keys): Add a new key.
 +
 +	agent: RSA signature verification by gpg-agent.
 +	* g10/sign.c (do_sign): Let verify signature by gpg-agent.
 +	* agent/pksign.c (agent_pksign_do): Call gcry_pk_verify for RSA.
 +
 +2015-09-28  Werner Koch  <wk at gnupg.org>
 +
 +	common: Provide two new error code replacements.
 +	* common/util.h (GPG_ERR_FALSE, GPG_ERR_TRUE): Rew replcements.
 +
 +	common: Change calling convention for gnupg_spawn_process.
 +	* common/exechelp.h (GNUPG_SPAWN_NONBLOCK): New.
 +	(GNUPG_SPAWN_RUN_ASFW, GNUPG_SPAWN_DETACHED): Macro to replace the
 +	numbers.
 +	* common/exechelp.h (gnupg_spawn_process): Change function to not take
 +	an optional stream for stdin but to return one.
 +	* common/exechelp-posix.c (gnupg_spawn_process): Implement change.
 +	(create_pipe_and_estream): Add args outbound and nonblock.
 +	* common/exechelp-w32.c (gnupg_spawn_process): Implement change.
 +
 +2015-09-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Handle error correctly.
 +	* scd/apdu.c (apdu_connect): Initialize variables and check an error
 +	of apdu_get_status_internal.
 +
 +2015-09-22  Werner Koch  <wk at gnupg.org>
 +
 +	ssh: Add 256, 384 and 521 bit test keys for the fingerprint.
 +	* common/t-ssh-utils.c (sample_keys): Add 3 new keys.
 +
 +	ssh: Fix fingerprint computation for 384 bit ECDSA keys.
 +	* common/ssh-utils.c (get_fingerprint): Fix hashed string.
 +
 +2015-09-19  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix importing ECC key.
 +	* agent/cvt-openpgp.c (convert_from_openpgp_main): Only encrypted
 +	parameters are stored as opaque.
 +	(apply_protection): ARRAY members are all normal, non-opaque MPI.
 +	(extract_private_key): Get public key as normal, non-opaque MPI.
 +	Remove support of ECC key with '(flags param)'.
 +	Remove support of "ecdsa" and "ecdh" keys of our experiment.
 +
 +	scd: Fix KEYTOCARD handling for ECC key.
 +	* scd/app-openpgp.c (ecc_writekey): Only public key can be native
 +	format.
 +
 +2015-09-19  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Add new function strlist_length.
 +	* common/strlist.c (strlist_length): New function.
 +
 +2015-09-18  Werner Koch  <wk at gnupg.org>
 +
 +	gpgconf: Change displayed name of Dirmngr to "Network Manager".
 +	* tools/gpgconf-comp.c (gc_component): Change printed name.
 +
 +	dirmngr: Add option --use-tor as a stub.
 +	* dirmngr/dirmngr.h (opt): Add field "use_tor".
 +	* dirmngr/dirmngr.c (oUseTor): New.
 +	(opts): Add --use-tor.
 +	(parse_rereadable_options): Set option.
 +	(main): Tell gpgconf about that option.
 +
 +	* dirmngr/crlfetch.c (crl_fetch): Pass TOR flag to the http module and
 +	return an error if LDAP is used in TOR mode.
 +	(ca_cert_fetch): Return an error in TOR mode.
 +	(start_cert_fetch): Ditto.
 +	* dirmngr/ks-engine-finger.c (ks_finger_fetch): Pass TOR flag to the
 +	http module.
 +	* dirmngr/ks-engine-hkp.c (send_request): Ditto.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
 +	* dirmngr/ks-engine-ldap.c (ks_ldap_get): Return an error in TOR mode.
 +	(ks_ldap_search): Ditto.
 +	(ks_ldap_put): Ditto.
 +	* dirmngr/ocsp.c (do_ocsp_request): Ditto.  Also pass TOR flag to the
 +	http module.
 +
 +	* dirmngr/server.c (option_handler): Add "honor-keyserver-url-used".
 +	(cmd_dns_cert): Return an error in TOR mode.
 +	(cmd_getinfo): Add subcommand "tor"
 +	* tools/gpgconf-comp.c (gc_options_dirmngr): Add TOR group.
 +
 +	gpg: Report a conflict between honor-keyserver-url and TOR.
 +	* g10/call-dirmngr.c (create_context): Send option and print a verbose
 +	error.
 +
 +	http: Add flag to force use of TOR (part 1)
 +	* common/http.h (HTTP_FLAG_FORCE_TOR): New.
 +	* common/http.c (http_raw_connect, send_request): Detect flag and
 +	return an error for now.
 +
 +2015-09-17  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +	scd: Fix ccid-driver timeout for OpenPGPcard v2.1.
 +	* scd/ccid-driver.c (CCID_CMD_TIMEOUT): New.
 +	(ccid_transceive_apdu_level, ccid_transceive): Use.
 +
 +2015-09-16  Werner Koch  <wk at gnupg.org>
 +
 +	agent: New option --pinentry-invisible-char.
 +	* agent/gpg-agent.c (oPinentryInvisibleChar): New.
 +	(opts): Add option.
 +	(parse_rereadable_options): Set option.
 +	* agent/agent.h (opt): Add field pinentry_invisible_char.
 +	* agent/call-pinentry.c (start_pinentry): Pass option to pinentry.
 +
 +	g13: Move some code to a separate module.
 +	* g13/g13-common.c, g13/g13-common.h: New.
 +	* g13/Makefile.am (g13_SOURCES): Add new files.
 +	* g13/g13.c (g13_errors_seen): Move to g13-common.c.
 +	(cmdline_conttype): New.
 +	(main): Use g13_init_signals and g13_install_emergency_cleanup.
 +	(emergency_cleanup, g13_exit): Move to g13-common.c.
 +	* g13/g13.h: Move OPT and some other code to g13-common.h.
 +
 +	gpg: Fix skip function dummy parameter.
 +	* g10/trustdb.c (search_skipfnc): Fix dummy argument
 +
 +	gpg: Change last commit to avoid extra translations.
 +	* g10/keyedit.c (keyedit_menu): Do not print usage hints in expert
 +	mode.
 +
 +2015-09-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Improve error message.
 +	* g10/keyedit.c (keyedit_menu): When complaining that a user ID or key
 +	must be selected, indicate what command to use to do this.
 +
 +	g10: Be more careful when merging self-signed data.
 +	* g10/getkey.c (merge_selfsigs_main): Stop looking for self-signed
 +	data belonging to the public key when we encounter an attribute packet
 +	or a subkey packet, not just a user id packet.  When looking for
 +	self-signed data belonging to a user id packet, stop when we see a
 +	user attribute packet.
 +
 +	g10: Simplify some complicated boolean expressions.
 +	* g10/getkey.c (finish_lookup): Simplify logic.
 +
 +	g10: Also mark revoked and expired keys as unusable.
 +	* g10/getkey.c (skip_unusable): Also mark the key as unusable if it
 +	has been revoked or has expired.
 +
 +	g10: Release resources when returning an error in get_seckey.
 +	* g10/getkey.c (get_seckey): If the key doesn't have a secret key,
 +	release *PK.
 +
 +	g10: Improve documentation and comments for getkey.c.
 +	* g10/getkey.c: Improve documentation and comments for most
 +	functions.  Move documentation for public functions from here...
 +	* g10/keydb.h: ... to here.
 +
 +	g10: Remove unused function have_any_secret_key.
 +	* g10/getkey.c (have_any_secret_key): Remove function.
 +
 +	g10: Bring cache semantics closer to non-cache semantics.
 +	* g10/getkey.c (get_pubkey_fast): When reading from the cache, only
 +	consider primary keys.
 +
 +	g10: Break out of the loop earlier.
 +	* g10/getkey.c (have_secret_key_with_kid): Once we find the relevent
 +	key or subkey, stop searching.
 +
 +	g10: Don't skip legacy keys if the search mode is KEYDB_SEARCH_MODE_NEXT
 +	* g10/getkey.c (lookup): Also don't skip legacy keys if the search
 +	mode is KEYDB_SEARCH_MODE_NEXT.
 +
 +	g10: Remove unused function get_seckeyblock_byfprint.
 +	* g10/keydb.h (get_seckeyblock_byfprint): Remove prototype.
 +	* g10/getkey.c (get_seckeyblock_byfprint): Remove function.
 +
 +	g10: Remove unused function get_seckey_byfprint.
 +	* g10/keydb.h (get_seckey_byfprint): Remove prototype.
 +	* g10/getkey.c (get_seckey_byfprint): Remove function.
 +
 +	g10: Simplify get_seckey_byname: it was never called with NAME not NULL.
 +	* g10/keydb.h (get_seckey_byname): Rename from this...
 +	(get_seckey_default): ... to this.  Drop the parameter name.  Update
 +	users.
 +	* g10/getkey.c (get_seckey_byname): Rename from this...
 +	(get_seckey_default): ... to this.  Drop the parameter name.  Drop the
 +	code which assumed that NAME is not NULL.
 +
 +	g10: Eliminate the redundant function get_keyblock_byfprint.
 +	* g10/keydb.h (get_keyblock_byfprint): Remove prototype.  Replace use
 +	of this function with get_pubkey_byfprint.
 +	* g10/getkey.c (get_pubkey_byname): Remove function.
 +
 +	g10: Simplify semantics of get_pubkey_byname.
 +	* g10/getkey.c (get_pubkey_byname): If R_KEYBLOCK is not NULL, return
 +	the keyblock in R_KEYBLOCK independent of whether PK is set or not.
 +
 +	g10: Eliminate the redundant function get_pubkey_byname.
 +	* g10/getkey.c (get_pubkey_byname): Remove function.
 +	(lookup): Replace use of get_pubkey_byname by get_pubkey_byfprint.
 +
 +	g10: Eliminate the redundant function get_pubkey_end.
 +	* g10/keydb.h (get_pubkey_end): Remove declaration.  Replace use of
 +	function with getkey_end.
 +	* g10/getkey.c (get_pubkey_byname): Remove function.
 +
 +	g10: Eliminate the redundant function get_pubkey_next.
 +	* g10/keydb.h (get_pubkey_next): Remove prototype.
 +	* g10/getkey.c (get_pubkey_next): Remove function.
 +	* g10/keylist.c (locate_one): Use getkey_next instead of
 +	get_pubkey_next.
 +
 +	kbx: Change skipfnc's prototype so that we can provide all information.
 +	* kbx/keybox-search-desc.h (struct keydb_search_desc.skipfnc): Change
 +	third parameter to be the index of the user id packet in the keyblock
 +	rather than the packet itself.  Update users.
 +
 +	g10: Remove unused prototype (get_pubkey_byfpr).
 +	* g10/keydb.h (get_pubkey_byfpr): Remove unused prototype.
 +
 +	g10: Remove unused function (get_pubkey_bynames).
 +	* g10/keydb.h (get_pubkey_bynames): Remove prototype.
 +	* g10/getkey.c (get_pubkey_bynames): Remove function.
 +
 +	g10: Simplify code.  Turn struct getkey_ctx_s.found_key into an argument
 +	* g10/getkey.c (struct getkey_ctx_s): Remove field found_key.
 +	(lookup): Add argument ret_found_key.  If not NULL, set it to the
 +	found key.  Update callers.
 +	(pk_from_block): Add argument found_key.  Use it instead of
 +	CTX->FOUND_KEY.  Update callers.
 +	(finish_lookup): Return a KBNODE (the found key) instead of an int.
 +	Don't set CTX->FOUND_KEY.  Return the found key instead.
 +
 +	g10: Remove unused field struct getkey_ctx_s.kbpos.
 +	* g10/getkey.c (struct getkey_ctx_s): Remove field kbpos.
 +	(getkey_end): Don't clear CTX->KBPOS.
 +
 +	g10: Simplify code: remove field struct getkey_ctx_s.keyblock.
 +	* g10/getkey.c (struct getkey_ctx_s): Remove field keyblock.
 +	(finish_lookup): Add parameter keyblock.  Update caller to pass this.
 +	(lookup): Add new local variable keyblock.  Use this instead of
 +	ctx->keyblock for referencing the keyblock.
 +
 +2015-09-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix registering SSH Key of Ed25519.
 +	* agent/command-ssh.c (stream_read_string): Add the prefix of 0x40.
 +
 +2015-09-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +2015-09-10  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.8.
 +
 +	tests: Silence the 5gb-packet test.
 +	* tests/openpgp/4gb-packet.test: Send output to /dev/null.
 +
 +	g10: Fix make distcheck problem.
 +	* g10/test.c: Include string.h.
 +	(prepend_srcdir): New.  Taken from Libgcrypt.
 +	(test_free): New.
 +	* g10/t-keydb.c (do_test): Malloc the filename.
 +	* g10/Makefile.am (AM_CPPFLAGS): Remove -DSOURCE_DIR
 +	(EXTRA_DIST): Add t-keydb-keyring.kbx.
 +
 +	g10: Improve portability of the new test driver.
 +	* g10/test.c: Include stdio.h and stdlib.h.
 +	(verbose): New.
 +	(print_results): Rename to exit_tests.
 +	(main): Remove atexit and call exit_tests.  Set verbose.
 +	(ASSERT, ABORT): Call exit_tests instead of exit.
 +
 +2015-09-09  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Allow sending much larger keyblocks.
 +	* dirmngr/server.c (MAX_CERT_LENGTH): Increase to 16k.
 +	(MAX_KEYBLOCK_LENGTH): Increase to 20M.
 +
 +2015-09-07  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Force key attribute change for writekey.
 +	* scd/app-openpgp.c (change_rsa_keyattr): New.
 +	(change_keyattr_from_string): Use change_rsa_keyattr.
 +	(rsa_writekey): Call change_rsa_keyattr when different size.
 +	(ecc_writekey): Try to change key attribute.
 +
 +	scd: KEYNO cleanup.
 +	* scd/app-openpgp.c (get_public_key, send_keypair_info, do_readkey)
 +	(change_keyattr, change_keyattr_from_string, ecc_writekey, do_genkey)
 +	(compare_fingerprint, check_against_given_fingerprint): KEYNO starts
 +	from 0.
 +
 +2015-09-02  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Remove unused field req_algo.
 +	* g10/packet.h (PKT_public_key): Remove unused field req_algo.  Remove
 +	users.
 +	* g10/getkey.c (struct getkey_ctx_s): Remove unused field req_algo.
 +	Remove users.
 +
 +	g10: Use a symbolic constant instead of a literal.
 +	* g10/trustdb.c (KEY_HASH_TABLE_SIZE): Define.
 +	(new_key_hash_table): Use KEY_HASH_TABLE_SIZE instead of a literal.
 +	(release_key_hash_table): Likewise.
 +	(test_key_hash_table): Likewise.
 +	(add_key_hash_table): Likewise.
 +
 +	g10: Add test for keydb as well as new testing infrastructure.
 +	* g10/Makefile.am (EXTRA_DIST): Add test.c.
 +	(AM_CPPFLAGS): Add -DSOURCE_DIR="\"$(srcdir)\"".
 +	(module_tests): Add t-keydb.
 +	(t_keydb_SOURCES): New variable.
 +	(t_keydb_LDADD): Likewise.
 +	* g10/t-keydb.c: New file.
 +	* g10/t-keydb-keyring.kbx: New file.
 +	* g10/test-stubs.c: New file.
 +	* g10/test.c: New file.
 +
 +	g10: Make the keyblock cache per-handle rather than global.
 +	* g10/keydb.c (keyblock_cache): Don't declare this variable.  Instead...
 +	(struct keyblock_cache): ... turn its type into this first class
 +	object...
 +	(struct keydb_handle): ... and instantiate it once per database
 +	handle.  Update all users.
 +	(keydb_rebuild_caches): Don't invalidate the keyblock cache.
 +
 +	g10: If iobuf_seek fails when reading from the cache, do a hard read.
 +	* g10/keydb.c (keydb_get_keyblock): If the iobuf_seek fails when
 +	reading from the cache, then simply clear the cache and try reading
 +	from the database.
 +
 +	iobuf: Reduce verbosity of test.
 +	* common/t-iobuf.c (main): Reduce verbosity.
 +
 +	iobuf: Add the IOBUF_INPUT_TEMP type to improve input temp handling.
 +	* common/iobuf.h (enum iobuf_use): Add new member, IOBUF_INPUT_TEMP.
 +	* common/iobuf.c (iobuf_temp_with_content): Create the iobuf as an
 +	IOBUF_INPUT_TEMP, not an IOBUF_INPUT buffer.  Assert that LENGTH ==
 +	A->D.SIZE.
 +	(iobuf_push_filter2): If A is an IOBUF_INPUT_TEMP, then make the new
 +	filter an IOBUF_INPUT filter and set its buffer size to
 +	IOBUF_BUFFER_SIZE.
 +	(underflow): If A is an IOBUF_INPUT_TEMP, then just return EOF; don't
 +	remove already read data.
 +	(iobuf_seek): If A is an IOBUF_INPUT_TEMP, don't discard the buffered
 +	data.
 +	(iobuf_alloc): Allow USE == IOBUF_INPUT_TEMP.
 +	(pop_filter): Allow USE == IOBUF_INPUT_TEMP.
 +	(iobuf_peek): Allow USE == IOBUF_INPUT_TEMP.
 +	(iobuf_writebyte): Fail if USE == IOBUF_INPUT_TEMP.
 +	(iobuf_write): Fail if USE == IOBUF_INPUT_TEMP.
 +	(iobuf_writestr): Fail if USE == IOBUF_INPUT_TEMP.
 +	(iobuf_flush_temp): Fail if USE == IOBUF_INPUT_TEMP.
 +
 +	iobuf: Rename IOBUF_TEMP to IOBUF_OUTPUT_TEMP.
 +	* common/iobuf.h (enum iobuf_use): Rename IOBUF_TEMP to
 +	IOBUF_OUTPUT_TEMP.  Update users.
 +
 +	iobuf: Use a first-class enum.
 +	* common/iobuf.h (enum iobuf_use): Name the IOBUF_OUTPUT, etc. enum.
 +	(struct iobuf_struct): Change the field use's type to it.
 +
 +	iobuf: Fix test.
 +	* common/t-iobuf.c (content_filter): If there is nothing to read,
 +	don't forget to set *LEN to 0.
 +	(main): Fix checks.
 +
 +2015-09-01  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Protect commit 135b1e3 against misbehaving Libgcrypt.
 +	* agent/command-ssh.c (ssh_key_to_blob): Check DATALEN.
 +
 +	gpg: Remove option --no-sig-create-check.
 +	* g10/gpg.c (opts): Remove --no-sig-create-check.
 +	* g10/options.h (struct opt): Remove field no_sig_create_check.
 +	* g10/sign.c (do_sign): Always check unless it is RSA and we are using
 +	Libgcrypt 1.7.
 +
 +	common: Assume an utf-8 locale on iconv errors.
 +	* common/utf8conv.c (handle_iconv_error): Use utf-8 as fallback.
 +
 +	common: Fix regression in building argpase.c standalone.
 +	* common/argparse.c (is_native_utf8) [GNUPG_MAJOR_VERSION]: New.
 +
 +2015-08-31  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Don't leak memory if we fail to initialize a new database handle.
 +	* g10/keydb.c (keydb_new): If we fail to open a keyring or keybox
 +	correctly release all resources.
 +
 +	g10: Improve interface documentation of the keydb API.
 +	* g10/keydb.c: Improve code comments and documentation of internal
 +	interfaces.  Improve documentation of public APIs and move that to...
 +	* g10/keydb.h: ... this file.
 +
 +	g10: Don't cache search results if the search didn't scan the whole DB.
 +	* g10/keydb.c (struct keydb_handle): Add new field is_reset.
 +	(keydb_new): Initialize hd->is_reset to 1.
 +	(keydb_locate_writable): Set hd->is_reset to 1.
 +	(keydb_search): Set hd->is_reset to 0.  Don't cache a key not found if
 +	the search started from the beginning of the database.
 +
 +	g10: Have keydb_search_first call keydb_search_reset before searching.
 +	* g10/keydb.c (keydb_search_first): Reset the handle before starting
 +	the search.
 +
 +	g10: Remove unused parameter.
 +	* g10/keydb.h (keydb_locate_writable): Remove unused parameter
 +	reserved.  Update users.
 +
 +2015-08-31  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix SSH public key for EdDSA.
 +	* agent/command-ssh.c (ssh_key_to_blob): Remove the prefix 0x40.
 +
 +2015-08-26  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10: Simplify cache.  Only include data that is actually used.
 +	* g10/keydb.c (struct kid_list_s): Rename from this...
 +	(struct kid_not_found_cache_bucket): ... to this.  Update users.
 +	Remove field state.
 +	(kid_list_t): Remove type.
 +	(KID_NOT_FOUND_CACHE_BUCKETS): Define.  Use this instead of a literal.
 +	(kid_found_table): Rename from this...
 +	(kid_not_found_cache_bucket): ... to this.  Update users.
 +	(kid_found_table_count): Rename from this...
 +	(kid_not_found_cache_count): ... to this.  Update users.
 +	(kid_not_found_p): Only return whether a key with the specified key id
 +	is definitely not in the database.
 +	(kid_not_found_insert): Remove parameter found.  Update callers.
 +	(keydb_search): Only insert a key id in the not found cache if it is
 +	not found.  Rename local variable once_found to already_in_cache.
 +
 +2015-08-25  Werner Koch  <wk at gnupg.org>
 +
 +	Add configure option --enable-build-timestamp.
 +	* configure.ac (BUILD_TIMESTAMP): Set to "<none>" by default.
 +
 +	gpg: Emit ERROR status for key signing failures.
 +	* g10/keyedit.c (sign_uids): Write an ERROR status for a signing
 +	failure.
 +	(menu_adduid, menu_addrevoker, menu_revsig): Ditto.
 +	(menu_revuid, menu_revkey, menu_revsubkey): Ditto.
 +
 +	gpg: Print a new FAILURE status after most commands.
 +	* common/status.h (STATUS_FAILURE): New.
 +	* g10/cpr.c (write_status_failure): New.
 +	* g10/gpg.c (main): Call write_status_failure for all commands which
 +	print an error message here.
 +	* g10/call-agent.c (start_agent): Print an STATUS_ERROR if we can't
 +	set the pinentry mode.
 +
 +2015-08-24  Neal H. Walfield  <neal at g10code.com>
 +
 +	agent: Raise the maximum password length.  Don't hard code it.
 +	* agent/agent.h (MAX_PASSPHRASE_LEN): Define.
 +	* agent/command-ssh.c (ssh_identity_register): Use it instead of a
 +	hard-coded literal.
 +	* agent/cvt-openpgp.c (convert_from_openpgp_main): Likewise.
 +	* agent/findkey.c (unprotect): Likewise.
 +	* agent/genkey.c (agent_ask_new_passphrase): Likewise.
 +
 +2015-08-24  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Support secret key export via the Assuan interface.
 +	* sm/server.c (cmd_export): Add options --secret, --raw, and --pkcs12.
 +
 +2015-08-23  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Allow sending of Zack's key.
 +	* dirmngr/server.c (MAX_KEYBLOCK_LENGTH): Increase to 1 MiB.
 +
 +	gpg: Fix regression in packet parser from Aug 19.
 +	* g10/parse-packet.c (parse): Use an int to compare to -1.  Use
 +	buf32_to_ulong.
 +
 +	gpg: Show not found keys with --locate-key --verbose.
 +	* g10/keylist.c (locate_one): Print a diagnostic for a not-found key.
 +
 +2015-08-21  Neal H. Walfield  <neal at g10code.com>
 +
 +	common: Don't incorrectly reject 4 GB - 1 sized packets.
 +	* g10/parse-packet.c (parse): Don't reject 4 GB - 1 sized packets.
 +	Add the constraint that the type must be 63.
 +	* kbx/keybox-openpgp.c (next_packet): Likewise.
 +	* tests/openpgp/4gb-packet.asc: New file.
 +	* tests/openpgp/4gb-packet.test: New file.
 +	* tests/openpgp/Makefile.am (TESTS): Add 4gb-packet.test.
 +	(TEST_FILES): Add 4gb-packet.asc.
 +
 +	common: Don't assume on-disk layout matches in-memory layout.
 +	* g10/packet.h (PKT_signature): Change revkey's type from a struct
 +	revocation_key ** to a struct revocation_key *.  Update users.
 +
 +	common: Don't incorrectly copy packets with partial lengths.
 +	* g10/parse-packet.c (parse): We don't handle copying packets with a
 +	partial body length to an output stream.  If this occurs, log an error
 +	and abort.
 +
 +	common: Check parameters more rigorously.
 +	* g10/parse-packet.c (dbg_copy_all_packets): Check that OUT is not
 +	NULL.
 +	(copy_all_packets): Likewise.
 +
 +	common: Don't continuing processing on error.
 +	* g10/parse-packet.c (dbg_parse_packet): Also return if parse returns
 +	an error.
 +	(parse_packet): Likewise.
 +	(dbg_search_packet): Likewise.
 +	(search_packet): Likewise.
 +
 +	common: Better respect the packet's length when reading it.
 +	* g10/parse-packet.c (parse_signature): Make sure PKTLEN doesn't
 +	underflow.  Be more careful that a read doesn't read more data than
 +	PKTLEN says is available.
 +
 +2015-08-20  Werner Koch  <wk at gnupg.org>
 +
 +	po: Add lost translation of validity strings.
 +	* po/POTFILES.in (trust.c): Add missing file.
 +	* po/de.po: Changed German validity strings.
 +	* doc/help.de.txt: Ditto.
 +
 +2015-08-20  Neal H. Walfield  <neal at g10code.com>
 +
 +	g10/parse-packet.c:parse: Try harder to not ignore an EOF.
 +	* g10/parse-packet.c (parse): Be more robust: make sure to process any
 +	EOF.
 +
 +	g10/parse-packet.c: Replace literal with symbolic expression.
 +	* g10/parse-packet.c (dump_hex_line): Use sizeof rather than the
 +	buffer's size.
 +
 +	Add documentation for g10/parse-packet.c.
 +	* g10/packet.h: Add documentation for functions defined in
 +	parse-packet.c.
 +	* g10/parse-packet.c: Improve comments for many functions.
 +
 +	g10/packet.h: Remove unused argument from enum_sig_subpkt.
 +	* g10/packet.h (enum_sig_subpkt): Remove argument RET_N.  Update
 +	callers.
 +	* g10/parse-packet.c (enum_sig_subpkt): Remove argument RET_N.
 +
 +	g10/parse-packet.c:mpi_read: Detect EOF and correct boundary conditions.
 +	* g10/parse-packet.c (mpi_read): Improve documentation.  Correctly
 +	handle an EOF.  On overflow, correctly return the number of bytes read
 +	from the pipeline.
 +
 +	common/iobuf.c: Make control flow more obvious.
 +	* common/iobuf.c (iobuf_read): Make control flow more obvious.
 +	(iobuf_get_filelength): Likewise.
 +	(iobuf_get_fd): Likewise.
 +	(iobuf_seek): Likewise.
 +
 +	common/iobuf.c: Add some sanity checks to catch programmer bugs.
 +	* common/iobuf.c (iobuf_alloc): Check that BUFSIZE is not 0.
 +	(iobuf_readbyte): Check that A is an input filter.  Check that the
 +	amount of read data is at most the amount of buffered data.
 +	(iobuf_read): Check that A is an input filter.
 +	(iobuf_writebyte): Check that A is not an input filter.
 +	(iobuf_writestr): Check that A is not an input filter.
 +	(iobuf_flush_temp): Check that A is not an input filter.
 +
 +	common/iobuf.c:iobuf_write_temp: Elide redundant code.
 +	* common/iobuf.c (iobuf_write_temp): Don't repeat iobuf_flush_temp.
 +	Use it directly.
 +
 +	common/iobuf.c: Have iobuf_writestr use iobuf_write, not iobuf_writebyte
 +	* common/iobuf.c (iobuf_write): Don't write a byte at a time.  Use
 +	iobuf_write.
 +
 +	common/iobuf: Improve documentation and code comments.
 +	common/iobuf.h: Improve documentation and code comments.
 +	common/iobuf.c: Likewise.
 +
 +	common/iobuf.c: Adjust buffer size of filters in front of temp filters.
 +	* common/iobuf.c (iobuf_push_filter2): If the head filter is a temp
 +	filter, use IOBUF_BUFFER_SIZE for the new filter.
 +
 +	common/iobuf.c: Buffered data should not be processed by new filters.
 +	* common/iobuf.c (iobuf_push_filter2): If the pipeline is an output or
 +	temp pipeline, the new filter shouldn't assume ownership of the old
 +	head's internal buffer: the data was written before the filter was
 +	added.
 +	* common/t-iobuf.c (double_filter): New function.
 +	(main): Add test cases for the above bug.
 +
 +	common/iobuf.c: Flush the pipeline in iobuf_temp_to_buffer.
 +	* common/iobuf.c (iobuf_temp_to_buffer): Flush each filter in the
 +	pipeline and copy the data from the last (not the first) filter's
 +	internal buffer.
 +
 +	common/iobuf.c: Combine iobuf_open, iobuf_create and iobuf_openrw.
 +	* common/iobuf.c (do_open): New function, which is a generalization of
 +	iobuf_open, iobuf_Create, iobuf_openrw.
 +	(iobuf_open): Call do_open.
 +	(iobuf_create): Likewise.
 +	(iobuf_openrw): Likewise.
 +
 +	common/iobuf.h: Remove iobuf_open_fd_or_name.
 +	* common/iobuf.h (iobuf_open_fd_or_name): Remove prototype.  Replace
 +	use with either iobuf_open or iobuf_fdopen_nc, as appropriate.
 +	* common/iobuf.c (iobuf_open): Remove function.
 +
 +	common/iobuf.c: Rename iobuf_flush and make it a static function.
 +	* common/iobuf.h (iobuf_flush): Remove prototype.
 +	* common/iobuf.c (filter_flush): New static prototype.
 +	(iobuf_flush): Rename...
 +	(filter_flush): ... to this.  Make static.  Simplify code.  Update
 +	callers.
 +
 +	common/iobuf.c: Don't abort freeing a pipeline if freeing a filter fails
 +	* common/iobuf.c (iobuf_cancel): Don't abort freeing a pipeline if
 +	freeing a filter fails.  This needs to a memory leak.  Instead, keep
 +	freeing and return the error code of the first filter that fails.
 +
 +	common/iobuf.c: Improve iobuf_peek.
 +	* common/iobuf.c (underflow): Take additional parameter
 +	clear_pending_eof.  If not set, don't clear a pending eof when
 +	returning EOF.  Update callers.
 +	(iobuf_peek): Fill the internal buffer, if needed, to be able to
 +	better satisfy any request.
 +
 +	common/iobuf.c: When requested, fill the buffer even if it is not empty.
 +	* common/iobuf.c (underflow): Don't require that the buffer be empty.
 +	When called, fill any available space.
 +
 +	common/t-iobuf.c: Add a test case for multiple EOFs.
 +	common/t-iobuf.c (main): Add a test case for multiple EOFs in an INPUT
 +	pipeline.
 +
 +	common/iobuf.c: Better respect boundary conditions in iobuf_read_line.
 +	* common/iobuf.c (iobuf_read_line): Be more careful with boundary
 +	conditions.
 +	* common/iobuf.h: Include <gpg-error.h>.
 +	* common/t-iobuf.c: New file.
 +	* common/Makefile.am (module_tests): Add t-iobuf.
 +	(t_mbox_util_LDADD): New variable.
 +
 +	common/iobuf.c: Fix filter type for iobuf_temp_with_content.
 +	* common/iobuf.c (iobuf_temp_with_content): Set the filter type to
 +	IOBUF_INPUT, not IOBUF_TEMP, which is only for output filters that
 +	write into a dynamic buffer.
 +
 +	common/iobuf.h: Remove unimplemented prototypes.
 +	* common/iobuf.h (iobuf_unread): Remove unimplemented prototype.
 +	(iobuf_clear_eof): Likewise.
 +	(iobuf_append): Likewise.
 +
 +	common/iobuf.c: Refactor code to not need the desc field.
 +	* common/iobuf.h (struct iobuf_struct): Remove field desc.
 +	* common/iobuf.c (iobuf_desc): New function.  When a filter's
 +	description is needed, use this instead of the filter's desc field.
 +
 +	common/iobuf.h: Clarify semantics of nofast.  Simplify implementation.
 +	* common/iobuf.h (struct iobuf_struct): Clarify semantics of nofast.
 +	Simplify use of nofast to implement just these semantics.
 +
 +	common/iobuf.c: Remove dead code (directfp).
 +	* common/iobuf.h (struct iobuf_struct): Remove field directfp.  Remove
 +	all uses of it.
 +
 +	common/iobuf.c: Remove dead code (opaque).
 +	* common/iobuf.h (struct iobuf_struct): Remove field opaque.  Remove
 +	all uses of it.
 +
 +	common/iobuf.h: Replace further use of literals with symbolic constants.
 +	* common/iobuf.c: Move BLOCK_FILTER_INPUT,
 +	BLOCK_FILTER_OUTPUT_BLOCK_FILTER_TEMP from here...
 +	* common/iobuf.h: ... to here and rename to IOBUF_INPUT, IOBUF_OUTPUT
 +	and IOBUF_TEMP, respectively.  Where appropriate, use these macros
 +	instead of a literal.
 +
 +2015-08-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid linking to Libksba.
 +	* kbx/keybox.h (KEYBOX_WITH_X509): Do not define.
 +	* sm/Makefile.am (AM_CPPFLAGS): Define it here.
 +	(common_libs): Change to libkeybox509.a
 +	* g10/Makefile.am (AM_CFLAGS): remove KSBA_CFLAGS.
 +	(gpg2_LDADD, gpgv2_LDADD): Remove KSBA_LIBS
 +	* kbx/Makefile.am (noinst_LIBRARIES): Add libkeybox509.a.
 +	(libkeybox509_a_SOURCES): New.
 +	(libkeybox_a_CFLAGS): New.
 +	(libkeybox509_a_CFLAGS): New.
 +	(kbxutil_CFLAGS): New.
 +	* kbx/keybox-search.c (has_keygrip) [!KEYBOX_WITH_X509]: Declare args
 +	as unused.
 +
 +2015-08-16  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Fix pinentry loopback and passphrase contraints.
 +	* agent/command.c (cmd_get_passphrase): Don't repeat passphrase for
 +	pinentry loopback mode.
 +	* agent/genkey.c (check_passphrase_constraints): Immediately return when
 +	pinentry mode is loopback.
 +
 +	Fix sending INQUIRE_MAXLEN for symmetric data.
 +	* g10/passphrase.c (passphrase_to_dek_ext): Write the status message.
 +
 +2015-08-15  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Inform a user about inquire length limit.
 +	* common/status.h (INQUIRE_MAXLEN): New.
 +	* g10/call-agent.c (default_inquire_cb): Send STATUS_INQUIRE_MAXLEN.
 +	client when inquiring a passphrase over pinentry-loopback.
 +
 +	Allow --gen-key to inquire a passphrase.
 +	* g10/gpg.c (main): test for --command-fd during --gen-key parse.
 +
 +	When --command-fd is set then imply --batch to let gpg inquire a
 +	passphrase rather than requiring a pinentry.
 +
 +2015-08-11  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.7.
 +
 +2015-08-10  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: fix ECC key handling.
 +	* agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
 +	(convert_transfer_key): CURVE is the name of curve.
 +
 +2015-08-08  Neal H. Walfield  <neal at g10code.com>
 +
 +	common/iobuf.c: Replace use of literals with symbolic constants.
 +	* common/iobuf.c (BLOCK_FILTER_INPUT): Define.  Where appropriate, use
 +	this instead of a literal.
 +	(BLOCK_FILTER_OUTPUT): Likewise.
 +	(BLOCK_FILTER_TEMP): Likewise.
 +
 +2015-08-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Allow gpgv to work with a trustedkeys.kbx file.
 +	* g10/keydb.h (KEYDB_RESOURCE_FLAG_GPGVDEF): New.
 +	* g10/keydb.c (keydb_add_resource): Take care of new flag.
 +	* g10/gpgv.c (main): Use new flag.
 +
 +	agent: Add option --force to the DELETE_KEY command.
 +	* agent/findkey.c (agent_delete_key): Add arg "force".
 +	* agent/command.c (cmd_delete_key): Add option --force.
 +
 +	common: Change alias for Curve25519 to "cv25519".
 +	* common/openpgp-oid.c (oidtable): Change alias.
 +
 +2015-08-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove duplicated printing of the curve name in "sub" lines.
 +	* g10/keylist.c (list_keyblock_print): Do not print extra curve name.
 +
 +	gpg: Add commands "fpr *" and "grip" to --edit-key.
 +	* g10/keyedit.c (cmdGRIP): New.
 +	(cmds): Add command "grip".
 +	(keyedit_menu) <cmdFPR>: Print subkeys with argument "*".
 +	(keyedit_menu) <cmdGRIP>: Print keygrip.
 +	(show_key_and_fingerprint): Add arg "with_subkeys".
 +	(show_key_and_grip): New.
 +	* g10/keylist.c (print_fingerprint): Add mode 4.
 +
 +	gpg: Adjust UID line indentation for common key algos.
 +	* g10/keylist.c (list_keyblock_print): Change UID line indentation
 +	* g10/mainproc.c (list_node): Ditto.
 +
 +2015-08-06  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Curve25519 support.
 +	* agent/cvt-openpgp.c (get_keygrip): Handle Curve25519.
 +	(convert_secret_key, convert_transfer_key): Ditto.
 +	* common/openpgp-oid.c (oidtable): Add Curve25519.
 +	(oid_crv25519, openpgp_oid_is_crv25519): New.
 +	* common/util.h (openpgp_oid_is_crv25519): New.
 +	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Handle the case
 +	with Montgomery curve which uses x-only coordinate.
 +	* g10/keygen.c (gen_ecc): Handle Curve25519.
 +	(ask_curve): Change the API and second arg is to return subkey algo.
 +	(generate_keypair, generate_subkeypair): Follow chage of ask_curve.
 +	* g10/keyid.c (keygrip_from_pk): Handle Curve25519.
 +	* g10/pkglue.c (pk_encrypt): Handle Curve25519.
 +	* g10/pubkey-enc.c (get_it): Handle the case with Montgomery curve.
 +	* scd/app-openpgp.c (ECC_FLAG_DJB_TWEAK): New.
 +	(send_key_attr): Work with general ECC, Ed25519, and Curve25519.
 +	(get_public_key): Likewise.
 +	(ecc_writekey): Handle flag_djb_tweak.
 +
 +	common: extend API of openpgp_oid_to_curve for canonical name.
 +	* common/openpgp-oid.c (openpgp_oid_to_curve): Add CANON argument.
 +	* common/util.h: Update.
 +	* g10/import.c (transfer_secret_keys): Follow the change.
 +	* g10/keyid.c (pubkey_string): Likewise.
 +	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Likewise.
 +	* parse-packet.c (parse_key): Likewise.
 +	* scd/app-openpgp.c (send_key_attr, get_public_key): Likewise.
 +
 +2015-08-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix ecc_oid.
 +	* scd/app-openpgp.c (ecc_oid): Call with OIDBUF.
 +
 +	scd: Fix ECC support.
 +	* scd/app-openpgp.c (send_key_attr): Send KEYNO.
 +	(get_public_key): Fix SEXP composing.
 +	(ecc_writekey): Fix OID length calculation.
 +	(ecc_oid): Prepend the length before query.
 +	(parse_algorithm_attribute): Handle the case the curve is not available.
 +
 +2015-08-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix duplicate key import due to legacy key in keyring.
 +	* g10/keydb.c (keydb_search_fpr): Skip legacy keys.
 +
 +	gpg: Properly handle legacy keys while looking for a secret key.
 +	* g10/getkey.c (have_secret_key_with_kid): Skip legacy keys.
 +
 +2015-07-31  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix endless loop for expired keys given by fpr.
 +	* g10/getkey.c (lookup): Disable keydb caching when continuing a
 +	search.
 +
 +2015-07-29  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Do not return "Legacy Key" from lookup if a key is expired.
 +	* g10/getkey.c (lookup): Map GPG_ERR_LEGACY_KEY.
 +
 +	gpg: Indicate secret keys and cards in a key-edit listing.
 +	* g10/keyedit.c (sign_uids): Add arg "ctrl".
 +	(show_key_with_all_names_colon): Ditto.
 +	(show_key_with_all_names): Ditto.
 +
 +	* g10/keyedit.c (show_key_with_all_names): Print key record
 +	indicators by checking with gpg-agent.
 +	(show_key_with_all_names): Ditto.  May now also print sec/sbb.
 +
 +2015-07-28  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove the edit-key toggle command.
 +	* g10/keyedit.c (cmds): Remove helptext from "toggle".
 +	(keyedit_menu): Remove "toggle" var and remove the sub/pub check
 +	against toggle.
 +
 +	common,w32: Avoid unused var warning about msgcache.
 +	* common/i18n.c (USE_MSGCACHE): New.
 +	(msgcache) [!USE_MSGCACHE]: Do not define.
 +	(i18n_localegettext): Repalce #if conditions by USE_MSGCACHE.
 +
 +	w32: Try more places to find an installed Pinentry.
 +	* common/homedir.c (get_default_pinentry_name): Re-implement to
 +	support several choices for Windows.
 +
 +2015-07-26  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Fix size_t/unsigned int mismatch.
 +	* scd/app-openpgp.c (ecc_writekey): Use extra var n.
 +
 +	Replace GNUPG_GCC_A_ macros by GPGRT_ATTR_ macros.
 +	* common/util.h: Provide replacement for GPGRT_ATTR_ macros when using
 +	libgpg-error < 1.20.
 +	* common/mischelp.h: Ditto.
 +	* common/types.h: Ditto.
 +
 +2015-07-25  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: support any curves defined by libgcrypt.
 +	* g10/call-agent.h (struct agent_card_info_s): Add curve field.
 +	* g10/call-agent.c (learn_status_cb): Use curve name.
 +	* g10/card-util.c (card_status): Show pubkey name.
 +	* scd/app-openpgp.c (struct app_local_s): Record OID and flags.
 +	(store_fpr): Use ALGO instead of key type.
 +	(send_key_attr): Use curve name instead of OID.
 +	(get_public_key): Clean up by OID to curve name.
 +	(ecc_writekey): Support any curves in libgcrypt.
 +	(do_genkey, do_auth, ): Follow the change.
 +	(ecc_oid): New.
 +	(parse_algorithm_attribute): Show OID here.
 +
 +2015-07-23  Peter Wu  <peter at lekensteyn.nl>
 +
 +	build: ignore scissor line for the commit-msg hook.
 +	* build-aux/git-hooks/commit-msg: Stop processing more lines when the
 +	  scissor line is encountered.
 +
 +2015-07-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Format change to specify "rsa2048" for KEY-ATTR.
 +	* g10/card-util.c (do_change_keysize): Put "rsa".
 +	* scd/app-openpgp.c (change_keyattr, change_keyattr_from_string):
 +	Change the command format.
 +	(rsa_writekey): Check key type.
 +	(do_writekey): Remove "ecdh" and "ecdsa" support which was available
 +	in experimental libgcrypt before 1.6.0.
 +
 +2015-07-22  Werner Koch  <wk at gnupg.org>
 +
 +	Avoid a leading double slash in make_filename.
 +	* common/stringhelp.c (do_make_filename): Special case leading '/'.
 +
 +2015-07-21  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: change_keyattr_from_string for ECC.
 +	* scd/app-openpgp.c (change_keyattr, change_keyattr_from_string):
 +	Support ECC.
 +	(rsa_writekey): Don't change key attribute.
 +
 +2015-07-17  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Use openpgpdefs.h for constants.
 +	* scd/app-openpgp.c: Include openpgpdefs.h.
 +
 +2015-07-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	Don't segfault if the first 'auto-key-locate' option is 'clear'.
 +	* g10/getkey.c (free_akl): If AKL is NULL, just return.
 +
 +2015-07-10  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Support non-NLS build.
 +	* agent/agent.h: Use ENABLE_NLS and define L_() macro.
 +
 +2015-07-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Remove unused files.
 +	* scd/Makefile.am (sc_copykeys_*): Remove.
 +	* scd/sc-copykeys.c: Remove.
 +	* scd/pcsc-wrapper.c: Remove.
 +	* scd/{card-common.h,card-dinsig.c,card-p15.c,card.c}: Remove.
 +
 +2015-07-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Use canonical name for curve.
 +	* g10/import.c (transfer_secret_keys): Use canonical name.
 +	* common/openpgp-oid.c (openpgp_curve_to_oid): Return NULL on error.
 +	* g10/keyid.c (pubkey_string): Follow change of openpgp_curve_to_oid.
 +	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
 +	* g10/parse-packet.c (parse_key): Ditto.
 +
 +2015-07-03  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	drop long-deprecated gpgsm-gencert.sh.
 +	 * tools/gpgsm-gencert.sh: remove deprecated script entirely.  It is
 +	   fully replaced by gpgsm --gen-key
 +	 * doc/tools.texi: remove gpgsm-gencert.sh documentation
 +	 * .gitignore: no longer ignore gpgsm-gencert.sh manpage
 +	 * doc/Makefile.am: quit making the manpage
 +	 * tools/Makefile.am: quit distributing the script
 +	 * doc/howto-create-a-server-cert.texi: overhaul documentation to use
 +	   gpgsm --gen-key and tweak explanations
 +
 +2015-07-02  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +	scd: Support AES decryption for OpenPGPcard v3.0.
 +	* scd/app-openpgp.c (do_decipher): Support AES decryption.
 +
 +2015-07-01  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.6.
 +
 +2015-07-01  Daiki Ueno  <ueno at gnu.org>
 +
 +	agent: Unset INSIDE_EMACS on gpg-agent startup.
 +	* agent/gpg-agent.c (main): Unset INSIDE_EMACS envvar.
 +
 +2015-07-01  Werner Koch  <wk at gnupg.org>
 +
 +	common: Implement i18n_localegettext.
 +	* common/i18n.c (msg_cache_s, msg_cache_head_s): New.
 +	(msgcache): New.
 +	(i18n_localegettext): Implement locale dependent lookup.
 +
 +2015-06-30  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	Pass DBUS_SESSION_BUS_ADDRESS for gnome3.
 +	* common/session-env.c (stdenvnames): Add DBUS_SESSION_BUS_ADDRESS.
 +
 +2015-06-30  Werner Koch  <wk at gnupg.org>
 +
 +	Flag the L_() function with attribute format_arg.
 +	* agent/agent.h (LunderscorePROTO): New.
 +	* common/util.h (GNUPG_GCC_ATTR_FORMAT_ARG): New.
 +	* common/i18n.h (GNUPG_GCC_ATTR_FORMAT_ARG): New. Use for
 +	i18n_localegettext.  Expand LunderscorePROTO.
 +	* agent/genkey.c (check_passphrase_constraints): Use xtryasprintf
 +	again to keep the old translations.
 +
 +	agent: Use different translation func for Pinentry strings.
 +	* po/Makevars (XGETTEXT_OPTIONS): Add keyword "L_".
 +	* common/i18n.c (i18n_localegettext): New stub.
 +	* common/i18n.h: Expand the LunderscoreIMPL macro.
 +	* agent/agent.h (L_): New.
 +	(LunderscoreIMPL): New.
 +	* agent/call-pinentry.c (setup_qualitybar): Add arg ctrl anc change
 +	caller.
 +	* agent/findkey.c (try_unprotect_cb): Add local var ctrl.
 +	* agent/genkey.c (check_passphrase_constraints): Replace xtryasprintf
 +	by xtrystrdup to avoid gcc warning.  Unfortinately this changes the
 +	string.
 +	(agent_ask_new_passphrase): Cleanup the use of initial_errtext.
 +
 +	gpg: Make show-sig-subpackets work again.
 +	* g10/gpg.c (parse_list_options): Fix offset for subpackets.
 +
 +2015-06-29  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Prepare for Libassuan with Cygwin support.
 +	* agent/gpg-agent.c (create_server_socket): Add arg "cygwin".  Call
 +	assuan_sock_set_flag if Assuan version is recent enough.
 +	(main): Create ssh server socket with Cygwin flag set.
 +
 +2015-06-29  Neal H. Walfield  <neal at gnu.org>
 +
 +	Show passphrase constraints errors as password prompt errors.
 +	* agent/agent.h (check_passphrase_constraints): Add parameter
 +	failed_constraint and remove parameter silent.  Update callers.
 +	* agent/genkey.c (check_passphrase_constraints): Add parameter
 +	failed_constraint and remove parameter silent.  If FAILED_CONSTRAINT
 +	is not NULL and OPT.ENFORCE_PASSPHRASE_CONSTRAINTS is FALSE, save the
 +	error text in *FAILED_CONSTRAINT and don't call take_this_one_anyway
 +	or take_this_one_anyway2.  If FAILED_CONSTRAINT is NULL, act as if
 +	SILENT was set.
 +	(agent_ask_new_passphrase): Change initial_errtext's type from a const
 +	char * to a char *.  Pass it to check_passphrase_constraints.  If it
 +	contains malloc's memory, free it.
 +
 +2015-06-29  Neal H. Walfield  <neal at g10code.com>
 +
 +	Improve documentation for default-cache-ttl and default-cache-ttl-ssh.
 +	* doc/gpg-agent.texi (Agent Options): Improve documentation for
 +	default-cache-ttl and default-cache-ttl-ssh.
 +
 +	Don't raise max-cache-ttl to default-cache-ttl.
 +	* agent/gpg-agent.c (finalize_rereadable_options): Don't raise
 +	max-cache-ttl to default-cache-ttl.  Likewise for max-cache-ttl-ssh
 +	and default-cache-ttl-ssh.
 +
 +	Improve the description of old packets with an indeterminate length.
 +	* g10/parse-packet.c (parse): Make the description more accurate when
 +	listing packets: old format packets don't support partial lengths,
 +	only indeterminate lengths (RFC 4880, Section 4.2).
 +
 +2015-06-29  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Add --verify to the PASSWD command.
 +	* agent/command.c (cmd_passwd): Add option --verify.
 +
 +	agent,w32: Do not create a useless socket with --enable-putty-support.
 +	* agent/agent.h (opt): Remove field ssh_support.
 +	* agent/gpg-agent.c (ssh_support): New.  Replace all opt.ssh_support
 +	by this.
 +	(main): Do not set ssh_support along with setting putty_support.
 +
 +	gpgsm: Add command option "offline".
 +	* sm/server.c (option_handler): Add "offline".
 +	(cmd_getinfo): Ditto.
 +	* sm/certchain.c (is_cert_still_valid):
 +	(do_validate_chain):
 +	* sm/gpgsm.c (gpgsm_init_default_ctrl): Default "offline" to the value
 +	of --disable-dirmngr.
 +	* sm/call-dirmngr.c (start_dirmngr_ext): Better also check for
 +	ctrl->offline.
 +
 +2015-06-26  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Support button flag and AES key data for OpenPGPcard v3.0.
 +	* scd/app-openpgp.c (do_getattr, show_caps, app_select_openpgp):
 +	Support button and symmetric decryption.
 +	(do_setattr): Support setting AESKEY.
 +
 +2015-06-25  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	sm: Fix cert storage for ephemeral certs.
 +	* sm/keydb.c (keydb_store_cert): Clear ephemeral flag for
 +	existing certs if store should not be ephemeral.
 +
 +2015-06-23  Werner Koch  <wk at gnupg.org>
 +
 +	Allow use of debug flag names for all tools.
 +	* g13/g13.c: Make use of debug_parse_flag.
 +	* scd/scdaemon.c: Ditto.
 +	* sm/gpgsm.c: Ditto
 +	* agent/gpg-agent.c: Ditto.  But do not terminate on "help"
 +	* dirmngr/dirmngr.c: Ditto.
 +
 +	common: Improve fucntion parse_debug_flag.
 +	* common/miscellaneous.c (parse_debug_flag): Add hack not to call
 +	exit.  Add "none" and "all" flags.
 +
 +2015-06-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: pinpad workaround for PC/SC implementations.
 +	* scd/adpu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Bigger buffer
 +	for TPDU card reader.
 +
 +2015-06-22  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Allow debug flag names for --debug.
 +	* g10/gpg.c (opts): Change arg for oDebug to a string.
 +	(debug_flags): New; factored out from set_debug.
 +	(set_debug): Remove "--debug-level help".  Use parse_debug_flag to
 +	print the used flags.
 +	(main): Use parse_debug_flag for oDebug.
 +
 +	common: Add function parse_debug_flag.
 +	* common/miscellaneous.c (parse_debug_flag): New.
 +	* common/util.h (struct debug_flags_s): New.
 +
 +	common: Add function strtokenize.
 +	* common/stringhelp.c: Include assert.h.
 +	(strtokenize): New.
 +	* common/t-stringhelp.c (test_strtokenize): New.
 +
 +	gpg: Fix regression due to recent commit 6500f33.
 +	* g10/keydb.c (kid_list_s): Keep a state in the table.
 +	(kid_not_found_table): Rename to kid_found_table.
 +	(n_kid_not_found_table): Rename to kid_found_table_count.
 +	(kid_not_found_p): Return found state.
 +	(kid_not_found_insert): Add arg found.
 +	(keydb_search): Store found state in the table.
 +
 +2015-06-22  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix Cherry ST-2000 support for pinpad input.
 +	* scd/apdu.c (pcsc_vendor_specific_init): Set pinmax to 15.
 +	* scd/ccid-driver.c (ccid_transceive_secure): Add zero for the
 +	template of APDU.
 +
 +2015-06-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print number of good signatures with --check-sigs.
 +	* g10/keylist.c (keylist_context): Add field good_sigs.
 +	(list_keyblock_print): Updated good_sigs.
 +	(print_signature_stats): Print number of good signatures and use
 +	log_info instead of tty_printf.
 +
 +	gpg: Improve speed of --check-sigs and --lish-sigs.
 +	* g10/keydb.c (kid_list_t): New.
 +	(kid_not_found_table, n_kid_not_found_table): New.
 +	(kid_not_found_p, kid_not_found_insert, kid_not_found_flush): New.
 +	(keydb_insert_keyblock): Flush the new cache.
 +	(keydb_delete_keyblock): Ditto.
 +	(keydb_update_keyblock): Ditto.
 +	(keydb_search): Use the new cache.
 +	(keydb_dump_stats): New.
 +	* g10/gpg.c (g10_exit): Dump keydb stats.
 +
 +2015-06-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add more log_clock calls to keydb.c.
 +	* g10/keydb.c (keydb_get_keyblock): Add log_clock calls.
 +
 +	gpg: Print available debug flags using "--debug-level help".
 +	* g10/gpg.c (set_debug): Add "help" option and use a table for the
 +	flags.
 +
 +	gpg: Fix export problem in case an old keyring has PGP-2 keys.
 +	* g10/export.c (do_export_stream): Skip legacy keys.
 +
 +2015-06-18  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix the cleanup zombies fix (685b782).
 +	* dirmngr/ldap-wrapper.c (ldap_wrapper_thread): Do not close the
 +	stdout reader after EOF from read_log_data.
 +	* dirmngr/crlcache.c (crl_cache_reload_crl): Close the reader before
 +	the next iteration.
 +
 +2015-06-17  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Print a warning for obsolete options.
 +	* g10/misc.c (obsolete_scdaemon_option): Move to
 +	* common/miscellaneous.c (obsolete_option): ... here.
 +	* agent/gpg-agent.c (main): Use obsolete_option for the 3 obsolete
 +	options.
 +
 +2015-06-16  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Cleanup zombies and fix hang on shutdown.
 +	* dirmngr/ldap-wrapper.c (ldap_wrapper_thread): Move nfds computation
 +	into the loop.  Check the queue also on timeout.  Close log_fd and
 +	reader context on EOF or error.
 +
 +	dirmngr: Avoid accessing uninitialized memory in log callback.
 +	* dirmngr/dirmngr.c (pid_suffix_callback): Clear int_and_ptr_u before
 +	use.
 +	(start_connection_thread): Ditto.
 +	(handle_connections): Ditto.
 +
 +2015-06-16  Neal H. Walfield  <neal at g10code.com>
 +
 +	Don't prompt for the password multiple times in pinentry loopback mode.
 +	* g10/gpg.c (main): If OPT.PINENTRY_MODE is PINENTRY_MODE_LOOPBACK,
 +	clear OPT.PASSPHRASE_REPEAT.
 +
 +2015-06-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese Translation.
 +
 +2015-06-15  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Add defs.inc to BUILT_SOURCES.
 +
 +2015-06-11  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.5.
 +
 +	agent: Fix --extra-socket on Windows.
 +	* agent/gpg-agent.c (start_connection_thread): Rename to ...
 +	(do_start_connection_thread): this.  Factor nonce checking out to ...
 +	(start_connection_thread_std): this,
 +	(start_connection_thread_extra): this,
 +	(start_connection_thread_browser): and this.
 +
 +	agent: Add experimental option --browser-socket.
 +	* agent/agent.h (opt): Add field "browser_socket".
 +	* agent/command.c (cmd_setkeydesc): Use a different message for
 +	restricted==2.
 +	* agent/gpg-agent.c (oBrowserSocket): New.
 +	(opts): Add --browser-socket.
 +	(socket_name_browser, redir_socket_name_browser): New.
 +	(socket_nonce_browser): New.
 +	(cleanup): Cleanup browser socket.
 +	(main): Implement option.
 +	(start_connection_thread_browser): New.
 +	(handle_connections): Add arg listen_fd_browser and use it.
 +
 +2015-06-10  Daiki Ueno  <ueno at gnu.org>
 +
 +	agent: Add option --allow-emacs-pinentry.
 +	* agent/agent.h (opt): Add field allow_emacs_pinentry.
 +	* agent/call-pinentry.c (start_pinentry): Act upon new var.
 +	* agent/gpg-agent.c (oAllowEmacsPinentry): New.
 +	(opts): Add option --allow-emacs-pinentry.
 +	(parse_rereadable_options): Set this option.
 +	* tools/gpgconf-comp.c (gc_options_gpg_agent): Add new option.
 +
 +2015-06-09  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Do not used fixed file names in the manuals.
 +	* doc/mkdefsinc.c: New.
 +	* doc/Makefile.am: Include cmacros.am.
 +	(EXTRA_DIST): Add mkdefsinc.c defsincdate.
 +	(BUILT_SOURCES): Add defsincdate
 +	(CLEANFILES): Add mkdefsinc and defs.inc.
 +	(mkdefsinc): New rule.
 +	(yat2m-stamp): Depend on defs.inc.
 +	($(myman_pages) gnupg.7): Ditto.
 +	(gnupg.texi): Remove rule to touch itself.
 +	(dist-hook): New.
 +	(defsincdate): New.
 +	(defs.inc): New.
 +	* doc/gnupg.texi: Remove inclusion of version.texi.  Include defs.inc.
 +	Also include defs.inc in all files used to build man files.  Change
 +	fixed directory names to those from defs.inc.
 +
 +	dirmngr: Avoid crash due to an empty crls.d/DIR.txt.
 +	* dirmngr/crlcache.c (check_dir_version): Avoid segv.
 +
 +2015-06-08  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Change the manual source to be only for GnuPG 2.1.
 +
 +	Convey envvar INSIDE_EMACS to the pinentry.
 +	* common/session-env.c (stdenvnames): Add it.
 +
 +	agent: Add command "getinfo std_env_names".
 +	* agent/command.c (cmd_getinfo): Add new sub-command.
 +
 +2015-06-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: do_decipher change for OpenPGPcard v3.0.
 +	* scd/app-openpgp.c (do_decipher): Add a header for ECDH.
 +
 +2015-06-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Replace -1 by GPG_ERR_NOT_FOUND in tdbio.c.
 +	* g10/tdbio.c (lookup_hashtable): Return GPG_ERR_NOT_FOUND.
 +	* g10/tdbdump.c (import_ownertrust): Test for GPG_ERR_NOT_FOUND.
 +	* g10/trustdb.c (read_trust_record): Ditto.
 +	(tdb_get_ownertrust, tdb_get_min_ownertrust): Ditto.
 +	(tdb_update_ownertrust, update_min_ownertrust): Ditto.
 +	(tdb_clear_ownertrusts, update_validity): Ditto.
 +	(tdb_cache_disabled_value): Ditto.
 +
 +	gpg: Cleanup error code path in case of a bad trustdb.
 +	* g10/tdbio.c (tdbio_read_record): Fix returning of the error.
 +
 +	gpg: Fix output in case of a corrupted trustdb.
 +	* g10/tdbdump.c (list_trustdb): Add arg FP and change callers to pass
 +	es_stdout.
 +	* g10/tdbio.c (upd_hashtable): On a corrupted trustdb call
 +	list_trustdb only in verbose > 1 mode and let it dump to stderr.
 +
 +2015-05-29  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix key template of ECC.
 +	* scd/app-openpgp.c (build_ecc_privkey_template): Use correct value.
 +
 +2015-05-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix a race condition initially creating trustdb.
 +	* g10/tdbio.c (take_write_lock, release_write_lock): New.
 +	(put_record_into_cache, tdbio_sync, tdbio_end_transaction): Use
 +	new lock functions.
 +	(tdbio_set_dbname): Fix the race.
 +	(open_db): Don't call dotlock_create.
 +
 +2015-05-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Remove g10/signal.c.
 +	* g10/signal.c: Remove.
 +	* g10/main.h: Remove old function API.
 +	* g10/tdbio.c: Use new API, even in the dead code.
 +
 +2015-05-20  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Cleanup caching code for command GET_PASSPHRASE.
 +	* agent/command.c (cmd_get_passphrase): Read from the user cache.
 +
 +2015-05-19  Neal H. Walfield  <neal at g10code.com>
 +
 +	agent: When the password cache is cleared, also clear the ext. cache.
 +	* agent/agent.h (agent_clear_passphrase): New declaration.
 +	* agent/call-pinentry.c (agent_clear_passphrase): New function.
 +	* agent/command.c (cmd_clear_passphrase): Call agent_clear_passphrase.
 +
 +	agent: Modify agent_clear_passphrase to support an ext. password cache.
 +	* agent/agent.h (agent_get_passphrase): Add arguments keyinfo and
 +	cache_mode.  Update callers.
 +	* agent/call-pinentry.c (agent_get_passphrase): Add arguments keyinfo
 +	and cache_mode.  If KEYINFO and CACHE_MODE describe a cachable key,
 +	then send SETKEYINFO to the pinentry.
 +
 +2015-05-19  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: detects public key encryption packet error properly.
 +	g10/mainproc.c (proc_pubkey_enc): Only allow relevant algorithms for
 +	encryption.
 +
 +2015-05-15  Werner Koch  <wk at gnupg.org>
 +
 +	build: Make --disable-gpgsm work.
 +	* Makefile.am: Always build kbx/
 +	* g10/Makefile.am (AM_CFLAGS): Include KSBA_CFLAGS.
 +
 +2015-05-12  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.4.
 +
 +	speedo: Add make option SELFCHECK=0 to build a new release.
 +	* build-aux/getswdb.sh: Add option --skip-selfcheck.
 +	* build-aux/speedo.mk: Add option SELFCHECK.
 +
 +2015-05-11  Werner Koch  <wk at gnupg.org>
 +
 +	common: Cope with AIX problem on number of open files.
 +	* common/exechelp-posix.c: Limit returned value for too hight values.
 +
 +	gpg-connect-agent: Fix quoting of internal percent+ function.
 +	* tools/gpg-connect-agent.c (get_var_ext) <percent, percent+): Also
 +	escape '+'.
 +
 +	agent: Add option --no-allow-external-cache.
 +	* agent/agent.h (opt): Add field allow_external_cache.
 +	* agent/call-pinentry.c (start_pinentry): Act upon new var.
 +	* agent/gpg-agent.c (oNoAllowExternalCache): New.
 +	(opts): Add option --no-allow-external-cache.
 +	(parse_rereadable_options): Set this option.
 +
 +	agent: Add strings for use by future Pinentry versions.
 +	* agent/call-pinentry.c (start_pinentry): Add more strings.
 +
 +	agent: Add option --debug-pinentry.
 +	* agent/gpg-agent.c (oDebugPinentry): New.
 +	(opts): Add --debug-pinentry.
 +	(parse_rereadable_options): Set that option.
 +	* agent/call-pinentry.c (start_pinentry): Pass option to
 +	assuan_set_flag.
 +
 +2015-05-08  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid cluttering stdout with trustdb info in verbose mode.
 +	* g10/trustdb.c (validate_keys): Call dump_key_array only in debug
 +	mode.
 +
 +	gpg: Fix wrong output in list mode.
 +	* g10/parse-packet.c (parse_gpg_control): Replace puts by es_fputs to
 +	LISTFP.
 +
 +	gpg: New command --quick-adduid.
 +	* g10/keygen.c (ask_user_id): Factor some code out to ...
 +	(uid_already_in_keyblock): new.
 +	(generate_user_id): Add arg UIDSTR.  Fix leaked P.
 +	* g10/keyedit.c (menu_adduid): Add new arg uidstring.  Adjust caller.
 +	(keyedit_quick_adduid): New.
 +	* g10/gpg.c (aQuickAddUid): New.
 +	(opts):  Add command --quick-adduid.
 +	(main): Implement that.
 +
 +	gpg: Add push/pop found state feature to keydb.
 +	* g10/keydb.c (keydb_handle): Add field saved_found.
 +	(keydb_new): Init new field.
 +	(keydb_push_found_state, keydb_pop_found_state): New.
 +	* g10/keyring.c (kyring_handle): Add field saved_found.
 +	(keyring_push_found_state, keyring_pop_found_state): New.
 +
 +	gpg: Minor code merging in keyedit.
 +	* g10/keyedit.c (fix_keyblock): Rename to fix_key_signature_order.
 +	(fix_keyblock): New.  Call fix_key_signature_order and other fix
 +	functions.
 +	(keyedit_menu): Factor code out to new fix_keyblock.
 +	(keyedit_quick_sign): Ditto.  Check for primary fpr before calling
 +	fix_keyblock.
 +
 +2015-05-07  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Minor change for 56b5c9f.
 +	* agent/call-pinentry.c (agent_askpin): Move option setting to ...
 +	(start_pinentry): here.  Fix error code check.
 +
 +2015-05-07  Kristian Fiskerstrand  <kf at sumptuouscapital.com>
 +
 +	dirmngr: Fix segfault in ldap engine.
 +	(ks-engine-ldap.c) Fix segfault caused by missing check whether uri is
 +	initialized
 +
 +2015-05-07  Neal H. Walfield  <neal at g10code.com>
 +
 +	agent: Improve support for externally cached passwords.
 +	* agent/call-pinentry.c (PINENTRY_STATUS_PASSWORD_FROM_CACHE): New
 +	constant.
 +	(pinentry_status_cb): Add it to *FLAGS if PASSWORD_FROM_CACHE was
 +	provided.
 +	(agent_askpin): Pass "OPTION allow-external-password-cache" to the
 +	pinentry.  Always pass SETKEYINFO to the pinentry.  If there is no
 +	stable identifier, then use "--clear".  If the password is incorrect
 +	and PINENTRY_STATUS_PASSWORD_FROM_CACHE is set in *PINENTRY_STATUS,
 +	then decrement PININFO->FAILED_TRIES.
 +
 +	agent: Or in the value; don't overwrite the variable.
 +	* agent/call-pinentry.c (pinentry_status_cb): Or in
 +	PINENTRY_STATUS_CLOSE_BUTTON; don't overwrite *FLAG.
 +
 +	agent: Avoid magic numbers.  Use more accurate names.
 +	* agent/call-pinentry.c (PINENTRY_STATUS_CLOSE_BUTTON): New constant.
 +	(PINENTRY_STATUS_PIN_REPEATED): Likewise.
 +	(close_button_status_cb): Rename from this...
 +	(pinentry_status_cb): ... to this.  Use the constants.
 +	(agent_askpin): Rename local variable from close_button to
 +	pinentry_status.  Use symbolic constants rather than magic numbers.
 +
 +2015-05-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve 'General key info' line of --card-status.
 +	* g10/keylist.c (print_pubkey_info): Print either "pub" or "sub".
 +
 +	* g10/getkey.c (get_pubkey_byfprint): Add optional arg R_KEYBLOCK.
 +	* g10/keyid.c (keyid_from_fingerprint): Adjust for change.
 +	* g10/revoke.c (gen_desig_revoke): Adjust for change.
 +	* g10/card-util.c (card_status): Simplify by using new arg.  Align
 +	card-no string.
 +
 +	* g10/card-util.c (card_status): Remove not used GnuPG-1 code.
 +
 +	gpg: Fix regression not displaying the card serial number.
 +	* g10/call-agent.c (keyinfo_status_cb): Detect KEYINFO.
 +
 +2015-05-06  Werner Koch  <wk at gnupg.org>
 +
 +	speedo,w32: Install a native pinentry.
 +	* build-aux/speedo.mk: Always build pinentry for w32.
 +	(speedo_pkg_pinentry_configure): Adjust to modern pinentry.
 +	* build-aux/speedo/w32/inst.nsi: Install native pinentry under the
 +	name pinentry-basic.exe.
 +
 +2015-05-01  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: fix cmp_public_key.
 +	* g10/free-packet.c (cmp_public_keys): Compare opaque
 +	data at the first entry of the array when it's unknown algo.
 +
 +2015-04-30  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: PC/SC reader selection by partial string match.
 +	* scd/apdu.c (open_pcsc_reader_direct): Partial string match.
 +
 +2015-04-24  Werner Koch  <wk at gnupg.org>
 +
 +	common: Remove JNLIB from boiler plate (jnlib merge).
 +	* common/README.jnlib: Remove.
 +
 +	common: Rename log and gcc attribute macros (jnlib merge).
 +	* common/logging.h: Rename JNLIB_LOG_* to GPGRT_LOG_*.
 +	* common/mischelp.h: Rename JNLIB_GCC_* to GPGRT_GCC_*.
 +
 +	common: Remove two JNLIB_ macros (jnlib merge).
 +	* configure.ac: Merge seperate jnlib checks.
 +	(HAVE_JNLIB_LOGGING): Remove.
 +	* common/logging.c, common/simple-pwquery.c (JNLIB_NEED_AFLOCAL):
 +	Rename to GNUPG_COMMON_NEED_AFLOCAL.  Change all tests.
 +
 +	common: Remove libjnlib-config.h (jnlib merge).
 +	* common/libjnlib-config.h: Remove.
 +	* common/common-defs.h (getenv) [HAVE_GETENV]: New.  From removed
 +	header.
 +	(getpid) [HAVE_W32CE_SYSTEM]: New.  From removed header.
 +	* common/argparse.c: Include util.h and common-defs.h.  Replace
 +	jnlib_ macro names for non-GNUPG builds by x* names.
 +	* common/dotlock.c: Ditto.
 +	* common/logging.c: Include util.h and common-defs.h.  Replace jnlib_
 +	symbol names by x* names.
 +	* common/strlist.c: Ditto.
 +	* common/utf8conv.c: Ditto.
 +	* common/w32-reg.c: Ditto.
 +	* common/mischelp.c: Ditto.  Also remove _jnlib_free.
 +	* common/stringhelp.c: Ditto.
 +	(JNLIB_LOG_WITH_PREFIX): Do not depend on this macro.
 +	* common/logging.h (JNLIB_LOG_WITH_PREFIX): Do not depend on this
 +	macro.
 +
 +2015-04-23  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Move all DNS access to Dirmngr.
 +	* common/dns-cert.h: Move to ../dirmngr/.
 +	* common/dns-cert.c: Move to ../dirmngr/.  Change args to return the
 +	key as a buffer.
 +	* common/t-dns-cert.c: Move to ../dirmngr/.
 +	* common/pka.c, common/pka.h, common/t-pka.c: Remove.
 +
 +	* dirmngr/server.c (data_line_cookie_write): Factor code out to
 +	data_line_write and make it a wrapper for that.
 +	(data_line_write): New.
 +	(cmd_dns_cert): New.
 +	(register_commands): Register new command.
 +
 +	* g10/Makefile.am (LDADD): Remove DNSLIBS.
 +	* g10/call-dirmngr.c (dns_cert_parm_s): New.
 +	(dns_cert_data_cb, dns_cert_status_cb): New.
 +	(gpg_dirmngr_dns_cert): New.
 +	(gpg_dirmngr_get_pka): New.
 +	* g10/gpgv.c (gpg_dirmngr_get_pka): New dummy function.
 +	* g10/keyserver.c (keyserver_import_cert): Replace get_dns_cert by
 +	gpg_dirmngr_dns_cert.
 +	(keyserver_import_pka): Replace get_pka_info by gpg_dirmngr_get_pka.
 +	* g10/mainproc.c: Include call-dirmngr.h.
 +	(pka_uri_from_sig): Add CTX arg. Replace get_pka_info by
 +	gpg_dirmngr_get_pka.
 +
 +	common: Minor change of hex2str to allow for embedded nul.
 +	* common/convert.c (hex2str): Set ERRNO.  Return adjusted COUNT.
 +
 +2015-04-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	common: removal of t-support.c from t_jnlib_src.
 +	* common/Makefile.am (t_jnlib_src): Remove t-support.c.
 +
 +2015-04-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make keyserver-option http_proxy work.
 +	* g10/options.h (opt): Add field keyserver_options.http_proxy.
 +	* g10/keyserver.c (warn_kshelper_option): Add arg noisy.
 +	(parse_keyserver_options): Parse into new http_proxy field.
 +	* g10/call-dirmngr.c (create_context): Send the http-proxy option.
 +
 +	common: Make proper use of http proxy parameter.
 +	* common/http.c (is_hostname_port): New.
 +	(send_request): Fix proxy name parsing.
 +
 +	dirmngr: Add http proxy support for keyservers.
 +	* dirmngr/dirmngr.h (server_control_s): Add field http_proxy.
 +	* dirmngr/dirmngr.c (dirmngr_init_default_ctrl): Copy http_proxy value
 +	from OPT.
 +	(dirmngr_deinit_default_ctrl): New.
 +	(main): Call dirmngr_deinit_default_ctrl.
 +	* dirmngr/server.c (start_command_handler): Ditto.
 +	(option_handler): Add option "http-proxy".
 +	* dirmngr/crlfetch.c (crl_fetch): Take http_proxy from CTRL.
 +	* dirmngr/ocsp.c (do_ocsp_request): Ditto.
 +	* dirmngr/ks-engine-hkp.c (send_request): Add proxy support.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
 +
 +	gpg: Do not use honor-keyserver-url sub-option by default.
 +
 +	gpg: Make preferred keyservers work.
 +	* g10/call-dirmngr.c (dirmngr_local_s): Add field set_keyservers_done.
 +	(create_context): Move keyserver setting to ...
 +	(open_context): here.
 +	(clear_context_flags): New.
 +	(gpg_dirmngr_ks_get): Add arg override_keyserver.
 +	* g10/keyserver.c (keyserver_refresh): Improve diagnostics.
 +	(keyserver_get_chunk): Ditto.  Pass OVERRIDE_KEYSERVER to ks_get.
 +
 +	gpg: Update sub-options of --keyserver-options.
 +	* g10/options.h (KEYSERVER_HTTP_PROXY): New.
 +	(KEYSERVER_USE_TEMP_FILES, KEYSERVER_KEEP_TEMP_FILES): Remove.
 +	(KEYSERVER_TIMEOUT): New.
 +	* common/keyserver.h (KEYSERVER_TIMEOUT): Remove.
 +	* g10/keyserver.c (keyserver_opts): Remove obsolete "use-temp-files"
 +	and "keep-temp-files". Add "http-proxy" and "timeout".
 +	(parse_keyserver_options): Remove 1.2 compatibility option
 +	"honor-http_proxy".  Remove "use-temp-files" and "keep-temp-files"
 +	code.
 +
 +2015-04-14  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Send the new SETKEYINFO command to the Pinentry.
 +	* agent/call-pinentry.c (agent_askpin): Add args keyinfo and
 +	cache_mode.  Change all callers to pass (NULL,0) for them.  Send
 +	SETKEYINFO command.
 +	* agent/findkey.c (unprotect): Pass the keygrip and the cache_mode for
 +	the new args.
 +
 +2015-04-14  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: better handling of extended APDU.
 +	* scd/apdu.c (send_le): Bug fix for not append Z when lc<0&&le<0.
 +	* scd/app-common.h (struct app_ctx_s): Use bit fields for flags.
 +	* scd/ccid-driver.c (CCID_MAX_BUF): New.  Only for OpenPGPcard.
 +	(struct ccid_driver_s): New field of max_ccid_msglen.
 +	 Remove ifsd field.
 +	(parse_ccid_descriptor): Initialize max_ccid_msglen.
 +	(ccid_transceive_apdu_level): Implement sending extended APDU in
 +	chain of CCID message.
 +
 +2015-04-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix NULL-segv due to invalid imported data.
 +	* g10/free-packet.c (my_mpi_copy): New.
 +	(copy_public_key, copy_signature): Use instead of mpi_copy.
 +
 +2015-04-13  Neal H. Walfield  <neal at g10code.com>
 +
 +	dirmngr: If LDAP is not enable, don't build the LDAP bits.
 +	* dirmngr/Makefile.am (dirmngr_SOURCES): Only include
 +	ks-engine-ldap.c, ldap-parse-uri.c and ldap-parse-uri.h if USE_LDAP
 +	is TRUE.
 +	(module_tests): Only add t-ldap-parse-uri if USE_LDAP is TRUE.
 +	* dirmngr/ks-action.c: Only include "ldap-parse-uri.h" if USE_LDAP is
 +	TRUE.
 +	(ks_action_help): Don't invoke LDAP functionality if USE_LDAP is not
 +	TRUE.
 +	(ks_action_search): Likewise.
 +	(ks_action_get): Likewise.
 +	(ks_action_put): Likewise.
 +	* dirmngr/server.c: Only include "ldap-parse-uri.h" if USE_LDAP is
 +	TRUE.
 +	(cmd_keyserver): Don't invoke LDAP functionality if USE_LDAP is not
 +	TRUE.
 +
 +2015-04-13  Werner Koch  <wk at gnupg.org>
 +
 +	common: Do without nested fucntions to support non-gcc.
 +	* common/t-stringhelp.c (test_strsplit): Remove nested function.
 +
 +2015-04-11  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.3.
 +
 +2015-04-11  Yuri Chornoivan  <yurchor at ukr.net>
 +
 +	po: Update Ukrainian translation.
 +
 +2015-04-11  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update and review Russian translation.
 +
 +2015-04-10  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr,w32: Make it build for Windows.
 +	* dirmngr/Makefile.am (t_common_ldadd): Add missing libs.
 +
 +	Remove obsolete directories from AM_CPPFLAGS.
 +
 +	dirmngr,w32: Replace functions not available under Windows.
 +	* dirmngr/ks-engine-ldap.c (extract_attributes): Replace isoptime and
 +	gmtime_r.
 +
 +	common: Add new function gnupg_gmtime.
 +	* common/gettime.c (gnupg_gmtime): New.
 +	(gnupg_get_isotime): Use it.  Also take care of an gmtime_t returning
 +	an error.
 +
 +	common: Add new function isodate_human_to_tm.
 +	* common/gettime.c (isotime_human_p): Add arg date_only.
 +	(isodate_human_to_tm): New.
 +	* common/t-gettime.c (test_isodate_human_to_tm): New.
 +	(main): Call new test.
 +
 +	dirmngr,w32: Avoid name clash with existing function.
 +	* dirmngr/ks-engine-ldap.c (ldap_connect): Rename to my_ldap_connect.
 +
 +	gpgparsemail: Fix last commit (3f2bdac)
 +	* tools/rfc822parse.c (parse_field): Replace break by goto.
 +
 +2015-04-09  Werner Koch  <wk at gnupg.org>
 +
 +	gpgparsemail: Fix case of zero length continuation lines.
 +	* tools/rfc822parse.c (parse_field): Loop after continuation line.
 +
 +2015-04-08  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Fix certificate lookup in dirmngr cache.
 +	* sm/call-dirmngr.c (get_cached_cert): Fix typo in LOOKUP command.
 +
 +2015-04-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print the user id in --fast-list-mode.
 +	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Change.
 +
 +	gpg: Prepare to pass additional context to the list functions.
 +	* g10/keylist.c (struct sig_stats): Rename to keylist_context and add
 +	field check_sigs.
 +	(keylist_context_release): New.
 +	(list_all): Set listctx.check_sigs and call release func.
 +	(list_one): Ditto.
 +	(locate_one): Ditto.
 +	(list_keyblock_print): Use .check_sigs field.  Repalce arg opaque by
 +	listctx.
 +	(list_keyblock): Ditto.  Make static.
 +	(list_keyblock_direct): New.
 +	* g10/keygen.c (do_generate_keypair): Replace list_keyblock by
 +	list_keyblock_direct.
 +
 +	gpg: Merge duplicated code for get_user_id et al.
 +	* g10/getkey.c (get_user_id_string): Add args mode and r_LEN.
 +	(get_user_id_string_native): Add new args.
 +	(get_long_user_id_string, get_user_id): Rewrite using
 +	get_user_id_string.
 +
 +	gpg: Add new option --debug-iolbf.
 +	* g10/gpg.c (oDebugIOLBF): new.
 +	(opts): Add --debug-iolbf.
 +	(main): Set option.
 +
 +	Rename DBG_ASSUAN to DBG_IPC and add separate DBG_EXTPROG.
 +	* g10/options.h (DBG_EXTPROG_VALUE): Separate from DBG_IPC_VALUE.
 +
 +	Fix use of DBG_CACHE and DBG_LOOKUP.
 +	* dirmngr/dirmngr.h (DBG_LOOKUP_VALUE): Change to 8192.
 +	* g10/options.h (DBG_LOOKUP_VALUE, DBG_LOOKUP): New.
 +	* g10/getkey.c: Use DBG_LOOKUP instead of DBG_CACHE at most places.
 +
 +	gpg: Rename a debug macro.
 +	* g10/options.h (DBG_CIPHER_VALUE): Rename to DBG_CRYPTO_VALUE.
 +	(DBG_CIPHER): Rename to DBG_CRYPTO.
 +
 +2015-04-05  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix DoS while parsing mangled secret key packets.
 +	* g10/parse-packet.c (parse_key): Check PKTLEN before calling mpi_read
 +	et al.
 +
 +2015-04-03  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	g10: Fix keytocard.
 +	g10/call-agent.h (agent_scd_learn): Add FORCE option.
 +	g10/call-agent.c (agent_scd_learn): Implement FORCE option.
 +	g10/keygen.c (gen_card_key): Follow the change of option.
 +	g10/card-util.c (change_pin, card_status, factory_reset): Likewise.
 +	g10/keyedit.c (keyedit_menu): Update private key storage by
 +	agent_scd_learn.
 +
 +	agent: Add --force option for LEARN.
 +	* agent/command.c (cmd_learn): Handle --force option.
 +	(cmd_keytocard): Don't update key storage file.
 +	* agent/agent.h (agent_handle_learn): Add FORCE.
 +	* agent/learncard.c (agent_handle_learn): Implement FORCE to update
 +	key stroage file.
 +
 +2015-03-31  Neal H. Walfield  <neal at g10code.com>
 +
 +	dirmngr: Don't use alloca.
 +	* dirmngr/ks-engine-ldap.c (ks_ldap_put): Replace use of alloca with
 +	xmalloc and xfree.
 +
 +	dirmngr: Simplify truncation of long strings in debug code.
 +	* dirmngr/ks-engine-ldap.c (modlist_dump): Simplify truncation of long
 +	strings.
 +
 +	dirmngr: Use a better error code.
 +	* dirmngr/ldap-parse-uri.c (ldap_parse_uri): On error, return
 +	GPG_ERR_GENERAL, not GPG_ERR_ASS_GENERAL.
 +
 +	dirmngr: Better encapsulate the keyservers variable.
 +	* dirmngr/dirmngr.h (struct server_control_s): Move field keyservers
 +	from here...
 +	* dirmngr/server.c (struct server_local_s): ... to here.  Update
 +	users.
 +	* dirmngr/ks-action.h (ks_action_resolve): Add argument keyservers.
 +	(ks_action_search): Likewise.
 +	(ks_action_get): Likewise.
 +	(ks_action_put): Likewise.
 +	* dirmngr/ks-action.c (ks_action_resolve): Add argument keyservers.
 +	Use it instead of ctrl->keyservers.
 +	(ks_action_search): Likewise.
 +	(ks_action_get): Likewise.
 +	(ks_action_put): Likewise.
 +
 +2015-03-28  Neal H. Walfield  <neal at g10code.de>
 +
 +	gpg: Only use the last specified keyserver.
 +	* g10/gpg.c (main): Only use the last specified keyserver.
 +
 +2015-03-25  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix resource leaks and check rare errors.
 +	* dirmngr/ks-engine-ldap.c (keyspec_to_ldap_filter): Fix resource
 +	leak.
 +	(ks_ldap_search): Check error from es_fopenmem.  Use LDAP_ERR where
 +	required.
 +	(modlist_dump): Check error from es_fopenmem.
 +	(uncescape): s/int/size_t/.  Use existing macros.
 +	(extract_attributes): Use existing trim function.
 +	(ks_ldap_put): Do not segv on error from modlist_dump.
 +
 +	dirmngr: Minor cleanups.
 +	* dirmngr/ks-engine-ldap.c [__riscos__]: Remove doubled util.h.
 +	(ldap_to_gpg_err): s/GPG_ERR_GENERAL/GPG_ERR_INTERNAL/.
 +	(tm2ldaptime): Use snprintf.
 +	(ldap_connect): Get error code prior to log_error and and use modern
 +	function.   Use xfree, xtrustrdup etc.
 +	(modlist_lookup): Use GNUPG_GCC_A_USED.
 +	(modlist_free): Use xfree.
 +
 +	common: Add macro GNUPG_GCC_A_USED.
 +	* common/util.h (GNUPG_GCC_A_USED): New.
 +
 +	sm: Change default algos to SHA256 (CSR) and AES128 (bulk encryption).
 +	* sm/certreqgen.c (create_request): Change default hash algo.
 +	* sm/gpgsm.c (DEFAULT_CIPHER_ALGO): Change default bulk cipher algo.
 +
 +2015-03-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpg,w32: Handle forward slash in --keyring option.
 +	* g10/keydb.c (keydb_add_resource): Allow forward slash under Windows.
 +
 +2015-03-23  Neal H. Walfield  <neal at g10code.de>
 +
 +	Improve documentation for ks_hkp_get.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_get): Improvement documentation.
 +
 +	Improve documenation of http_parse_uri.
 +	* common/http.c (http_parse_uri): Improve documentation.
 +
 +	Add support to talking to LDAP key servers.
 +	* g10/call-dirmngr.c (record_output): New function.
 +	(ks_put_inq_cb): Use it here to generate a --with-colons like output
 +	instead of a custom format.
 +	* dirmngr/ks-action.c: Include "ldap-parse-uri.h".
 +	(ks_action_help): If the provided URI is an LDAP URI, then use
 +	ldap_parse_uri to parse.  Call ks_ldap_help.
 +	(ks_action_search): If passed an LDAP URI, then call ks_ldap_search.
 +	(ks_action_get): Likewise.
 +	(ks_action_put): Likewise.  Also, change data from a 'const void *' to
 +	a 'void *' and add info and infolen parameters.  Add note that
 +	function may modify DATA.
 +	* dirmngr/ks-action.h (ks_action_put): Update declaration accordingly.
 +	* dirmngr/server.c: Include "ldap-parse-uri.h".
 +	(cmd_keyserver): If ITEM->URI is an LDAP URI, parse it using
 +	ldap_parse_uri.
 +	(hlp_ks_put): Improve documentation.
 +	(cmd_ks_put): Also pass info and infolen to ks_action_put.  Improve
 +	documentation.
 +	* dirmngr/ks-engine.h (ks_ldap_help): New declaration.
 +	(ks_ldap_search): Likewise.
 +	(ks_ldap_get): Likewise.
 +	(ks_ldap_put): Likewise.
 +	* dirmngr/ks-engine-ldap.c: New file.
 +	* dirmngr/Makefile.am (dirmngr_SOURCES): Add ks-engine-ldap.c,
 +	ldap-parse-uri.c and ldap-parse-uri.h.
 +	(dirmngr_LDADD) [USE_LDAP]: Add $(ldaplibs).
 +
 +	Import _gpgme_parse_timestamp from gpgme as parse_timestamp.
 +	* common/gettime.h (parse_timestamp): New declaration.
 +	* common/gettime.c (_win32_timegm): New function imported from
 +	gpgme/src/conversion.c:_gpgme_timegm.
 +	(parse_timestamp): New function imported from
 +	gpgme/src/conversion.c:_gpgme_parse_timestamp.
 +
 +	Move copy_stream function to misc.c.
 +	* dirmngr/ks-action.c (copy_stream): Move function from here...
 +	* dirmngr/misc.c (copy_stream): ... to here and drop the static
 +	qualifier.
 +	* dirmngr/misc.h (copy_stream): Add declaration.
 +
 +	Move armor_data to misc.c.
 +	* dirmngr/ks-engine-hkp.c (armor_data): Move function from here...
 +	* dirmngr/misc.c (armor_data): ... to here and drop static qualifier.
 +	* dirmngr/misc.h: New declaration.
 +
 +	Add new LDAP utility functions.
 +	* dirmngr/Makefile.am (module_tests): New variable.
 +	(noinst_PROGRAMS): New primary.  Set it to $(module_tests).
 +	(TESTS): New variable.  Set it to $(module_tests).
 +	(t_common_src): New variable.
 +	(t_common_ldadd): Likewise.
 +	(t_ldap_parse_uri_SOURCES): New primary.
 +	(t_ldap_parse_uri_LDADD): Likewise.
 +	* dirmngr/ldap-parse-uri.c: New file.
 +	* dirmngr/ldap-parse-uri.h: Likewise.
 +	* dirmngr/t-ldap-parse-uri.c: Likewise.
 +	* dirmngr/t-support.h: Likewise.
 +
 +	Add new function uri_query_lookup.
 +	* common/http.h (uri_query_lookup): New declaration.
 +	* common/http.c (uri_query_lookup): The corresponding implementation.
 +
 +	Add new function strlist_find.
 +	* common/strlist.h (strlist_find): New declaration.
 +	* common/strlist.c (strlist_find): New function.
 +
 +	common: Add new helper function, strsplit.
 +	* common/stringhelp.h (strsplit): New declaration.
 +	* common/stringhelp.c (strsplit): New function.
 +	* common/t-stringhelp.c (test_strsplit): New function.
 +	(main): Call it here.
 +
 +2015-03-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Consider a mailbox only userid in mail search mode.
 +	* kbx/keybox-search.c: Include mbox-util.h.
 +	(blob_cmp_mail): Improve OpenPGP uid parsing.
 +
 +	common: Add function is_valid_mailbox_mem.
 +	* common/mbox-util.c (mem_count_chr): New.
 +	(my_memstr): New.
 +	(has_invalid_email_chars): Change args to work on a buffer.
 +	(is_valid_mailbox_mem): New.
 +	(is_valid_mailbox): Rewrite to use is_valid_mailbox_mem.
 +
 +	gpg: Find keys using mail addresses with garbage after the '>'
 +	* kbx/keybox-search.c (blob_cmp_mail): Stop comparing at the '>'.
 +
 +	common: Fix syntax error when building with gnutls.
 +	* common/http.c (send_request): Add missing comma.
 +
 +2015-03-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Emit status line NEWSIG before signature verification starts.
 +	* g10/mainproc.c (check_sig_and_print): Emit STATUS_NEWSIG.
 +
 +	agent: Compute correct MPI length header for protected ECC keys.
 +	* agent/cvt-openpgp.c (apply_protection): Strip leading zeroes from
 +	opaque MPIs to comply with the OpenPGP spec.
 +
 +	hkps: Fix host name verification when using pools.
 +	* common/http.c (send_request): Set the requested for SNI.
 +	* dirmngr/ks-engine-hkp.c (map_host): Return the poolname and not
 +	the selecting a host.
 +
 +	Define replacement error codes from libgpg-error 1.19.
 +	* common/util.h: Add GPG_ERR_LDAP codes for libgpg-error < 1.19.
 +
 +2015-03-17  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	gpgtar: Fix extracting files with !(size % 512)
 +	* tools/gpgtar-extract.c (extract_regular): Handle size multiples
 +	  of RECORDSIZE.
 +
 +2015-03-17  Werner Koch  <wk at gnupg.org>
 +
 +	common: Add feature to ease using argparse's usage().
 +	* common/argparse.c (show_help): Take care of flag value
 +	(usage): Ditto.
 +
 +	common: Allow standalone build of argparse.c.
 +	* common/argparse.h: Remove types.h - not required.
 +	* common/argparse.c: Change to allow standalone use.
 +
 +2015-03-16  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Create all MPIs with RFC-4880 correct length headers.
 +	* g10/build-packet.c (gpg_mpi_write): Strip leading zeroes.
 +
 +	gpg: Allow printing of MPI values in --list-mode.
 +	* g10/parse-packet.c (set_packet_list_mode): Set mpi_print_mode.
 +	* g10/misc.c (mpi_print): Do not print an extra leading zero.
 +
 +	gpg: Fix broken write of opaque MPI length header.
 +	* g10/build-packet.c (gpg_mpi_write): Use a char array for the length.
 +
 +2015-03-15  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix possible dead code elimination.
 +	* g10/encrypt.c: Change condition for detecting a real file.
 +
 +	g13: Fix pointer wrap check.
 +	* g13/utils.c (find_tuple, next_tuple): Cast pointer to size_t before
 +	doing an overflow check.
 +
 +	agent: Remove useless conditions in command.c.
 +	* agent/command.c (cmd_setkeydesc): Remove NULL check.
 +	(cmd_get_passphrase): Ditto.
 +	(cmd_clear_passphrase): Ditto.
 +	(cmd_get_confirmation): Ditto.
 +	(cmd_getval): Ditto.
 +	(cmd_putval): Ditto.
 +
 +	agent: Fix length test in sshcontrol parser.
 +	* agent/command-ssh.c (ssh_search_control_file): Check S before
 +	upcasing it.
 +
 +	agent: Remove useless conditions.
 +	* agent/genkey.c (agent_ask_new_passphrase): Remove useless condition.
 +	* agent/command-ssh.c (ssh_identity_register): Ditto.
 +
 +	gpg: Remove useless condition.
 +	* g10/keylist.c (list_keyblock_colon): Remove useless condition (PK).
 +	(list_keyblock_print):  Likewise.
 +
 +	scd: Fix possible NULL deref in apdu.c.
 +	* scd/apdu.c (control_pcsc_direct): Take care of BUFLEN being NULL.
 +	(control_pcsc_wrapped): Ditto.
 +
 +	common: Make openpgp_oid_to_str more robust.
 +	* common/openpgp-oid.c (openpgp_oid_to_str): Take care of
 +	gcry_mpi_get_opaque returning NULL.  Remove useless condition !BUF.
 +
 +2015-03-11  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Improve error reporting from Pinentry.
 +	* agent/call-pinentry.c (unlock_pinentry): Add error logging.  Map
 +	error source of uncommon errors to Pinentry.
 +
 +2015-03-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change --print-pka-records into an option.
 +	* g10/gpg.c (aPrintPKARecords): Rename to oPrintPKARecords and do not
 +	use it as a command.
 +	* g10/keylist.c (list_keyblock): List PKA rceords also for secret
 +	keys.
 +
 +	gpg: Add --list-gcrypt-config and "curve" item for --list-config.
 +	* common/openpgp-oid.c (curve_supported_p): New.
 +	(openpgp_enum_curves): New.
 +	* common/t-openpgp-oid.c (test_openpgp_enum_curves): New.
 +	(main): Add option --verbose.
 +	* g10/gpg.c (opts): Add --list-gcrypt-config.
 +	(list_config): Add items "curve" and "curveoid".  Remove unused code.
 +
 +2015-03-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: fix for 64-bit arch.
 +	* agent/pksign.c (agent_pksign_do): Use int.
 +	* scd/app-openpgp.c (get_public_key): Likewise.
 +
 +2015-03-04  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: avoid chatter about trustdb when --quiet.
 +	* g10/trustdb.c (tdb_check_trustdb_stale): avoid log_info() when
 +	  opt.quiet
 +
 +2015-02-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Lowercase mailbox for PKA lookups.
 +	* common/stringhelp.c (ascii_strlwr): New.
 +	* common/mbox-util.c (mailbox_from_userid): Downcase result.
 +
 +	gpg: Fix memory leak due to PKA lookup.
 +	* g10/keyserver.c (keyserver_import_pka): Move the xfree.
 +
 +2015-02-25  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Switch to a hash and CERT record based PKA system.
 +	* common/dns-cert.c (get_dns_cert): Make r_key optional.
 +	* common/pka.c: Rewrite for the new hash based lookup.
 +	* common/t-pka.c: New.
 +	* configure.ac: Remove option --disable-dns-pka.
 +	(USE_DNS_PKA): Remove ac_define.
 +	* g10/getkey.c (parse_auto_key_locate): Always include PKA.
 +
 +	common: Allow requesting a specific certtype with get_dns_cert()
 +	* common/dns-cert.c (get_dns_cert): Add arg want_certtype.  Change all
 +	callers.
 +	(CERTTYPE_): Move constants to ...
 +	* common/dns-cert.h: here as DNS_CERTTYPE_.
 +
 +	Move new mailbox.c source file to common/.
 +	* g10/mailbox.c: Move to ...
 +	* common/mbox-util.c: new file.
 +	* common/mbox-util.h: New. Include where needed.
 +	* g10/t-mailbox.c: Move to ...
 +	* common/t-mbox-util.c: new file.
 +
 +2015-02-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add command --print-pka-records.
 +	* g10/gpg.c (main): Add command --print-pka-records.
 +	* g10/options.h (struct opt): Add field "print_pka_records".
 +	* g10/keylist.c (list_keyblock_pka): New.
 +	(list_keyblock): Call it if new option is set.
 +	(print_fingerprint): Add mode 10.
 +
 +	gpg: Add function to extract the mailbox.
 +	* g10/misc.c (has_invalid_email_chars, is_valid_mailbox)
 +	(is_valid_user_id): Move to ...
 +	* g10/mailbox.c: new file.
 +	(string_has_ctrl_or_space, has_dotdot_after_at): New.
 +	(has_invalid_email_chars): New.
 +
 +	* g10/t-mailbox.c: New.
 +	* g10/Makefile.am (module_tests): Add t-mailbox.
 +	(t_mailbox_SOURCES, t_mailbox_LDADD): New.
 +
 +2015-02-23  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add option to print fingerprints in ICAO spelling.
 +	* g10/gpg.c: Add option --with-icao-spelling.
 +	* g10/options.h (struct opt): Add with_icao_spelling.
 +	* g10/keylist.c (print_icao_hexdigit): New.
 +	(print_fingerprint): Print ICAO spelling.
 +
 +	gpg: Skip legacy keys while searching keyrings.
 +	* g10/getkey.c (search_modes_are_fingerprint): New.
 +	(lookup): Skip over legacy keys.
 +
 +	common: Fix regression due to commit 2183683b.
 +	* common/dns-cert.c (get_dns_cert): Remove cruft.
 +
 +2015-02-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Replace remaining uses of stdio by estream.
 +	* g10/sign.c (sign_file):  Use log_printf instead of stderr.
 +	* g10/tdbdump.c (export_ownertrust): Use estream fucntions.
 +	(import_ownertrust): Ditto.
 +	* g10/tdbio.c (tdbio_dump_record): Ditto.  Change arg to estream_t.
 +
 +	gpg: Fix segv due to NULL value stored as opaque MPI.
 +	* g10/build-packet.c (gpg_mpi_write): Check for NULL return from
 +	gcry_mpi_get_opaque.
 +	(gpg_mpi_write_nohdr, do_key): Ditto.
 +	* g10/keyid.c (hash_public_key): Ditto.
 +
 +2015-02-12  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Fix regression in 2.1.2 (due to commit 2183683)
 +	* scd/apdu.c (pcsc_vendor_specific_init): Replace use of
 +	bufNN_to_uint by direct code.
 +
 +2015-02-12  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	dirmngr: Initialize cache from sysconfig dir.
 +	* dirmngr/certcache.c (cert_cache_init): Load certificates
 +	from sysconfig dir instead of the homeidr.
 +	* dirmngr/dirmngr.c (main): Removed parsing of obsolete
 +	homedir_data option.
 +	* dirmngr/dirmngr.h (opt): Removed homedir_data.
 +	* doc/dirmngr.texi: Update and clarify certs directory doc.
 +
 +2015-02-11  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.2.
 +
 +	dirmngr: Avoid warning about unused function.
 +	* dirmngr/dirmngr.c (my_gnutls_log): Build only if gnutls is used.
 +
 +	build: Update standard build-aux files.
 +
 +	Use inline functions to convert buffer data to scalars.
 +	* common/host2net.h (buf16_to_ulong, buf16_to_uint): New.
 +	(buf16_to_ushort, buf16_to_u16): New.
 +	(buf32_to_size_t, buf32_to_ulong, buf32_to_uint, buf32_to_u32): New.
 +
 +2015-02-09  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Prevent an invalid memory read using a garbled keyring.
 +	* g10/keyring.c (keyring_get_keyblock): Whitelist allowed packet
 +	types.
 +	* g10/keydb.c (parse_keyblock_image): Ditto.
 +
 +	gpg: Fix a NULL-deref in export due to invalid packet lengths.
 +	* g10/build-packet.c (write_fake_data): Take care of a NULL stored as
 +	opaque MPI.
 +
 +	gpg: Fix a NULL-deref due to empty ring trust packets.
 +	* g10/parse-packet.c (parse_trust): Always allocate a packet.
 +
 +2015-02-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpg-agent: Use "pinentry-basic" as fallback.
 +	* common/homedir.c (get_default_pinentry_name): New.
 +	(gnupg_module_name): Use that for the default pinentry.
 +	(gnupg_module_name_flush_some): New.
 +	* agent/gpg-agent.c (agent_sighup_action): Flush some module names.
 +	* agent/call-pinentry.c (start_pinentry): Do not modify
 +	opt.pinentry_program.
 +
 +	w32: Add manifest to gpg.
 +	* g10/gpg.w32-manifest.in: New.
 +	* g10/gpg-w32info.rc: Add manifest.
 +	* g10/Makefile.am (EXTRA_DIST): Add manifest.
 +	(gpg-w32info.o): Depend on manifest.
 +	* configure.ac (BUILD_VERSION): New.
 +	(AC_CONFIG_FILES): Add manifest.
 +
 +2015-02-03  Werner Koch  <wk at gnupg.org>
 +
 +	Update copyright years.
 +	* common/w32info-rc.h.in (W32INFO_COMPANYNAME): Change to "The GnuPG
 +	Project".
 +
 +2015-02-02  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Change default Windows install dir and add bin to PATH.
 +	* build-aux/speedo.mk (WITH_GUI): New macro.  The Windows installer is
 +	now build by default without any GUI stuff.
 +	* build-aux/speedo/w32/inst.nsi: Change standard installation
 +	directory.
 +	(AddToPath, un.RemoveFromPath): New.
 +	(gnupginst): Add bin directory to the PATH.
 +
 +2015-02-01  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Allow for Unicocde installation directory.
 +	* common/homedir.c (w32_rootdir): Use Unicode fucntion not only for
 +	WinCE.
 +
 +2015-01-30  Joshua Rogers  <git at internot.info>
 +
 +	kbx: Fix resource leak.
 +	* kbx/keybox-update.c (blob_filecopy): Fix resource leak.  On error
 +	return, 'fp' and 'newfp' was never closed.
 +
 +2015-01-29  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Fix use of imported but unprotected openpgp keys.
 +	* agent/agent.h (PRIVATE_KEY_OPENPGP_NONE): New.
 +	* agent/command.c (do_one_keyinfo): Implement it.
 +	* agent/findkey.c (agent_key_from_file): Ditto.
 +	(agent_key_info_from_file): Ditto.
 +	(agent_delete_key): Ditto.
 +	* agent/protect.c (agent_private_key_type): Add detection for openpgp
 +	"none" method.
 +
 +2015-01-29  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese Translation.
 +
 +2015-01-28  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Limit the size of key packets to a sensible value.
 +	* g10/parse-packet.c (MAX_KEY_PACKET_LENGTH): New.
 +	(MAX_UID_PACKET_LENGTH): New.
 +	(MAX_COMMENT_PACKET_LENGTH): New.
 +	(MAX_ATTR_PACKET_LENGTH): New.
 +	(parse_key): Limit the size of a key packet to 256k.
 +	(parse_user_id): Use macro for the packet size limit.
 +	(parse_attribute): Ditto.
 +	(parse_comment): Ditto.
 +
 +	gpg: Fix buffering problem in --list-config.
 +	* g10/gpg.c (list_config): Replace print_sanitized_string2 by
 +	es_write_sanitized.
 +
 +	* common/stringhelp.c (print_sanitized_buffer2): Remove.
 +	(print_sanitized_buffer, print_sanitized_utf8_buffer): Remove.
 +	(print_sanitized_utf8_buffer, print_sanitized_utf8_string): Remove.
 +	(print_sanitized_string): Remove.
 +
 +	* sm/certdump.c (print_dn_part, print_dn_parts): Remove arg FP.
 +	(pretty_print_sexp, gpgsm_print_name2, gpgsm_print_name): Remove.
 +
 +	Add a hook to be called right after main.
 +	* common/init.c (early_system_init): New stub function.
 +
 +	gpg: Allow predefined names as answer to the keygen.algo prompt.
 +	* g10/keygen.c (ask_algo): Add list of strings.
 +
 +	agent: Add some extra robustness to extract_private_key.
 +	* agent/cvt-openpgp.c (extract_private_key): Add arg "arraysize".
 +	Make sure that R_FLAGS and R_CURVE are set to NULL.
 +
 +2015-01-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix varargs call for 64-bit arch on ECC keys.
 +	* scd/app-openpgp.c (store_fpr): Remove CARD_VERSION from the
 +	arguments.
 +	(rsa_writekey): Follow the change.
 +	(do_genkey): Likewise.
 +	(ecc_writekey): Likewise.  Cast to size_t.
 +
 +2015-01-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix segv introduced to commit 4d7c9b0.
 +	* g10/keygen.c (get_parameter_passphrase): Take care of R == NULL.
 +
 +2015-01-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix agent_public_key_from_file for ECC.
 +	* agent/cvt-openpgp.c (extract_private_key): New.
 +	(convert_to_openpgp): Use extract_private_key.
 +	* agent/findkey.c (agent_public_key_from_file): Use
 +	extract_private_key.
 +
 +2015-01-26  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Simplify fix ed8383c6.
 +	* sm/minip12.c (p12_build): Release PWBUF only at the end.
 +
 +2015-01-25  Joshua Rogers  <git at internot.info>
 +
 +	ccid: Remove incorrect expression leading to errors.
 +	* scd/ccid-driver.c (send_escape_cmd): Fix setting of 'rc'.
 +
 +2015-01-23  Werner Koch  <wk at gnupg.org>
 +
 +	gpgconf: Fix validity check for UINT32 values.
 +	* tools/gpgconf-comp.c (option_check_validity): Enable check for
 +	UINT32.
 +
 +2015-01-22  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve skipping of PGP-2 keys.
 +	* g10/keydb.c (keydb_search_first, keydb_search_next): Skip legacy
 +	keys.
 +	* g10/keyring.c (keyring_get_keyblock): Handle GPG_ERR_LEGACY_KEY.
 +	(prepare_search): Ditto.
 +	(keyring_rebuild_cache): Skip legacy keys.
 +	* g10/keyserver.c (keyidlist): Ditto.
 +	* g10/trustdb.c (validate_key_list): Ditto.
 +
 +	gpg: Add dedicated error code for PGP-2 keys.
 +	* g10/parse-packet.c (parse_key): Return GPG_ERR_LEGACY_KEY for PGP2
 +	keys.
 +	* g10/import.c (read_block): Simplify by checking GPG_ERR_LEGACY_KEY.
 +	* g10/getkey.c (lookup): Silence error message for PGP-2 keys.
 +
 +	* common/util.h (GPG_ERR_LEGACY_KEY): Add replacement for older
 +	libgpg-error.
 +
 +	gpg: Replace remaining old error code macros by GPG_ERR_.
 +	* g10/gpg.h (g10_errstr): Remove macro and change all occurrences by
 +	gpg_strerror.
 +	(G10ERR_): Remove all macros and change all occurrences by their
 +	GPG_ERR_ counterparts.
 +
 +	gpg: Remove an unused variable.
 +	* g10/getkey.c (getkey_ctx_s): Remove last_rc.
 +
 +2015-01-21  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix TLS build problems.
 +	* dirmngr/Makefile.am (AM_CFLAGS): Add flags for TLS libs.
 +
 +	gpg: Support --passphrase with --quick-gen-key.
 +	* g10/keygen.c: Include shareddefs.h.
 +	(quick_generate_keypair): Support static passphrase.
 +	(get_parameter_passphrase): New.
 +	(do_generate_keypair): Use it.
 +
 +	gpg: Re-enable the "Passphrase" parameter for batch key generation.
 +	* agent/command.c (cmd_genkey): Add option --inq-passwd.
 +	* agent/genkey.c (agent_genkey): Add new arg override_passphrase.
 +	* g10/call-agent.c (inq_genkey_parms): Handle NEWPASSWD keyword.
 +	(agent_genkey): Add arg optional arg "passphrase".
 +	* g10/keygen.c (common_gen, gen_elg, gen_dsa, gen_ecc)
 +	(gen_rsa, do_create): Add arg "passphrase" and pass it through.
 +	(do_generate_keypair): Make use of pPASSPHRASE.
 +	(release_parameter_list): Wipe out a passphrase parameter.
 +
 +2015-01-19  Werner Koch  <wk at gnupg.org>
 +
 +	kbx: Minor cleanup for the previous fix.
 +	* kbx/keybox-search.c (blob_get_keyid): Rename to
 +	blob_get_first_keyid. Check number of keys and remove blob type check.
 +
 +2015-01-19  Damien Goutte-Gattat  <dgouttegattat at incenp.org>
 +
 +	kbx: Call skipfnc callback to filter out keys.
 +	* kbx/keybox-search.c (blob_get_keyid): New.
 +	(keybox-search): Call skipfnc callback function.
 +
 +2015-01-13  Andreas Schwier  <andreas.schwier at cardcontact.de>
 +
 +	scd: Allow for certificates > 1024 with PC/SC.
 +	* scd/pcsc-wrapper.c (handle_transmit): Enlarge buffer to 4096 too
 +	allow for larger certificates.
 +
 +2015-01-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	dirmngr: Fix error code path of map_host.
 +	* dirmngr/ks-engine-hkp.c (map_host): Fix error return.
 +
 +2015-01-08  Joshua Rogers  <git at internot.info>
 +
 +	scd: fix get_public_key for OpenPGPcard v1.0.
 +	* scd/app-openpgp.c (get_public_key): correctly close 'fp' upon use.
 +
 +2015-01-07  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	dirmngr: fix LDAP query PATTERNS limit check.
 +	* dirmngr/ldap.c (start_cert_fetch_ldap): fix ARGC limitation.
 +
 +	scd: fix merge failure.
 +	* scd/apdu.c (pcsc_pinpad_verify): Remove wrong lines inserted by
 +	merge.
 +
 +2015-01-05  Werner Koch  <wk at gnupg.org>
 +
 +	sm,g13: Init local vars to avoid compiler warnings.
 +	* sm/misc.c (transform_sigval): Init RSA_S_LEN.
 +	* g13/mount.c (read_keyblob): Init HEADERLEN.
 +
 +	gpg: Remove unused args from a function.
 +	* g10/keyserver.c (parse_keyserver_uri): Remove args configname and
 +	configlineno.  Change all callers.
 +
 +	gpg: Clear a possible rest of the KDF secret buffer.
 +	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Fix order of args.
 +
 +	build: Require automake 1.14.
 +	* configure.ac (AM_INIT_AUTOMAKE): Add serial-tests.
 +
 +2015-01-04  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Make --allow-loopback-pinentry gpgconf changeable.
 +
 +2014-12-22  Joshua Rogers  <git at internot.info>
 +
 +	tools: Free variable before return.
 +	* tools/gpgconf-comp.c: Free 'dest_filename' before it is returned
 +	upon error.
 +
 +2014-12-22  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	sm: Avoid double-free on iconv failure.
 +	* sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
 +	double-free of pwbuf.
 +
 +	scd: Avoid double-free on error condition in scd.
 +	* scd/command.c (cmd_readkey): avoid double-free of cert
 +
 +	avoid future chance of using uninitialized memory.
 +	* common/iobuf.c: (iobuf_open): initialize len
 +
 +	avoid double-close in unusual dotlock situations.
 +	* common/dotlock.c: (dotlock_create_unix) avoid double-close()
 +	 in unusual situations.
 +
 +	gpgkey2ssh: clean up varargs.
 +	* tools/gpgkey2ssh.c (key_to_blob) : ensure that va_end is called.
 +
 +2014-12-22  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Fix memory leak in yat2m.
 +	* doc/yat2m.c (write_th): Free NAME.
 +
 +	dirmngr: Fix memory leak.
 +	* dirmngr/server.c (cmd_ks_search, cmd_ks_get): Fix memory leak.
 +
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_mark_host): Remove double check.
 +
 +	dirmngr: Remove un-needed check.
 +	* dirmngr/crlfetch.c (crl_fetch): Check that URL is not NULL.
 +
 +	dirmngr,gpgsm: Return NULL on fail.
 +	* dirmngr/ldapserver.c (ldapserver_parse_one): Set SERVER to NULL.
 +	* sm/gpgsm.c (parse_keyserver_line): Ditto.
 +
 +2014-12-22  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: ECDH Support.
 +	* agent/divert-scd.c (divert_pkdecrypt): Support ECDH.
 +	* scd/app-openpgp.c (get_algo_byte, store_fpr): Support ECDH.
 +	(send_key_attr): Support ECDH.  Fix EdDSA algorithm value.
 +	(retrieve_key_material): Initialize fields.
 +	(get_public_key, ecc_writekey, do_writekey): Support ECDH.
 +	(ecdh_writekey): Remove.
 +	(do_decipher): Support ECDH.
 +	(parse_algorithm_attribute): Support ECDH.  Fix EdDSA.
 +
 +2014-12-19  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Make sure --max-cache-ttl is >= --default-cache-ttl.
 +	* agent/gpg-agent.c (finalize_rereadable_options): New.
 +	(main, reread_configuration): Call it.
 +
 +	agent: Keep the session environment for restricted connections.
 +	* agent/command-ssh.c (setup_ssh_env): Move code to ...
 +	* agent/gpg-agent.c (agent_copy_startup_env): .. new function.  Change
 +	calllers.
 +	* agent/command.c (start_command_handler): Call that fucntion for
 +	restricted connections.
 +
 +	agent: Fix string prepended to remotely initiated prompts.
 +	* agent/command.c (cmd_setkeydesc): Use %0A and not \n. Make
 +	translatable.
 +
 +2014-12-18  Werner Koch  <wk at gnupg.org>
 +
 +	build: Remove option to build without agent.
 +	* configure.ac (build-agent): Set to yes.
 +
 +2014-12-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpgconf: Exit with failure if --launch fails.
 +	* tools/gpgconf-comp.c (gc_component_launch): Return an error code.
 +	* tools/gpgconf.c (main): Exit if launch failed.
 +
 +2014-12-16  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.1.
 +
 +	po: Update the German translation.
 +
 +2014-12-16  Petr Pisar  <petr.pisar at atlas.cz>
 +
 +	po: Update Czech translation.
 +
 +2014-12-16  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Show private DO information in the card status.
 +	* g10/call-agent.c (agent_release_card_info): Free private_do.
 +	(learn_status_cb): Parse PRIVATE-DO-n stati.
 +
 +2014-12-16  Ineiev  <ineiev at gnu.org>
 +
 +	po: Update Russian translation.
 +
 +2014-12-16  Jedi  <jedi at jedi.org>
 +
 +	po: Update zh_TW translation.
 +
 +2014-12-15  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add sub-command "factory-reset" to --card-edit.
 +	* common/util.h (GPG_ERR_OBJ_TERM_STATE): New.
 +	* scd/iso7816.c (map_sw): Add this error code.
 +	* scd/app-openpgp.c (do_getattr): Return the life cycle indicator.
 +	* scd/app.c (select_application): Allow a return value of
 +	GPG_ERR_OBJ_TERM_STATE.
 +	* scd/scdaemon.c (set_debug): Print the DBG_READER value.
 +	* g10/call-agent.c (start_agent): Print a status line for the
 +	termination state.
 +	(agent_scd_learn): Make arg "info" optional.
 +	(agent_scd_apdu): New.
 +	* g10/card-util.c (send_apdu): New.
 +	(factory_reset): New.
 +	(card_edit): Add command factory-reset.
 +
 +	gpg: Fix regression in notation data regression.
 +	* g10/misc.c (pct_expando): Reorder conditions for clarity.
 +	* g10/sign.c (write_signature_packets): Fix notation data creation.
 +
 +	gpg: Avoid extra LF in notaion data listing.
 +	* g10/keylist.c (show_notation): Use log_printf.
 +
 +2014-12-12  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Fix possibly inhibited checkpin of the admin pin.
 +	* scd/app-openpgp.c (do_check_pin): Do not check a byte of a released
 +	buffer.
 +
 +	gpg: Let --card--status create a shadow key (card key stub).
 +	* agent/command.c (cmd_learn): Add option --sendinfo.
 +	* agent/learncard.c (agent_handle_learn): Add arg "send" andsend
 +	certifciate only if that is set.
 +	* g10/call-agent.c (agent_scd_learn): Use --sendinfo.  Make INFO
 +	optional.
 +	(agent_learn): Remove.
 +	* g10/keygen.c (gen_card_key): Replace agent_learn by agent_scd_learn.
 +
 +	gpg: Fix possible read of unallocated memory.
 +	* g10/parse-packet.c (can_handle_critical): Check content length
 +	before calling can_handle_critical_notation.
 +
 +2014-12-11  Werner Koch  <wk at gnupg.org>
 +
 +	build: Replace deprecated autconf macro.
 +	* m4/intl.m4: s/AM_PROG_MKDIR_P/AC_PROG_MKDIR_P/
 +	* m4/po.m4: Ditto.
 +
 +2014-12-08  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Improve dead host detection.
 +	* dirmngr/ks-engine-hkp.c (handle_send_request_error): Mark host dead
 +	also for 2 other error messages.
 +
 +	http: Improve diagnostic messages.
 +	* common/http.c (send_request): Print TLS alert info
 +	(connect_server): Detect bogus DNS entry.
 +
 +	gpg: Obsolete some keyserver helper options.
 +	* g10/options.h (opt): Remove keyserver_options.other.
 +	* g10/gpg.c (main): Obsolete option --honor-http-proxt.
 +	* g10/keyserver.c (add_canonical_option): Replace by ...
 +	(warn_kshelper_option): New.
 +	(parse_keyserver_uri): Obsolete "x-broken-http".
 +
 +	dirmngr: Return a proper error for all dead hosts.
 +	* dirmngr/ks-engine-hkp.c (map_host): Change to return an gpg_error_t.
 +	Return an error code for all dead hosts.
 +	(make_host_part): Change to return an gpg_error_t.  Change all
 +	callers.
 +
 +	gpg: Write a status line for a failed --send-keys.
 +	* g10/keyserver.c (keyserver_put): Write an status error.
 +
 +2014-12-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix for EdDSA.
 +	* scd/app-openpgp.c (get_algo_byte): It catches 22.
 +	(store_fpr): It's MPI usually, but it's opaque bytes for EdDSA.
 +
 +2014-12-05  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	Document no-allow-mark-trusted option.
 +	    doc: Document no-allow-mark-trusted for gpg-agent
 +
 +	    * doc/gpg-agent.texi: Change allow-mark-trusted doc to
 +	    no-allow-mark-trusted.
 +
 +	    --
 +	    Since rev. 78a56b14 allow-mark-trusted is the default option
 +	    and was replaced by no-allow-mark-trusted to disable the
 +	    interactive prompt.
 +
 +2014-12-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix for NIST P-256.
 +	* g10/card-util.c (card_store_subkey): Error check.
 +	* scd/app-opengpg.c (ecc_writekey): Support NIST P-256.
 +	(do_writekey): Error check.
 +
 +2014-12-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Allow import of large keys.
 +	* g10/import.c (import): Skip too large keys.
 +	* kbx/keybox-file.c (IMAGELEN_LIMIT): Change limit from 2MB to 5MB.
 +
 +2014-12-03  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove option aliases --[no-]throw-keyid and --notation-data.
 +	* g10/gpg.c (opts): Remove them.
 +	* g10/options.h (opt): s/throw_keyid/throw_keyids/ and change users.
 +
 +2014-12-02  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Replace some sprintf.
 +	* agent/call-scd.c (agent_card_pksign): Replace sprintf by bin2hex.
 +	* agent/command-ssh.c (ssh_identity_register): Ditto.
 +	* agent/pkdecrypt.c (agent_pkdecrypt): Replace sprintf by
 +	put_membuf_printf.
 +
 +2014-12-01  Werner Koch  <wk at gnupg.org>
 +
 +	tools: Improve watchgnupg portability.
 +	* configure.ac (AC_CHECK_HEADERS): Check for sys.select.h
 +	* tools/watchgnupg.c: Include it.
 +
 +	gpg: Fix export bug using exact search with only one key in the keybox.
 +	* g10/export.c (do_export_stream): Disable caching.
 +	* g10/keyserver.c (keyidlist): Ditto.
 +
 +	scd: Implement socket redirection.
 +	* scd/scdaemon.c (ENAMETOOLONG): New.
 +	(redir_socket_name): New.
 +	(cleanup): Take care of a redirected socket.
 +	(main): Pass redir_socket_name to create_server_socket.
 +	(create_socket_name): Remove superfluous length check.
 +	(create_server_socket): Add arg r_redir_name and implement
 +	redirection.  Replace assert for older Assuan by an error message.
 +
 +	dirmngr: Implement socket redirection.
 +	* dirmngr/dirmngr.c (ENAMETOOLONG): new.
 +	(redir_socket_name): New.
 +	(main): Add Assuan socket redirection.
 +	(cleanup): Adjust cleanup for redirection.
 +
 +2014-11-28  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Implement socket redirection.
 +	* agent/gpg-agent.c (ENAMETOOLONG): New.
 +	(redir_socket_name, redir_socket_name_extra)
 +	(redir_socket_name_ssh): New.
 +	(remove_socket): Take care of the redir names.
 +	(main): Pass the redir names to create_server_socket.
 +	(create_socket_name): Remove length check - that is anyway done later.
 +	(create_server_socket): Add arg r_redir_name and implement redirection
 +	if Libassuan is at least 2.14.
 +
 +	gpg: Change another BUG() call to a regular error message.
 +	* g10/mainproc.c (proc_tree): Replace BUG by a proper error messages.
 +
 +	Add option --no-autostart.
 +	* g10/gpg.c: Add option --no-autostart.
 +	* sm/gpgsm.c: Ditto.
 +	* g10/options.h (opt): Add field autostart.
 +	* sm/gpgsm.h (opt): Ditto.
 +	* g10/call-agent.c (start_agent): Print note if agent was not
 +	autostarted.
 +	* sm/call-agent.c (start_agent): Ditto.
 +	* g10/call-dirmngr.c (create_context): Likewise.
 +	* sm/call-dirmngr.c (start_dirmngr_ext): Ditto.
 +
 +2014-11-27  Мирослав Николић  <wk at gnupg.org>
 +
 +	gpg-agent: Add restricted connection feature.
 +	* agent/agent.h (opt): Add field extra_socket.
 +	(server_control_s): Add field restricted.
 +	* agent/command.c: Check restricted flag on many commands.
 +	* agent/gpg-agent.c (oExtraSocket): New.
 +	(opts): Add option --extra-socket.
 +	(socket_name_extra): New.
 +	(cleanup): Cleanup that socket name.
 +	(main): Implement oExtraSocket.
 +	(create_socket_name): Add arg homedir and change all callers.
 +	(create_server_socket): Rename arg is_ssh to primary and change
 +	callers.
 +	(start_connection_thread): Take ctrl as arg.
 +	(start_connection_thread_std): New.
 +	(start_connection_thread_extra): New.
 +	(handle_connections): Add arg listen_fd_extra and replace the
 +	connection starting code by parameterized loop.
 +	* common/asshelp.c (start_new_gpg_agent): Detect the use of the
 +	restricted mode and don't fail on sending the pinentry environment.
 +
 +	* common/util.h (GPG_ERR_FORBIDDEN): New.
 +
 +	agent: Make auditing of the option list easier.
 +	* agent/gpg-agent.c (opts): Use ARGPARSE_ macros.
 +
 +2014-11-26  Kristian Fiskerstrand  <kf at sumptuouscapital.com>
 +
 +	dirmngr: Only report hkps scheme when available.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_help): Make use of TLS macros.
 +
 +2014-11-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change a bug() call to a regular error message.
 +	* g10/decrypt-data.c (decrypt_data): Return an error code instead of
 +	calling BUG().
 +
 +2014-11-25  Werner Koch  <wk at gnupg.org>
 +
 +	Fix buffer overflow in openpgp_oid_to_str.
 +	* common/openpgp-oid.c (openpgp_oid_to_str): Fix unsigned underflow.
 +
 +	* common/t-openpgp-oid.c (BADOID): New.
 +	(test_openpgp_oid_to_str): Add test cases.
 +
 +2014-11-24  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix use of uninit.value in listing sig subpkts.
 +	* g10/parse-packet.c (dump_sig_subpkt): Print regex subpacket
 +	sanitized.
 +
 +	gpg: Fix off-by-one read in the attribute subpacket parser.
 +	* g10/parse-packet.c (parse_attribute_subpkts): Check that the
 +	attribute packet is large enough for the subpacket type.
 +
 +	gpg: Fix batch generation of ECC keys.
 +	* g10/keygen.c (get_parameter_algo): Map ECC algorithm strings
 +	directly.
 +
 +2014-11-24  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	Distinguish between ARGPARSE_AMBIGUOUS_{OPTION,COMMAND}
 +	* common/argparse.c (initialize): Use correct value.
 +
 +	gpg: Refer to --throw-keyids instead of --throw-keyid.
 +	* g10/encrypt.c: adjust error message
 +
 +2014-11-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Track number of skipped v3 keys on import.
 +	* g10/import.c (stats_s): Add field v3keys.
 +	(import): Update this field.
 +	(import_print_stats): Print v3 key count.
 +	(read_block): Skip v3 keys and return a count for them.
 +
 +	gpg: Fix regression in parse_key.
 +	* g10/parse-packet.c (parse): Better return just the gpg_err_code.
 +	(parse_key): Return the error code.
 +
 +	speedo: Add simple logos to the installer.
 +	* build-aux/speedo/w32/README.txt: Include GnuPG Readme.
 +	* build-aux/speedo/w32/gnupg-logo-150x57.bmp: New.
 +	* build-aux/speedo/w32/gnupg-logo-164x314.bmp: New.
 +	* build-aux/speedo/w32/inst.nsi: Add logos.
 +	* build-aux/speedo.mk ($(bdir)/NEWS.tmp): Extract news items.
 +
 +2014-11-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix hash detection for ECDSA.
 +	* g10/sign.c (sign_file): Use DSA or ECDSA and not DSA|EdDSA.
 +
 +	Fix linker problem on OS X.
 +	* common/init.c (default_errsource): Move to the .data segmemt.
 +
 +2014-11-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg-connect-agent: Add convenience option --uiserver.
 +
 +	Add "gpgconf --kill dirmngr" and avoid useless launch before a kill.
 +	* common/asshelp.c (start_new_gpg_agent): Add arg autostart.  Change
 +	all callers to use 1 for it.
 +	(start_new_dirmngr): Ditto.
 +	* tools/gpg-connect-agent.c: Add option --no-autostart.
 +	(main): Default autostart to 1.
 +	(start_agent): Implement no-autostart.
 +	* tools/gpgconf-comp.c (gpg_agent_runtime_change): Use --no-autostart.
 +	(scdaemon_runtime_change): Ditto.
 +	(dirmngr_runtime_change): New.
 +
 +	po: Copied missing translations from the 2.0 branch.
 +	* po/LINGUAS: Add new translations.
 +
 +2014-11-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix a NULL-deref for invalid input data.
 +	* g10/mainproc.c (proc_encrypted): Take care of canceled passpharse
 +	entry.
 +
 +2014-11-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make the use of "--verify FILE" for detached sigs harder.
 +	* g10/openfile.c (open_sigfile): Factor some code out to ...
 +	(get_matching_datafile): new function.
 +	* g10/plaintext.c (hash_datafiles): Do not try to find matching file
 +	in batch mode.
 +	* g10/mainproc.c (check_sig_and_print): Print a warning if a possibly
 +	matching data file is not used by a standard signatures.
 +
 +	gpg: Fix a missing LF in debug output.
 +	* g10/kbnode.c (dump_kbnode): Print a LF.
 +
 +	gpg: Remove PGP-2 related cruft.
 +	* g10/armor.c (parse_hash_header,carmor_filter): Ignore MD5 in hash
 +	header.
 +	(fake_packet): Remove pgp-2 workaround for white space stripping.
 +	* g10/filter.h (armor_filter_context_t): Remove field pgp2mode.
 +	* g10/options.h (opt): Remove field pgp2_workarounds.
 +	* g10/gpg.c (main): Do not set this field.
 +	* g10/gpgv.c (main): Ditto.
 +	* g10/mainproc.c (proc_encrypted): Use SHA-1 as fallback s2k hash
 +	  algo.  Using MD5 here is useless.
 +	(proc_plaintext): Remove PGP-2 related woraround
 +	(proc_tree): Remove another workaround but keep the one for PGP-5.
 +
 +2014-11-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve perceived speed of secret key listings.
 +	* g10/keylist.c (list_keyblock): Flush stdout for secret keys.
 +
 +	gpg: Fix regression in --refresh-keys.
 +	* g10/keyserver.c (keyserver_get): Factor all code out to ...
 +	(keyserver_get_chunk): new.  Extimate line length.
 +	(keyserver_get): Split up requests into chunks.
 +
 +	gpg: Add import options "keep-ownertrust".
 +	* g10/options.h (IMPORT_KEEP_OWNERTTRUST): New.
 +	* g10/import.c (parse_import_options): Add "keep-ownertrust".
 +	(import_one): Act upon new option.
 +
 +2014-11-11  Werner Koch  <wk at gnupg.org>
 +
 +	Remove use of gnulib (part 2)
 +	* configure.ac (strpbrk): Add to AC_CHECK_FUNCS.
 +	(gl_EARLY): Remove.
 +	* common/stringhelp.c (strpbrk) [!HAVE_STRPBRK]: New.
 +	* common/sysutils.c (gnupg_mkdtemp): New.  Based on code from
 +	glibc-2.6.
 +	(gnupg_setenv): Rewrite.
 +	(gnupg_unsetenv): Rewrite.
 +	* g10/exec.c: Include sysutils.h and replace mkdtemp by gnupg_mkdtemp.
 +	* g13/be-encfs.c: Ditto.
 +	* g13/mount.c: Ditto.
 +	* tools/symcryptrun.c (confucius_mktmpdir): Ditto.
 +
 +	Remove use of gnulib (part 1)
 +	* gl/: Remove entire tree.
 +	* configure.ac: Remove gnulib tests and the gl/ Makefile.
 +	(setenv): Add to AC_CHECK_FUNCS.
 +	* autogen.rc (extra_aclocal_flags): Set to empty.
 +	* Makefile.am (ACLOCAL_AMFLAGS): Remove -I gl/m4
 +	(SUBDIRS): Remove gl/.
 +	* agent/Makefile.am (common_libs): Remove ../gl/gnulib.a
 +	* common/Makefile.am (t_common_ldadd): Ditto.
 +	* dirmngr/Makefile.am (dirmngr_LDADD): Ditto.
 +	(dirmngr_ldap_LDADD, dirmngr_client_LDADD): Ditto.
 +	* g10/Makefile.am (needed_libs): Ditto.
 +	* g13/Makefile.am (g13_LDADD): Ditto.
 +	* kbx/Makefile.am (kbxutil_LDADD): Ditto.
 +	($(PROGRAMS)): Ditto.
 +	* scd/Makefile.am (scdaemon_LDADD): Ditto.
 +	* sm/Makefile.am (common_libs): Ditto.
 +	* tools/Makefile.am (common_libs, commonpth_libs): Ditto.
 +
 +	* agent/gpg-agent.c: Remove "mkdtemp.h"
 +	* g10/exec.c: Ditto.
 +	* scd/scdaemon.c: Ditto.
 +	* tools/symcryptrun.c: Ditto.
 +	* common/sysutils.c: Remove "setenv.h"
 +
 +	* common/t-timestuff.c: Use putenv if setenv is not available.
 +
 +2014-11-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove warning message for non-implemented search modes.
 +	* kbx/keybox-search.c (keybox_search): Silently ignore.
 +	* doc/specify-user-id.texi: Docuement '@", '+', and '.' search
 +	prefixes.
 +
 +	w32: Fix http access module.
 +	* common/http.c (write_server) [W32]: Rework to use send() instead of
 +	write even when build with npth.
 +	(cookie_read) [W32]: Rework to use recv() instead of read even when
 +	build with npth.
 +
 +	build: Add method to use a custom swdb.lst and use adns with Windows.
 +	* build-aux/getswdb.sh: Add option --skip-verify.
 +	* build-aux/speedo.mk: Add config var CUSTOM_SWDB.  Tage adns version
 +	from swdb and build for Windows with adns.
 +
 +	build: Improve test for ADNS.
 +	* configure.ac <adns>: Use adns_free as probe function for libadns.
 +	(HAVE_ADNS_FREE): Remove bogus tests to set this and remove the macro.
 +	(ADNSLIBS): Do not ac_subst - it is only used within configure.
 +
 +2014-11-05  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Append the date to the Windows installer.
 +	* build-aux/speedo.mk (BUILD_DATESTR): New.
 +	(dist-source, installer): Use it.
 +
 +	Release 2.1.0.
 +
 +	Avoid sign extension when shifting the MSB.
 +	* sm/fingerprint.c (gpgsm_get_short_fingerprint): Cast MSB before
 +	shifting.
 +	* g10/build-packet.c (delete_sig_subpkt): Ditto.
 +
 +2014-11-04  Werner Koch  <wk at gnupg.org>
 +
 +	Remove all expired common CA certificates.
 +	* doc/com-certs.pem: Remove certifciates.
 +
 +2014-11-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid extra pinentries for each subkey in --export-secret-keys.
 +	* agent/command.c (cmd_export_key): Actually implement the cache_nonce
 +	feature.
 +	* g10/export.c (do_export_stream): Make use of a cache_nonce.
 +
 +	gpg: Fix endless loop in keylisting with fingerprint.
 +	* g10/getkey.c (getkey_next): Disable cache.
 +
 +	gpg: Minor cleanup for key listing related code.
 +	* g10/getkey.c (get_pubkey_next): Divert to getkey_next.
 +	(get_pubkey_end): Move code to getkey_end.
 +	* g10/keydb.c (keydb_search_reset): Add a debug statement.
 +	(dump_search_desc): Add arg HD and print the handle.
 +
 +	gpg: Do not show an useless passphrase prompt in batch mode.
 +	* g10/keygen.c: Remove unused PASSPHRASE related code.
 +	(proc_parameter_file): Remove useless asking for a passphrase in batch
 +	mode.
 +
 +2014-10-31  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove superfluous check for Libgcrypt >= 1.4.0.
 +	* g10/gpg.c (main): Remove check.
 +
 +	kbx: Let keydb_search skip unwanted blobs.
 +	* kbx/keybox.h (keybox_blobtype_t): New.
 +	* kbx/keybox-defs.h (BLOBTYPE_*): Replace by KEYBOX_BLOBTYPE_*.
 +	* kbx/keybox-search.c (keybox_search): Add arg want_blobtype and skip
 +	non-matching blobs.
 +	* sm/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_X509 to keybox_search.
 +	* g10/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_PGP to keybox_search.
 +
 +	gpg: Fix --rebuild-keydb-caches.
 +	* g10/parse-packet.c (parse_key): Store even unsupported packet
 +	versions.
 +	* g10/keyring.c (keyring_rebuild_cache): Do not copy keys with
 +	versions less than 4.
 +
 +	gpg: Fix testing for secret key availability.
 +	* g10/getkey.c (have_secret_key_with_kid): Do not change the search
 +	mode.
 +
 +	build: Avoid distributing backup files etc.
 +	* Makefile.am (EXTRA_DIST): Do not include directories.
 +
 +2014-10-30  Werner Koch  <wk at gnupg.org>
 +
 +	tests: Speed up the genkey1024.test by using not so strong random.
 +	* agent/gpg-agent.c (oDebugQuickRandom): New.
 +	(opts): New option --debug-quick-random.
 +	(main): Use new option.
 +	* common/asshelp.c (start_new_gpg_agent): Add hack to pass an
 +	additional argument for the agent name.
 +	* tests/openpgp/defs.inc: Pass --debug-quick-random to the gpg-agent
 +	starting parameters.
 +	* tests/openpgp/version.test: Ditto.
 +
 +2014-10-29  Werner Koch  <wk at gnupg.org>
 +
 +	common: Check option arguments for a valid range.
 +	* common/argparse.h (ARGPARSE_INVALID_ARG): New.
 +	* common/argparse.c: Include limits h and errno.h.
 +	(initialize): Add error strings for new error constant.
 +	(set_opt_arg): Add range checking.
 +
 +	Fix stdint.h problem for Apple.
 +	* gl/stdint_.h [__APPLE__]: Include hack.
 +
 +2014-10-27  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Fixes for native build.
 +	* build-aux/speedo.mk (TARGETOS): Init with empty string.
 +	(speedo_pkg_gnupg_configure): Use --enable-gpg2-is-gpg only for w32.
 +	(INST_VERSION, INST_PROD_VERSION): Create only for w32.
 +
 +2014-10-24  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Support pinentries with integrated repeat passphrase feature.
 +	* agent/agent.h (struct pin_entry_info_s): Add fields repeat_okay and
 +	with_repeat.
 +	* agent/call-pinentry.c (close_button_status_cb): Rewrite and check
 +	for PIN_REPEAT.  Change users to check only the relevant bit.
 +	(agent_askpin): Support repeat logic of new Pinentries.
 +
 +	* agent/command-ssh.c (ssh_identity_register): Use the new repeat
 +	feature.
 +	* agent/genkey.c (agent_ask_new_passphrase): Ditto.
 +
 +2014-10-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Silence "packet with obsolete versoin" warnings.
 +	* g10/parse-packet.c (parse_key): Print warning only in very verbose
 +	mode.
 +
 +	gpg: Make card key generation work again.
 +	* g10/call-agent.c (agent_scd_learn): Rename from agent_learn.
 +	(agent_learn): New.
 +	* g10/keygen.c (gen_card_key): Call new agent-learn.
 +
 +2014-10-17  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Allow building without LDAP support.
 +	* configure.ac: Add option --disable-ldap.
 +	(USE_LDAP): New ac_define and am_conditional.
 +	* dirmngr/Makefile.am: Take care of USE_LDAP.
 +	* dirmngr/dirmngr.c (!USE_LDAP): Make all ldap options dummy options
 +	and do not call any ldap function.
 +	* dirmngr/server.c (!USE_LDAP): Do not call any ldap function.
 +	* dirmngr/crlfetch.c (!USE_LDAP): Ditto.
 +
 +	w32: Set SYSROOT to help finding config scripts.
 +	* autogen.sh <build-w32>: Set SYSROOT.
 +
 +	gpg: Remove all support for v3 keys and always create v4-signatures.
 +	* g10/build-packet.c (do_key): Remove support for building v3 keys.
 +	* g10/parse-packet.c (read_protected_v3_mpi): Remove.
 +	(parse_key): Remove support for v3-keys.  Add dedicated warnings for
 +	v3-key packets.
 +	* g10/keyid.c (hash_public_key): Remove v3-key support.
 +	(keyid_from_pk): Ditto.
 +	(fingerprint_from_pk): Ditto.
 +
 +	* g10/options.h (opt): Remove fields force_v3_sigs and force_v4_certs.
 +	* g10/gpg.c (cmd_and_opt_values): Remove oForceV3Sigs, oNoForceV3Sigs,
 +	oForceV4Certs, oNoForceV4Certs.
 +	(opts): Turn --force-v3-sigs, --no-force-v3-sigs, --force-v4-certs,
 +	--no-force-v4-certs int dummy options.
 +	(main): Remove setting of the force_v3_sigs force_v4_certs flags.
 +	* g10/revoke.c (gen_revoke, create_revocation): Always create v4 certs.
 +	* g10/sign.c (hash_uid): Remove support for v3-signatures
 +	(hash_sigversion_to_magic): Ditto.
 +	(only_old_style): Remove this v3-key function.
 +	(write_signature_packets): Remove support for creating v3-signatures.
 +	(sign_file): Ditto.
 +	(sign_symencrypt_file): Ditto.
 +	(clearsign_file): Ditto.  Remove code to emit no Hash armor line if
 +	only v3-keys are used.
 +	(make_keysig_packet): Remove arg SIGVERSION and force using
 +	v4-signatures.  Change all callers to not pass a value for this arg.
 +	Remove all v3-key related code.
 +	(update_keysig_packet): Remove v3-signature support.
 +	* g10/keyedit.c (sign_uids): Always create v4-signatures.
 +
 +	* g10/textfilter.c (copy_clearsig_text): Remove arg pgp2mode and
 +	change caller.
 +
 +2014-10-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove extra RSA import status line.
 +	* g10/import.c (stats_s): Remove field "imported_rsa".
 +	(import_print_stats): Do not print separate value for RSA.
 +	(import_one): Remove the RSA counter.
 +
 +	gpg: Fix informative printing of user ids.
 +	* g10/getkey.c (keyid_list): Add field "fpr".
 +	(cache_user_id): Store fpr and check for dups only by fpr.
 +	(get_pubkey_byfpr): New.
 +	(get_user_id_string): Make static and use xasprintf.
 +	(get_long_user_id_string): Use xasprintf.
 +	(get_user_id_byfpr): New.
 +	(get_user_id_byfpr_native): New.
 +	* g10/keyid.c (fingerprint_from_pk): Make arg RET_LEN optional.
 +	* g10/import.c (import_one): Use get_user_id_byfpr_native.
 +
 +	gpg: Allow importing keys with duplicated long key ids.
 +	* g10/keydb.c (keydb_handle): Add field no_caching.
 +	(keyblock_cache): Repalce field kid by fpr.
 +	(keydb_disable_caching): New.
 +	(keydb_search): Use the fingerprint as cache index.
 +
 +	* g10/import.c (import_one): Use the fingerprint and not the kid to
 +	lookup the key.  Call keydb_disable_caching beofre re-searching for
 +	update.
 +
 +	* tests/openpgp/import.test: Add a test case.
 +
 +	tests: Speed up conventional encryption tests for gpg.
 +	* tests/openpgp/conventional-mdc.test: Add an s2k-count option.
 +	* tests/openpgp/conventional.test: Ditto.
 +
 +2014-10-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Minor change for better readability.
 +	* g10/build-packet.c (write_version): Remove.
 +	(do_pubkey_enc, do_onepass_sig): Write version directly.
 +
 +2014-10-10  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Fix a man page rendering problem.
 +	* doc/gpg-agent.texi (Agent Configuration): Fix rendering of the
 +	sshcontrol example.
 +
 +2014-10-10  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: Add build and runtime support for larger RSA keys.
 +	* configure.ac: Added --enable-large-secmem option.
 +	* g10/options.h: Add opt.flags.large_rsa.
 +	* g10/gpg.c: Contingent on configure option: adjust secmem size,
 +	add gpg --enable-large-rsa, bound to opt.flags.large_rsa.
 +	* g10/keygen.c: Adjust max RSA size based on opt.flags.large_rsa
 +	* doc/gpg.texi: Document --enable-large-rsa.
 +
 +2014-10-09  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Skip overlong keys and a print a warning.
 +	* kbx/keybox-search.c (keybox_search): Add arg r_skipped and skip too
 +	long blobs.
 +	* sm/keydb.c (keydb_search): Call keybox_search with a dummy param.
 +	* g10/keydb.c (struct keydb_handle): Add field skipped_long_blobs.
 +	(keydb_search_reset): Reset that field.
 +	(keydb_search): Update that field.
 +	(keydb_get_skipped_counter): New.
 +	* g10/keylist.c (list_all): Print count of skipped keys.
 +
 +	gpg: Sync keylist output and warning messages.
 +	* g10/keylist.c (list_all): Flush stdout before logging.
 +	* g10/misc.c (print_pubkey_algo_note): Ditto.
 +	(print_cipher_algo_note): Ditto.
 +	(print_digest_algo_note): Ditto.
 +	(print_md5_rejected_note): Ditto.
 +
 +	kbx: Fix handling of overlong keys.
 +	* kbx/keybox-file.c (IMAGELEN_LIMIT): Change limit from 10^6 to 2MiB.
 +	(_keybox_read_blob2): Skip too long record records.
 +	(_keybox_write_blob): Do not accept too long record.
 +	* kbx/keybox-dump.c (file_stats_s): Add field skipped_long_blobs.
 +	(_keybox_dump_file): Print new counter.
 +	(_keybox_dump_file): Skip too long records.
 +	----
 +
 +	To test this feature you may set the limit back to 1MiB and use key
 +	F7F0E70F307D56ED which is in my local copy close to 2MiB.  Without
 +	this patch it was possible to import the key but access to that key
 +	and all keys stored after it was not possible.
 +
 +	gpg: Take care to use pubring.kbx if it has ever been used.
 +	* kbx/keybox-defs.h (struct keybox_handle): Add field for_openpgp.
 +	* kbx/keybox-file.c (_keybox_write_header_blob): Set openpgp header
 +	flag.
 +	* kbx/keybox-blob.c (_keybox_update_header_blob): Add arg for_openpgp
 +	and set header flag.
 +	* kbx/keybox-init.c (keybox_new): Rename to do_keybox_new, make static
 +	and add arg for_openpgp.
 +	(keybox_new_openpgp, keybox_new_x509): New.  Use them instead of the
 +	former keybox_new.
 +	* kbx/keybox-update.c (blob_filecopy): Add arg for_openpgp and set the
 +	openpgp header flags.
 +
 +	* g10/keydb.c (rt_from_file): New.  Factored out and extended from
 +	keydb_add_resource.
 +	(keydb_add_resource): Switch to the kbx file if it has the openpgp
 +	flag set.
 +
 +	* kbx/keybox-dump.c (dump_header_blob): Print header flags.
 +
 +2014-10-09  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	Avoid unnecessary library linkage.
 +	* dirmngr/Makefile.am: Avoid $(DNSLIBS) for dirmngr_ldap
 +	* g10/Makefile.am: $(LIBREADLINE) is only for gpg2; gpgv2 does not
 +	need $(LIBASSUAN_LIBS)
 +	* sm/Makefile.am: gpgsm does not need $(ZLIBS)
 +	* tools/Makefile.am: gpgconf does not need $(NPTH_LIBS)
 +
 +2014-10-08  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid error exit if keygrip computations fails in a key listing.
 +	* g10/keyid.c (keygrip_from_pk): Use log_info and clear array on error.
 +
 +2014-10-03  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.0-beta864.
 +
 +	gpg: Allow creating a cert-only primary key.
 +	* g10/keygen.c (ask_key_flags): Allow a 'c' in direct entry.
 +
 +	build: Add configure options --disable-{ntb,gnu}tls.
 +	* configure.ac: Add --disable-ntbtls and --disable-gnutls.
 +
 +2014-10-03  Andre Heinecke  <aheinecke at intevation.de>
 +
 +	gpg: Check gpg-agent version before 2.1 migration.
 +	* g10/call-agent.c, g10/call-agent.h (agent_get_version): New.
 +	* g10/migrate.c (migrate_secring): Abort migration if
 +	agent_get_version returns not at least 2.1.0
 +
 +2014-10-03  Werner Koch  <wk at gnupg.org>
 +
 +	po: Update German translation.
 +
 +	Remove support for the GPG_AGENT_INFO envvar.
 +	* agent/agent.h (opt): Remove field use_standard_socket.
 +	* agent/command.c (cmd_killagent): Always allow killing.
 +	* agent/gpg-agent.c (main): Turn --{no,}use-standard-socket and
 +	--write-env-file into dummy options.  Always return true for
 +	--use-standard-socket-p. Do not print the GPG_AGENT_INFO envvar
 +	setting or set that envvar.
 +	(create_socket_name): Simplify by removing non standard socket
 +	support.
 +	(check_for_running_agent): Ditto.
 +	* common/asshelp.c (start_new_gpg_agent): Remove GPG_AGENT_INFO use.
 +	* common/simple-pwquery.c (agent_open): Ditto.
 +	* configure.ac (GPG_AGENT_INFO_NAME): Remove.
 +	* g10/server.c (gpg_server): Do not print the AgentInfo comment.
 +	* g13/server.c (g13_server): Ditto.
 +	* sm/server.c (gpgsm_server): Ditto.
 +	* tools/gpgconf.c (main): Simplify by removing non standard socket
 +	support.
 +
 +2014-10-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix regression removing SHA256.
 +	* g10/misc.c (map_md_openpgp_to_gcry): Always use SHA256.
 +
 +	First changes for future use of NTBTLS.
 +	* configure.ac (NEED_NTBTLS_ABI, NEED_NTBTLS_VERSION): New.
 +	(HTTP_USE_NTBTLS): New.  Prefer over GNUTLS.
 +	* m4/ntbtls.m4: New.
 +	* m4/Makefile.am (EXTRA_DIST): Add new file.
 +	* common/http.c: Add conditionals to eventually use NTBTLS.
 +
 +	build: Update m4 scripts.
 +	* m4/gpg-error.m4: Update from Libgpg-error git master.
 +	* m4/libgcrypt.m4: Update from Libgcrypt git master.
 +	* configure.ac: Declare SYSROOT a precious variable.  Add extra error
 +	message for library configuration mismatches.
 +
 +2014-09-29  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Remove GnuPG-1 related parts from gpg.texi.
 +	* doc/Makefile.am (YAT2M_OPTIONS): Add 2.1 to the source info.
 +	* doc/gpg.texi: Remove gpg1 related texts.
 +
 +2014-09-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Default to SHA-256 for all signature types on RSA keys.
 +	* g10/main.h (DEFAULT_DIGEST_ALGO): Use SHA256 in --gnupg and SHA1 in
 +	strict RFC or PGP modes.
 +	* g10/sign.c (make_keysig_packet): Use DEFAULT_DIGEST_ALGO also for
 +	RSA key signatures.
 +	* configure.ac: Do not allow to disable sha256.
 +
 +	gpg: Simplify command --gen-key and add --full-gen-key.
 +	* g10/gpg.c (aFullKeygen): New.
 +	(opts): Add command --full-key-gen.
 +	(main): Implement it.
 +	* g10/keygen.c (DEFAULT_STD_ALGO): Replace wrong GCRY_PK_RSA although
 +	the value is identical.
 +	(DEFAULT_STD_CURVE): New.
 +	(DEFAULT_STD_SUBALGO): New.
 +	(DEFAULT_STD_SUBKEYSIZE): New.
 +	(DEFAULT_STD_SUBCURVE): New.
 +	(quick_generate_keypair): Use new macros here.
 +	(generate_keypair): Add arg "full" and fix call callers. Do not ask
 +	for keysize in non-full node.
 +	(ask_user_id): Add arg "full" and simplify for non-full mode.
 +
 +2014-09-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add shortcut for setting key capabilities.
 +	* g10/keygen.c (ask_key_flags): Add shortcut '='.
 +	* doc/help.txt (gpg.keygen.flags): New.
 +
 +2014-09-25  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Do not always print dashes in obsolete_option.
 +	* g10/gpg.c (main): Pass option names to obsolete_option without
 +	double dash.
 +	* g10/misc.c (obsolete_option, obsolete_scdaemon_option): Print double
 +	dash only for command line options.
 +
 +2014-09-25  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: Warn about (but don't fail) on scdaemon options in gpg.conf.
 +	* g10/gpg.c: Add config options that should belong in scdaemon.conf
 +	* g10/main.h, g10/misc.c (obsolete_scdaemon_option): New.
 +
 +2014-09-22  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Check that wget and gpgv are installed.
 +	* build-aux/getswdb.sh: Check for required tools.
 +
 +	speedo: Autodetect sha1sum tools.
 +	* build-aux/getswdb.sh: Add option --find-sha1sum.
 +	* build-aux/speedo.mk (check-tools): New phony target.  Not yet used.
 +	(SHA1SUM): New var.  Use it instead of sha1sum.
 +
 +	gpg: Create default keyring with .kbx suffix.
 +	* g10/keydb.c (maybe_create_keyring_or_box): Rename arg for clarity.
 +	(keydb_add_resource): Fix order of args to maybe_create_keyring_or_box
 +	and check and create .kbx.
 +
 +2014-09-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: --delete-secret-key - check that a secret key exists.
 +	* g10/delkey.c (do_delete_key): Check availibility of a secret key.
 +
 +	gpg: Make algorithm selection prompt for ECC more clear.
 +	* g10/keygen.c (ask_algo): Change 9 to "ECC and ECC".
 +
 +2014-09-18  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.0-beta834.
 +
 +	speedo: Distribute needed files.
 +	* Makefile.am (EXTRA_DIST): Add speedo stuff.
 +
 +	build: Enable gpgtar by default.
 +
 +	common: Do not build maintainer modules in non-maintainer mode.
 +	* common/Makefile.am (module_maint_tests): Use only in maintainer
 +	mode.
 +	(t_common_cflags): New.
 +
 +	common: Remove superfluous statements.
 +	* common/exechelp-posix.c: Remove weak pragmas.
 +	* common/sexputil.c (make_canon_sexp_from_rsa_pk): Remove double
 +	const.
 +
 +	g13: Avoid segv after pipe creation failure.
 +	* g13/call-gpg.c (gpg_encrypt_blob): Init some vars in case of an
 +	early error.
 +	(gpg_decrypt_blob): Ditto.
 +
 +	scd: Fix int/short mismatch in format string of app-p15.c.
 +	* scd/app-p15.c (parse_certid): Use snprintf and cast value.
 +	(send_certinfo): Ditto.
 +	(send_keypairinfo): Ditto.
 +	(do_getattr): Ditto.
 +
 +	agent: Init a local variable in the error case.
 +	* agent/pksign.c (do_encode_md): Init HASH on error.
 +
 +	agent: Remove left over debug output.
 +	* agent/command-ssh.c (ssh_signature_encoder_eddsa): Remove debug
 +	output.
 +
 +	agent: Silence compiler warning for a debug message.
 +	* agent/call-pinentry.c (agent_query_dump_state): Use %p for
 +	POPUP_TID.
 +
 +	sm: Silence compiler warnings.
 +	* sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Remove unused var I.
 +	* sm/certreqgen.c (proc_parameters): Init PUBLIC to avoid compiler
 +	warning.
 +
 +	gpg: Silence a compiler warning.
 +	* g10/parse-packet.c (enum_sig_subpkt): Replace hack.
 +
 +	gpg: Replace a hash algo test function.
 +	* g10/gpg.c (print_mds): Replace openpgp_md_test_algo.
 +
 +	speedo: Various fixes.
 +	* build-aux/speedo.mk: Take zlib and bzip2 from ftp.gnupg.org.  Minor
 +	other fixes.
 +
 +2014-09-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print a warning if the subkey expiration may not be what you want.
 +	* g10/keyedit.c (subkey_expire_warning): New.
 +	(keyedit_menu): Call it when needed.
 +
 +	gpg: Improve passphrase caching.
 +	* agent/cache.c (last_stored_cache_key): New.
 +	(agent_get_cache): Allow NULL for KEY.
 +	(agent_store_cache_hit): New.
 +	* agent/findkey.c (unprotect): Call new function and try to use the
 +	last stored key.
 +
 +	* g10/revoke.c (create_revocation): Add arg CACHE_NONCE and pass to
 +	make_keysig_packet.
 +	(gen_standard_revoke): Add arg CACHE_NONCE and pass to
 +	create_revocation.
 +	* g10/keygen.c (do_generate_keypair): Call gen_standard_revoke with
 +	cache nonce.
 +
 +2014-09-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Use algorithm id 22 for EdDSA.
 +	* common/openpgpdefs.h (PUBKEY_ALGO_EDDSA): Change to 22.
 +	* g10/keygen.c (ask_curve): Reword the Curve25519 warning note.
 +
 +2014-09-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Stop early on bogus old style comment packets.
 +	* g10/parse-packet.c (parse_key): Take care of too short packets for
 +	old style commet packets.
 +
 +2014-09-10  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Support https for KS_FETCH.
 +	* dirmngr/ks-engine-hkp.c (cert_log_cb): Move to ...
 +	* dirmngr/misc.c (cert_log_cb): here.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Support 307-redirection
 +	and https.
 +
 +	dirmngr: Fix the ks_fetch command for the http scheme.
 +	* common/http.c (http_session_ref): Allow for NULL arg.
 +
 +2014-09-08  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix memory leak in ECC encryption.
 +	* g10/pkglue.c (pk_encrypt): Fix memory leak and streamline error
 +	handling.
 +
 +2014-09-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix export of NIST ECC keys.
 +	* common/openpgp-oid.c (struct oidtable): New.
 +	(openpgp_curve_to_oid): Rewrite and allow OID as input.
 +	(openpgp_oid_to_curve): Make use of the new table.
 +
 +	agent: Fix import of OpenPGP EdDSA keys.
 +	* agent/cvt-openpgp.c (get_keygrip): Special case EdDSA.
 +	(convert_secret_key): Ditto.
 +	(convert_transfer_key): Ditto.
 +	(apply_protection): Handle opaque MPIs.
 +
 +	(do_unprotect): Check FLAG_OPAQUE instead of FLAG_USER1 before
 +	unpacking an opaque mpi.
 +
 +2014-09-01  Kyle Butt  <kylebutt at gmail.com>
 +
 +	gpg: Fix export of ecc secret keys by adjusting check ordering.
 +	* g10/export.c (transfer_format_to_openpgp): Move the check against
 +	PUBKEY_MAX_NSKEY to after the ECC code adjusts the number of
 +	parameters.
 +
 +2014-09-01  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Allow key unprotection using AES-256.
 +	* agent/protect.c (PROT_CIPHER): Rename to GCRY_CIPHER_AES128 for
 +	clarity.
 +	(do_decryption): Add args prot_cipher and prot_cipher_keylen.  USe
 +	them instead of the hardwired values.
 +	(agent_unprotect): Change to use a table of protection algorithms.
 +	Add AES-256 variant.
 +
 +2014-08-28  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Do not show "MD5" and triplicated "RSA" in --version.
 +	* g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
 +	(build_list_md_test_algo): Ignore MD5.
 +
 +	gpg: Do not show "MD5" and triplicated "RSA" in --version.
 +	* g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
 +	(build_list_md_test_algo): Ignore MD5.
 +
 +2014-08-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove CAST5 from the default prefs and order SHA-1 last.
 +	* g10/keygen.c (keygen_set_std_prefs): Update prefs.
 +
 +	Switch to the libgpg-error provided estream.
 +	* configure.ac (NEED_GPG_ERROR_VERSION): Reguire 1.14.
 +	(GPGRT_ENABLE_ES_MACROS): Define.
 +	(estream_INIT): Remove.
 +	* m4/estream.m4: Remove.
 +	* common/estream-printf.c, common/estream-printf.h: Remove.
 +	* common/estream.c, common/estream.h: Remove.
 +	* common/init.c (_init_common_subsystems): Call gpgrt initialization.
 +
 +	gpg: Allow for positional parameters in the passphrase prompt.
 +	* g10/passphrase.c (passphrase_get): Replace sprintf by xasprintf.
 +
 +2014-08-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix "can't handle public key algorithm" warning.
 +	* g10/parse-packet.c (unknown_pubkey_warning): Check for encr/sign
 +	capabilities.
 +
 +2014-08-19  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Get version numbers from online database.
 +	* build-aux/getswdb.sh: New.
 +	* build-aux/speedo.mk: Get release version numbers from swdb.lst.
 +
 +	build: Create VERSION file via autoconf.
 +	* Makefile.am (dist-hook): Remove creation of VERSION.
 +	(EXTRA_DIST): Add VERSION.
 +	* configure.ac: Let autoconf create VERSION.
 +
 +2014-08-18  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Install the current release signing pubkey.
 +	* g10/distsigkey.gpg: New.
 +
 +	agent: Return NO_SECKEY instead of ENONET for PKSIGN and others.
 +	* agent/pksign.c (agent_pksign_do): Replace ENONET by NO_SECKEY.
 +	* agent/findkey.c (agent_key_from_file): No diagnostic for NO_SECKEY.
 +	* agent/pkdecrypt.c (agent_pkdecrypt): Replace checking for ENOENT.
 +
 +	kbx: Make user id and signature data optional for OpenPGP.
 +	* kbx/keybox-blob.c (_keybox_create_openpgp_blob): Remove restriction.
 +
 +	gpg: Change default cipher for --symmetric from CAST5 to AES-128.
 +	* g10/main.h (DEFAULT_CIPHER_ALGO): Chhange to AES or CAST5 or 3DES
 +	depending on configure option.
 +	* g10/gpg.c (main): Set opt.s2k_cipher_algo to DEFAULT_CIPHER_ALGO.
 +
 +	yat2m: Support @set and @value.
 +	* doc/yat2m.c (variablelist): New.
 +	(set_variable): New.
 +	(macro_set_p): Also check the variables.
 +	(proc_texi_cmd): Support the @value command.
 +	(parse_file): Support the @set command.
 +	(top_parse_file): Release variablelist.
 +
 +	yat2m: Support the $* command for man page rendering.
 +
 +2014-08-17  Werner Koch  <wk at gnupg.org>
 +
 +	estream: Change license from GPL to LPGL.
 +	* common/estream-printf.c, common/estream-printf.h: Change license.
 +	* common/estream.c, common/estream.h: Ditto.
 +
 +2014-08-14  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.0-beta783.
 +
 +	po: Update the German (de) translation.
 +
 +	sm: Create homedir and lock empty keybox creation.
 +	* sm/gpgsm.h (opt): Add field "no_homedir_creation".
 +	* sm/gpgsm.c (main): Set it if --no-options is used.
 +	* sm/keydb.c (try_make_homedir): New.  Similar to the one from
 +	g10/openfile.c.
 +	(maybe_create_keybox): New.  Similar to the one from g10/keydb.c.
 +	(keydb_add_resource): Replace some code by maybe_create_keybox.
 +
 +	gpg: Screen keyserver responses.
 +	* g10/main.h (import_screener_t): New.
 +	* g10/import.c (import): Add screener callbacks to param list.
 +	(import_one): Ditto.
 +	(import_secret_one): Ditto.
 +	(import_keys_internal): Ditto.
 +	(import_keys_stream): Ditto.
 +	* g10/keyserver.c (struct ks_retrieval_screener_arg_s): New.
 +	(keyserver_retrieval_screener): New.
 +	(keyserver_get): Pass screener to import_keys_es_stream().
 +
 +	scd: Minor changes to app-sc-hsm.
 +	* scd/app-sc-hsm.c: Re-indendet some parts and set some vars to NULL
 +	after xfree for improbed robustness.
 +	(read_ef_prkd): Replace serial operator by blocks for better
 +	readability.
 +	(apply_PKCS_padding): Rewrite for easier auditing.
 +	(strip_PKCS15_padding): Ditto.  Add stricter check on SRCLEN.
 +
 +	gpg: Disable an MD5 workaround for pgp2 by default.
 +	* g10/sig-check.c (do_check): Move some code to ...
 +	* g10/misc.c (print_md5_rejected_note): new function.
 +	* g10/mainproc.c (proc_tree, proc_plaintext): Enable MD5 workaround
 +	only if option --allow-weak-digest-algos is used.
 +
 +	gpg: Remove options --pgp2 and --rfc1991.
 +	* g10/gpg.c (oRFC1991, oPGP2): Remove
 +	(opts): Remove --pgp2 and --rfc1991.
 +	* g10/options.h (CO_PGP2, CO_RFC1991): Remove.  Remove all users.
 +	(RFC2440, PGP2): Remove.  Remove all code only enabled by these
 +	conditions.
 +	* tests/openpgp/clearsig.test: Remove --rfc1991 test.
 +
 +	build: Fix autogen.sh base version hack.
 +	* autogen.sh <find-version>: Fix.
 +
 +	gpg: Remove --compress-keys and --compress-sigs feature.
 +	* g10/gpg.c (oCompressKeys, oCompressSigs): Remove.
 +	(opts): Turn --compress-keys and --compress-signs in NOPs.
 +	* g10/options.h (opt): Remove fields compress_keys and compress_sigs.
 +	* g10/export.c (do_export): Remove compress_keys feature.
 +	* g10/sign.c (sign_file): Remove compress_sigs feature.
 +
 +2014-08-13  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add list-option "show-usage".
 +	* g10/gpg.c (parse_list_options): Add "show-usage".
 +	* g10/options.h (LIST_SHOW_USAGE): New.
 +	* g10/keyid.c (usagestr_from_pk): Add arg FILL.  Change caller.
 +	* g10/keylist.c (list_keyblock_print): Print usage info.
 +
 +2014-08-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make --with-colons work again for --search-keys.
 +	* g10/keyserver.c (search_line_handler): Replace log_debug by
 +	es_printf.
 +
 +2014-08-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +2014-07-25  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Minor and editorial changes to app-sc-hsm.c.
 +	* scd/app-sc-hsm.c (select_and_read_binary): Use SW_ macro.
 +	(parse_certid): Remove useless test.
 +	(send_certinfo, send_keypairinfo): Shrink malloc to the needed size.
 +	(do_getattr): Ditto.
 +	(verify_pin): Use SW_ macro.
 +	(do_decipher): Replace OFS variable and extend comment.
 +
 +	scd: Add a new status word code.
 +	* scd/apdu.h (SW_REF_DATA_INV): New.
 +	* scd/apdu.c (apdu_strerror): Add string.
 +
 +2014-07-25  Andreas Schwier  <andreas.schwier at cardcontact.de>
 +
 +	scd: Support for SmartCard-HSM.
 +	* scd/app-sc-hsm.c: New.
 +	* scd/app.c (select_application, get_supported_applications): Register
 +	new app.
 +
 +2014-07-25  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Switch to an EdDSA format with prefix byte.
 +	* g10/keygen.c (gen_ecc): USe "comp" for EdDSA.
 +
 +2014-07-23  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Show just one warning with all failed passphrase constraints.
 +	* agent/genkey.c (check_passphrase_constraints): Build a final warning
 +	after all checks.
 +
 +	agent: Only one confirmation prompt for an empty passphrase.
 +	* agent/genkey.c (check_passphrase_constraints): Moev empty passphrase
 +	check to the front.
 +
 +	gpg: Add command --quick-gen-key.
 +	* g10/gpg.c (aQuickKeygen): New.
 +	* g10/misc.c (is_valid_user_id): New stub.
 +	* g10/keygen.c (quickgen_set_para): New.
 +	(quick_generate_keypair): New.
 +
 +	common: Add cpr_get_answer_is_yes_def()
 +	* g10/cpr.c (cpr_get_answer_is_yes): Factor code out to ....
 +	(cpr_get_answer_is_yes_def): ...new.
 +
 +	gpg: Make --quick-sign-key promote local key signatures.
 +	* g10/keyedit.c (sign_uids): Promote local sigs in quick mode.
 +
 +2014-07-22  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Do not use the pcsc-wrapper.
 +	* scd/apdu.c (NEED_PCSC_WRAPPER): Do not define.
 +	* scd/Makefile.am (libexec_PROGRAMS): Remove gnupg-pcsc-wrapper
 +	(gnupg_pcsc_wrapper_SOURCES): Remove.
 +	(gnupg_pcsc_wrapper_LDADD): Remove.
 +	(gnupg_pcsc_wrapper_CFLAGS): Remove.
 +
 +2014-07-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve --list-packets output for faulty packets.
 +	* g10/parse-packet.c: Add list_mode output for certain failures.
 +
 +	gpg: Cap size of attribute packets at 16MB.
 +	* g10/parse-packet.c (parse_attribute): Avoid xmalloc failure and cap
 +	size of packet.
 +
 +2014-07-03  Werner Koch  <wk at gnupg.org>
 +
 +	Release 2.1.0-beta751.
 +
 +	gpg: Make show-uid-validity the default.
 +
 +	tests: Fix end-of-all-ticks test for Western locales.
 +	* common/t-timestuff.c (test_timegm): Use timegm if available.
 +	(main): Set TX to UTC if timegm is not available.
 +
 +2014-07-03  Kristian Fiskerstrand  <kf at sumptuouscapital.com>
 +
 +	gpg: Spelling error.
 +
 +2014-06-30  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Auto-create revocation certificates.
 +	* configure.ac (GNUPG_OPENPGP_REVOC_DIR): New config define.
 +	* g10/revoke.c (create_revocation): Add arg "leadin".
 +	(gen_standard_revoke): New.
 +	* g10/openfile.c (get_openpgp_revocdir): New.
 +	(open_outfile): Add MODE value 3.
 +	* g10/keyid.c (hexfingerprint): New.
 +	* g10/keygen.c (do_generate_keypair): Call gen_standard_revoke.
 +
 +	estream: Fix minor glitch in "%.*s" format.
 +	* common/estream-printf.c (pr_string): Take care of non-nul terminated
 +	strings.
 +
 +	gpg: Rearrange code in gen_revoke.
 +	* g10/revoke.c (gen_revoke): Factor some code out to ...
 +	(create_revocation): new.
 +
 +	gpg: Create exported secret files and revocs with mode 700.
 +	* common/iobuf.c (direct_open): Add arg MODE700.
 +	(iobuf_create): Ditto.
 +	* g10/openfile.c (open_outfile): Add arg RESTRICTEDPERM.  Change call
 +	callers to pass 0 for it.
 +	* g10/revoke.c (gen_desig_revoke, gen_revoke): Here pass true for new
 +	arg.
 +	* g10/export.c (do_export): Pass true for new arg if SECRET is true.
 +
 +	common: Minor code cleanup for a legacy OS.
 +	* common/iobuf.c (direct_open) [__riscos__]: Simply cpp conditionals.
 +
 +2014-06-27  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Fix the w32 installer name.
 +
 +	po: Update some strings of the French (fr) translation.
 +
 +	po: Update the German (de) translation.
 +
 +	agent: Adjust for changed npth_eselect under W32.
 +	* agent/gpg-agent.c (handle_connections) [W32]: Make events_set an
 +	unsigned int to match the changed prototype.
 +
 +	dirmngr: Use the homedir based socket also under W32.
 +	* common/homedir.c (dirmngr_user_socket_name): Use same code for all
 +	platforms.
 +
 +2014-06-27  Yuri Chornoivan  <yurchor at ukr.net>
 +
 +	po: Update and enable Ukrainian (uk) translation.
 +
 +	Fix typos in messages.
 +
 +2014-06-27  Werner Koch  <wk at gnupg.org>
 +
 +	build: Remove unused options.
 +	* configure.ac: Remove option --build-agent-only.
 +	(FAKE_CURL, GPGKEYS_CURL): Remove check for cURL
 +	(GPGKEYS_MAILTO): Remove ac_subst but keep the currently unused
 +	SENDMAIL check.
 +	(GPGKEYS_KDNS): Remove ac_subst.
 +	* autogen.rc (final_info): Remove suggestion to use the removed option
 +	--enable-mailto.
 +
 +2014-06-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Add pinpad support for REINER SCT cyberJack go.
 +	* scd/ccid-driver.h (VENDOR_REINER, CYBERJACK_GO): New.
 +	* scd/ccid-driver.c (ccid_transceive_secure): Handle the case for
 +	VENDOR_REINER. Original work was by Alina Friedrichsen (tiny change).
 +
 +2014-06-27  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Support reader Gemalto IDBridge CT30.
 +	* scd/ccid-driver.h (GEMPC_CT30): New product id.
 +	* scd/ccid-driver.c (parse_ccid_descriptor): Add quirk for that
 +	reader.
 +
 +2014-06-26  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Limit keysize for unattended key generation to useful values.
 +	* g10/keygen.c (gen_elg): Enforce keysize 1024 to 4096.
 +	(gen_rsa): Enforce keysize 1024 to 4096.
 +	(gen_dsa): Enforce keysize 768 to 3072.
 +
 +	Enable DNS SRV records again.
 +	* configure.ac (GPGKEYS_HKP, GPGKEYS_FINGER): Remove ac_subst.
 +	(use_dns_srv): Make test work.
 +
 +	agent: Fix export of RSA keys to OpenPGP.
 +	* agent/cvt-openpgp.c (convert_transfer_key): Fix sexp build format
 +	string.
 +
 +	gpg,gpgsm: Simplify wrong_args function.
 +
 +	speedo: "make clean-gnupg" may not remove the source.
 +	* build-aux/speedo.mk (clean-$(1)): Take care of gnupg.
 +
 +	gpgsm: Fix default config name.
 +
 +2014-06-25  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Improve the rendering of the manual.
 +
 +	doc: Update for modern makeinfo.
 +	* doc/texi.css: Remove.
 +	* doc/Makefile.am (AM_MAKEINFOFLAGS): Use --css-ref.
 +
 +	gpg: Allow key-to-card upload for cert-only keys.
 +	* g10/card-util.c (card_store_subkey): Allo CERT usage for key 0.
 +
 +2014-06-24  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Add conditionals for GnuPG-1.
 +
 +2014-06-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make export of ECC keys work again.
 +	* agent/cvt-openpgp.c (convert_to_openpgp): Use the curve name instead
 +	of the curve parameters.
 +	* g10/export.c (canon_pubkey_algo): Rename to ...
 +	(canon_pk_algo): this.  Support ECC.
 +	(transfer_format_to_openpgp): Expect curve name.
 +
 +	gpg: Avoid infinite loop in uncompressing garbled packets.
 +	* g10/compress.c (do_uncompress): Limit the number of extra FF bytes.
 +
 +2014-06-17  Kristian Fiskerstrand  <kf at sumptuouscapital.com>
 +
 +	gpg: Fix a couple of spelling errors.
 +
 +2014-06-17  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Support building from dist-source generated tarball.
 +
 +2014-06-13  Werner Koch  <wk at gnupg.org>
 +
 +	http: Print human readable GNUTLS status.
 +	* common/http.c (send_gnutls_bye): Take care of EAGAIN et al.
 +	(http_verify_server_credentials): Print a human readable status.
 +
 +2014-06-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Improve the output of --list-packets.
 +	* g10/parse-packet.c (parse): Print packet meta info in list mode.
 +
 +2014-06-11  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Improve building of the w32 installer.
 +	* build-aux/speedo.mk: Change name of build directory to PLAY.
 +	Improve the dist-source target.
 +	* build-aux/speedo/w32/gdk-pixbuf-loaders.cache: Add a blank
 +	line (plus comment).
 +	* build-aux/speedo/w32/inst.nsi: Change name of file to gnupg-w32-*.
 +	Install more tools.
 +
 +2014-06-10  Werner Koch  <wk at gnupg.org>
 +
 +	speedo: Revamped speedo and include a w32 installer.
 +	* build-aux/speedo/: New.
 +	* build-aux/speedo/w32/: New.
 +
 +	build: Add more options to autogen.sh.
 +	* autogen.sh: Add options --print-host and --print-build.
 +
 +	w32: Fix build problem with dirmngr.
 +	* dirmngr/ks-engine-hkp.c (EAI_SYSTEM) [W32]: Add replacement
 +	constant.
 +
 +	gpg: Use more specific reason codes for INV_RECP.
 +	* g10/pkclist.c (find_and_check_key, build_pk_list): Use more specific
 +	reasons codes for INV_RECP.
 +
 +2014-06-06  Werner Koch  <wk at gnupg.org>
 +
 +	Improve the beta number generation.
 +	* autogen.sh: Add option --find-version
 +	* configure.ac: Rework the setting of the mym4_ variables.
 +
 +2014-06-05  Werner Koch  <wk at gnupg.org>
 +
 +	Remove keyserver helper code.
 +	* configure.ac: Remove keyserver helper related stuff.
 +	* Makefile.am (SUBDIRS): Remove keyserver.
 +	* keyserver/Makefile.am: Remove.
 +
 +	gpg: Require confirmation for --gen-key with experimental curves.
 +	* g10/keygen.c (ask_curve): Add arg both.  Require confirmation for
 +	Curve25519.
 +
 +	gpg: Auto-migrate existing secring.gpg.
 +	* g10/migrate.c: New.
 +	* g10/import.c (import_old_secring): New.
 +	(import_one): Add arg silent.
 +	(transfer_secret_keys): Add arg batch.
 +	(import_secret_one): Add args batch and for_migration.
 +	* g10/gpg.c (main): Call migration function.
 +
 +2014-06-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpgsm: Fix commit be07ed65.
 +	* sm/server.c (option_handler): Use "with-secret".
 +
 +2014-06-03  Werner Koch  <wk at gnupg.org>
 +
 +	Add new option --with-secret.
 +	* g10/gpg.c: Add option --with-secret.
 +	* g10/options.h (struct opt): Add field with_secret.
 +	* g10/keylist.c (public_key_list): Pass opt.with_secret to list_all
 +	and list_one.
 +	(list_all, list_one): Add arg mark_secret.
 +	(list_keyblock_colon): Add arg has_secret.
 +	* sm/gpgsm.c: Add option --with-secret.
 +	* sm/server.c (option_handler): Add option "with-secret".
 +	* sm/gpgsm.h (server_control_s): Add field with_secret.
 +	* sm/keylist.c (list_cert_colon): Take care of with_secret.  Also move
 +	the token string from the wrong field 14 to 15.
 +
 +	gpgsm: New commands --export-secret-key-{p8,raw}
 +	* sm/gpgsm.c: Add new commands.
 +	* sm/minip12.c (build_key_sequence): Add arg mode.
 +	(p12_raw_build): New.
 +	* sm/export.c (export_p12): Add arg rawmode.  Call p12_raw_build.
 +	(gpgsm_p12_export): Ditto.
 +	(print_short_info): Print the keygrip.
 +
 +2014-06-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Avoid NULL-deref in default key listing.
 +	* g10/keyid.c (hash_public_key): Take care of NULL keys.
 +	* g10/misc.c (pubkey_nbits): Ditto.
 +
 +	gpg: Simplify default key listing.
 +	* g10/mainproc.c (list_node): Rework.
 +
 +	gpg: Graceful skip reading of corrupt MPIs.
 +	* g10/parse-packet.c (mpi_read): Change error message on overflow.
 +
 +	gpgsm: Handle re-issued CA certificates in a better way.
 +	* sm/certchain.c (find_up_search_by_keyid): Consider all matching
 +	certificates.
 +	(find_up): Add some debug messages.
 +
 +	gpgsm: Add a way to save a found state.
 +	* kbx/keybox-defs.h (keybox_found_s): New.
 +	(keybox_handle): Factor FOUND out to above.  Add saved_found.
 +	* kbx/keybox-init.c (keybox_release): Release saved_found.
 +	(keybox_push_found_state, keybox_pop_found_state): New.
 +
 +	* sm/keydb.c (keydb_handle): Add field saved_found.
 +	(keydb_new): Init it.
 +	(keydb_push_found_state, keydb_pop_found_state): New.
 +
 +	gpg: Fix bug parsing a zero length user id.
 +	* g10/getkey.c (get_user_id): Do not call xmalloc with 0.
 +
 +	* common/xmalloc.c (xmalloc, xcalloc): Take extra precaution not to
 +	pass 0 to the arguments.
 +
 +2014-05-19  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Print certificates on failed TLS verification.
 +	* dirmngr/ks-engine-hkp.c (cert_log_cb): New.
 +	(send_request): Set callback.
 +
 +	http: Add callback to help logging of server certificates.
 +	* common/http.c (http_session_s): Add field cert_log_cb.
 +	(http_session_set_log_cb): New.
 +	(http_verify_server_credentials): Call callback.
 +
 +2014-05-16  Werner Koch  <wk at gnupg.org>
 +
 +	keyserver: Improve support for hkps pools.
 +	* dirmngr/ks-engine-hkp.c (hostinfo_s): Add fields cname, v4addr, and
 +	v6addr.
 +	(create_new_hostinfo): Clear them.
 +	(my_getnameinfo): Add args numeric and r_isnumeric.
 +	(is_ip_address): New.
 +	(map_host): Add arg r_host.  Rewrite the code to handle pools in a
 +	special way.
 +	(ks_hkp_print_hosttable): Change format of help info output.
 +	(make_host_part): Add arg optional r_httphost.
 +	(send_request): Add arg httphost.
 +	(ks_hkp_search, ks_hkp_get, ks_hkp_put): Get httphost and pass it to
 +	send_request.
 +
 +	http: Allow overriding of the Host header.
 +	* common/http.c (http_open): Add arg httphost.
 +	(http_open_document): Pass NULL for httphost.
 +	(send_request): Add arg httphost.  If given, use HTTPHOST instead of
 +	SERVER.  Use https with a proxy if requested.
 +	(http_verify_server_credentials): Do not stop at the first error
 +	message.
 +	* dirmngr/ocsp.c (do_ocsp_request): Adjust call to http_open.
 +	* keyserver/curl-shim.c (curl_easy_perform): Ditto.
 +	* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_help): Ditto.
 +
 +2014-05-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix uninitialized access to search descindex with gpg keyboxes.
 +	* kbx/keybox-search.c (keybox_search): Add arg  R_DESCINDEX.  Chnage
 +	both callers.
 +	* g10/keydb.c (keydb_search): Always set DESCINDEX.
 +
 +	w32: Make make_absfilename work with drive letters.
 +	* common/stringhelp.c (do_make_filename) [HAVE_DRIVE_LETTERS]: Fix.
 +
 +	gpg: Remove useless diagnostic in MDC verification.
 +	* g10/decrypt-data.c (decrypt_data): Do not distinguish between a bad
 +	MDC packer header and a bad MDC.
 +
 +	gpg: Fix glitch entering a full expiration time.
 +	* g10/keygen.c (ask_expire_interval): Get the current time after the
 +	prompt.
 +
 +2014-05-08  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Fix import of non-protected gpg keys.
 +	* agent/cvt-openpgp.c (do_unprotect): Return an s-exp also for
 +	non-protected keys.
 +	(convert_from_openpgp_main): Do not call agent_askpin for a
 +	non-protected key.
 +
 +	Make more use of *_NAME macros.
 +	* configure.ac (GPG_DISP_NAME, GPGSM_DISP_NAME): New.
 +	(GPG_AGENT_DISP_NAME, SCDAEMON_DISP_NAME): New.
 +	(DIRMNGR_DISP_NAME, G13_DISP_NAME): New.
 +	(GPGCONF_DISP_NAME): New.
 +	(SCDAEMON_SOCK_NAME): New.
 +	* common/argparse.c (show_help): Map description string.
 +
 +2014-05-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix auth key comment handling.
 +	* agent/command-ssh.c (ssh_send_key_public): Handle the case with no
 +	comment.
 +
 +2014-05-07  Werner Koch  <wk at gnupg.org>
 +
 +	Make -jN work again.
 +	* common/Makefile.am ($(PROGRAMS)): New rule
 +	(t_http_LDADD): Use libcommontls.a without directory prefix.
 +	* dirmngr/Makefile.am ($(PROGRAMS)): New rule.
 +
 +	gpg: Print the key algorithm/curve with signature info.
 +	* g10/mainproc.c (check_sig_and_print): Print the name and curve.
 +
 +	gpg: Fix memleak in signature verification of bogus keys.
 +	* g10/mainproc.c (check_sig_and_print): Factor common code out to ...
 +	(print_good_bad_signature): here.
 +
 +	gpg: Mark experimental algorithms in the key listing.
 +	* g10/keylist.c (list_keyblock_print): Remove duplicate curve name.
 +	Print a note for experimental algorithms.
 +	* g10/misc.c (print_pubkey_algo_note): Fix warning message.
 +
 +	gpg: Finish experimental support for Ed25519.
 +	* agent/cvt-openpgp.c (try_do_unprotect_arg_s): Add field "curve".
 +	(get_keygrip): Add and use arg CURVE.
 +	(convert_secret_key): Ditto.
 +	(convert_transfer_key): Ditto.
 +	(get_npkey_nskey): New.
 +	(prepare_unprotect): Replace gcrypt functions by
 +	get_npkey_nskey.  Allow opaque MPIs.
 +	(do_unprotect): Use CURVE instead of parameters.
 +	(convert_from_openpgp_main): Ditto.
 +	(convert_to_openpgp):  Simplify.
 +	* g10/import.c (one_mpi_from_pkey): Remove.
 +	(transfer_secret_keys): Rewrite to use the curve instead of the
 +	parameters.
 +	* g10/parse-packet.c (parse_key): Mark protected MPIs with USER1 flag.
 +
 +	* common/openpgp-oid.c (openpgp_curve_to_oid): Allow the use of
 +	 "NIST P-256" et al.
 +	* g10/keygen.c (ask_curve): Add arg ALGO.
 +	(generate_keypair): Rewrite the ECC key logic.
 +
 +	* tests/openpgp/ecc.test: Provide the "ecc" passphrase.
 +
 +	kbx: Add experimental support for EDDSA.
 +	* kbx/keybox-openpgp.c (parse_key): Use algo constants and add
 +	experimental support for EdDSA.
 +
 +	agent: Remove greeting message.
 +	* agent/gpg-agent.c (main): Remove greeting.  Make --no-greeting a
 +	dummy.
 +
 +2014-05-06  Werner Koch  <wk at gnupg.org>
 +
 +	Use "samethread" mode keyword for some es_fopenmem.
 +	* dirmngr/ks-engine-hkp.c (armor_data): Add mode keyword.
 +	* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
 +	* scd/atr.c (atr_dump): Ditto.
 +
 +2014-05-05  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Add support for hkps keyservers.
 +	* dirmngr/dirmngr.c: Include gnutls.h.
 +	(opts): Add --gnutls-debug and --hkp-cacert.
 +	(opt_gnutls_debug, my_gnutls_log): New.
 +	(set_debug): Set gnutls log level.
 +	(parse_rereadable_options): Register a CA file.
 +	(main): Init GNUTLS.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_help): Support hkps.
 +	(send_request): Ditto.
 +
 +	http: Add reference counting to the session object.
 +	* common/http.c (http_session_t): Add field "refcount".
 +	(_my_socket_new, _my_socket_ref, _my_socket_unref): Add debug code.
 +	(send_request, my_npth_read, my_npth_write): Use SOCK object for the
 +	transport ptr.
 +	(http_session_release): Factor all code out to ...
 +	(session_unref): here.  Deref SOCK.
 +	(http_session_new): Init refcount and transport ptr.
 +	(http_session_ref): New.  Ref and unref all assignments.
 +
 +2014-05-02  Werner Koch  <wk at gnupg.org>
 +
 +	http: Add HTTP_FLAG_FORCE_TLS and http_get_tls_info.
 +	* common/http.c (http_parse_uri): Factor code out to ...
 +	(parse_uri): here.  Add arg FORCE_TLS.
 +	(do_parse_uri): Ditto.  Implement flag.
 +	(http_get_tls_info): New.
 +	(http_register_tls_ca): Allow clearing of the list.
 +	(send_request): Use a default verification function.
 +	* common/http.h (HTTP_FLAG_FORCE_TLS): New.
 +	* common/t-http.c (main): Add several command line options.
 +
 +	common: Fix test for openpgp_oid_is_ed25519.
 +	* common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): Add correct
 +	value.
 +
 +	http: Revamp TLS API.
 +	* configure.ac (NEED_GNUTLS_VERSION): New.
 +	(HTTP_USE_GNUTLS, LIBGNUTLS_CFLAGS, LIBGNUTLS_LIBS): New ac_subst.
 +
 +	* common/http.h (http_session_t): New.
 +	* common/http.c: Remove compatibility for gnutls < 3.0.
 +	(http_session_s): New.
 +	(cookie_s): Replace gnutls_session_t by http_session_t.
 +	(tls_callback, tls_ca_certlist): New variables.
 +	(my_socket_unref): Add preclose args.
 +	(my_npth_read, my_npth_write): New.
 +	(make_header_line): Fix bug using int* instead of char*.
 +	(http_register_tls_callback): New.
 +	(http_register_tls_ca): New.
 +	(http_session_new): New.
 +	(http_session_release): New.
 +	(http_get_header_names): New.
 +	(escape_data): Add hack to escape in forms mode.
 +	(send_request) [HTTP_USE_GNUTLS]: Support SNI.
 +	(send_request) [HTTP_USE_GNUTLS]: Fix use of make_header_line.
 +	(send_gnutls_bye): New.
 +	(cookie_close): Make use of preclose feature.
 +	(http_verify_server_credentials): New.
 +	(main) [TEST]: Remove test code.
 +	* common/t-http.c: New.
 +	* common/tls-ca.pem: New.
 +	* common/Makefile.am (tls_sources): New. Move http code to here.
 +	(libcommontls_a_SOURCES): New.
 +	(libcommontlsnpth_a_SOURCES): New.
 +	(EXTRA_DIST): Add tls-ca.pem
 +	(module_maint_tests): Add t-http.
 +	(t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
 +
 +	* dirmngr/Makefile.am (dirmngr_LDADD): Add libcommontlsnpth.
 +
 +	common: Cleanup the use of USE_NPTH and HAVE_NPTH macros.
 +	* configure.ac (HAVE_NPTH): New ac_define.
 +	* common/estream.c: Use USE_NPTH instead of HAVE_NPTH.
 +	* common/http.c: Ditto.  Replace remaining calls to pth by npth calls.
 +	(connect_server): Remove useless _().
 +	* common/exechelp-posix.c, common/exechelp-w32.c
 +	* common/exechelp-w32ce.c: Use HAVE_PTH to include npth.h.
 +	* common/init.c (_init_common_subsystems): Remove call to pth_init.
 +	* common/sysutils.c (gnupg_sleep): Use npth_sleep.
 +	* scd/ccid-driver.c (my_sleep): Ditto.
 +
 +2014-04-30  Werner Koch  <wk at gnupg.org>
 +
 +	estream: Implement "samethread" mode keyword.
 +	* src/estream.c (estream_internal): Add field SAMETHREAD.
 +	(init_stream_lock, lock_stream, trylock_stream, unlock_stream): Use it.
 +	(parse_mode): Add arg SAMETHREAD and parse that keyword.
 +	(es_initialize): Rename to ...
 +	(init_stream_obj): this.  Add arg SAMETHREAD.
 +	(es_create): Add arg SAMETHREAD.  Call init_stream_lock after
 +	init_stream_obj.
 +	(doreadline): Call es_create with samethread flag.
 +	(es_fopen, es_mopen, es_fopenmem, es_fopencookie, do_fdopen)
 +	(do_fpopen, do_w32open): Implement "samethread" keyword.
 +	(es_freopen): Take samthread flag from old stream.
 +	(es_tmpfile): Call es)_create w/o samethread.
 +
 +	estream: Fix deadlock in es_fileno.
 +	* src/estream.c (es_fileno_unlocked): Call the unlocked functions.
 +
 +	estream: Add debug code to the lock functions.
 +	* common/estream.c (dbg_lock_0, dbg_lock_1, dbg_lock_1): New.
 +
 +	estream: Replace locking macros by functions.
 +	* common/estream.c: Replace most macros.
 +
 +2014-04-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	ECC Fixes.
 +	* agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
 +	(convert_transfer_key): Follow newer (>= 1.6) libgcrypt API, which
 +	does not distinguish the detail.
 +	(do_unprotect, convert_from_openpgp_main): Don't call
 +	map_pk_openpgp_to_gcry, as it's the value of libgcrypt API already and
 +	not the value defined by OpenPGP.
 +	(convert_to_openpgp): It's "ecc".
 +	* agent/gpg-agent.c (map_pk_openpgp_to_gcry): Remove.
 +	* g10/call-agent.c (agent_pkdecrypt): Fix off-by-one error.
 +	* g10/pubkey-enc.c (get_it): Fix swapping the fields error.
 +
 +2014-04-22  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Pass --homedir to gpg-agent.
 +	* agent/gpg-agent.c (main): Make sure homedir is absolute.
 +	* common/asshelp.c (lock_spawning): Create lock file with an absolute
 +	name.
 +	(start_new_gpg_agent): Use an absolute name for the socket and pass
 +	option --homedir to the agent.
 +	(start_new_dirmngr): Use an absolute name for the --homedir.
 +
 +	common: Add functions make_absfilename and make_absfilename_try.
 +	* common/stringhelp.c (do_make_filename): Add modes 2 and 3.
 +	(make_absfilename): New.
 +	(make_absfilename_try): New.
 +
 +	common: Add function gnupg_getcwd.
 +	* tools/gpg-connect-agent.c (gnu_getcwd): Move to ...
 +	* common/sysutils.c (gnupg_getcwd): .. here.
 +	* tools/gpg-connect-agent.c (get_var_ext): Use gnupg_getcwd.
 +
 +	gpg: Print a warning if GKR has hijacked gpg-agent.
 +	* g10/call-agent.c (check_hijacking): New.
 +	(start_agent): Call it.
 +	(membuf_data_cb, default_inq_cb): Move more to the top.
 +
 +2014-04-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: New %U expando for the photo viewer.
 +	* g10/photoid.c (show_photos): Set namehash.
 +	* g10/misc.c (pct_expando): Add "%U" expando.
 +
 +	common: Add z-base-32 encoder.
 +	* common/zb32.c: New.
 +	* common/t-zb32.c: New.
 +	* common/Makefile.am (common_sources): Add zb82.c
 +	(module_tests): Add t-zb32.
 +
 +2014-04-16  Werner Koch  <wk at gnupg.org>
 +
 +	Two minor code cleanups and one NULL deref on error fix.
 +	* common/estream.c (es_freopen): Remove useless check for STREAM.
 +	* kbx/keybox-blob.c (_keybox_create_x509_blob): Remove useless check
 +	for BLOB.
 +	* tools/sockprox.c (run_proxy): Do not fclose(NULL).
 +
 +2014-04-15  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Re-enable secret key deletion.
 +	* g10/call-agent.c (agent_delete_key): New.
 +	* g10/keydb.h (FORMAT_KEYDESC_DELKEY): New.
 +	* g10/passphrase.c (gpg_format_keydesc): Support new format.
 +	* g10/delkey.c (do_delete_key): Add secret key deletion.
 +
 +	gpg: Re-indent a file.
 +	* g10/delkey.c: Re-indent.
 +	(do_delete_key, delete_keys): Change return type top gpg_error_t.
 +
 +	gpg: Fix regression in secret key export.
 +	* agent/cvt-openpgp.c (convert_to_openpgp): Fix use
 +	gcry_sexp_extract_param.
 +	* g10/export.c (do_export_stream): Provide a proper prompt to the
 +	agent.
 +
 +	gpg: Change pinentry prompt to talk about "secret key".
 +	* g10/passphrase.c (gpg_format_keydesc): Add mode 2.  Change strings.
 +	* g10/keydb.h (FORMAT_KEYDESC_NORMAL, FORMAT_KEYDESC_IMPORT)
 +	(FORMAT_KEYDESC_EXPORT): New.  Use them for clarity.
 +
 +	agent: Add command DELETE_KEY.
 +	* agent/command.c (cmd_delete_key): New.
 +	* agent/findkey.c (modify_description): Add '%C' feature.
 +	(remove_key_file): New.
 +	(agent_delete_key): New.
 +	* agent/command-ssh.c (search_control_file): Make arg R_DISABLE
 +	optional.
 +
 +	* configure.ac: Require libgpg-error 1.13.
 +
 +2014-04-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: EdDSA support.
 +	* scd/app-openpgp.c (KEY_TYPE_EDDSA, CURVE_ED25519): New.
 +	(struct app_local_s): Add eddsa.
 +	(get_algo_byte, store_fpr): Support KEY_TYPE_EDDSA.
 +	(get_ecc_key_parameters, get_curve_name): Support CURVE_ED25519.
 +	(send_key_attr, get_public_key): Support KEY_TYPE_EDDSA.
 +	(build_ecc_privkey_template): Rename as it supports both of
 +	ECDSA and EdDSA.
 +	(ecc_writekey): Rename.  Support CURVE_ED25519, too.
 +	(do_writekey): Follow the change of ecc_writekey.
 +	(do_auth): Support KEY_TYPE_EDDSA.
 +	(parse_ecc_curve): Support CURVE_ED25519.  Bug fix for other curves.
 +	(parse_algorithm_attribute): Bug fix for ECDH.  Support EdDSA.
 +
 +2014-04-08  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Fix compiler warning.
 +	* common/mischelp.h (JNLIB_GCC_HAVE_PUSH_PRAGMA): New.
 +	* dirmngr/dirmngr.c (handle_tick): Factor time check out to ...
 +	(time_for_housekeeping_p): new.
 +
 +	gpgconf: Add command --launch.
 +	* tools/gpgconf.c: Add command --launch.
 +	* tools/gpgconf-comp.c (gc_component_launch): New.
 +
 +	scd: Silent compiler warnings about unused variables.
 +	* scd/app-openpgp.c (build_ecdsa_privkey_template): Mark unused arg.
 +	(ecdh_writekey): Mark unused args.
 +
 +2014-04-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Support EdDSA.
 +	* agent/pksign.c (agent_pksign_do): Handle EdDSA signature.
 +
 +	g10: EdDSA support.
 +	* g10/keyid.c (keygrip_from_pk): Compute keygrip of EdDSA key.
 +	* g10/keygen.c (generate_subkeypair): Ed25519 is for EdDSA.
 +	* common/openpgp-oid.c (oid_ed25519): Update.
 +
 +2014-04-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: EdDSA support for SSH.
 +	* agent/command-ssh.c (ssh_signature_encoder_eddsa): Signature is
 +	two 32-byte opaque data which should not be interpreted as number.
 +
 +2014-03-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add commands --quick-sign-key and --quick-lsign-key.
 +	* g10/gpg.c (main): Add commands --quick-sign-key and
 +	--quick-lsign-key.
 +	* g10/keyedit.c (sign_uids): Add args FP and QUICK.
 +	(keyedit_quick_sign): New.
 +	(show_key_with_all_names): Add arg NOWARN.
 +
 +	Change some keyedit functions to allow printing to arbitrary streams.
 +	* common/ttyio.c (tty_print_string): Add optional arg FP. Change all
 +	callers.
 +	(tty_print_utf8_string2): Ditto.
 +	* g10/keyedit.c (show_prefs):  Ditto.
 +	(show_key_with_all_names_colon): Ditto.
 +	(show_names): Ditto.
 +	* g10/keylist.c (print_revokers): Ditto.
 +	(print_fingerprint): Ditto.
 +
 +2014-03-23  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Replace es_mopen by es_fopenmem for ssh.
 +	* agent/command-ssh.c (ssh_read_key_public_from_blob): Use
 +	es_fopenmem.
 +	(ssh_handler_request_identities): Ditto.
 +	(ssh_request_process): Ditto.
 +
 +2014-03-22  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Put ssh key type as comment into sshcontrol.
 +	* agent/command-ssh.c (ssh_key_type_spec): Add field name.
 +	(ssh_key_types): Add human readable names.
 +	(add_control_entry): Add arg SPEC and print key type as comment.
 +	(ssh_identity_register): Add arg SPEC.
 +	(ssh_handler_add_identity): Add var SPEC and pass ssh_receive_key.
 +
 +	agent: Support the Ed25519 signature algorithm for ssh.
 +	* agent/command-ssh.c (SPEC_FLAG_IS_EdDSA): New.
 +	(ssh_key_types): Add entry for ssh-ed25519.
 +	(ssh_identifier_from_curve_name): Move to the top.
 +	(stream_read_skip): New.
 +	(stream_read_blob): New.
 +	(ssh_signature_encoder_rsa): Replace MPIS array by an s-exp and move
 +	the s-exp parsing to here.
 +	(ssh_signature_encoder_dsa): Ditto.
 +	(ssh_signature_encoder_ecdsa): Ditto.
 +	(ssh_signature_encoder_eddsa): New.
 +	(sexp_key_construct): Rewrite.
 +	(ssh_key_extract): Rename to ...
 +	(ssh_key_to_blob): .. this and rewrite most of it.
 +	(ssh_receive_key): Add case for EdDSA.
 +	(ssh_convert_key_to_blob, key_secret_to_public): Remove.
 +	(ssh_send_key_public): Rewrite.
 +	(ssh_handler_request_identities): Simplify.
 +	(data_sign): Add rename args.  Add new args HASH and HASHLEN.  Make
 +	use of es_fopenmen and es_fclose_snatch.  Remove parsing into MPIs
 +	which is now doe in the sgnature encoder functions.
 +	(ssh_handler_sign_request): Take care of Ed25519.
 +	(ssh_key_extract_comment): Rewrite using gcry_sexp_nth_string.
 +
 +	agent: Cleanups to prepare implementation of Ed25519.
 +	* agent/cvt-openpgp.c: Remove.
 +	(convert_to_openpgp): Use gcry_sexp_extract_param.
 +	* agent/findkey.c (is_eddsa): New.
 +	(agent_is_dsa_key, agent_is_eddsa_key): Check whether ecc means EdDSA.
 +	* agent/pksign.c (agent_pksign_do): Add args OVERRIDEDATA and
 +	OVERRIDEDATALEN.
 +
 +	* common/ssh-utils.c (is_eddsa): New.
 +	(get_fingerprint): Take care or EdDSA.
 +
 +2014-03-18  Werner Koch  <wk at gnupg.org>
 +
 +	tools: Fix NULL deref in gpg-connect-agent.
 +	* tools/gpg-connect-agent.c (handle_inquire): Do not pass NULL to
 +	strlen.
 +
 +	dirmngr: Resurrect hosts in the HKP hosttable.
 +	* dirmngr/dirmngr.c (HOUSEKEEPING_INTERVAL): New.
 +	(housekeeping_thread): New.
 +	(handle_tick): Call new function.
 +	* dirmngr/ks-engine-hkp.c (RESURRECT_INTERVAL): New.
 +	(struct hostinfo_s): Add field died_at and set it along with the dead
 +	flag.
 +	(ks_hkp_print_hosttable): Print that info.
 +	(ks_hkp_housekeeping): New.
 +
 +	common: New function elapsed_time_string.
 +	* common/gettime.c (elapsed_time_string): New.
 +
 +2014-03-17  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Reject signatures made with MD5.
 +	* g10/gpg.c: Add option --allow-weak-digest-algos.
 +	(main): Set option also in PGP2 mode.
 +	* g10/options.h (struct opt): Add flags.allow_weak_digest_algos.
 +	* g10/sig-check.c (do_check): Reject MD5 signatures.
 +	* tests/openpgp/defs.inc: Add allow_weak_digest_algos to gpg.conf.
 +
 +	gpg: Make --auto-key-locate work again with keyservers.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_get): Allow exact search mode.
 +	* g10/keyserver.c (keyserver_import_name): Implement.
 +	(keyserver_get): Use exact mode for name based import.
 +	(keyserver_get): Add args R_FPR and R_FPRLEN.  Change all callers.
 +
 +	gpg: New mechanism "clear" for --auto-key-locate.
 +	* g10/getkey.c (parse_auto_key_locate): Implement "clear".
 +
 +2014-03-14  Werner Koch  <wk at gnupg.org>
 +
 +	gpg-connect-agent: Make it easier to connect to the dirmngr.
 +	* tools/gpg-connect-agent.c: Add options --dirmngr and
 +	--dirmngr-program.
 +
 +	dirmngr: Make use of IPv4 and IPV6 more explicit.
 +	* common/http.c (connect_server): Handle the new flags.
 +	* common/http.h (HTTP_FLAG_IGNORE_IPv4, HTTP_FLAG_IGNORE_IPv4): New.
 +	* dirmngr/ks-engine-hkp.c (map_host): Add arg r_httpflags.
 +	(make_host_part): Ditto.
 +	(send_request): Add arg httpflags.
 +	(ks_hkp_search, ks_hkp_get, ks_hkp_put): Handle httpflags.
 +
 +	dirmngr: Do not use brackets around legacy IP addresses.
 +	* dirmngr/ks-engine-hkp.c (my_getnameinfo): Change args to take a
 +	complete addrinfo.  Bracket only v6 addresses.  Change caller.
 +
 +	gpg: Print the actual used keyserver address.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_search, ks_hkp_get): Print SOURCE
 +	status lines.
 +	* g10/call-dirmngr.c (ks_status_parm_s): New.
 +	(ks_search_parm_s): Add field stparm.
 +	(ks_status_cb): New.
 +	(ks_search_data_cb): Send source to the data callback.
 +	(gpg_dirmngr_ks_search): Change callback prototope to include the
 +	SPECIAL arg.  Adjust all users.  Use ks_status_cb.
 +	(gpg_dirmngr_ks_get): Add arg r_source and use ks_status_cb.
 +	* g10/keyserver.c (search_line_handler): Adjust callback and print
 +	"data source" disgnostic.
 +	(keyserver_get): Print data source diagnostic.
 +
 +	dirmngr: Default to a user socket name and enable autostart.
 +	* common/homedir.c (dirmngr_socket_name): Rename to
 +	dirmngr_sys_socket_name.
 +	(dirmngr_user_socket_name): New.
 +	* common/asshelp.c (start_new_dirmngr): Handle sys and user dirmngr
 +	socket.
 +	* dirmngr/dirmngr.c (main): Ditto.
 +	* dirmngr/server.c (cmd_getinfo): Ditto.
 +	* sm/server.c (gpgsm_server): Ditto.
 +	* dirmngr/dirmngr-client.c (start_dirmngr): Likewise.
 +	* tools/gpgconf.c (main): Print "dirmngr-sys-socket" with --list-dirs.
 +
 +	* configure.ac (USE_DIRMNGR_AUTO_START): Set by default.
 +
 +2014-03-12  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add option --dirmngr-program.
 +	* g10/gpg.c: Add option --dirmngr-program.
 +	* g10/options.h (struct opt): Add field dirmngr_program.
 +	* g10/call-dirmngr.c (create_context): Use new var.
 +
 +	* dirmngr/dirmngr.c: Include gc-opt-flags.h.
 +	(main): Remove GC_OPT_FLAG_*.
 +	* tools/gpgconf-comp.c (GC_OPT_FLAG_NO_CHANGE): Move macro to ...
 +	* common/gc-opt-flags.h: here.
 +
 +	dirmngr: Detect dead keyservers and try another one.
 +	* dirmngr/ks-action.c (ks_action_resolve): Rename var for clarity.
 +	(ks_action_search, ks_action_put): Ditto.
 +	(ks_action_get): Consult only the first server which retruned some
 +	data.
 +
 +	* dirmngr/ks-engine-hkp.c (SEND_REQUEST_RETRIES): New.
 +	(map_host): Add arg CTRL and call dirmngr_tick.
 +	(make_host_part): Add arg CTRL.
 +	(mark_host_dead): Allow the use of an URL.
 +	(handle_send_request_error): New.
 +	(ks_hkp_search, ks_hkp_get, ks_hkp_put): Mark host dead and retry on
 +	error.
 +
 +	http: Add a flag to the URL parser indicating a literal v6 address.
 +	* common/http.h (struct parsed_uri_t): Add field v6lit.
 +	* common/http.c (do_parse_uri): Set v6lit.
 +
 +2014-03-12  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: writekey support of ECC.
 +	* scd/app-openpgp.c (CURVE_SEC_P256K1, get_algo_byte): New.
 +	(store_fpr): Support ECC keys with varargs.
 +	(get_ecc_key_parameters, get_curve_name): Support secp256k1.
 +	(parse_ecc_curve): Likewise.
 +	(build_ecdsa_privkey_template, rsa_writekey, ecdsa_writekey): New.
 +	(ecdh_writekey): New.  Not implemented yet.
 +	(do_writekey): Call rsa_writekey, ecdsa_writekey, or ecdh_writekey.
 +	(do_genkey): Follow the change of store_fpr.
 +
 +2014-03-11  Werner Koch  <wk at gnupg.org>
 +
 +	dirmngr: Put brackets around IP addresses in the hosttable.
 +	* dirmngr/ks-engine-hkp.c (EAI_OVERFLOW): Provide a substitute.
 +	(my_getnameinfo): New.
 +	(map_host): Use it.
 +
 +	dirmngr: Add command option to mark hosts as dead or alive.
 +	* dirmngr/server.c (cmd_killdirmngr): Factor some code out to ...
 +	(check_owner_permission): here.
 +	(cmd_keyserver): Add options --dead and --alive.
 +	* dirmngr/ks-engine-hkp.c (host_in_pool_p): New.
 +	(ks_hkp_mark_host): New.
 +
 +	dirmngr: Make Assuan output of keyblocks easier readable.
 +	* dirmngr/server.c (data_line_cookie_write): Print shorter data lines
 +	in verbose mode.
 +
 +	dirmngr: Fix HKP host selection code.
 +	* dirmngr/server.c (cmd_keyserver): Add option --resolve and change
 +	--print-hosttable to --hosttable.
 +	* dirmngr/ks-action.c (ks_printf_help): New.
 +	(ks_action_resolve): New.
 +	* dirmngr/ks-engine-hkp.c (select_random_host): Fix selection.
 +	(ks_hkp_print_hosttable): Print to assuan stream.
 +	(map_host): Remove debug code.  Add arg FORCE_SELECT.  Return numeric
 +	IP addr if it can't be resolved.
 +	(make_host_part): Add arg FORCE_SELECT; change callers to pass false.
 +	(ks_hkp_resolve): New.
 +
 +	List readline support in configure summary.
 +	* m4/readline.m4: Set gnupg_cv_have_readline.
 +	* configure.ac: Add readline support to summary output.
 +
 +2014-03-11  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: API change of agent_key_from_file.
 +	* agent/findkey.c (agent_key_from_file): Always return S-expression.
 +	* agent/command.c (cmd_passwd): Distinguish by SHADOW_INFO.
 +	(cmd_export_key): Likewise.  Free SHADOW_INFO.
 +	(cmd_keytocard): Likewise.  Release S_SKEY.
 +	* agent/pkdecrypt.c (agent_pkdecrypt): Likewise.
 +	* agent/pksign.c (agent_pksign_do): Likewise.  Use the S-expression to
 +	know the key type.
 +
 +2014-03-10  Werner Koch  <wk at gnupg.org>
 +
 +	Backport useful code from fixes for bug 1447.
 +	* configure.ac: Cehck for inet_ntop.
 +	* m4/libcurl.m4: Provide a #define for the version of the curl
 +	library.
 +
 +	scd: acquire lock in new_reader_slot.
 +	* scd/apdu.c (new_reader_slot): Acquire lock.
 +	(open_ct_reader, open_pcsc_reader_direct, open_pcsc_reader_wrapped)
 +	(open_ccid_reader, open_rapdu_reader): Release lock.
 +	(lock_slot, trylock_slot, unlock_slot): Move more to the top.
 +
 +	Do not require libiconv for Android.
 +	* configure.ac (require_iconv): New.  Set to false for android.
 +	(AM_ICONV): Run only if required.
 +
 +2014-03-07  Werner Koch  <wk at gnupg.org>
 +
 +	dirmmgr: Use a portability wrapper for struct timeval.
 +	* dirmngr/dirmngr_ldap.c [W32]: Include winber.h.
 +	(my_ldap_timeval_t): New.
 +
 +	Silence more warnings about unused vars and args.
 +	* dirmngr/cdblib.c (cdb_init) [W32]: Remove unused var.
 +	* dirmngr/dirmngr-client.c (start_dirmngr): s/int/assuan_fd_t/.
 +	* dirmngr/dirmngr.c (w32_service_control): Mark unused args.
 +	(call_real_main): New.
 +	(main) [W32]: Use new function to match prototype.
 +	(real_main) [W32]: Mark unused vars.
 +	(handle_signal) [W32]: Do not build the function at all.
 +	(handle_connections) [W32]: Do not define signo.
 +	* dirmngr/ldap-wrapper-ce.c (outstream_reader_cb): Remove used vars.
 +	* g10/tdbio.c (ftruncate) [DOSISH]: Define only if not yet defined.
 +
 +	dirmngr: Simplify strtok macro.
 +	* dirmngr/ldap-url.c (ldap_utf8_strtok): Remove unused r3d arg.
 +	(ldap_str2charray): Remove lasts.
 +
 +	Use attribute __gnu_printf__ also in estream header files.
 +	* common/estream-printf.h: Use attribute gnu_printf.
 +	* common/estream.h: Ditto.
 +
 +	Use attribute __gnu_printf__ with our estream-printf functions.
 +	* common/mischelp.h (JNLIB_GCC_A_PRINTF): Use __gnu_printf__
 +	(JNLIB_GCC_A_NR_PRINTF): Ditto.
 +
 +	w32: Silence warnings about unused vars.
 +	* agent/gpg-agent.c (main) [W32]: Mark unused vars.
 +	* sm/gpgsm.c (run_protect_tool) [W32]: Ditto.
 +	* g10/trustdb.c (check_regexp) [DISABLE_REGEX]: Ditto.
 +	* scd/scdaemon.c (main) [W32]: Ditto.
 +	(handle_connections) [W32]: Ditto.
 +	(handle_signal) [W32]: Do not build the function at all.
 +	* scd/apdu.c (pcsc_send_apdu_direct): Ditto.
 +	(connect_pcsc_card): s/long/pcsc_dword_t/.
 +	(open_pcsc_reader_direct): Remove var listlen.
 +
 +	w32: Fix a potential problem in gpgconf's gettext.
 +	* tools/gpgconf-comp.c (my_dgettext) [USE_SIMPLE_GETTEXT]: Make sure
 +	to return something even DOMAIN is not given.
 +
 +	Silence several warnings when building under Windows.
 +	* agent/call-scd.c (start_scd): Replace int by assuan_fd_t.
 +	(start_pinentry): Ditto.
 +	* common/asshelp.c (start_new_gpg_agent): Replace int by assuan_fd_t.
 +	* common/dotlock.c (GNUPG_MAJOR_VERSION): Include stringhelp.h for
 +	prototypes on Windows and some other platforms.
 +	* common/logging.c (fun_writer): Declare addrbuf only if needed.
 +	* g10/decrypt.c (decrypt_message_fd) [W32]: Return not_implemented.
 +	* g10/encrypt.c (encrypt_crypt) [W32]: Return error if used in server
 +	mode.
 +	* g10/dearmor.c (dearmor_file, enarmor_file): Replace GNUPG_INVALID_FD
 +	by -1 as temporary hack for Windows.
 +	* g10/export.c (do_export): Ditto.
 +	* g10/revoke.c (gen_desig_revoke, gen_revoke): Ditto.
 +	* g10/sign.c (sign_file, clearsign_file, sign_symencrypt_file): Ditto.
 +	* g10/server.c (cmd_verify, gpg_server) [W32]: Return an error.
 +
 +	w32: Include winsock2.h to silence warnings.
 +
 +	gl: Avoid warning about shadowing an arg.
 +	* gl/setenv.c (KNOWN_VALUE): s/value/_v/.
 +
 +	common: Fix build problem with Sun Studio compiler.
 +	* common/estream.c (ESTREAM_MUTEX_UNLOCK): Use int dummy dummy
 +	functions.
 +	(ESTREAM_MUTEX_INITIALIZE): Ditto.
 +
 +	gpg: Do not require a trustdb with --always-trust.
 +	* g10/tdbio.c (tdbio_set_dbname): Add arg R_NOFILE.
 +	* g10/trustdb.c (trustdb_args): Add field no_trustdb.
 +	(init_trustdb): Set that field.
 +	(revalidation_mark):  Take care of a nonexistent trustdb file.
 +	(read_trust_options): Ditto.
 +	(tdb_get_ownertrust): Ditto.
 +	(tdb_get_min_ownertrust): Ditto.
 +	(tdb_update_ownertrust): Ditto.
 +	(update_min_ownertrust): Ditto.
 +	(tdb_clear_ownertrusts): Ditto.
 +	(tdb_cache_disabled_value): Ditto.
 +	(tdb_check_trustdb_stale): Ditto.
 +	(tdb_get_validity_core): Ditto.
 +	* g10/gpg.c (main): Do not create a trustdb with most commands for
 +	trust-model always.
 +
 +	gpg: Print a "not found" message for an unknown key in --key-edit.
 +	* g10/keyedit.c (keyedit_menu): Print message.
 +
 +	gpg: Protect against rogue keyservers sending secret keys.
 +	* g10/options.h (IMPORT_NO_SECKEY): New.
 +	* g10/keyserver.c (keyserver_spawn, keyserver_import_cert): Set new
 +	flag.
 +	* g10/import.c (import_secret_one): Deny import if flag is set.
 +
 +	agent: Fix UPDATESTARTUPTTY for ssh.
 +	* agent/command-ssh.c (setup_ssh_env): Fix env setting.
 +
 +	gpgv: Init Libgcrypt to avoid syslog warning.
 +	* g10/gpgv.c (main): Check libgcrypt version and disable secure
 +	memory.
 +
 +	Improve libcurl detection.
 +	* m4/libcurl.m4: Do not use AC_PATH_PROG if --with-libcurl as been
 +	given.  Suggested by John Marshall.
 +
 +	gpg: Remove legacy keyserver examples from the template conf file.
 +	* g10/options.skel: Update.
 +
 +	(cherry picked from commit f3c5cc8bcd37e38b5d65db6a50466e22d03d1f0c)
 +
 +	w32: Define WINVER only if needed.
 +	* common/sysutils.c (WINVER): Define only if less that 5.0.
 +
 +	w32: Remove unused code.
 +	* jnlib/w32-reg.c (write_w32_registry_string): Remove.
 +
 +	agent: Make --allow-mark-trusted the default.
 +	* agent/gpg-agent.c (opts, main): Add option --no-allow-mark-trusted.
 +	Put this option into the gpgconf-list.
 +	(main): Enable opt.allow_mark_trusted by default.
 +	* tools/gpgconf-comp.c (gc_options_gpg_agent): Replace
 +	allow-mark-trusted by no-allow-mark-trusted.
 +
 +	* agent/trustlist.c (agent_marktrusted): Always set the "relax" flag.
 +
 +	ssh: Add support for Putty.
 +	* agent/gpg-agent.c [W32]: Include Several Windows header.
 +	(opts): Change help text for enable-ssh-support.
 +	(opts, main): Add option --enable-putty-support
 +	(putty_support, PUTTY_IPC_MAGIC, PUTTY_IPC_MAXLEN): New for W32.
 +	(agent_init_default_ctrl): Add and asssert call.
 +	(putty_message_proc, putty_message_thread): New.
 +	(handle_connections) [W32]: Start putty message thread.
 +	* common/sysutils.c (w32_get_user_sid): New for W32 only
 +	* tools/gpgconf-comp.c (gc_options_gpg_agent): Add
 +	--enable-ssh-support and --enable-putty-support.  Make the
 +	configuration group visible at basic level.
 +	* agent/command-ssh.c (serve_mmapped_ssh_request): New for W32 only.
 +
 +	agent: Fix binary vs. text mode problem in ssh.
 +	* agent/command-ssh.c (file_to_buffer)
 +	(ssh_handler_request_identities): Open streams in binary mode.
 +	(start_command_handler_ssh): Factor some code out to ..
 +	(setup_ssh_env): new function.
 +
 +	Fix syntax error for building on APPLE.
 +	* scd/pcsc-wrapper.c [__APPLE__]: Fix syntax error.
 +
 +	Ignore obsolete option --disable-keypad.
 +	* scd/scdaemon.c (opts): Ignore --disable-keypad.
 +
 +	Allow marking options as ignored.
 +	* jnlib/argparse.h (ARGPARSE_OPT_IGNORE): New.
 +	(ARGPARSE_TYPE_MASK): New, for internal use.
 +	(ARGPARSE_ignore): New.
 +	* jnlib/argparse.c (optfile_parse, arg_parse): Replace remaining
 +	constants by macros.
 +	(optfile_parse): Implement ARGPARSE_OPT_IGNORE.
 +	(arg_parse): Exclide ignore options from --dump-options.
 +
 +2014-03-06  Werner Koch  <wk at gnupg.org>
 +
 +	common: Fix recent commit 55656208.
 +	* common/membuf.c (get_membuf_shrink): Fix use of LEN.
 +
 +2014-03-06  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Fix g10/trust.c.
 +	* g10/trust.c (register_trusted_keyid, register_trusted_key)
 +	(update_ownertrust): Call functions with tdb_.
 +
 +2014-02-26  Werner Koch  <wk at gnupg.org>
 +
 +	common: Replace all macros in strusage() returned strings.
 +	* common/argparse.c (writechar): Remove.
 +	(writestrings): Simplify.
 +	(strusage): Use map_static_macro_string.
 +
 +	common: New function map_static_macro_string.
 +	* common/mapstrings.c: New.
 +	* common/t-mapstrings.c: New.
 +	* common/t-support.h (DIM, DIMof): Define if not defined.
 +	* common/Makefile.am: Add new files.
 +
 +	common: New function get_membuf_shrink.
 +	* common/membuf.c (get_membuf_shrink): New.
 +
 +	agent: Fixed unresolved symbol under Windows.
 +	* agent/gpg-agent.c (main): s/ttyname/gnupg_ttyname/.
 +
 +	common: Require an installed libiconv.
 +	* common/utf8conv.c: Remove dynload.h.
 +	(load_libiconv): Remove.  Remove all calls to it.
 +
 +2014-02-10  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Silent more compiler warnings due to some configure options.
 +	* g10/keygen.c (generate_keypair, gen_card_key)
 +	(gen_card_key_with_backup) [!ENABLE_CARD_SUPPORT]: Mark unused args.
 +
 +	tests: Avoid segv if dns cert lookup is not configured.
 +	* common/dns-cert.c (get_dns_cert) [!USE_DNS_CERT]: Reset return args.
 +
 +	gpg: Cleanup compiler warnings due to some configure options.
 +	* g10/photoid.c (show_photos) [DISABLE_PHOTO_VIEWER]: Mark args as
 +	unused.
 +	* tools/gpgconf-comp.c (my_dgettext): Mark DOMAIN as unused if NLS is
 +	not configured.
 +
 +	gpg: Allow building without any trust model support.
 +	* configure.ac: Add option --disable-trust-models
 +	(NO_TRUST_MODELS): New ac_define and am_conditional.
 +	* g10/Makefile.am (trust_source): New.
 +	(gpg2_SOURCES): Factor some files out to above.  Add trust.c.
 +	* g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
 +	--import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
 +	--list-trustdb, --trustdb-name, --auto-check-trustdb,
 +	--no-auto-check-trustdb, and --force-ownertrust.
 +	(parse_trust_model) [NO_TRUST_MODELS]: Do not build.
 +	(main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
 +	trustdb related option code.
 +	* g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
 +	"enable", and "disable".
 +	* g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
 +	"tru" record.
 +
 +	* g10/trust.c: New.
 +	* g10/trustdb.c (struct key_item): Move to trustdb.h.
 +	(register_trusted_keyid): Rename to tdb_register_trusted_keyid.
 +	(register_trusted_key): Rename to tdb_register_trusted_key.
 +	(trust_letter, uid_trust_string_fixed, trust_value_to_string)
 +	(string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
 +	(get_ownertrust_string, get_validity_info, get_validity_string)
 +	(clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
 +	(mark_usable_uid_certs): Move to trust.c and make global.
 +	(is_in_klist): Move as inline to trustdb.h.
 +	(trustdb_check_or_update): Rename to tdb_check_or_update
 +	(revalidation_mark): Rename to tdb_revalidation_mark.
 +	(get_ownertrust): Rename to tdb_get_ownertrust.
 +	(get_min_ownertrust): Rename to tdb_get_min_ownertrust.
 +	(update_ownertrust): Rename to tdb_update_ownertrust.
 +	(clear_ownertrusts): Rename to tdb_clear_ownertrusts.
 +	(cache_disabled_value): Rename to tdb_cache_disabled_value.
 +	(check_trustdb_stale): Rename to tdb_check_trustdb_stale.
 +	(get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
 +	factor some code out to ...
 +	* trust.c (get_validity): ...new.
 +	(check_or_update_trustdb): New wrapper.
 +	(revalidation_mark): New wrapper.
 +	(get_ownertrust): New wrapper.
 +	(get_ownertrust_with_min): New wrapper.
 +	(update_ownertrust): New wrapper.
 +	(clear_ownertrusts): New wrapper.
 +	(cache_disabled_value): New wrapper.
 +	(check_trustdb_stale): New wrapper.
 +
 +	* tests/openpgp/defs.inc (opt_always): New.  Use in all tests instead
 +	of --always-trust.
 +
 +	tests: Handle disabled algorithms.
 +	* tests/openpgp/mds.test: Skip disabled algorithms.
 +	* tests/openpgp/signencrypt-dsa.test: Ditto.
 +	* tests/openpgp/sigs-dsa.test: Ditto.
 +
 +2014-02-07  Werner Koch  <wk at gnupg.org>
 +
 +	Silence annoying ABI change warning.
 +	* configure.ac [GCC]: Pass -Wno-psabi for gcc >= 4.6.  Avoid some gcc
 +	option tests for gcc >= 4.6
 +
 +	Allow disabling of card support.
 +	* configure.ac: Add option --disable-card-support.  Also add
 +	am_conditional and do not build scd if card support is enabled.
 +
 +	gpg: List only available algos in --gen-key.
 +	* g10/keygen.c (ask_algo, ask_curve): Take care of GPG_USE_<algo>.
 +
 +	gpg: Change --print-mds to output enabled OpenPGP algos.
 +	* g10/gpg.c (print_mds): Use opengpg_md_test_algo.  Test also for MD5
 +	availibility.
 +
 +	gpg: Avoid compiler warnings for disabled algos.
 +	* g10/misc.c (map_cipher_openpgp_to_gcry): Add case for disabled algo.
 +	(openpgp_pk_test_algo2): Ditto.
 +	(map_md_openpgp_to_gcry): Ditto.
 +
 +2014-02-05  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change format for the key size in --list-key and --edit-key.
 +	* g10/gpg.c (oLegacyListMode, opts, main): Add --legacy-list-mode.
 +	* g10/options.h (struct opt): Add field legacy_list_mode.
 +	* g10/keydb.h (PUBKEY_STRING_SIZE): New.
 +	* g10/keyid.c (pubkey_string): New.
 +	* g10/import.c (import_one, import_secret_one): Use pubkey_string.
 +	* g10/keylist.c (print_seckey_info): Ditto.
 +	(print_pubkey_info, print_card_key_info): Ditto.
 +	(list_keyblock_print): Ditto.
 +	* g10/mainproc.c (list_node): Ditto.
 +	* g10/pkclist.c (do_edit_ownertrust, build_pk_list): Ditto.
 +	* g10/keyedit.c (show_key_with_all_names): Ditto.  Also change the
 +	format.
 +	(show_basic_key_info): Ditto.
 +	* common/openpgp-oid.c (openpgp_curve_to_oid): Also allow "ed25519".
 +	(openpgp_oid_to_curve): Downcase "ed25519"
 +
 +2014-01-31  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add configure options to disable algorithms.
 +	* acinclude.m4 (GNUPG_GPG_DISABLE_ALGO): New.
 +	* configure.ac: Add --enable-gpg-* options to disable non MUS
 +	algorithms.
 +	* g10/misc.c (map_cipher_openpgp_to_gcry): Implement these options.
 +	(openpgp_pk_test_algo2): Ditto.
 +	(map_md_openpgp_to_gcry): Ditto.
 +	(openpgp_cipher_test_algo, openpgp_md_test_algo): Simplify.
 +
 +	gpg: Improve --version algo info output.
 +	* g10/misc.c (openpgp_pk_algo_name): Return a different string for
 +	each ECC algorithm.
 +	* g10/gpg.c (build_list_pk_test_algo): New wrapper to cope with the
 +	different algo type enums.
 +	(build_list_pk_algo_name): Ditto.
 +	(build_list_cipher_test_algo): Ditto.
 +	(build_list_cipher_algo_name): Ditto.
 +	(build_list_md_test_algo): Ditto.
 +	(build_list_md_algo_name): Ditto.
 +	(my_strusage): Use them.
 +	(list_config): Ditto. Add "pubkeyname".
 +	(build_list): Add letter==1 hack.
 +
 +	gpg: Start using OpenPGP digest algo ids.
 +	* g10/misc.c (print_pubkey_algo_note): Use enum typedef for the arg.
 +	(print_cipher_algo_note): Ditto.
 +	(print_digest_algo_note): Ditto.
 +	(map_md_openpgp_to_gcry): New.
 +	(openpgp_md_test_algo): Rewrite.
 +	(openpgp_md_algo_name): Rewrite to do without Libgcrypt.
 +	* g10/cpr.c (write_status_begin_signing): Remove hardwired list of
 +	algo ranges.
 +
 +	gpg: Use only OpenPGP cipher algo ids.
 +	* g10/misc.c (map_cipher_openpgp_to_gcry): Use explicit mapping and
 +	use enums for the arg and return value.
 +	(map_cipher_gcry_to_openpgp): Ditto.
 +	(openpgp_cipher_blocklen): Use constant macros.
 +	(openpgp_cipher_test_algo): Use mapping function and prepare to
 +	disable algorithms.
 +	(openpgp_cipher_algo_name): Do not use Libgcrypt.
 +
 +	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Replace
 +	CGRY_CIPHER_* by CIPHER_ALGO_*.
 +
 +	* common/openpgpdefs.h (cipher_algo_t): Remove unused
 +	CIPHER_ALGO_DUMMY.
 +
 +2014-01-30  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Use only OpenPGP public key algo ids and add the EdDSA algo id.
 +	* common/sexputil.c (get_pk_algo_from_canon_sexp): Change to return a
 +	string.
 +	* g10/keygen.c (check_keygrip): Adjust for change.
 +	* sm/certreqgen-ui.c (check_keygrip): Likewise.
 +
 +	* agent/pksign.c (do_encode_dsa): Remove bogus map_pk_openpgp_to_gcry.
 +
 +	* g10/misc.c (map_pk_openpgp_to_gcry): Remove.
 +	(openpgp_pk_test_algo): Change to a wrapper for openpgp_pk_test_algo2.
 +	(openpgp_pk_test_algo2): Rewrite.
 +	(openpgp_pk_algo_usage, pubkey_nbits): Add support for EdDSA.
 +	(openpgp_pk_algo_name): Rewrite to remove need for gcry calls.
 +	(pubkey_get_npkey, pubkey_get_nskey): Ditto.
 +	(pubkey_get_nsig, pubkey_get_nenc): Ditto.
 +	* g10/keygen.c(do_create_from_keygrip):  Support EdDSA.
 +	(common_gen, gen_ecc, ask_keysize, generate_keypair): Ditto.
 +	* g10/build-packet.c (do_key): Ditto.
 +	* g10/export.c (transfer_format_to_openpgp): Ditto.
 +	* g10/getkey.c (cache_public_key): Ditto.
 +	* g10/import.c (transfer_secret_keys): Ditto.
 +	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
 +	* g10/mainproc.c (proc_pubkey_enc): Ditto.
 +	* g10/parse-packet.c (parse_key): Ditto,
 +	* g10/sign.c (hash_for, sign_file, make_keysig_packet): Ditto.
 +	* g10/keyserver.c (print_keyrec): Use openpgp_pk_algo_name.
 +	* g10/pkglue.c (pk_verify, pk_encrypt, pk_check_secret_key): Use only
 +	OpenPGP algo ids and support EdDSA.
 +	* g10/pubkey-enc.c (get_it): Use only OpenPGP algo ids.
 +	* g10/seskey.c (encode_md_value): Ditto.
 +
 +2014-01-29  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Remove cipher.h and put algo ids into a common file.
 +	* common/openpgpdefs.h (cipher_algo_t, pubkey_algo_t, digest_algo_t)
 +	(compress_algo_t): New.
 +	* agent/gpg-agent.c: Remove ../g10/cipher.h. Add openpgpdefs.h.
 +	* g10/cipher.h (DEK): Move to ...
 +	* g10/dek.h: new file.
 +	* g10/cipher.h (is_RSA, is_ELGAMAL, is_DSA)
 +	(PUBKEY_MAX_NPKEY, PUBKEY_MAX_NSKEY, PUBKEY_MAX_NSIG, PUBKEY_MAX_NENC)
 +	(PUBKEY_USAGE_SIG, PUBKEY_USAGE_ENC, PUBKEY_USAGE_CERT)
 +	(PUBKEY_USAGE_AUTH, PUBKEY_USAGE_NONE): Move to
 +	* g10/packet.h: here.
 +	* g10/cipher.h: Remove.  Remove from all files.
 +	* g10/filter.h, g10/packet.h:  Include dek.h.
 +	* g10/Makefile.am (common_source): Remove cipher.h.  Add dek.h.
 +
 +	include: Remove this directory.
 +	* include/cipher.h: Move to ...
 +	* g10/cipher.h: here.
 +	* agent/gpg-agent.c: Adjust header file name.
 +
 +	* include/host2net.h: Move to ...
 +	* common/host2net.h: here.  Change license to LGPLv3/GPLv2.  Adjust
 +	notices to reflect that only me worked on that file.
 +
 +	* include/types.h: Remove.
 +	* common/types.h: Include inttypes.h.  Add byte typedef and comments
 +	for __riscos__.
 +	* common/iobuf.h: Adjust header file name.
 +
 +	* include/_regex.h: Remove this unused file.
 +
 +	* include/Makefile.am: Remove.
 +	* Makefile.am (SUBDIRS): Remove "include".
 +	* configure.ac (AC_CONFIG_FILES): Remove include/Makefile.
 +	* include/ChangeLog-2011: Move to ...
 +	* common/ChangeLog-2011.include: here.
 +	* common/Makefile.am (EXTRA_DIST): Add file.
 +
 +	* include/zlib-riscos.h: Move this repo only file to ...
 +	* g10/zlib-riscos.h: here.
 +
 +	* include/: Remove.
 +
 +2014-01-17  Werner Koch  <wk at gnupg.org>
 +
 +	Remove unused u64 type definitions.
 +	* configure.ac: Remove check for uint64 and UINT64_C.
 +	* include/types.h: Remove u64 stuff.
 +	* common/types.h: Ditto.
 +
 +2014-01-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Not remove SSH socket when already running.
 +	* agent/gpg-agent.c (main): Defer setting of socket_name_ssh to avoid
 +	removal of the socket when it will die in create_server_socket for
 +	socket_name.
 +
 +	agent: Fix agent_is_eddsa_key.
 +	* agent/findkey.c (agent_is_eddsa_key): Implemented.
 +
 +2014-01-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Add secp256k1.
 +	* common/openpgp-oid.c (openpgp_curve_to_oid): Add secp256k1.
 +	(openpgp_oid_to_curve): Likewise.
 +
 +	* g10/keygen.c (ask_curve): Add secp256k1.
 +
 +2014-01-10  Werner Koch  <wk at gnupg.org>
 +
 +	autogen.sh: Add rule for 64 bit windows.
 +
 +	Turn autogen.sh into a generic script.
 +	* autogen.sh: Revamp.
 +	* autogen.rc: New.
 +	* Makefile.am (EXTRA_DIST): Add autogen.rc.
 +
 +	Rename scripts/ to build-aux/
 +	* scripts/: Rename to build-aux/
 +	* Makefile.am: Adjust accordingly.
 +	* configure.ac (AC_CONFIG_AUX_DIR): Change to build-aux.
 +
 +2014-01-09  Werner Koch  <wk at gnupg.org>
 +
 +	Improve the speedo make script.
 +	* scripts/gpg-w32-dev/README: Remove
 +	* scripts/gpg-w32-dev/GNUmakefile, scripts/gpg-w32-dev/speedo.mk:
 +	Merge into ..
 +	* scripts/speedo.mk: this.
 +
 +	gpgsplit: Allow building without zlib support.
 +	* tools/gpgsplit.c [!HAVE_ZLIB]: Do not include zlib.h.
 +	(handle_zlib): Build only if HAVE_ZLIB is defined.
 +	(write_part): Support zlib and zip only if HAVE_ZLIB is defined.
 +
 +	w32: Fix backslash quoting in registry name.
 +	* configure.ac (GNUPG_REGISTRY_DIR): Double backslashes.
 +
 +	Fix test for zlib.
 +	* configure.ac (HAVE_ZLIB): Define only if found.
 +
 +	Add --enable-silent-rules stuff.
 +	* configure.ac: Add AM_SILENT_RULES.
 +
 +2014-01-08  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Add macro for the registry key.
 +	* configure.ac (GNUPG_REGISTRY_DIR) [W32]: New ac-define.
 +	* common/homedir.c (default_homedir): Use it.
 +	* common/logging.c (do_logv): Use it.
 +
 +2013-12-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change --show-session-key to print the session key earlier.
 +	* g10/cpr.c (write_status_strings): New.
 +	(write_status_text): Replace code by a call to write_status_strings.
 +	* g10/mainproc.c (proc_encrypted): Remove show_session_key code.
 +	* g10/decrypt-data.c (decrypt_data): Add new show_session_key code.
 +
 +2013-12-05  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change OID of Ed25519 and add Brainpool oids.
 +	* common/openpgp-oid.c (openpgp_curve_to_oid): Change OID for
 +	Ed25519.  Add brainpool OIDs.
 +	(openpgp_oid_to_curve): Ditto.
 +
 +2013-11-29  Werner Koch  <wk at gnupg.org>
 +
 +	common: Add put_membuf_printf.
 +	* common/membuf.c (put_membuf_printf): New.
 +
 +2013-11-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Change armor Version header to emit only the major version.
 +	* g10/options.h (opt): Rename field no_version to emit_version.
 +	* g10/gpg.c (main): Init opt.emit_vesion to 1.  Change --emit-version
 +	to bump up opt.emit_version.
 +	* g10/armor.c (armor_filter): Implement different --emit-version
 +	values.
 +
 +2013-11-18  Werner Koch  <wk at gnupg.org>
 +
 +	Make use of the *_NAME etc macros.
 +	Replace hardwired strings at many places with new macros from config.h
 +	and use the new strusage macro replacement feature.
 +
 +	* common/asshelp.c (lock_spawning) [W32]: Change the names of the spawn
 +	sentinels.
 +	* agent/command.c (cmd_import_key): Use asprintf to create the prompt.
 +
 +	Add strusage macro replacement feature.
 +	* common/argparse.c (writechar): New.
 +	(writestrings): Add macro replacement feature.
 +	(show_help): Remove specialized @EMAIL@ replacement.
 +	* configure.ac (GNUPG_NAME, GPG_NAME, GPGSM_NAME): Define.
 +	(GPG_AGENT_NAME, DIRMNGR_NAME, G13_NAME, GPGCONF_NAME): Define.
 +	(GPGTAR_NAME, GPG_AGENT_INFO_NAME, GPG_AGENT_SOCK_NAME): Define.
 +	(GPG_AGENT_SSH_SOCK_NAME, DIRMNGR_INFO_NAME): Define.
 +	(DIRMNGR_SOCK_NAME): Define.
 +
 +2013-11-15  Werner Koch  <wk at gnupg.org>
 +
 +	kbx: Implement update operation for OpenPGP keyblocks.
 +	* kbx/keybox-update.c (keybox_update_keyblock): Implement.
 +	* kbx/keybox-search.c (get_blob_flags): Move to ...
 +	* kbx/keybox-defs.h (blob_get_type): here.
 +	* kbx/keybox-file.c (_keybox_read_blob2): Fix calling without R_BLOB.
 +	* g10/keydb.c (build_keyblock_image): Allow calling without
 +	R_SIGSTATUS.
 +	(keydb_update_keyblock): Implement for keybox.
 +
 +	* kbx/keybox-dump.c (_keybox_dump_blob): Fix printing of the unhashed
 +	size.  Print "does not expire" also on 64 bit platforms.
 +
 +	gpg: Rework ECC support and add experimental support for Ed25519.
 +	* agent/findkey.c (key_parms_from_sexp): Add algo name "ecc".
 +	(agent_is_dsa_key): Ditto.
 +	(agent_is_eddsa_key): New.  Not finished, though.
 +	* agent/pksign.c (do_encode_eddsa): New.
 +	(agent_pksign_do): Use gcry_log_debug functions.
 +	* agent/protect.c (agent_protect): Parse a flags parameter.
 +	* g10/keygen.c (gpg_curve_to_oid): Move to ...
 +	* common/openpgp-oid.c (openpgp_curve_to_oid): here and rename.
 +	(oid_ed25519): New.
 +	(openpgp_oid_is_ed25519): New.
 +	(openpgp_oid_to_curve): New.
 +	* common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): New.
 +	* g10/build-packet.c (gpg_mpi_write): Write the length header also for
 +	opaque MPIs.
 +	(gpg_mpi_write_nohdr): New.
 +	(do_key): Use gpg_mpi_write_nohdr depending on algorithm.
 +	(do_pubkey_enc): Ditto.
 +	* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Use
 +	gpg_mpi_write_nohdr.
 +	* g10/export.c (transfer_format_to_openpgp):
 +	* g10/keygen.c (ecckey_from_sexp): Return the error.
 +	(gen_ecc): Repalce arg NBITS by CURVE.
 +	(read_parameter_file): Add keywords "Key-Curve" and "Subkey-Curve".
 +	(ask_curve): New.
 +	(generate_keypair, generate_subkeypair): Use ask_curve.
 +	(do_generate_keypair): Also pass curve name.
 +	* g10/keylist.c (list_keyblock_print, list_keyblock_colon): Print
 +	curve name.
 +	* g10/parse-packet.c (mpi_read): Remove workaround for
 +	Libcgrypt < 1.5.
 +	(parse_key): Fix ECC case.  Print the curve name.
 +	* g10/pkglue.c (mpi_from_sexp): Rename to get_mpi_from_sexp.
 +	(pk_verify, pk_check_secret_key): Add special case for Ed25519.
 +	* g10/seskey.c (encode_md_value): Ditto.
 +	* g10/sign.c (do_sign, hash_for, sign_file): Ditto.
 +
 +	kbx: Fix possible segv in kbxdump.
 +	* kbx/keybox-dump.c (_keybox_dump_blob): Check length before get32.
 +
 +	Require Libgcrypt 1.6.
 +	* agent/pksign.c (do_encode_dsa): Remove Libgcrypt version check
 +
 +2013-11-13  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: more pinpad input fix for PC/SC.
 +	* scd/apdu.c (check_pcsc_pinpad): Set default values here.
 +	(pcsc_pinpad_verify, pcsc_pinpad_modify): Remove setting default
 +	values, as it's too late.
 +
 +2013-11-11  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: more pinpad fix.
 +	* scd/apdu.c (check_pcsc_pinpad): Set ->minlen and ->maxlen only when
 +	those are specified.
 +	(pcsc_pinpad_modify): Remove old check code.
 +
 +2013-10-29  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: pinpad fix for PC/SC on Windows.
 +	* scd/apdu.c (SCARD_CTL_CODE): Fix for Windows.
 +
 +2013-10-28  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Change yat2m to allow arbitrary condition names.
 +	* doc/yat2m.c (MAX_CONDITION_NESTING): New.
 +	(gpgone_defined): Remove.
 +	(condition_s, condition_stack, condition_stack_idx): New.
 +	(cond_is_active, cond_in_verbatim): New.
 +	(add_predefined_macro, set_macro, macro_set_p): New.
 +	(evaluate_conditions, push_condition, pop_condition): New.
 +	(parse_file): Rewrite to use the condition stack.
 +	(top_parse_file): Set prefined macros.
 +	(main): Change -D to define arbitrary macros.
 +
 +2013-10-25  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: fix pinpad input on Windows.
 +	* scd/apdu.c (open_pcsc_reader_direct): Don't call
 +	pcsc_vendor_specific_init here, but...
 +	(connect_pcsc_card): Call it here.
 +
 +2013-10-23  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Update Japanese translation.
 +
 +2013-10-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: add pinpad readers information for PC/SC service.
 +	* scd/apdu.c (pcsc_vendor_specific_init): Add information for Cherry
 +	ST-2xxx, Reiner cyberJack, Vasco DIGIPASS, FSIJ Gnuk Token, and KAAN
 +	Advance.
 +
 +2013-10-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: remove pin length check.
 +	* scd/apdu.c (pcsc_pinpad_verify): Remove old check code for pin
 +	length.
 +
 +2013-10-04  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Limit the nesting level of I/O filters.
 +	* common/iobuf.c (MAX_NESTING_FILTER): New.
 +	(iobuf_push_filter2): Limit the nesting level.
 +
 +	* g10/mainproc.c (mainproc_context): New field ANY.  Change HAVE_DATA
 +	and ANY_SIG_SIGN to bit fields of ANY.  Add bit field
 +	UNCOMPRESS_FAILED.
 +	(proc_compressed): Avoid printing multiple Bad Data messages.
 +	(check_nesting): Return GPG_ERR_BAD_DATA instead of UNEXPECTED_DATA.
 +
 +2013-10-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix bug with deeply nested compressed packets.
 +	* g10/mainproc.c (MAX_NESTING_DEPTH): New.
 +	(proc_compressed): Return an error code.
 +	(check_nesting): New.
 +	(do_proc_packets): Check packet nesting depth.  Handle errors from
 +	check_compressed.
 +
 +2013-09-08  Werner Koch  <wk at gnupg.org>
 +
 +	Switch to deterministic DSA.
 +	* agent/pksign.c (rfc6979_hash_algo_string): New.
 +	(do_encode_dsa) [Libgcrypt >= 1.6]: Make use of RFC-6979.
 +
 +2013-08-30  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Suppress gcc warning about possible uninitialized use.
 +	* scd/app-nks.c (parse_pwidstr): Always init r_pwid.
 +
 +	gpg: Use 2048 as the default keysize in batch mode.
 +	* g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
 +	2048.
 +
 +	gpgtar: Fix building for systems with a separate libintl.
 +	* tools/Makefile.am (gpgtar_LDADD): Add LIBINTL and LIBICONV.
 +
 +	scd: Use vendor and product id macros also in apdu.c.
 +	* scd/ccid-driver.c: Move vendor and product ids to ...
 +	* scd/ccid-driver.h: here.
 +	* scd/apdu.c (CCID_DRIVER_INCLUDE_USB_IDS): Define to include ids.
 +	(pcsc_vendor_specific_init): Use vendor and product id macros.
 +
 +2013-08-30  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: PC/SC pinpad input improvement.
 +	* scd/apdu.c (struct reader_table_s): Add members: PINMIN, PINMAX, and
 +	PINPAD_VERLEN_SUPPORTED.
 +	(CM_IOCTL_VENDOR_IFD_EXCHANGE, FEATURE_GET_TLV_PROPERTIES,
 +	PCSCv2_PART10_PROPERTY_*): New.
 +	(new_reader_slot): Initialize pinpad_varlen_supported, pinmin, pinmax.
 +	(pcsc_vendor_specific_init): New.
 +	(open_pcsc_reader_direct, open_pcsc_reader_wrapped): Call
 +	pcsc_vendor_specific_init.
 +	(check_pcsc_pinpad): Not detect here but use the result of
 +	pcsc_vendor_specific_init.
 +	(pcsc_pinpad_verify, pcsc_pinpad_modify): Specify bNumberMessage.
 +
 +2013-08-29  Jonas Borgström  <jonas at borgstrom.se>
 +
 +	scd: add support for RSA_CRT and RSA_CRT_N key import.
 +	* scd/app-openpgp.c (do_writekey): Added RSA_CRT and RSA_CRT_N support.
 +
 +2013-08-29  Werner Koch  <wk at gnupg.org>
 +
 +	kbx: Add a few macros for easier readability.
 +	* kbx/keybox-update.c (FILECOPY_INSERT)
 +	(FILECOPY_DELETE, FILECOPY_UPDATE): New macros.  Replace numbers by
 +	them.
 +
 +2013-08-28  Werner Koch  <wk at gnupg.org>
 +
 +	Fix commit 04e2c83f.
 +	* agent/command-ssh.c (stream_read_string): Do not assign to a NULL
 +	ptr.
 +
 +	gpg: Make decryption with the OpenPGP card work.
 +	* scd/app-common.h (APP_DECIPHER_INFO_NOPAD): New.
 +	* scd/app-openpgp.c (do_decipher): Add arg R_INFO.
 +	* scd/app-nks.c (do_decipher): Add arg R_INFO as a dummy.
 +	* scd/app.c (app_decipher): Add arg R_INFO.
 +	* scd/command.c (cmd_pkdecrypt): Print status line "PADDING".
 +	* agent/call-scd.c (padding_info_cb): New.
 +	(agent_card_pkdecrypt): Add arg R_PADDING.
 +	* agent/divert-scd.c (divert_pkdecrypt): Ditto.
 +	* agent/pkdecrypt.c (agent_pkdecrypt): Ditto.
 +	* agent/command.c (cmd_pkdecrypt):  Print status line "PADDING".
 +	* g10/call-agent.c (padding_info_cb): New.
 +	(agent_pkdecrypt): Add arg R_PADDING.
 +	* g10/pubkey-enc.c (get_it): Use padding info.
 +
 +	agent: Fix two compiler warnings.
 +	* agent/command.c (cmd_preset_passphrase, pinentry_loopback): Use %zu
 +	in format string.
 +	* scd/ccid-driver.c (ccid_get_atr): Ditto.
 +	* agent/command-ssh.c (stream_read_string): Init arg STRING_SIZE to
 +	avoid maybe_unitialized warning.
 +
 +2013-08-27  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: fix parsing login-data DO.
 +	* scd/app-openpgp.c (parse_login_data): Release RELPTR.  Fix parsing.
 +
 +	scd: fix Vega for Alpha reader.
 +	* scd/ccid-driver.c (ccid_vendor_specific_init): Fix error handling
 +	and size of command.
 +
 +2013-08-21  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Make SPRx32 pinpad work with PC/SC on Windows.
 +	* scd/apdu.c (CM_IOCTL_GET_FEATURE_REQUEST): Use SCARD_CTL_CODE.
 +	(SCARD_CTL_CODE): Define if not defined.
 +	(reader_table_s): Add is_spr532.
 +	(new_reader_slot): Clear it.
 +	(check_pcsc_pinpad): Set it.
 +	(pcsc_pinpad_verify, pcsc_pinpad_modify): Add fix for SPR532.
 +
 +	scd: Improve --enable-pinpad-varlen.
 +	* tools/gpgconf-comp.c (gc_options_scdaemon): Add
 +	enable-pinpad-varlen.
 +	* scd/apdu.c (check_pcsc_pinpad): Detect SPRx32 reader.
 +
 +2013-08-08  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Extend cmd KEYINFO to return data from sshcontrol.
 +	* agent/command-ssh.c (struct control_file_s): Rename to
 +	ssh_control_file_s.
 +	(ssh_open_control_file, ssh_close_control_file)
 +	(ssh_read_control_file, ssh_search_control_file): New.
 +	(control_file_t):  Rename and move to ...
 +	* agent/agent.h (ssh_control_file_t): here.
 +	* agent/command.c (do_one_keyinfo): Add args is_ssh, ttl, disabled,
 +	and confirm. Rename unknown keytype indicator from '-' to 'X'.  Extend
 +	output.
 +	(cmd_keyinfo): Add options --ssh-list and --with-ssh.
 +
 +2013-08-02  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: No need to create a trustdb when encrypting with --always-trust.
 +	* g10/gpg.c (main): Special case setup_trustdb for --encrypt.
 +
 +2013-08-01  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Fix recent patch 9ff72e4.
 +	* common/homedir.c (check_portable_app): Fix the name of the control
 +	file.
 +
 +	agent: Include missing prototype.
 +	* agent/protect.c: Include cvt-openpgp.h.
 +
 +	w32: Add code to support a portable use of GnuPG.
 +	* common/homedir.c (w32_bin_is_bin, w32_portable_app) [W32]: New.
 +	(check_portable_app) [W32]: New.
 +	(standard_homedir, default_homedir) [W32]: Support the portable flag.
 +	(w32_rootdir, w32_commondir) [W32]: Ditto.
 +	(gnupg_bindir, gnupg_cachedir, dirmngr_socket_name) [W32]: Ditto.
 +	* common/logging.h (JNLIB_LOG_NO_REGISTRY): New.
 +	* common/logging.c (no_registry): New variable.
 +	(log_set_prefix, log_get_prefix): Set/get that variable.
 +	(do_logv): Do not check the registry if that variable is set.
 +
 +	Silence compiler warning about deprecated Libgcrypt symbols.
 +	* configure.ac (AH_BOTTOM): Define GCRYPT_NO_DEPRECATED.
 +
 +	dirmngr: Define missing LDAP constant.
 +	* dirmngr/ldap-url.c (LDAP_SCOPE_DEFAULT): Define if missing.
 +
 +	scd: Fix a syntax error for Apple and Windows.
 +	* scd/apdu.c (pcsc_dword_t) [W32]: Fix syntax error.
 +
 +	common: Fix a build error when using adns.
 +	* common/dns-cert.c (get_dns_cert) [USE_ADNS]: Fix synatx error.
 +
 +2013-07-31  Werner Koch  <wk at gnupg.org>
 +
 +	common: Comment out unused code.
 +	* common/w32-reg.c (write_w32_registry_string): Comment out.
 +
 +	dirmngr: Remove unused file.
 +	* dirmngr/get-path.c: Remove.
 +
 +2013-06-27  Werner Koch  <wk at gnupg.org>
 +
 +	sm: Remove cruft from source files.
 +	* sm/keydb.c, sm/keydb.h: Remove disabled code parts.
 +
 +	Prepare for newer automake versions.
 +	* configure.ac (AM_INIT_AUTOMAKE): Replace 2 argument form by the
 +	option form.  Add options from the top Makefile.
 +	(AM_CONFIG_HEADER): Rename to AC_CONFIG_HEADER.
 +	* Makefile.am (AUTOMAKE_OPTIONS): Remove.
 +
 +	* kbx/Makefile.am: Remove INCLUDES.  Include cmacros.am.  FActor some
 +	AM_CPPFLAGS options to  AM_CFLAGS.
 +
 +2013-06-26  Werner Koch  <wk at gnupg.org>
 +
 +	Fix Makefile regression.
 +	* agent/Makefile.am (gpg_agent_DEPENDENCIES): Remove cruft from wrong
 +	resolve conflict 2013-04-25.
 +	(gpg_agent_DEPENDENCIES): Remove obsolete gpg_agent_res_deps
 +	(gpg_agent_LDFLAGS): Remove obsolete gpg_agent_res_ldflags.
 +
 +2013-05-22  Werner Koch  <wk at gnupg.org>
 +
 +	Implement unattended OpenPGP secret key import.
 +	* agent/command.c (cmd_import_key): Add option --unattended.
 +	* agent/cvt-openpgp.c (convert_transfer_key): New.
 +	(do_unprotect): Factor some code out to ...
 +	(prepare_unprotect): new function.
 +	(convert_from_openpgp): Factor all code out to ...
 +	(convert_from_openpgp_main): this.  Add arg 'passphrase'.  Implement
 +	openpgp-native protection modes.
 +	(convert_from_openpgp_native): New.
 +	* agent/t-protect.c (convert_from_openpgp_native): New dummy fucntion
 +	* agent/protect-tool.c (convert_from_openpgp_native): Ditto.
 +	* agent/protect.c (agent_unprotect): Add arg CTRL.  Adjust all
 +	callers.  Support openpgp-native protection.
 +	* g10/call-agent.c (agent_import_key): Add arg 'unattended'.
 +	* g10/import.c (transfer_secret_keys): Use unattended in batch mode.
 +
 +	New debug functions log_printcanon and log_printsexp.
 +	* common/sexputil.c (sexp_to_string, canon_sexp_to_string): New.
 +	(log_printcanon, log_printsexp): New.
 +
 +	agent: Fix length detection of canonical formatted openpgp keys.
 +	* agent/command.c (cmd_import_key): Pass 0 instead of KEYLEN to
 +	gcry_sexp_canon_len.
 +
 +	agent: New option --disable-check-own-socket.
 +	* agent/gpg-agent.c (oDisableCheckOwnSocket): New.
 +	(disable_check_own_socket): New.
 +	(parse_rereadable_options): Set new option.
 +	(check_own_socket): Implement new option.
 +
 +2013-05-07  Werner Koch  <wk at gnupg.org>
 +
 +	w32: Add icons and version information.
 +	* common/gnupg.ico: New.  Take from artwork/gnupg-favicon-1.ico.
 +	* agent/gpg-agent-w32info.rc: New.
 +	* g10/gpg-w32info.rc: New.
 +	* scd/scdaemon-w32info.rc: New.
 +	* sm/gpgsm-w32info.rc: New.
 +	* tools/gpg-connect-agent-w32info.rc: New.
 +	* common/w32info-rc.h.in: New.
 +	* configure.ac (BUILD_REVISION, BUILD_FILEVERSION, BUILD_TIMESTAMP)
 +	(BUILD_HOSTNAME): New.
 +	(AC_CONFIG_FILES): Add w32info-rc.h.
 +	* am/cmacros.am (.rc.o): New rule.
 +	* agent/Makefile.am, common/Makefile.am, g10/Makefile.am
 +	* scd/Makefile.am, sm/Makefile.am, tools/Makefile.am: Add stuff to
 +	build resource files.
 +
 +2013-05-07  Ian Abbott  <abbotti at mev.co.uk>
 +
 +	doc: fix some Texinfo warnings.
 +	* doc/gpg.texi: Fix syntax and add missing menu entries.
 +	* doc/gpgsm.texi: Fix subsectioning.
 +
 +2013-04-22  Werner Koch  <wk at gnupg.org>
 +
 +	Fix potential heap corruption in "gpg -v --version".
 +	* g10/gpg.c (build_list): Rewrite to cope with buffer overflow in
 +	certain locales.
 +
 +2013-04-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpgsm: Remove non-implemented commands from --help.
 +	* sm/gpgsm.c (opts): Removed commands --clearsign, --symmetric,
 +	--send-keys, and --recv-keys.
 +
 +2013-04-19  Daiki Ueno  <ueno at gnu.org>
 +
 +	Make sure to call fflush if estream_t is backed with stdio.
 +	* common/estream.c (es_func_fp_write): Call fflush after fwrite.
 +
 +2013-04-19  Werner Koch  <wk at gnupg.org>
 +
 +	doc: Formatting fixes.
 +	* doc/Makefile.am (.fig.jpg): Correct to use -L jpeg.
 +	* doc/gpg.texi: Fix cross reference for --options.
 +	* doc/gpgsm.texi: Likewise.
 +	* doc/gpl.texi: Fix enumerate and re-indent examples.
 +
 +2013-04-01  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: move SCDaemon to libexecdir.
 +	* common/homedir.c (gnupg_module_name): It's now libexecdir.
 +	* scd/Makefile.am (libexec_PROGRAMS): Add scdaemon
 +	(bin_PROGRAMS): Remove scdaemon.
 +
 +2013-03-29  Werner Koch  <wk at gnupg.org>
 +
 +	copyright assignments are not anymore required.
 +
 +2013-03-26  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: PC/SC status fix.
 +	* scd/apdu.c (pcsc_get_status_direct): Check PCSC_STATE_MUTE only when
 +	PCSC_STATE_PRESENT.
 +
 +	* scd/pcsc-wrapper.c (handle_status): Ditto.
 +
 +	scd: PC/SC cleanup (more).
 +	* scd/apdu.c (control_pcsc_direct, control_pcsc_wrapped, control_pcsc)
 +	(check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify): Use
 +	pcsc_dword_t.
 +
 +	scd: call update_card_removed only when detecting removal.
 +	* scd/command.c (update_reader_status_file): Add condition
 +	vr->status == 0.
 +
 +2013-03-22  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: PC/SC cleanup.
 +	* scd/apdu.c (pcsc_dword_t): New.  It was named as DWORD (double-word)
 +	when a word was 16-bit.
 +	(struct reader_table_s): Fixes for types.
 +	(struct pcsc_readerstate_s) [__APPLE__]: Enable #pragma pack(1).
 +	Throughout: Fixes for types.
 +
 +	* scd/pcsc-wrapper.c: Likewise.
 +
 +2013-03-21  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	po: Enable ja.po.
 +	* po/LINGUAS: Enable ja.po.
 +
 +	scd: change default value of pinpad maxlen.
 +	* scd/apdu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Default value
 +	of maxlen for pinpad input is now 15 (was: 25).
 +
 +	* scd/ccid-driver.c (ccid_transceive_secure): Likewise.
 +
 +2013-03-20  Werner Koch  <wk at gnupg.org>
 +
 +	Add code to allow for late memory cleanup.
 +	* common/init.c (mem_cleanup_item_t): New.
 +	(run_mem_cleanup): New.
 +	(_init_common_subsystems): Add an atexit for it.
 +	(register_mem_cleanup_func): New.
 +
 +	* g10/kbnode.c (cleanup_registered): New.
 +	(release_unused_nodes): New.
 +	(alloc_node): Call register_mem_cleanup_func.
 +
 +	kbx: Remove unused macro.
 +	* kbx/keybox.h (KEYBOX_WITH_OPENPGP): Remove unused macro.
 +
 +2013-03-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Print indicator for unknown key capability.
 +	* g10/keylist.c (print_capabilities): Print '?' for unknown usage.
 +
 +2013-03-19  Daniel Kahn Gillmor  <dkg at fifthhorseman.net>
 +
 +	gpg: Allow setting of all zero key flags.
 +	* g10/keygen.c (do_add_key_flags): Do not check for empty key flags.
 +
 +2013-03-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Distinguish between missing and cleared key flags.
 +	* include/cipher.h (PUBKEY_USAGE_NONE): New.
 +	* g10/getkey.c (parse_key_usage): Set new flag.
 +
 +2013-03-15  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: ccid-driver supporting larger APDU.
 +	* scd/ccid-driver.c (ccid_transceive_apdu_level): Support larger
 +	APDU.
 +
 +	scd: fix missing close paren.
 +	* scd/app-openpgp.c (du_auth): Fix.
 +
 +2013-03-09  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: support ECDSA signing.
 +	* scd/app-openpgp.c (do_sign): Only prepend message digest block
 +	for RSA or do_auth.
 +	(do_auth): Remove message digest block for ECDSA.
 +
 +2013-03-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: support ECDSA public key.
 +	* scd/app-openpgp.c (key_type_t): New.
 +	(CURVE_NIST_P256, CURVE_NIST_P384, CURVE_NIST_P521): New.
 +	(struct app_local_s): Change keyattr to have key_type and union.
 +	(get_ecc_key_parameters, get_curve_name): New.
 +	(send_key_attr, get_public_key): Support ECDSA.
 +	(build_privkey_template, do_writekey, do_genkey): Follow the change
 +	of the member KEY_ATTR.
 +	(parse_historical): New.
 +	(parse_algorithm_attribute): Support ECDSA.
 +
 +2013-03-05  Werner Koch  <wk at gnupg.org>
 +
 +	Require libgpg-error 1.11.
 +	* configure.ac: Require libgpg-error 1.11.
 +	* common/util.h (GPG_ERR_NO_KEYSERVER, GPG_ERR_INV_CURVE)
 +	(GPG_ERR_UNKNOWN_CURVE): Remove fallback definitions.
 +
 +2013-02-28  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: pksign result conversion to sexp to upper layer.
 +	* agent/agent.h (divert_pksign): Add R_SIGLEN argument.
 +	* agent/divert-scd.c (divert_pksign): Return length at R_SIGLEN.
 +	* agent/call-scd.c (agent_card_pksign): Move composition of
 +	S-expression to...
 +	* agent/pksign.c (agent_pksign_do): ... here.
 +
 +2013-02-22  Werner Koch  <wk at gnupg.org>
 +
 +	Use has_leading_keyword in the assuan callbacks.
 +	* agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
 +	* agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
 +	* g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
 +	(inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
 +	* g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
 +	* sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
 +	(inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
 +	(keyinfo_status_cb, inq_import_key_parms): Ditto.
 +	* sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
 +	(lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
 +
 +	Remove some unused variables.
 +	* tools/gpgconf-comp.c (gc_process_gpgconf_conf): Remove unused
 +	used_components.
 +	* agent/command-ssh.c (ssh_signature_encoder_ecdsa): Mark unused arg.
 +	* g13/g13.c (main): Comment variable of yet unimplemented options.
 +
 +	gpg: Fix a memory leak in batch key generation.
 +	* g10/keygen.c (append_to_parameter): New.
 +	(proc_parameter_file): Use new func to extend the parameter list.
 +
 +	* g10/passphrase.c (passphrase_to_dek_ext): Print a diagnostic of
 +	gcry_kdf_derive failed.
 +	* g10/keygen.c (proc_parameter_file): Print a diagnostic if
 +	passphrase_to_dek failed.
 +
 +	gpg: Handle the agent's NEW_PASSPHRASE inquiry.
 +	* g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
 +
 +	common: Add func has_leading_keyword.
 +	* common/stringhelp.c (has_leading_keyword): New.
 +
 +	Remove build hacks for FreeBSD.
 +	* configure.ac [freebsd]: Do not add /usr/local to CPPFLAGS and
 +	LDFLAGS.
 +
 +2013-02-22  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: fix two bugs.
 +	* agent/command.c (cmd_keytocard): Decrement KEYDATALEN.
 +	* agent/findkey.c (agent_public_key_from_file): Increment for ELEMS.
 +
 +	gpg: fix keytocard and support ECC card for key attribute.
 +	* g10/call-agent.c (agent_keytocard): Supply PARM arg.
 +	* g10/card-util.c (card_status): Support ECC.
 +	(card_store_subkey): Don't assume RSA.
 +
 +2013-02-21  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix a memory leak in batch key generation.
 +	* g10/keygen.c (append_to_parameter): New.
 +	(proc_parameter_file): Use new func to extend the parameter list.
 +
 +	* g10/passphrase.c (passphrase_to_dek_ext): Print a diagnostic of
 +	gcry_kdf_derive failed.
 +	* g10/keygen.c (proc_parameter_file): Print a diagnostic if
 +	passphrase_to_dek failed.
 +
 +	gpg: Handle the agent's NEW_PASSPHRASE inquiry.
 +	* g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
 +
 +	common: Add func has_leading_keyword.
 +	* common/stringhelp.c (has_leading_keyword): New.
 +
 +2013-02-20  Werner Koch  <wk at gnupg.org>
 +
 +	Remove build hacks for FreeBSD.
 +	* configure.ac [freebsd]: Do not add /usr/local to CPPFLAGS and
 +	LDFLAGS.
 +
 +2013-02-12  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	gpg: Implement card_store_subkey again.
 +	* g10/call-agent.h (agent_keytocard): New.
 +	* g10/call-agent.c (agent_keytocard): New.
 +	* g10/card-util.c (replace_existing_key_p): Returns 1 when replace.
 +	(card_generate_subkey): Check return value of replace_existing_key_p.
 +	(card_store_subkey): Implement again using agent_keytocard.
 +
 +	agent: Add KEYTOCARD command.
 +	* agent/agent.h (divert_writekey, agent_card_writekey): New.
 +	* agent/call-scd.c (inq_writekey_parms, agent_card_writekey): New.
 +	* agent/command.c (cmd_keytocard, hlp_keytocard): New.
 +	(register_commands): Add cmd_keytocard.
 +	* agent/divert-scd.c (divert_writekey): New.
 +
 +	Japanese: update po and doc.
 +	* doc/help.ja.txt, po/ja.po: Updated.
 +
 +2013-02-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Rename 'keypad' to 'pinpad'.
 +	* NEWS: Mention scd changes.
 +
 +	* agent/divert-scd.c (getpin_cb): Change message.
 +
 +	* agent/call-scd.c (inq_needpin): Change the protocol to
 +	POPUPPINPADPROMPT and DISMISSPINPADPROMPT.
 +	* scd/command.c (pin_cb): Likewise.
 +
 +	* scd/apdu.c (struct reader_table_s): Rename member functions.
 +	(check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify,
 +	check_ccid_pinpad, ccid_pinpad_operation, apdu_check_pinpad
 +	apdu_pinpad_verify, apdu_pinpad_modify): Rename.
 +
 +	* scd/apdu.h (SW_HOST_NO_PINPAD, apdu_check_pinpad)
 +	(apdu_pinpad_verify, apdu_pinpad_modify): Rename.
 +
 +	* scd/iso7816.h (iso7816_check_pinpad): Rename.
 +
 +	* scd/iso7816.c (map_sw): Use SW_HOST_NO_PINPAD.
 +	(iso7816_check_pinpad): Rename.
 +	(iso7816_verify_kp, iso7816_change_reference_data_kp): Follow
 +	the change.
 +
 +	* scd/ccid-driver.h (CCID_DRIVER_ERR_NO_PINPAD): Rename.
 +	* scd/ccid-driver.c (ccid_transceive_secure): Use it.
 +
 +	* scd/app-dinsig.c (verify_pin): Follow the change.
 +	* scd/app-nks.c (verify_pin): Follow the change.
 +
 +	* scd/app-openpgp.c (check_pinpad_request): Rename.
 +	(parse_login_data, verify_a_chv, verify_chv3, do_change_pin): Follow
 +	the change.
 +
 +	* scd/scdaemon.c (oDisablePinpad, oEnablePinpadVarlen): Rename.
 +
 +	* scd/scdaemon.h (opt): Rename to disable_pinpad,
 +	enable_pinpad_varlen.
 +
 +	* tools/gpgconf-comp.c (gc_options_scdaemon): Rename to
 +	disable-pinpad.
 +
 +2013-02-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add pinentry-mode feature.
 +	* g10/gpg.c: Include shareddefs.h.
 +	(main): Add option --pinentry-mode.
 +	* g10/options.h (struct opt): Add field pinentry_mode.
 +	* g10/passphrase.c: Include shareddefs.h.
 +	(have_static_passphrase): Take care of loopback pinentry_mode.
 +	(read_passphrase_from_fd): Ditto.
 +	(get_static_passphrase): New.
 +	(passphrase_to_dek_ext): Factor some code out to ...
 +	(emit_status_need_passphrase): new.
 +	* g10/call-agent.c (start_agent): Send the pinentry mode.
 +	(default_inq_cb): Take care of the PASSPHRASE inquiry.  Return a
 +	proper error code.
 +	(agent_pksign): Add args keyid, mainkeyid and pubkey_algo.
 +	(agent_pkdecrypt): Ditto.
 +	* g10/pubkey-enc.c (get_it): Pass new args.
 +	* g10/sign.c (do_sign): Pass new args.
 +
 +	* g10/call-agent.c (struct default_inq_parm_s): New.  Change all
 +	similar structs to reference this one.  Change all users and inquire
 +	callback to use this struct, instead of NULL or some undefined but not
 +	used structs.  This change will help to eventually get rid of global
 +	variables.
 +
 +2013-02-06  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Move a typedef to common and provide parse_pinentry_mode.
 +	* common/agent-opt.c: New.
 +	* common/shareddefs.h: New.
 +	* common/Makefile.am: Add new files.
 +	* agent/agent.h: Include shareddefs.h.
 +	(pinentry_mode_t): Factor out to shareddefs.h.
 +	* agent/command.c (option_handler): Use parse_pinentry_mode.
 +
 +	agent: Return a better error code if no passphrase was given.
 +	* agent/protect.c (hash_passphrase): Handle an empty passphrase.
 +
 +2013-02-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: Fix check_keypad_request.
 +	* scd/app-openpgp.c (check_keypad_request): 0 means not to use pinpad.
 +
 +	SCD: Add vendor specific initalization.
 +	* scd/ccid-driver.c (ccid_vendor_specific_init): New.
 +	(ccid_open_reader): Call ccid_vendor_specific_init.
 +
 +	SCD: Support P=N format for login data.
 +	* scd/app-openpgp.c (parse_login_data): Support P=N format.
 +
 +	SCD: Better interoperability.
 +	* scd/apdu.c: Fill bTeoPrologue[2] field.
 +
 +	SCD: Defaults to use pinpad if the reader has the capability.
 +	* scd/app-openpgp.c (struct app_local_s): Remove VARLEN.
 +	(parse_login_data): "P=0" means to disable pinpad.
 +	(check_keypad_request): Default is to use pinpad if available.
 +
 +	SCD: handle keypad request on the card.
 +	* scd/app-openpgp.c: Add 2013.
 +	(struct app_local_s): Add keypad structure.
 +	(parse_login_data): Add parsing keypad request on the card.
 +	(check_keypad_request): New.
 +	(verify_a_chv, verify_chv3, do_change_pin): Call check_keypad_request
 +	to determine use of keypad.
 +
 +	SCD: Minor fix of ccid-driver.
 +	* scd/ccid-driver.c (VENDOR_VEGA): Fix typo.
 +
 +	SCD: Add support of Covadis VEGA_ALPHA reader.
 +	* scd/ccid-driver.c: Add 2013.
 +	(VENDER_VEGA, VEGA_ALPHA):New.
 +	(ccid_transceive_secure): VEGA_ALPHA is same firmware as GEMPC_PINPAD.
 +	Change bNumberMessage to 0x01, as it works better (was: 0xff).
 +
 +	SCD: Support fixed length PIN input for keypad (PC/SC).
 +	* scd/apdu.c (pcsc_keypad_verify): SUpport fixed length PIN input for
 +	keypad.
 +	(pcsc_keypad_modify): Likewise.
 +	* scd/ccid-driver.c (ccid_transceive_secure): Clean up.
 +
 +	SCD: Support fixed length PIN input for keypad.
 +	* scd/iso7816.h (struct pininfo_s): Remove MODE and add FIXEDLEN.
 +	* scd/app-dinsig.c (verify_pin): Initialize FIXEDLEN to unknown.
 +	* scd/app-nks.c (verify_pin): Likewise.
 +	* scd/app-openpgp.c (verify_a_chv, verify_chv3, do_change_pin):
 +	Likewise.
 +	* scd/apdu.c (check_pcsc_keypad): Add comment.
 +	(pcsc_keypad_verify, pcsc_keypad_modify): PC/SC driver only support
 +	readers with the feature of variable length input (yet).
 +	(apdu_check_keypad): Set FIXEDLEN.
 +	* scd/ccid-driver.c (ccid_transceive_secure): Add GEMPC_PINPAD
 +	specific settings.
 +	Support fixed length PIN input for keypad.
 +
 +	SCD: API cleanup for keypad handling.
 +	* scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
 +	Change meaning of MODE.
 +	(pininfo_t): Rename from iso7816_pininfo_t.
 +	* scd/sc-copykeys.c: Include "iso7816.h".
 +	* scd/scdaemon.c, scd/command.c: Likewise.
 +	* scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
 +	(ccid_transceive_secure): Follow the change of PININFO_T.
 +	* scd/app.c: Include "apdu.h" after "iso7816.h".
 +	* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
 +	(iso7816_change_reference_data_kp): Follow the change of API.
 +	* scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
 +	KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
 +	(check_pcsc_keypad, check_ccid_keypad): Likewise.
 +	(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
 +	(pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
 +	(pcsc_send_apdu_direct,  pcsc_send_apdu_wrapped, pcsc_send_apdu)
 +	(send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
 +	(send_le): Follow the change of API.
 +	* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
 +	(apdu_keypad_modify): Change the API.
 +	* scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
 +	change.
 +
 +	SCD: Clean up.  Remove PADLEN for keypad input.
 +	* scd/apdu.c (struct pininfo_s): Use iso7816_pininfo_s.
 +	(struct reader_table_s): Remove last arg from check_keypad method.
 +	(check_pcsc_keypad, check_pcsc_keypad): Remove PIN_PADLEN.
 +	(pcsc_keypad_verify, pcsc_keypad_modify): Don't check PIN_PADLEN.
 +	(send_apdu_ccid, ccid_keypad_operation): Remove PIN_PADLEN.
 +	(apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify):
 +	Likewise.
 +
 +	* scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
 +	(apdu_keypad_modify): Remove PIN_PADLEN.
 +
 +	* scd/ccid-driver.c (ccid_transceive_secure): Remove PIN_PADLEN.
 +
 +	* scd/ccid-driver.h (ccid_transceive_secure): Remove PIN_PADLEN.
 +
 +	* scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
 +	(iso7816_change_reference_data_kp): Remove PADLEN.
 +
 +	* scd/iso7816.h (struct iso7816_pininfo_s): Remove PADLEN, PADCHAR.
 +
 +	SCD: Add option enable-keypad-varlen and support for GEMPC_PINPAD.
 +	* scd/scdaemon.h (opt): Add enable_keypad_varlen.
 +	* scd/scdaemon.c (cmd_and_opt_values): Add oEnableKeypadVarlen.
 +	(opts, main): Add oEnableKeypadVarlen.
 +	* scd/ccid-driver.c (GEMPC_PINPAD): New.
 +	(ccid_transceive_secure): Add enable_varlen handling.
 +	Enable GEMPC_PINPAD.
 +
 +2013-01-30  Werner Koch  <wk at gnupg.org>
 +
 +	Remove unused status codes.
 +	* common/status.h (STATUS_BEGIN_STREAM, STATUS_END_STREAM)
 +	(STATUS_SIEXPIRED): Remove unused codes.
 +
 +	gpg: Add status line PINENTRY_LAUNCHED.
 +	* common/status.h (STATUS_PINENTRY_LAUNCHED): New.
 +	* g10/server.c (server_local_s): Add field allow_pinentry_notify.
 +	(option_handler): Add option "allow-pinentry-notify".
 +	(gpg_proxy_pinentry_notify): New.
 +	* g10/call-agent.c (default_inq_cb): Factor code out to the new
 +	function.
 +
 +2013-01-25  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix a bug of handling return code from npth_join.
 +	* agent/call-pinentry.c (agent_popup_message_stop): Fix npth_join
 +	return code.
 +
 +2013-01-11  Christian Aistleitner  <christian at quelltextlich.at>
 +
 +	gpg: Fix honoring --cert-digest-algo when recreating a cert.
 +	* g10/sign.c (update_keysig_packet): Override original signature's
 +	digest algo in hashed data and for hash computation.
 +
 +2013-01-11  Werner Koch  <wk at gnupg.org>
 +
 +	Fix spurious cruft from configure summary output.
 +	* configure.ac (build_scdaemon_extra): Remove $tmp cruft.
 +
 +2013-01-11  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	SCD: Hold lock for pinpad input.
 +	* scd/apdu.c (apdu_check_keypad, apdu_keypad_verify)
 +	(apdu_keypad_modify): Hold lock to serialize communication.
 +
 +2013-01-08  Werner Koch  <wk at gnupg.org>
 +
 +	kbx: Switch from MD5 to SHA-1 for the checksum.
 +	* kbx/keybox-blob.c (put_membuf): Use a NULL buf to store zero bytes.
 +	(create_blob_finish): Write just the needed space.
 +	(create_blob_finish): Switch to SHA-1.
 +	* kbx/keybox-dump.c (print_checksum): New.
 +	(_keybox_dump_blob): Print the checksum and the verification status.
 +
 +	gpg: Cache keybox searches.
 +	* common/iobuf.c (iobuf_seek): Fix for temp streams.
 +	* g10/pubkey-enc.c (get_session_key, get_it): Add some log_clock calls.
 +	* g10/keydb.c (dump_search_desc): New.
 +	(enum_keyblock_states, struct keyblock_cache): New.
 +	(keyblock_cache_clear): New.
 +	(keydb_get_keyblock, keydb_search): Implement a keyblock cache.
 +	(keydb_update_keyblock, keydb_insert_keyblock, keydb_delete_keyblock)
 +	(keydb_rebuild_caches, keydb_search_reset): Clear the cache.
 +
 +	Make log_clock easier to read.
 +	* common/logging.c (log_clock): Print in microseconds.
 +
 +	gpg: Remove a function wrapper.
 +	* g10/keydb.h (keydb_search): Remove macro.
 +	* g10/keydb.c (keydb_search2): Rename to keydb_search.  Change all
 +	callers.
 +
 +2013-01-08  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	SCD: Support not-so-smart card readers.
 +	* scd/ccid-driver.c (struct ccid_driver_s): Add auto_voltage,
 +	auto_param, and auto_pps.
 +	(parse_ccid_descriptor): Set auto_voltage, auto_param, and auto_pps.
 +	Support non-autoconf readers.
 +	(update_param_by_atr): New.
 +	(ccid_get_atr): Use 5V for PowerOn when auto_voltage is not supported.
 +	Use 0x10 when nonnull_nad for SetParameters.
 +	Call update_param_by_atr for parsing ATR, and use param for
 +	SetParameters.
 +	Send PPS if reader requires it and card is negotiable.
 +	When bNadValue in the return values of SetParameters == 0,
 +	clear handle->nonnull_nad flag.
 +
 +2013-01-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Set the node flags while retrieving a keyblock.
 +	* g10/keydb.c (parse_keyblock_image): Add args PK_NO and UID_NO and
 +	set the note flags accordingly.
 +	(keydb_get_keyblock): Transfer PK_NO and UID_NO to parse_keyblock_image.
 +	* kbx/keybox-search.c (blob_cmp_fpr, blob_cmp_fpr_part)
 +	(blob_cmp_name, blob_cmp_mail): Return the key/user number.
 +	(keybox_search): Set the key and user number into the found struct.
 +	(keybox_get_keyblock): Add args R_PK_NO and R_UID_NO and set them from
 +	the found struct.
 +
 +	New function log_clock.
 +	* common/logging.c (log_clock): New.
 +	* g10/gpg.c (set_debug): Print clock debug flag.
 +	* g10/options.h (DBG_CLOCK_VALUE, DBG_CLOCK): New.
 +
 +	gpg: Allow searching for user ids in a keybox.
 +	* kbx/keybox-search.c (blob_cmp_name): Add arg X509 and adjust for PGP
 +	use.  Change callers.
 +	(blob_cmp_mail): Add arg X509 and find the mailbox offset for PGP.
 +	Chnage callers.
 +	(has_subject_or_alt): Rename to has_username.
 +	(has_username): Allow blobtype PGP.
 +	(has_mail): Ditto.
 +
 +	gpg: Allow generation of more than 4096 keys in one run.
 +	* g10/getkey.c (cache_public_key): Make room in the cache if needed.
 +
 +2013-01-07  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Update Japanese Translation.
 +	* po/ja.po: Fix wrong translations for designated revocation.
 +	Reported by Hideki Saito.
 +
 +	Conflicts:
 +		po/ja.po
 +
 +2013-01-05  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Update Japanese Translation.
 +	* po/ja.po: Fix fuzzy translations.
 +
 +2013-01-03  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Update Japanese Translation.
 +	* po/ja.po: Update with POT.
 +
 +	Update Japanese Translation.
 +	* po/ja.po: Start from the new one of 2.0.
 +
 +2012-12-28  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Add signature cache support to the keybox.
 +	* g10/keydb.c (parse_keyblock_image): Add arg SIGSTATUS.
 +	(keydb_get_keyblock): Handle it.
 +	(build_keyblock_image): Add arg SIGSTATUS.
 +	(keydb_insert_keyblock): Handle it.
 +	* kbx/keybox-blob.c (pgp_create_sig_part): Add arg SIGSTATUS.
 +	(_keybox_create_openpgp_blob): Ditto.
 +	* kbx/kbxutil.c (import_openpgp): Adjust for above change.
 +	* kbx/keybox.h (KEYBOX_FLAG_SIG_INFO): New.
 +	* kbx/keybox-search.c (_keybox_get_flag_location): Handle new flag.
 +	(keybox_get_keyblock): Add arg R_SIGSTATUS.
 +	* kbx/keybox-update.c (keybox_insert_keyblock): Add arg SIGSTATUS.
 +
 +	kbxutil: Improve format of the Sig-Expire lines.
 +	* kbx/keybox-dump.c (_keybox_dump_blob): Print the expirate timestamp.
 +
 +	gpg: First working support for keyboxes.
 +	* g10/getkey.c (get_pubkey_fast): Improve the assertion.
 +	* kbx/keybox.h: Include iobuf.h.
 +	* kbx/keybox-blob.c (keyboxblob_uid): Add field OFF.
 +	(KEYBOX_WITH_OPENPGP): Remove use of this macro.
 +	(pgp_create_key_part_single): New.
 +	(pgp_temp_store_kid): Change to use the keybox-openpgp parser.
 +	(pgp_create_key_part): Ditto.
 +	(pgp_create_uid_part): Ditto.
 +	(pgp_create_sig_part): Ditto.
 +	(pgp_create_blob_keyblock): Ditto.
 +	(_keybox_create_openpgp_blob): Ditto.
 +	* kbx/keybox-search.c (keybox_get_keyblock): New.
 +	* kbx/keybox-update.c (keybox_insert_keyblock): New.
 +	* g10/keydb.c (parse_keyblock_image):
 +	(keydb_get_keyblock): Support keybox.
 +	(build_keyblock_image): New.
 +	(keydb_insert_keyblock): Support keybox.
 +
 +	* kbx/kbxutil.c (import_openpgp, main): Add option --dry-run and print
 +	a kbx file to stdout.
 +
 +	* kbx/keybox-file.c (_keybox_read_blob2): Allow keyblocks up to 10^6
 +	bytes.
 +
 +	kbxutil: Print algo number and fold similar lines.
 +	* kbx/keybox-defs.h (_keybox_openpgp_key_info): Add field ALGO.
 +	* kbx/keybox-openpgp.c (parse_key): Store algo.
 +	* kbx/kbxutil.c (dump_openpgp_key): Print algo number.
 +	* kbx/keybox-dump.c (_keybox_dump_blob): Print identical Sig-Expire
 +	value lines with a range of indices.
 +
 +2012-12-27  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: First patches to support a keybox storage backend.
 +	* kbx/keybox-defs.h (_keybox_write_header_blob): Move prototype to ..
 +	* kbx/keybox.h: here.
 +	* kbx/keybox-init.c (keybox_lock): Add dummy function
 +	* g10/keydb.c: Include keybox.h.
 +	(KeydbResourceType): Add KEYDB_RESOURCE_TYPE_KEYBOX.
 +	(struct resource_item): Add field kb.
 +	(maybe_create_keyring_or_box): Add error descriptions to diagnostics.
 +	Add arg IS_BOX.  Write a header for a new keybox file.
 +	(keydb_add_resource): No more need for the force flag.  Rename the
 +	local variable "force" to "create".  Add URL scheme "gnupg-kbx".  Add
 +	magic test to detect a keybox file.  Add basic support for keybox.
 +	(keydb_new, keydb_get_resource_name, keydb_delete_keyblock)
 +	(keydb_locate_writable, keydb_search_reset, keydb_search2): Add
 +	support for keybox.
 +	(lock_all, unlock_all): Ditto.
 +	* g10/Makefile.am (needed_libs): Add libkeybox.a.
 +	(gpg2_LDADD, gpgv2_LDADD): Add KSBA_LIBS as a workaround.
 +
 +	* g10/keydb.h (KEYDB_RESOURCE_FLAG_PRIMARY)
 +	KEYDB_RESOURCE_FLAG_DEFAULT, KEYDB_RESOURCE_FLAG_READONLY): New.
 +	* g10/gpg.c, g10/gpgv.c (main): Use new constants.
 +
 +2012-12-20  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Import only packets which are allowed in a keyblock.
 +	* g10/import.c (valid_keyblock_packet): New.
 +	(read_block): Store only valid packets.
 +
 +2012-12-19  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make commit 2b3cb2ee actually work.
 +	* g10/sign.c (update_keysig_packet): Use digest_algo.
 +
 +	(cherry-picked from commit d23ec86095714d388acac14b515445fe69f019e9)
 +
 +	gpg: Suppress "public key already present" in quiet mode.
 +	* g10/pkclist.c (find_and_check_key, build_pk_list): Print a
 +	diagnostic only in non-quiet mode.
 +
 +2012-12-18  Werner Koch  <wk at gnupg.org>
 +
 +	common: Add meta option ignore-invalid-option.
 +	* common/argparse.c (iio_item_def_s, IIO_ITEM_DEF): New.
 +	(initialize): Init field IIO_LIST.
 +	(ignore_invalid_option_p): New.
 +	(ignore_invalid_option_add): New.
 +	(ignore_invalid_option_clear): New.
 +	(optfile_parse): Implement meta option.
 +
 +2012-12-13  Werner Koch  <wk at gnupg.org>
 +	    Hans of Guardian  <hans at guardianproject.info>
 +
 +	utf8conv.c: Add hacks for Android.
 +	* common/utf8conv.c [HAVE_ANDROID_SYSTEM]: Do not include iconv.h.
 +	(iconv_open, iconv_close, load_libiconv) [HAVE_ANDROID_SYSTEM]: New
 +	dummy functions.
 +	(set_native_charset) [HAVE_ANDROID_SYSTEM]: Force use of "utf-8".
 +	(jnlib_iconv_open) [HAVE_ANDROID_SYSTEM]: Act the same as under W32.
 +	(jnlib_iconv) [HAVE_ANDROID_SYSTEM]: Ditto.
 +	(jnlib_iconv_close) [HAVE_ANDROID_SYSTEM]: Ditto.
 +
 +2012-12-13  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	SCD: Fix the process of writing key or generating key.
 +	* scd/app-openpgp.c (store_fpr): Flush KEY-FPR and KEY-TIME.
 +
 +2012-12-12  Werner Koch  <wk at gnupg.org>
 +
 +	ssh: Support ECDSA keys.
 +	* agent/command-ssh.c (SPEC_FLAG_IS_ECDSA): New.
 +	(struct ssh_key_type_spec): Add fields CURVE_NAME and HASH_ALGO.
 +	(ssh_key_types): Add types ecdsa-sha2-nistp{256,384,521}.
 +	(ssh_signature_encoder_t): Add arg spec and adjust all callers.
 +	(ssh_signature_encoder_ecdsa): New.
 +	(sexp_key_construct, sexp_key_extract, ssh_receive_key)
 +	(ssh_convert_key_to_blob): Support ecdsa.
 +	(ssh_identifier_from_curve_name): New.
 +	(ssh_send_key_public): Retrieve and pass the curve_name.
 +	(key_secret_to_public): Ditto.
 +	(data_sign): Add arg SPEC and change callers to pass it.
 +	(ssh_handler_sign_request): Get the hash algo from SPEC.
 +	* common/ssh-utils.c (get_fingerprint): Support ecdsa.
 +
 +	* agent/protect.c (protect_info): Add flag ECC_HACK.
 +	(agent_protect): Allow the use of the "curve" parameter.
 +	* agent/t-protect.c (test_agent_protect): Add a test case for ecdsa.
 +
 +	* agent/command-ssh.c (ssh_key_grip): Print a better error code.
 +
 +2012-12-11  Werner Koch  <wk at gnupg.org>
 +
 +	ssh: Rewrite a function for better maintainability.
 +	* agent/command-ssh.c (ssh_signature_encoder_dsa): Rewrite.
 +
 +2012-12-10  Werner Koch  <wk at gnupg.org>
 +
 +	ssh: Improve key lookup for many keys.
 +	* agent/command-ssh.c: Remove dirent.h.
 +	(control_file_s): Add struct item.
 +	(rewind_control_file): New.
 +	(search_control_file): Factor code out to ...
 +	(read_control_file_item): New.
 +	(ssh_handler_request_identities): Change to iterate over entries in
 +	sshcontrol.
 +
 +	ssh: Cleanup sshcontrol file access code.
 +	* agent/command-ssh.c (SSH_CONTROL_FILE_NAME): New macro to replace
 +	the direct use of the string.
 +	(struct control_file_s, control_file_t): New.
 +	(open_control_file, close_control_file): New.  Use them instead of
 +	using fopen/fclose directly.
 +
 +	agent: Add envvar "gnupg_SSH_AUTH_SOCK_by"
 +	* agent/gpg-agent.c (main): Pass new envar gnupg_SSH_AUTH_SOCK_by to
 +	an invoked process.
 +
 +	config: Update npth.m4.
 +	* m4/npth.m4: Take from current npth master.
 +
 +2012-12-04  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Revert SCD changes of 2010-05-03.
 +	* scd/apdu.c (pcsc_no_service): Remove.
 +	(open_pcsc_reader_direct, open_pcsc_reader_wrapped): Remove
 +	pcsc_no_service support.
 +	(apdu_open_reader): Remove R_NO_SERVICE.
 +	* scd/apdu.h (apdu_open_reader): Remove R_NO_SERVICE.
 +	* scd/command.c (reader_disabled): Remove.
 +	(get_current_reader): Follow the change of R_NO_SERVICE.
 +	(open_card, cmd_serialno, scd_command_handler): Remove reader_disabled
 +	support.
 +	* scd/sc-copykeys.c (main): Follow the change of R_NO_SERVICE.
 +
 +	Don't keep opening unavailable card reader.
 +	* scd/command.c (update_reader_status_file): Don't call
 +	get_current_reader.
 +
 +2012-11-30  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Refresh sample keys.
 +
 +	Adjust awk to not add trailing whitespace.
 +	* mksamplekeys: Tweak awk script to not add trailing whitespace to
 +	  blank lines (makes git pre-commit hook unhappy)
 +
 +2012-11-29  David Shaw  <dshaw at jabberwocky.com>
 +
 +	The keyserver search menu should honor --keyid-format.
 +	* keyserver.c (print_keyrec): Honor --keyid-format when getting back
 +	  full fingerprints from the keyserver (the comment in the code was
 +	  correct, the code was not).
 +
 +2012-11-27  Werner Koch  <wk at gnupg.org>
 +
 +	Fix printing of ECC algo names in hkp keyserver listings.
 +	* g10/keyserver.c (print_keyrec): Map OpenPGP algorithm ids.
 +
 +2012-11-26  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Check for inet_addr() in -lnsl.
 +	* configure.ac: Check for inet_addr() in libnsl.
 +
 +2012-11-20  Werner Koch  <wk at gnupg.org>
 +
 +	Do not use a broken ttyname.
 +	* configure.ac (HAVE_BROKEN_TTYNAME): New ac_define set for Android
 +	systems.
 +	* common/util.h (gnupg_ttyname): New macro.  Change all callers of
 +	ttyname to use this macro instead.
 +	(ttyname) [W32]: Rename to _gnupg_ttyname and use also if
 +	HAVE_BROKEN_TTYNAME is defined.
 +	* common/simple-pwquery.c (agent_send_all_options): Keep on using
 +	ttyname unless HAVE_BROKEN_TTYNAME is set.  This is because this file
 +	may be used standalone.
 +
 +2012-11-16  Werner Koch  <wk at gnupg.org>
 +
 +	Fix non-portable use of chmod in autogen.sh.
 +	* autogen.sh: Remove option -c from chmod.
 +
 +	Improve parsing of the GIT revision number.
 +	* configure.ac (mmm4_revision): Use git rev-parse.
 +
 +	Add an OpenPGP card vendor.
 +	* g10/card-util.c (get_manufacturer): Add Yubico.
 +
 +2012-11-06  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Use wipememory instead of memset in one place.
 +	* agent/command.c (clear_outbuf): Use wipememory.  Suggested by Ben
 +	Kibbey.
 +
 +	Allow decryption with card keys > 3072 bits.
 +	* scd/command.c (MAXLEN_SETDATA): New.
 +	(cmd_setdata): Add option --append.
 +	* agent/call-scd.c (agent_card_pkdecrypt): Use new option for long
 +	data.
 +
 +	* scd/app-openpgp.c (struct app_local_s): Add field manufacturer.
 +	(app_select_openpgp): Store manufacturer.
 +	(do_decipher): Print a note for broken cards.
 +
 +2012-11-02  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	agent: Fix wrong use of gcry_sexp_build_array.
 +	* findkey.c (agent_public_key_from_file): Fix use of
 +	gcry_sexp_build_array.
 +
 +2012-10-31  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	SCD: Upon error, open_pcsc_reader_wrapped does same as _direct.
 +	* scd/apdu.c (PCSC_E_NO_SERVICE): New.
 +	(open_pcsc_reader_direct): Use PCSC_E_NO_SERVICE.
 +	(open_pcsc_reader_wrapped): Set pcsc_no_service.
 +
 +2012-08-24  Werner Koch  <wk at gnupg.org>
 +
 +	Update and enable French translation.
 +	* po/fr.po: Update.
 +	* po/LINGUAS: Enable fr.
 +
 +2012-08-24  David Prévot  <taffit at debian.org>
 +
 +	Fix typos spotted during translations.
 +	* agent/genkey.c: s/to to/to/
 +	* sm/*.c: s/failed to allocated/failed to allocate/
 +	* sm/certlist.c, ./dirmngr/validate.c: s/should have not/should not have/
 +	* g10/seskey.c: missing closing parenthesis
 +	* dirmngr/crlcache.c: s/may has/may have/
 +
 +	Consistency fix:
 +
 +	* g10/gpg.c, kbx/kbxutil.c, sm/gpgsm.c: uppercase after Syntax
 +	* dirmngr/dirmngr_ldap: no period in Syntax
 +	* dirmngr/dirmngr-client.c: infinitive for option description:
 +		s/certificates are expected/expect certificates/
 +
 +	Keep previous msgids of translated messages.
 +	* po/Makefile.in.in: Use --previous with msgmerge.
 +
 +2012-08-24  Hans-Christoph Steiner  <hans at eds.org>
 +
 +	Fix build system for Android by disabling tests since its x-compiled.
 +	* configure.ac (HAVE_ANDROID_SYSTEM, RUN_TESTS): New.
 +	(AH_BOTTOM) [__ANDROID__]: Do not re-define ttyname.
 +	* Makefile.am: Depend tests on new RUN_TESTS conditional.
 +
 +2012-08-24  Werner Koch  <wk at gnupg.org>
 +
 +	Fix left over use of jnlib on some platforms.
 +	* tools/watchgnupg.c: Take mischelp.h from common/ and not jnlib/.
 +
 +2012-06-25  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	scd: handle reader/token removal.
 +	* scd/apdu.c (pcsc_error_to_sw): PCSC_E_UNKNOWN_READER means
 +	SW_HOST_NO_READER.
 +
 +2012-06-05  Werner Koch  <wk at gnupg.org>
 +
 +	Change all quotes in strings and comments to the new GNU standard.
 +	The asymmetric quotes used by GNU in the past (`...') don't render
 +	nicely on modern systems.  We now use two \x27 characters ('...').
 +
 +	The proper solution would be to use the correct Unicode symmetric
 +	quotes here.  However this has the disadvantage that the system
 +	requires Unicode support.  We don't want that today.  If Unicode is
 +	available a generated po file can be used to output proper quotes.  A
 +	simple sed script like the one used for en at quote is sufficient to
 +	change them.
 +
 +	The changes have been done by applying
 +
 +	  sed -i "s/\`\([^'\`]*\)'/'\1'/g"
 +
 +	to most files and fixing obvious problems by hand.  The msgid strings in
 +	the po files were fixed with a similar command.
 +
 +2012-05-24  Werner Koch  <wk at gnupg.org>
 +
 +	Print the hash algorithm in colon mode key listing.
 +	* g10/keylist.c (list_keyblock_colon): Print digest_algo.
 +
 +	Fix type conflict warning.
 +	* g10/keylist.c: Change min_cert_level to a byte.
 +
 +2012-05-11  Werner Koch  <wk at gnupg.org>
 +
 +	Switch to the new automagic beta numbering scheme.
 +	* configure.ac: Add all the require m4 magic.
 +
 +2012-05-08  Werner Koch  <wk at gnupg.org>
 +
 +	Add tweaks for the not anymore patented IDEA algorithm.
 +	* g10/keygen.c (keygen_set_std_prefs): Include IDEA only in PGP2
 +	compatibility mode.
 +	* g10/misc.c (idea_cipher_warn): Remove.  Also remove all callers.
 +	* common/status.h (STATUS_RSA_OR_IDEA): Remove.  Do not emit this
 +	status anymore.
 +
 +	po: Update de.po.
 +	* po/de.po: Update.
 +
 +	common: Remove generated files only during maintainer-clean.
 +	* common/Makefile.am (CLEANFILES): Rename to MAINTAINERCLEANFILES.
 +
 +2012-04-30  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Fix deadlock in trustlist due to the switch to npth.
 +	* agent/trustlist.c (clear_trusttable): New.
 +	(agent_reload_trustlist): Use new function.
 +	(read_trustfiles): Require to be called with lock held.
 +	(agent_istrusted): Factor all code out to ...
 +	(istrusted_internal): new.  Add ALREADY_LOCKED arg.  Make sure the
 +	table islocked.  Do not print TRUSTLISTFLAG stati if called internally.
 +	(agent_marktrusted): Replace calls to agent_reload_trustlist by
 +	explicit code.
 +
 +2012-04-26  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	make DNS and URI fields work in gpgsm --gen-key.
 +	* sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Actually set mb_uri and
 +	mb_dns.avoid buffer strncpy-induced buffer overrun
 +
 +2012-04-26  Jim Meyering  <jim at meyering.net>
 +
 +	avoid buffer strncpy-induced buffer overrun.
 +	* dirmngr/crlcache.c (open_dir): Ensure that both this_update
 +	and next_update member strings are NUL-terminated.
 +
 +	remove doubled words in a comment.
 +
 +2012-04-20  Werner Koch  <wk at gnupg.org>
 +
 +	Change license for some files in common to LGPLv3+/GPLv2+.
 +	Having the LGPL on the common GnuPG code helps to share code
 +	between GnuPG and related projects (like GPGME and Libassuan).  This
 +	is good for interoperability and to reduces bugs.
 +
 +	* common/asshelp.c, common/asshelp.h, common/asshelp2.c, common/b64dec.c
 +	* common/b64enc.c, common/convert.c, common/dns-cert.c
 +	* common/dns-cert.h common/exechelp-posix.c, common/exechelp-w32.c
 +	* common/exechelp-w32ce.c, common/exechelp.h, common/get-passphrase.c
 +	* common/get-passphrase.h, common/gettime.c, common/gpgrlhelp.c
 +	* common/helpfile.c, common/homedir.c, common/http.c, common/http.h
 +	* common/i18n.c, common/init.c, common/init.h, common/iobuf.c
 +	* common/iobuf.h, common/localename.c, common/membuf.c, common/membuf.h
 +	* common/miscellaneous.c, common/openpgp-oid.c, common/openpgpdefs.h
 +	* common/percent.c, common/pka.c, common/pka.h, common/session-env.c
 +	* common/session-env.h, common/sexp-parse.h, common/sexputil.c
 +	* common/signal.c, common/srv.c, common/srv.h, common/ssh-utils.c
 +	* common/ssh-utils.h, common/sysutils.c, common/sysutils.h
 +	* common/tlv.c, common/tlv.h, common/ttyio.c, common/ttyio.h
 +	* common/userids.c, common/userids.h, common/xasprintf.c: Change
 +	license to LGPLv3+/GPLv2+/
 +
 +2012-04-10  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Fix killing PID -1.
 +	When the KILLSCD command had been sent a race condition would occur
 +	causing PID -1 getting killed, which on Linux seems to terminate all
 +	applications for the current user.
 +
 +2012-04-05  Werner Koch  <wk at gnupg.org>
 +
 +	Do not mix test result with progress lines.
 +	This makes parsing of the results easier.  Fixes bug#1400.
 +
 +	* tests/openpgp/defs.inc (progress_cancel, progress_end)
 +	(progress_new): New.
 +	* tests/openpgp/conventional-mdc.test: Use progress functions
 +	* tests/openpgp/conventional.test: Ditto.
 +	* tests/openpgp/encrypt-dsa.test: Ditto.
 +	* tests/openpgp/encrypt.test: Ditto.
 +	* tests/openpgp/sigs.test: Ditto.
 +
 +2012-04-04  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Mention status messages in the documentation.
 +	Note INQUIRE_MAXLEN.
 +
 +	Document PASSWD --preset.
 +
 +	Document GENKEY options.
 +
 +	Document PRESET_PASSPHRASE.
 +
 +	Document CLEAR_PASSPHRASE.
 +	And describe the --mode=normal option.
 +
 +2012-03-27  Werner Koch  <wk at gnupg.org>
 +
 +	Fix timegm regression test.
 +	* common/t-timestuff.c (test_timegm): Change test to use January and
 +	not February or December+1.  Bug spotted by Daniel Kahn Gillmor.
 +
 +	Print warning for arguments not considered an option.
 +	GnuPG requires that options are given before other arguments.  This
 +	can sometimes be confusing.  We now print a warning if we found an
 +	argument looking alike a long option without being preceded by the
 +	stop option.  This is bug#1343.
 +
 +	* common/argparse.h (ARGPARSE_FLAG_STOP_SEEN): New.
 +	* common/argparse.c (arg_parse): Set new flag.
 +	* g10/gpg.c (main): Print the warning.
 +	* agent/gpg-agent.c (main): Ditto.
 +	* dirmngr/dirmngr.c (main): Ditto.
 +	* g13/g13.c (main): Ditto.
 +	* scd/scdaemon.c (main): Ditto.
 +	* sm/gpgsm.c (main): Ditto.
 +	* tools/gpg-connect-agent.c (main): Ditto.
 +	* tools/gpgconf.c (main): Ditto.
 +
 +2012-03-26  Werner Koch  <wk at gnupg.org>
 +
 +	Allow compress algorithm 0.
 +	* g10/mainproc.c (proc_compressed): Remove superfluous check for
 +	compress algorithm 0.  Reported by pfandrade.  This is bug#1326.
 +
 +	Add mksamplekeys script.
 +	* doc/mksamplekeys: New.
 +
 +2012-02-28  Marcus Brinkmann  <mb at g10code.com>
 +
 +	Replace npth_yield in busy wait by npth_usleep.
 +	* dirmngr/ldap-wrapper.c (ldap_wrapper_wait_connections): Call
 +	npth_usleep instead of npth_yield.
 +
 +2012-02-16  Marcus Brinkmann  <mb at g10code.com>
 +
 +	Check for lber and link dirmngr_ldap to it.
 +	* configure.ac (LBER_LIBS, HAVE_LBER): New variables, check for lber.
 +	* dirmngr/Makefile.am (dirmngr_lda_LDADD): Add $(LBER_LIBS).
 +
 +2012-02-07  Werner Koch  <wk at gnupg.org>
 +
 +	agent: Add pin length field to the shadowed private key format.
 +	This is not yet fully implemented.  It will eventually allow to
 +	support pinpad equipped readers which do not support variable length
 +	pin lengths.
 +	* agent/protect.c (parse_shadow_info): Add optional arg R_PINLEN and
 +	parse pinlen info.  Change all callers to pass NULL for it.
 +
 +	Use new status printing functions.
 +	* agent/command.c (cmd_geteventcounter): Get rid of static buffers.
 +	* scd/command.c (cmd_serialno, cmd_learn): Simplify by using
 +	print_assuan_status.
 +
 +	agent: New function agent_print_status.
 +	* common/asshelp2.c (vprint_assuan_status): New.
 +	(print_assuan_status): Re-implement using above func.
 +	* agent/command.c (agent_print_status): New.
 +
 +	po: Add Ukrainian translation.
 +	* po/uk.po: New.
 +
 +	common: Replace macro based function calls by using DEFAULT_ERRSOURCE.
 +	* common/dns-cert.h (get_dns_cert): Remove macro.
 +	* common/dns-cert.c (_get_dns_cert): Rename to get_dns_cert.  Replace
 +	arg ERRSOURCE by global DEFAULT_ERRSOURCE.
 +	* common/http.h (http_parse_uri, http_raw_connect, http_open)
 +	(http_open_document, http_wait_response): Remove macros.
 +	* common/http.c (_http_parse_uri, _http_raw_connect, _http_open)
 +	(_http_open_document, _http_wait_response): Remove underscore from
 +	symbols.  Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
 +	* common/ssh-utils.h (ssh_get_fingerprint)
 +	(ssh_get_fingerprint_string): Remove macros.
 +	* common/ssh-utils.h (_ssh_get_fingerprint)
 +	(_ssh_get_fingerprint_string): Remove underscore from symbols.
 +	Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
 +	* common/tlv.h (parse_ber_header, parse_sexp): Remove macros.
 +	* common/tlv.c: Include util.h.
 +	(_parse_ber_header, _parse_sexp): Remove underscore from symbols.
 +	Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
 +
 +2012-02-06  Werner Koch  <wk at gnupg.org>
 +
 +	Add replacement hack for Android's broken ttyname.
 +	* configure.ac (HAVE_TTYNAME) [__ANDROID__]: Add hack.
 +
 +	agent: Simplify printing of INQUIRE_MAXLEN.
 +	* agent/command.c: Include asshelp.h.
 +	(cmd_pkdecrypt, cmd_genkey, cmd_preset_passphrase)
 +	(pinentry_loopback): Use print_assuan_status for INQUIRE_MAXLEN.
 +
 +	common: Add function print_assuan_status.
 +	* common/asshelp2.c: New.
 +	(print_assuan_status): New function.
 +	* common/Makefile.am (common_sources): Add asshelp2.c.
 +
 +	common: Add a global variable to for the default error source.
 +	For the shared code parts it is cumbersome to pass an error sourse
 +	variable to each function.  Its value is always a constant for a given
 +	binary and thus a global variable makes things a lot easier than the
 +	former macro stuff.
 +	* common/init.c (default_errsource): New global var.
 +	(init_common_subsystems): Rename to _init_common_subsystems.  Set
 +	DEFAULT_ERRSOURCE.
 +	* common/init.h: Assert value of GPG_ERR_SOURCE_DEFAULT.
 +	(init_common_subsystems): New macro.
 +	* common/util.h (default_errsource): Add declaration.
 +	* kbx/keybox-defs.h: Add some GPG_ERR_SOURCE_DEFAULT trickery.
 +
 +2012-02-03  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Also let GENKEY and PKDECRYPT send the INQUIRE_MAXLEN status message.
 +	* agent/command.c (cmd_pkdecrypt): Send the INQUIRE_MAXLEN status
 +	message before doing the inquire.
 +	(cmd_genkey): Ditto.
 +
 +2012-02-02  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Inform the client of the preset passphrase length.
 +	* agent/command.c (cmd_preset_passphrase): Send the INQUIRE_MAXLEN
 +	status message before inquiring the passphrase.
 +
 +2012-02-01  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Honor --cert-digest-algo when recreating a cert.
 +	* g10/sign.c (update_keysig_packet): Honor --cert-digest-algo when
 +	  recreating a cert.
 +
 +	This is used by various things in --edit-key like setpref, primary,
 +	etc.  Suggested by Christian Aistleitner.
 +
 +2012-01-27  Werner Koch  <wk at gnupg.org>
 +
 +	gl: Add support for Android to stdint.h replacement.
 +	* gl/stdint_.h: When included from Bionic <sys/types.h>, just include
 +	the system's <stdint.h>.
 +
 +	gpg-connect-tool: Take the string "true" as a true condition.
 +	* tools/gpg-connect-agent.c (main): Handle strings "true" and "yes" in
 +	conditions as expected.
 +
 +2012-01-26  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Return GPG_ERR_CARD_NOT_PRESENT when pinentry-mode=loopback.
 +	Since there isn't a way to prompt the user to insert the smartcard when
 +	pinentry-mode=loopback, return GPG_ERR_CARD_NOT_PRESENT instead of
 +	GPG_ERR_NO_PIN_ENTRY.
 +
 +	* agent/divert-scd.c (ask_for_card): Return GPG_ERR_CARD_NOT_PRESENT
 +	when pinentry-mode=loopback.
 +
 +	Also check for GPG_ERR_ASS_CANCELED during an inquire.
 +	Fix pinentry-mode=loopback when cancelling an inquire from scdaemon.
 +	This is similar to commit 4f21f8d but for both protocol command
 +	cancellation and pinentry cancellation.
 +
 +	* agent/call-scd.c (agent_card_pkdecrypt): Check for
 +	GPG_ERR_ASS_CANCELED.
 +	(agent_card_pksign): Ditto.
 +
 +2012-01-25  Werner Koch  <wk at gnupg.org>
 +
 +	nPth is now a hard requirement for GnuPG.
 +	* configure.ac: Remove cruft to allow building without npth.
 +
 +	Require libassuan 2.1.0.
 +	* configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.1.0.  This is due to
 +	the npth changes.
 +
 +	Fix strerror vs. gpg_strerror usage.
 +	This bug was introduced by the migration to npth.
 +	* agent/gpg-agent.c (handle_connections): Use strerror.
 +
 +	Add missing variable.
 +	* agent/gpg-agent.c (handle_connections) [!W32]: Add missing variable.
 +
 +2012-01-25  Marcus Brinkmann  <marcus.brinkmann at ruhr-uni-bochum.de>
 +
 +	Port LDAP wrapper to NPTH.
 +	* agent/gpg-agent.c (handle_connections): Handle error.
 +	* dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c: Port to NPTH.
 +
 +	Port Windows code to NPTH.
 +	* agent/gpg-agent.c (get_agent_ssh_socket_name): Use
 +	INVALID_HANDLE_VALUE instead of 0.
 +	(handle_signal) [!HAVE_W32_SYSTEM]: Don't define.
 +	(handle_connections): Port Windows code to NPTH.
 +	* dirmngr/dirmngr.c (handle_connections): Port Windows code to NPTH.
 +	* g13/g13.c (handle_connections): Port Windows code to NPTH.
 +	* scd/scdaemon.c (handle_connections): Port Windows code to NPTH.
 +
 +	Port to npth.
 +	* configure.ac: Don't check for PTH but for NPTH.
 +	(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
 +	(have_pth): Rename to ...
 +	(have_npth): ... this.
 +	(USE_GNU_NPTH): Rename to ...
 +	(USE_GNU_PTH): ... this.
 +	* m4/npth.m4: New file.
 +	* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
 +	agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
 +	agent/trustlist.c, common/Makefile.am, common/estream.c,
 +	common/exechelp-posix.c, common/exechelp-w32.c,
 +	common/exechelp-w32ce.c, common/http.c, common/init.c,
 +	common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
 +	dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
 +	dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
 +	g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
 +	scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
 +	scd/scdaemon.c, tools/Makefile.am: Port to npth.
 +
 +2012-01-25  Werner Koch  <wk at gnupg.org>
 +
 +	Require gitlog-to-changelog to be installed.
 +	* Makefile.am (GITLOG_TO_CHANGELOG): New.
 +	(gen-ChangeLog): Use installed version of gitlog-to-changelog.
 +
 +2012-01-20  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Changes to --min-cert-level should cause a trustdb rebuild (issue 1366)
 +	* g10/gpgv.c, g10/trustdb.c (read_trust_options): Add min_cert_level
 +
 +	* g10/trustdb.c (check_trustdb_stale): Request a rebuild if
 +	  pending_check_trustdb is true (set when we detect a trustdb
 +	  parameter has changed).
 +
 +	* g10/keylist.c (public_key_list): Use 'l' in the "tru" with-colons
 +	  listing for min_cert_level not matching.
 +
 +	* g10/tdbio.c (tdbio_update_version_record, create_version_record,
 +	  tdbio_db_matches_options, tdbio_dump_record, tdbio_read_record,
 +	  tdbio_write_record): Add a byte for min_cert_level in the tdbio
 +	  version record.
 +
 +2012-01-20  Werner Koch  <wk at gnupg.org>
 +
 +	estream: Fix unclean usage of realloc.
 +	* common/estream-printf.c (_ESTREAM_PRINTF_MALLOC): Remove.
 +	(_ESTREAM_PRINTF_FREE): Remove.
 +	(_ESTREAM_PRINTF_REALLOC): New.
 +	(fixed_realloc) [!_ESTREAM_PRINTF_REALLOC]): New.
 +	(estream_vasprintf): Use my_printf_realloc instead of my_printf_malloc
 +	and my_printf_free.
 +	(dynamic_buffer_out): Use my_printf_realloc instead of realloc.
 +
 +	Do not copy default merge commit log entries into the ChangeLog.
 +	* scripts/gitlog-to-changelog: Skip merge commits.
 +
 +2012-01-18  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Add the INQUIRE_MAXLEN status message.
 +	This status message is used to inform the client of the maximum length
 +	of an inquired passphrase and is used in pinentry-mode=loopback.
 +
 +	* agent/command.c (pinentry_loopback): Send the INQUIRE_MAXLEN status
 +	message before doing the inquire.
 +
 +2012-01-16  Jim Meyering  <meyering at redhat.com>
 +
 +	yat2m: don't dereference pointer to freed memory.
 +	* doc/yat2m.c (top_parse_file): Correct macrolist-freeing loop.
 +
 +	gpg-agent: fix lc-messages handling not to change Xauthority setting.
 +	* agent/gpg-agent.c (main): Supply omitted "break" statement for
 +	lc-messages option.  Otherwise, control would fall through to the
 +	following oXauthority case and use the same value there.
 +
 +2012-01-15  Werner Koch  <wk at gnupg.org>
 +
 +	Fix indentation.
 +
 +2012-01-14  Ben Kibbey  <bjk at luxsci.net>
 +
 +	Fix scdaemon pinentry inquire cancelation.
 +	Similar to commit 29af488 but also fixes PKDECRYPT and PKSIGN.
 +
 +	* agent/call-scd.c (agent_card_pkdecrypt): Check for GPG_ERR_CANCELED
 +	when returning from the PKDECRYPT operation of scdaemon and cancel the
 +	inquire.
 +	(agent_card_pksign): Ditto.
 +	(cancel_inquire): New.
 +
 +2012-01-11  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Fix segv with RSA_S keys.
 +	* g10/misc.c (pubkey_get_npkey, pubkey_get_nskey)
 +	(pubkey_get_nsig, pubkey_get_nenc): Map all RSA algo ids to
 +	GCRY_PK_RSA.
 +
 +	estream: Avoid printing leading zeroes by %p on 32 bit systems.
 +	* common/estream-printf.c (pr_pointer): Synchronize definition of
 +	AULONG with its use.
 +
 +2012-01-11  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Refresh sample keys.
 +
 +2012-01-10  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Adapt HKP fix for fingerprint/long keyid retrievals for dirmngr.
 +	* dirmngr/ks-engine-hkp.c (ks_hkp_get): Use the longest valid keyid form
 +
 +2012-01-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpg: Make the double space in the middle of a fingerprint optional.
 +	This change might help to c+p a fingerprint from an HTML page without
 +	being enclosed in a "pre" tag.
 +	* common/userids.c (classify_user_id): Skip a second blank in the
 +	middle of a fingerprint.
 +
 +	gpg: Allow use of a standard space separated fingerprint.
 +	* common/userids.c (classify_user_id): Check for space separated GPG
 +	fingerprint.
 +
 +2012-01-06  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Merge ccid_driver_improvement branch.
 +	* scd/apdu.c (ccid_keypad_operation): Rename from ccid_keypad_verify.
 +	(open_ccid_reader): Use ccid_keypad_operation for verify and modify.
 +
 +	* scd/ccid-driver.c (VENDOR_VASCO, VASCO_920): New.
 +	(ccid_transceive_apdu_level): Permit sending packet where
 +	apdulen <= 289.  Support receiving packets in a chain.
 +	(ccid_transceive_secure): Maximum is 15 for VASCO DIGIPASS 920.
 +	Support keypad_modify method such as CHANGE_REFERENCE_DATA: 0x24.
 +
 +2012-01-03  Marcus Brinkmann  <marcus.brinkmann at ruhr-uni-bochum.de>
 +
 +	Silence gcc warning.
 +	* sm/call-dirmngr.c (get_cached_cert): Make sure buflen is initialized.
 +
 +	Revert last change, add comment about link() return values.
 +	* common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Do not check
 +	return value of link().
 +
 +	Fix compiler warnings.
 +	* common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Check return
 +	value of link().
 +	* g13/g13.c: Make sure err is initialized.
 +	* scd/scdaemon.c (main) [!USE_GCRY_THREAD_CBS]: Do not define ERR.
 +
 +	Fix last change: Only set gcrypt thread callback for older versions.
 +	* dirmngr/dirmngr.c, g13/g13.c: Rename FIX_GCRY_PTH_INIT to
 +	USE_GCRY_THREAD_CBS.
 +
 +2012-01-03  Werner Koch  <wk at gnupg.org>
 +
 +	Terminate csh commands with a semicolon also for dirmngr.
 +	* dirmngr/dirmngr.c (main): Terminate csh style output with a semicolon.
 +
 +	Terminate csh commands with a semicolon.
 +	Fixes bug#1386.
 +
 +	* agent/gpg-agent.c (main): Terminate csh style output with a semicolon.
 +	* scd/scdaemon.c: Ditto.
 +
 +2012-01-02  Marcus Brinkmann  <marcus.brinkmann at ruhr-uni-bochum.de>
 +
 +	Only set gcrypt thread callback for older version of gcrypt.
 +	* agent/gpg-agent.c, dirmngr/dirmngr.c, g13/g13.c, scd/scdaemon.c
 +	(USE_GCRY_THREAD_CBS): New macro, defined if
 +	GCRY_THREAD_OPTION_VERSION is 0.
 +	(fixed_gcry_pth_init) [!USE_GCRY_THREAD_CBS]: Don't define.
 +	(main) [!USE_GCRY_THREAD_CBS]: Do not install thread callbacks.
 +
 +2011-12-28  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Use the longest key ID available when talking to a HKP server.
 +	This is issue 1340.  Now that PKSD is dead, and SKS supports long key
 +	IDs, this is safe to do.  Patch from Daniel Kahn Gillmor
 +	<dkg at fifthhorseman.net>.
 +
 +2011-12-20  Werner Koch  <wk at gnupg.org>
 +
 +	Post-release version number update.
 +
 +	Release 2.1.0beta3.
 +
 +	Prepare for the beta3 release.
 +
 +	po: Update the German translation.
 +
 +	Add the STEED Self-Signing Nonthority certificate.
 +	* doc/com-certs.pem: Install it when creating a keybox.
 +
 +	faq: Add section on US export restrictions.
 +
 +	Require Libassuan 2.0.3.
 +	* configure.ac: Require Libassuan 2.0.3.
 +	* agent/call-scd.c (ASSUAN_CONVEY_COMMENTS): Remove macro replacement.
 +	* agent/command.c (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Remove
 +	dependency.
 +	(cmd_killagent) [ASSUAN_FORCE_CLOSE]: Ditto.
 +	* scd/command.c (cmd_killscd) [ASSUAN_FORCE_CLOSE]: Ditto.
 +
 +2011-12-20  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Add error log and debug log for pcsc_keypad_verify and pcsc_keypad_modify.
 +	* scd/apdu.c (pcsc_keypad_verify): Add debug log and error log.
 +	(pcsc_keypad_modify): Likewise.
 +
 +2011-12-19  Werner Koch  <wk at gnupg.org>
 +	    Ben Kibbey  <bjk at luxsci.net>
 +
 +	scd: Fix for card change returning GPG_ERR_CARD_RESET.
 +	* scd/apdu.c (apdu_connect): Do not test for zero atrlen.
 +
 +2011-12-16  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Don't kill pinentry by SIGKILL but let it quit by SIGINT.
 +	* agent/call-pinentry.c (agent_popup_message_stop): To pinentry, send
 +	SIGINT (was: SIGKILL).
 +
 +2011-12-15  David Shaw  <dshaw at jabberwocky.com>
 +
 +	Merge fix for issue 1331 from 1.4.
 +	* photoid.c (generate_photo_id): Check for the JPEG magic numbers
 +	instead of JFIF since some programs generate an EXIF header first.
 +
 +2011-12-15  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Prefer application Geldkarte over DINSIG.
 +	* scd/app.c (select_application): Reorder application tests.
 +
 +	scd: Add option --dump-atr to command APDU.
 +	* scd/atr.c: Rewrite.
 +	* scd/Makefile.am (scdaemon_SOURCES): Add atr.c and atr.h.
 +	* scd/command.c (cmd_apdu): Add option --dump-atr.
 +
 +	estream: New function es_fclose_snatch.
 +	* common/estream.c (cookie_ioctl_function_t): New type.
 +	(es_fclose_snatch): New function.
 +	(COOKIE_IOCTL_SNATCH_BUFFER): New constant.
 +	(struct estream_internal): Add field FUNC_IOCTL.
 +	(es_initialize): Clear FUNC_IOCTL.
 +	(es_func_mem_ioctl): New function.
 +	(es_fopenmem, es_fopenmem_init): Init FUNC_IOCTL.
 +
 +2011-12-14  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Skip S/N reading for the "undefined" application.
 +	* scd/app.c (select_application): Skip serial number reading.
 +
 +	scd: Add more status word values for documentation.
 +
 +	scd: Add the "undefined" stub application.
 +	* scd/app.c (select_application): Implement the "undefined"
 +	application.
 +
 +	agent: Pass comment lines from scd verbatim thru gpg-agent.
 +	* agent/call-scd.c (pass_status_thru): Pass comment lines verbatim.
 +	* tools/gpg-connect-agent.c (help_cmd_p): New.
 +	(main): Treat an "SCD HELP" the same as "HELP".
 +
 +	scd: Fix resetting and closing of the reader.
 +	* scd/command.c (update_card_removed): Do no act on an invalid VRDR.
 +	(do_reset): Ignore apdu_reset error codes for no and inactive card.
 +	Close the reader before setting the slot to -1.
 +	(update_reader_status_file): Notify the application before closing the
 +	reader.
 +
 +	scd: Add debug option for reader function calls.
 +	* scd/scdaemon.h (DBG_READER_VALUE, DBG_READER): New.
 +	* scd/apdu.c (apdu_open_reader, apdu_close_reader)
 +	(apdu_shutdown_reader, apdu_connect, apdu_disconnect)
 +	(apdu_reset, apdu_get_atr, apdu_get_status): Add debug code.
 +	(apdu_activate): Remove this unused function.
 +
 +2011-12-13  Werner Koch  <wk at gnupg.org>
 +
 +	scd: New option --debug-assuan-log-cats.
 +	* scd/scdaemon.c (oDebugAssuanLogCats): New.
 +	(opts): Add option --debug-assuan-log-cats.
 +	(main): Implement option.
 +	* common/asshelp.c (set_libassuan_log_cats): New.
 +
 +	scd: Introduce a virtual reader table.
 +	The vreader table makes the code more clear by explicitly talking
 +	about APDU slots and reader indices.  It also accommodates for future
 +	extensions.
 +
 +	* scd/scdaemon.h (server_control_s): Remove READER_SLOT.
 +	* scd/scdaemon.c (scd_init_default_ctrl): Do not init READER_SLOT.
 +	* scd/app.c (check_application_conflict): Add arg SLOT.
 +	* scd/command.c (slot_status_s): Rename to vreader_s.
 +	(server_local_s): Add field VREADER_IDX as replacement for
 +	the READER_SLOT in server_control_s.  Change all users.
 +	(slot_table): Rename to vreader_table.  Change all users.
 +	(vreader_slot): New.
 +	(do_reset, cmd_apdu): Map vreader to apdu slot.
 +	(get_reader_slot): Rename to get_current_reader.  Return -1 on error.
 +	(open_card): Map vreader toapdu slot.  Pass slot to
 +	check_application_conflict.
 +	(scd_command_handler): Init VREADER_IDX.
 +	(update_reader_status_file): Reset SLOT field on error.
 +
 +2011-12-12  Werner Koch  <wk at gnupg.org>
 +
 +	scd: Retry command SERIALNO for an inactive card.
 +	* scd/command.c (cmd_serialno): Retry once for an inactive card.
 +
 +	Fix detection of card removal and insertion.
 +	* scd/apdu.c (apdu_connect): Return status codes for no card available
 +	and inactive card.
 +	* scd/command.c (TEST_CARD_REMOVAL): Also test for GPG_ERR_CARD_RESET.
 +	(open_card): Map apdu_connect status to GPG_ERR_CARD_RESET.
 +
 +	gitlog-to-changelog: New option --tear-off.
 +	* scripts/gitlog-to-changelog: Add option --tear-off.
 +	* Makefile.am (gen-ChangeLog): Use that option.
 +
 +2011-12-07  Werner Koch  <wk at gnupg.org>
 +
 +	gpgsm: Add new validation model "steed".
 +	* sm/gpgsm.h (VALIDATE_FLAG_STEED): New.
 +	* sm/gpgsm.c (gpgsm_parse_validation_model): Add model "steed".
 +	* sm/server.c (option_handler): Allow validation model "steed".
 +	* sm/certlist.c (gpgsm_cert_has_well_known_private_key): New.
 +	* sm/certchain.c (do_validate_chain): Handle the
 +	well-known-private-key attribute.  Support the "steed" model.
 +	(gpgsm_validate_chain): Ditto.
 +	* sm/verify.c (gpgsm_verify): Return "steed" in the trust status line.
 +	* sm/keylist.c (list_cert_colon): Print the new 'w' flag.
 +
 +	Correct punctuation in the ChangeLog summary line.
 +	* Makefile.am (gen-ChangeLog): Supply --append-dot.
 +
 +	Allow comments which will not show up in the ChangeLog.
 +	* scripts/gitlog-to-changelog: Ignore lines after a "--" line.
 +
 +2011-12-06  Werner Koch  <wk at gnupg.org>
 +
 +	gpgsm: Allow specification of an AuthorityKeyIdentifier.
 +	* sm/certreqgen.c (pAUTHKEYID): New.
 +	(read_parameters): Add keyword Authority-Key-Id.
 +	(proc_parameters): Check its value.
 +	(create_request): Insert an Authority-Key-Id.
 +
 +	gpgsm: Allow arbitrary extensions for cert creation.
 +	* sm/certreqgen.c (pSUBJKEYID, pEXTENSION): New.
 +	(read_parameters): Add new keywords.
 +	(proc_parameters): Check values of new keywords.
 +	(create_request): Add SubjectKeyId and extensions.
 +	(parse_parameter_usage): Support "cert" and the encrypt alias "encr".
 +
 +	gpgsm: Fix storing of the serial number.
 +	* sm/certreqgen.c (create_request): Fix hex-bin conversion.
 +
 +2011-12-05  Werner Koch  <wk at gnupg.org>
 +
 +	Fix last change.
 +	* agent/command.c (start_command_handler): Remove use of removed var.
 +
 +	Amend the agent code with more comments.
 +	* agent/command.c (server_local_s): Remove unused field MESSAGE_FD.
 +
 +2011-12-02  Werner Koch  <wk at gnupg.org>
 +
 +	Support the Cherry ST-2000 card reader.
 +	* scd/ccid-driver.c (SCM_SCR331, SCM_SCR331DI, SCM_SCR335)
 +	(SCM_SCR3320, SCM_SPR532, CHERRY_ST2000): New constants.
 +	(parse_ccid_descriptor): Use them.
 +	(scan_or_find_usb_device, ccid_transceive_secure): Handle Cherry
 +	ST-2000.  Suggested by Matthias-Christian Ott.
 +
 +	Avoid possible double free in export.c.
 +	* g10/export.c (transfer_format_to_openpgp): Avoid possible double
 +	  free of LIST.  Reported by NIIBE Yutaka.
 +
 +2011-12-02  NIIBE Yutaka  <gniibe at fsij.org>
 +
 +	Fix pinpad input support for passphrase modification.
 +	* apdu.c (pcsc_keypad_verify): Have dummy Lc field with value 0.
 +	(pcsc_keypad_modify): Likewise.
 +	(pcsc_keypad_modify): It's only for ISO7816_CHANGE_REFERENCE_DATA.
 +	bConfirmPIN value is determined by the parameter p0.
 +
 +	* app-openpgp.c (do_change_pin): The flag use_keypad should be 0 when
 +	reset_mode is on, or resetcode is on.  use_keypad only makes sense for
 +	iso7816_change_reference_data_kp.
 +
 +	* iso7816.h (iso7816_put_data_kp): Remove.
 +	(iso7816_reset_retry_counter_kp): Remove.
 +	(iso7816_reset_retry_counter_with_rc_kp): Remove.
 +	(iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
 +
 +	* iso7816.c (iso7816_put_data_kp): Remove.
 +	(iso7816_reset_retry_counter_kp): Remove.
 +	(iso7816_reset_retry_counter_with_rc_kp): Remove.
 +	(iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
 +
 +2011-12-01  Werner Koch  <wk at gnupg.org>
 +
 +	Add hook to check the commit log syntax.
 +	* autogen.sh: Install commit-msg hook for git.
 +
 +	Generate the ChangeLog from commit logs.
 +	* scripts/gitlog-to-changelog: New script.  Taken from gnulib.
 +	* scripts/git-log-fix: New file.
 +	* scripts/git-log-footer: New file.
 +	* doc/HACKING: Describe the ChangeLog policy
 +	* ChangeLog: New file.
 +	* Makefile.am (EXTRA_DIST): Add new files.
 +	(gen-ChangeLog): New.
 +	(dist-hook): Run gen-ChangeLog.
 +
 +	Rename all ChangeLog files to ChangeLog-2011.
 +
 +2011-12-01  Werner Koch  <wk at gnupg.org>
 +
 +	NB: Changes done before December 1st, 2011 are described in
 +	per directory files named ChangeLog-2011.  See doc/HACKING for
 +	details.
 +
 +        -----
 +	Copyright (C) 2011 Free Software Foundation, Inc.
 +
 +	Copying and distribution of this file and/or the original GIT
 +	commit log messages, with or without modification, are
 +	permitted provided the copyright notice and this notice are
 +	preserved.
diff --cc VERSION
index 67da954,0000000..291d0de
mode 100644,000000..100644
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,0 +1,1 @@@
- 2.1.15
++2.1.16
diff --cc common/audit-events.h
index 71b159c,0000000..ae9fde2
mode 100644,000000..100644
--- a/common/audit-events.h
+++ b/common/audit-events.h
@@@ -1,116 -1,0 +1,116 @@@
 +/* Output of mkstrtable.awk.  DO NOT EDIT.  */
 +
 +/* audit.h - Definitions for the audit subsystem
 + *	Copyright (C) 2007 Free Software Foundation, Inc.
 + *
 + * This file is part of GnuPG.
 + *
 + * GnuPG is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
 + * the Free Software Foundation; either version 3 of the License, or
 + * (at your option) any later version.
 + *
 + * GnuPG is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License
-  * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
 + */
 +
 +/* The purpose of this complex string table is to produce
 +   optimal code with a minimum of relocations.  */
 +
 +static const char eventstr_msgstr[] = 
 +  "null event" "\0"
 +  "setup ready" "\0"
 +  "agent ready" "\0"
 +  "dirmngr ready" "\0"
 +  "gpg ready" "\0"
 +  "gpgsm ready" "\0"
 +  "g13 ready" "\0"
 +  "got data" "\0"
 +  "detached signature" "\0"
 +  "cert only sig" "\0"
 +  "data hash algo" "\0"
 +  "attr hash algo" "\0"
 +  "data cipher algo" "\0"
 +  "bad data hash algo" "\0"
 +  "bad data cipher algo" "\0"
 +  "data hashing" "\0"
 +  "read error" "\0"
 +  "write error" "\0"
 +  "usage error" "\0"
 +  "save cert" "\0"
 +  "new sig" "\0"
 +  "sig name" "\0"
 +  "sig status" "\0"
 +  "new recp" "\0"
 +  "recp name" "\0"
 +  "recp result" "\0"
 +  "decryption result" "\0"
 +  "validate chain" "\0"
 +  "chain begin" "\0"
 +  "chain cert" "\0"
 +  "chain rootcert" "\0"
 +  "chain end" "\0"
 +  "chain status" "\0"
 +  "root trusted" "\0"
 +  "crl check" "\0"
 +  "got recipients" "\0"
 +  "session key" "\0"
 +  "encrypted to" "\0"
 +  "encryption done" "\0"
 +  "signed by" "\0"
 +  "signing done";
 +
 +static const int eventstr_msgidx[] =
 +  {
 +    0,
 +    11,
 +    23,
 +    35,
 +    49,
 +    59,
 +    71,
 +    81,
 +    90,
 +    109,
 +    123,
 +    138,
 +    153,
 +    170,
 +    189,
 +    210,
 +    223,
 +    234,
 +    246,
 +    258,
 +    268,
 +    276,
 +    285,
 +    296,
 +    305,
 +    315,
 +    327,
 +    345,
 +    360,
 +    372,
 +    383,
 +    398,
 +    408,
 +    421,
 +    434,
 +    444,
 +    459,
 +    471,
 +    484,
 +    500,
 +    510,
 +    
 +  };
 +
 +#define eventstr_msgidxof(code) (0 ? -1 \
 +  : ((code >= 0) && (code <= 40)) ? (code - 0) \
 +  : -1)
diff --cc common/status-codes.h
index 5cc0289,0000000..6be226d
mode 100644,000000..100644
--- a/common/status-codes.h
+++ b/common/status-codes.h
@@@ -1,238 -1,0 +1,238 @@@
 +/* Output of mkstrtable.awk.  DO NOT EDIT.  */
 +
 +/* status.h - Status codes
 + *	Copyright (C) 2007 Free Software Foundation, Inc.
 + *
 + * This file is part of GnuPG.
 + *
 + * This file is free software; you can redistribute it and/or modify
 + * it under the terms of either
 + *
 + *   - the GNU Lesser General Public License as published by the Free
 + *     Software Foundation; either version 3 of the License, or (at
 + *     your option) any later version.
 + *
 + * or
 + *
 + *   - the GNU General Public License as published by the Free
 + *     Software Foundation; either version 2 of the License, or (at
 + *     your option) any later version.
 + *
 + * or both in parallel, as here.
 + *
 + * This file is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License
-  * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ * along with this program; if not, see <https://www.gnu.org/licenses/>.
 + */
 +
 +/* The purpose of this complex string table is to produce
 +   optimal code with a minimum of relocations.  */
 +
 +static const char statusstr_msgstr[] = 
 +  "ENTER" "\0"
 +  "LEAVE" "\0"
 +  "ABORT" "\0"
 +  "GOODSIG" "\0"
 +  "BADSIG" "\0"
 +  "ERRSIG" "\0"
 +  "BADARMOR" "\0"
 +  "TRUST_UNDEFINED" "\0"
 +  "TRUST_NEVER" "\0"
 +  "TRUST_MARGINAL" "\0"
 +  "TRUST_FULLY" "\0"
 +  "TRUST_ULTIMATE" "\0"
 +  "NEED_PASSPHRASE" "\0"
 +  "VALIDSIG" "\0"
 +  "SIG_ID" "\0"
 +  "ENC_TO" "\0"
 +  "NODATA" "\0"
 +  "BAD_PASSPHRASE" "\0"
 +  "NO_PUBKEY" "\0"
 +  "NO_SECKEY" "\0"
 +  "NEED_PASSPHRASE_SYM" "\0"
 +  "DECRYPTION_INFO" "\0"
 +  "DECRYPTION_FAILED" "\0"
 +  "DECRYPTION_OKAY" "\0"
 +  "MISSING_PASSPHRASE" "\0"
 +  "GOOD_PASSPHRASE" "\0"
 +  "GOODMDC" "\0"
 +  "BADMDC" "\0"
 +  "ERRMDC" "\0"
 +  "IMPORTED" "\0"
 +  "IMPORT_OK" "\0"
 +  "IMPORT_PROBLEM" "\0"
 +  "IMPORT_RES" "\0"
 +  "IMPORT_CHECK" "\0"
 +  "EXPORTED" "\0"
 +  "EXPORT_RES" "\0"
 +  "FILE_START" "\0"
 +  "FILE_DONE" "\0"
 +  "FILE_ERROR" "\0"
 +  "BEGIN_DECRYPTION" "\0"
 +  "END_DECRYPTION" "\0"
 +  "BEGIN_ENCRYPTION" "\0"
 +  "END_ENCRYPTION" "\0"
 +  "BEGIN_SIGNING" "\0"
 +  "DELETE_PROBLEM" "\0"
 +  "GET_BOOL" "\0"
 +  "GET_LINE" "\0"
 +  "GET_HIDDEN" "\0"
 +  "GOT_IT" "\0"
 +  "PROGRESS" "\0"
 +  "SIG_CREATED" "\0"
 +  "SESSION_KEY" "\0"
 +  "NOTATION_NAME" "\0"
 +  "NOTATION_FLAGS" "\0"
 +  "NOTATION_DATA" "\0"
 +  "POLICY_URL" "\0"
 +  "KEY_CREATED" "\0"
 +  "USERID_HINT" "\0"
 +  "UNEXPECTED" "\0"
 +  "INV_RECP" "\0"
 +  "INV_SGNR" "\0"
 +  "NO_RECP" "\0"
 +  "NO_SGNR" "\0"
 +  "KEY_CONSIDERED" "\0"
 +  "ALREADY_SIGNED" "\0"
 +  "KEYEXPIRED" "\0"
 +  "KEYREVOKED" "\0"
 +  "EXPSIG" "\0"
 +  "EXPKEYSIG" "\0"
 +  "ATTRIBUTE" "\0"
 +  "REVKEYSIG" "\0"
 +  "NEWSIG" "\0"
 +  "SIG_SUBPACKET" "\0"
 +  "PLAINTEXT" "\0"
 +  "PLAINTEXT_LENGTH" "\0"
 +  "KEY_NOT_CREATED" "\0"
 +  "NEED_PASSPHRASE_PIN" "\0"
 +  "CARDCTRL" "\0"
 +  "SC_OP_FAILURE" "\0"
 +  "SC_OP_SUCCESS" "\0"
 +  "BACKUP_KEY_CREATED" "\0"
 +  "PKA_TRUST_BAD" "\0"
 +  "PKA_TRUST_GOOD" "\0"
 +  "TOFU_USER" "\0"
 +  "TOFU_STATS" "\0"
 +  "TOFU_STATS_SHORT" "\0"
 +  "TOFU_STATS_LONG" "\0"
 +  "TRUNCATED" "\0"
 +  "MOUNTPOINT" "\0"
 +  "BLOCKDEV" "\0"
 +  "PINENTRY_LAUNCHED" "\0"
 +  "PLAINTEXT_FOLLOWS" "\0"
 +  "ERROR" "\0"
 +  "WARNING" "\0"
 +  "SUCCESS" "\0"
 +  "FAILURE" "\0"
 +  "INQUIRE_MAXLEN";
 +
 +static const int statusstr_msgidx[] =
 +  {
 +    0,
 +    6,
 +    12,
 +    18,
 +    26,
 +    33,
 +    40,
 +    49,
 +    65,
 +    77,
 +    92,
 +    104,
 +    119,
 +    135,
 +    144,
 +    151,
 +    158,
 +    165,
 +    180,
 +    190,
 +    200,
 +    220,
 +    236,
 +    254,
 +    270,
 +    289,
 +    305,
 +    313,
 +    320,
 +    327,
 +    336,
 +    346,
 +    361,
 +    372,
 +    385,
 +    394,
 +    405,
 +    416,
 +    426,
 +    437,
 +    454,
 +    469,
 +    486,
 +    501,
 +    515,
 +    530,
 +    539,
 +    548,
 +    559,
 +    566,
 +    575,
 +    587,
 +    599,
 +    613,
 +    628,
 +    642,
 +    653,
 +    665,
 +    677,
 +    688,
 +    697,
 +    706,
 +    714,
 +    722,
 +    737,
 +    752,
 +    763,
 +    774,
 +    781,
 +    791,
 +    801,
 +    811,
 +    818,
 +    832,
 +    842,
 +    859,
 +    875,
 +    895,
 +    904,
 +    918,
 +    932,
 +    951,
 +    965,
 +    980,
 +    990,
 +    1001,
 +    1018,
 +    1034,
 +    1044,
 +    1055,
 +    1064,
 +    1082,
 +    1100,
 +    1106,
 +    1114,
 +    1122,
 +    1130,
 +    
 +  };
 +
 +#define statusstr_msgidxof(code) (0 ? -1 \
 +  : ((code >= 0) && (code <= 96)) ? (code - 0) \
 +  : -1)
diff --cc doc/defsincdate
index 0d1789c,0000000..e548e39
mode 100644,000000..100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@@ -1,1 -1,0 +1,1 @@@
- 1471529749
++1479392975
diff --cc po/ca.po
index 8d22f5f,9df52ad..b5c757a
--- a/po/ca.po
+++ b/po/ca.po
@@@ -27,7 -27,6 +27,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.4.0\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2005-02-04 02:04+0100\n"
  "Last-Translator: Jordi Mallach <jordi at gnu.org>\n"
  "Language-Team: Catalan <ca at dodds.net>\n"
@@@ -36,7 -35,6 +36,7 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
@@@ -47,41 -45,32 +47,41 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  #| msgid "Do you really want to create a sign and encrypt key? "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Segur que voleu crear una clau de signatura i xifratge? "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -89,7 -78,6 +89,7 @@@ msgstr "la contrasenya és invàlida
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr ""
  
@@@ -99,75 -87,59 +99,75 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, 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:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "la contrasenya és errònia"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
  msgstr "la línia és massa llarga\n"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "la contrasenya és massa llarga\n"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
  msgstr "l'MPI és erroni"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "la contrasenya és errònia"
@@@ -177,25 -148,11 +177,25 @@@
  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:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "no s'ha pogut crear «%s»: %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -223,58 -176,39 +223,48 @@@ msgstr "
  "no s'ha trobat cap anell secret de escrivible: %s\n"
  "\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "canvia la contrasenya"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -407,8 -317,6 +397,8 @@@ msgstr "
  msgid "Please enter the new passphrase"
  msgstr "canvia la contrasenya"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
@@@ -418,116 -326,91 +408,122 @@@ msgstr "
  "Opcions:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "La clau ha estat substituïda"
+ 
  # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "detall"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "una mica més silenciós"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
  msgstr "cerca claus en un servidor de claus"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
  msgstr "actualitza la base de dades de confiança"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NOM|el joc de caràcters serà NOM"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
  # Gènere?  Nombre?  ivb
  # Werner FIXME: please add translator comment saying *what* is
  # uncompressed so we know the gender. jm
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
@@@ -536,7 -419,6 +532,7 @@@ msgstr "no és suportat
  # Gènere?  Nombre?  ivb
  # Werner FIXME: please add translator comment saying *what* is
  # uncompressed so we know the gender. jm
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -545,162 -427,120 +541,162 @@@ msgstr "no és suportat
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, 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:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "fitxer d'opcions «%s»: %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "s'estan llegint opcions de «%s»\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
  msgstr "AVÍS: %s és una opció desaconsellada.\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "no s'ha pogut crear «%s»: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, fuzzy, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "Certificat de revocació vàlid"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, 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:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "ha fallat l'actualització: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "no es pot crear el directori «%s»: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: s'ha creat el directori\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, 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:1957
++#: agent/gpg-agent.c:2248
  #, 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:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, 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:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "ha fallat l'actualització de la clau secreta: %s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "\t%lu claus es descarta\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent no està disponible en aquesta sessió\n"
@@@ -716,8 -554,6 +712,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -725,9 -561,6 +721,9 @@@ msgstr "
  "@Ordres:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -781,7 -606,6 +777,8 @@@ msgstr "Cancel·la
  msgid "error while asking for the passphrase: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
@@@ -841,8 -656,6 +838,8 @@@ msgstr "
  msgid "Yes"
  msgstr "sí|si"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -872,40 -682,33 +869,40 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
  msgstr "canvia la contrasenya"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Realment voleu eliminar les claus seleccionades? "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  msgid "Delete key"
  msgstr "activa una clau"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -920,12 -721,10 +917,12 @@@ msgstr "
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
@@@ -953,86 -748,74 +950,97 @@@ msgstr "l'algoritme de protecció %d%s 
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "l'algoritme de protecció %d%s no està suportat\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "ha fallat l'actualització: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "ha fallat l'actualització: %s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
  msgstr "no s'ha pogut connectar amb «%s»: %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  #, fuzzy
  msgid "problem setting the gpg-agent options\n"
  msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
  
  # bolcats de memòria?  ivb
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
  
  # Indi. ivb
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "ha fallat l'actualització: %s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "no s'ha pogut crear l'armadura: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "sí|si"
  
@@@ -1088,7 -860,6 +1096,7 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "error en crear l'anell «%s»: %s\n"
@@@ -1108,38 -876,31 +1116,38 @@@ msgstr "AVÍS: %s és una opció desaco
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
  # Destès? ivb
  # Desatès, sí. jm
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  msgid "connection to agent is in restricted mode\n"
  msgstr "no es pot fet això en mode desatès\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1229,8 -974,6 +1237,8 @@@ msgstr "armadura: %s\n
  # 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
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1319,12 -1046,10 +1327,12 @@@ msgstr "
  "No s'han trobat certificats amb confiança no definida.\n"
  "\n"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
  msgstr "Certificat correcte"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
  msgstr "La clau és disponible en: "
@@@ -1366,7 -1083,6 +1374,7 @@@ msgstr "No hi ha ajuda disponible per 
  msgid "ignoring garbage line"
  msgstr "error en l'última línia\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
  msgstr "[no establert]"
@@@ -1454,7 -1155,6 +1462,7 @@@ msgstr "
  # Probablement és una clau, femení. jm
  # Werner FIXME: please add translator comment saying *what* is
  # uncompressed so we know the gender. jm
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
  msgstr "no forçat"
@@@ -1513,8 -1202,6 +1521,8 @@@ msgstr "no s'ha trobat la clau públic
  msgid "waiting for lock %s...\n"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1604,13 -1273,11 +1612,13 @@@ msgstr "
  "hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha "
  "utilitzat un MTA amb errors\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "no llegible per humans"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1618,25 -1285,20 +1626,25 @@@ msgstr "
  "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
  "amb el signe «=»\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  #, fuzzy
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "un valor de notació no pot utilitzar cap caràcter de control\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  msgid "a notation name may not contain an '=' character\n"
  msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
@@@ -1646,53 -1308,42 +1654,52 @@@ msgstr "
  "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
  "amb el signe «=»\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, fuzzy, c-format
  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"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Introduïu la contrasenya: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "error en crear l'anell «%s»: %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
  # FIXME: preferència? jm
  # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
  msgstr "AVÍS: %s té preferència sobre %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, fuzzy, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "la clau secreta no està disponible"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
  # Destès? ivb
  # Desatès, sí. jm
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "no es pot fet això en mode desatès\n"
@@@ -1703,15 -1353,10 +1710,15 @@@ msgid "This command is only available f
  msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
  
  # Parts?  Peces?  ivb
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "parts de la clau secreta no estan disponbles\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "La vostra selecció? "
  
@@@ -1743,184 -1382,142 +1750,184 @@@ msgstr "no forçat
  msgid "forced"
  msgstr "forçat"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr ""
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr ""
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr ""
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  #, fuzzy
  msgid "URL to retrieve public key: "
  msgstr "no hi ha cap clau pública corresponent: %s\n"
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr ""
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr ""
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  #, fuzzy
  msgid "Language preferences: "
  msgstr "preferències actualitzades"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  #, fuzzy
  msgid "Error: invalid length of preference string.\n"
  msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  #, fuzzy
  msgid "Error: invalid characters in preference string.\n"
  msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr ""
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  #, fuzzy
  msgid "Error: invalid response.\n"
  msgstr "error: l'empremta digital és invàlida\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  #, fuzzy
  msgid "CA fingerprint: "
  msgstr "Empremta digital:"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  #, fuzzy
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "error: l'empremta digital és invàlida\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, fuzzy, c-format
  msgid "key operation not possible: %s\n"
  msgstr "La generació de claus ha fallat: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  #, fuzzy
  msgid "not an OpenPGP card"
  msgstr "no s'han trobat dades OpenPGP vàlides.\n"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Quina grandària voleu? (1024) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "Quina grandària voleu? (1024) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Quina grandària voleu? (1024) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "arrodonida fins a %u bits\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
  msgstr "es descarta: la clau secreta ja és present\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1928,154 -1525,119 +1935,154 @@@
  "You should change them using the command --change-pin\n"
  msgstr ""
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  #, fuzzy
  msgid "Please select the type of key to generate:\n"
  msgstr "Seleccioneu quin tipus de clau voleu:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr ""
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  #, fuzzy
  msgid "   (2) Encryption key\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "La selecció és invàlida.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  #, fuzzy
  msgid "Please select where to store the key:\n"
  msgstr "Seleccioneu la raó de la revocació:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "ha fallat l'actualització: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
  msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "es descarta: la clau secreta ja és present\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  msgid "Continue? (y/N) "
  msgstr "Signar realment? "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "ix del menú"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  #, fuzzy
  msgid "show admin commands"
  msgstr "les ordres entren en conflicte\n"
  
  # «pantalla» o «ajuda»?  ivb
  # «ajuda», evidentment. jm
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "mostra aquesta ajuda"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  #, fuzzy
  msgid "list all available data"
  msgstr "La clau és disponible en: "
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr ""
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr ""
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr ""
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  #, fuzzy
  msgid "change the login name"
  msgstr "canvia la data de caducitat"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  #, fuzzy
  msgid "change the language preferences"
  msgstr "canvia la confiança"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr ""
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  #, fuzzy
  msgid "change a CA fingerprint"
  msgstr "mostra empremta"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr ""
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  #, fuzzy
  msgid "generate new keys"
  msgstr "genera un nou parell de claus"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr ""
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr ""
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  #, fuzzy
  msgid "Admin-only command\n"
  msgstr "les ordres entren en conflicte\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr ""
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr ""
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "L'ordre no és vàlida (proveu «help»)\n"
  
@@@ -2083,23 -1644,15 +2090,23 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output no funciona per a aquesta ordre\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "no s'ha pogut obrir «%s»\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "no s'ha trobat la clau «%s»: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@@ -2222,7 -1753,6 +2229,7 @@@ msgstr "
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s xifrat per a: «%s»\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "no podeu usar %s mentre esteu en mode %s\n"
@@@ -2309,67 -1824,53 +2316,67 @@@ msgstr "AVÍS: no s'ha pogut eliminar e
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "AVÍS: no s'ha pogut eliminar el directori temporal «%s»: %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  #, fuzzy
  msgid "export signatures that are marked as local-only"
  msgstr ""
  "\n"
  "La signatura es marcarà com a irrevocable.\n"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  #, fuzzy
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
  
- #: g10/export.c:108
++#: g10/export.c:112
  #, fuzzy
  msgid "remove unusable parts from key during export"
  msgstr "la clau secreta és inusable"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: es descarta: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "s'està escrivint en «%s»\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr ""
  "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
  "descarta\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "AVÍS: no s'ha exportat res\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2380,8 -1880,6 +2387,8 @@@ msgstr "error en crear «%s»: %s\n
  msgid "[User ID not found]"
  msgstr "[No s'ha trobat l'id d'usuari]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
  msgstr "opcions d'importació no vàlides\n"
@@@ -2402,269 -1897,210 +2409,269 @@@ msgstr "error en la lectura de «%s»: 
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "error en crear l'anell «%s»: %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
  msgstr "Empremta digital:"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "|NOM|usa NOM com a clau secreta predeterminada"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "|NOM|usa NOM com a clau secreta predeterminada"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, fuzzy, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
  "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, fuzzy, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "|[fitxer]|crea una signatura"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[fitxer]|crea una signatura en text clar"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "crea una signatura separada"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "xifra dades"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "xifra només amb xifratge simètric"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "desxifra dades (predeterminat)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verifica una signatura"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "llista claus"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "llista claus i signatures"
  
  # «de les claus» o «de la clau»?  ivb
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "comprova les signatures de la claus"
  
  # «dactilars» o «digitals»?  ivb
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "llista claus i empremtes digitals"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "llista claus secretes"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "genera un nou parell de claus"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "genera un nou parell de claus"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "genera un nou parell de claus"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "genera un nou parell de claus"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "genera un certificat de revocació"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "elimina claus de l'anell públic"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "elimina claus de l'anell secret"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "signa una clau"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "signa una clau localment"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "signa una clau"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "signa una clau localment"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "signa o edita una clau"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
  msgstr "canvia la contrasenya"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "exporta claus"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "exporta claus a un servidor de claus"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "importa claus d'un servidor de claus"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "cerca claus en un servidor de claus"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "actualitza totes les claus des d'un servidor de claus"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "importa/fon claus"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "actualitza la base de dades de confiança"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [fitxers]|imprimeix resums de missatges"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "crea eixida amb armadura ascii"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NOM|xifra per a NOM"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "usa aquest id per a signar o desxifrar"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|nivell de compressió N (0 no comprimeix)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "usa el mode de text canònic"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "no fa cap canvi"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "pregunta abans de sobreescriure"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2675,7 -2111,6 +2682,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:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2695,13 -2130,11 +2702,13 @@@ msgstr "
  " --list-keys [noms]         mostra claus\n"
  " --fingerprint [noms]       mostra empremtes digitals\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2721,7 -2154,6 +2728,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:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2729,635 -2161,504 +2736,640 @@@ msgstr "
  "\n"
  "Algoritmes suportats:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "Clau pública: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Xifratge: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Dispersió: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Compressió: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "forma d'ús: gpg [opcions] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "les ordres entren en conflicte\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  #| msgid "no = sign found in group definition `%s'\n"
  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:1529
++#: g10/gpg.c:1537
  #, 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:1532
++#: g10/gpg.c:1540
  #, 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:1535
++#: g10/gpg.c:1543
  #, 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:1541
++#: g10/gpg.c:1549
  #, 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:1544
++#: g10/gpg.c:1552
  #, 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:1547
++#: g10/gpg.c:1555
  #, 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:1553
++#: g10/gpg.c:1561
  #, 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:1556
++#: g10/gpg.c:1564
  #, 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:1559
++#: g10/gpg.c:1567
  #, 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:1565
++#: g10/gpg.c:1573
  #, 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:1568
++#: g10/gpg.c:1576
  #, 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:1571
++#: g10/gpg.c:1579
  #, 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:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  #, 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:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "mostra en quin anell de claus està una clau llistada"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "desactiva una clau"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "el destinatari predeterminat és desconegut «%s»\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "opcions d'importació no vàlides\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
  msgstr "NOTA: %s no és per a ús normal!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, 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:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "No és una adreça vàlida\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "l'algoritme de dispersió és invàlid «%s»\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, 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:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  #, 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:3042
++#: g10/gpg.c:3137
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opcions d'importanció no vàlides\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opcions d'importanció no vàlides\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opcions d'importació no vàlides\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s no és un joc de caràcters vàlid\n"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  #, 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:3107
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s no és un joc de caràcters vàlid\n"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, 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:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opcions d'exportació no vàlides\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, 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:3319
++#: g10/gpg.c:3417
  #, 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:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  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:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVÍS: %s té preferència sobre %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s no és permés amb %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s no té sentit amb %s!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "l'algorisme de xifratge triat no és vàlid\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "l'algorisme de resum seleccionat no és vàlid\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "l'algorisme de xifratge triat no és vàlid\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed ha de ser major que 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed ha de ser major que 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  #, 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:3588
++#: g10/gpg.c:3686
  #, 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:3590
++#: g10/gpg.c:3688
  #, 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:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  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:3597
++#: g10/gpg.c:3695
  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:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "les preferències per defecte són invàlides\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "les preferències personals de xifrat són invàlides\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "les preferències personals de digest són invàlides\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "les preferències personals de compressió són invàlides\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s encara no funciona amb %s\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, 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:3704
++#: g10/gpg.c:3802
  #, 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:3709
++#: g10/gpg.c:3807
  #, 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:3803
++#: g10/gpg.c:3906
  #, 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:3815
++#: g10/gpg.c:3918
  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:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [nom_del_fitxer]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [nom_del_fitxer]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "ha fallat el desxifratge: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [nom_del_fitxer]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  #, fuzzy
  msgid "--symmetric --encrypt [filename]"
  msgstr "--sign --encrypt [nom_del_fitxer]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, 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:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [nom_del_fitxer]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [nom_del_fitxer]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  #, fuzzy
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--sign --encrypt [nom_del_fitxer]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, 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:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [nom_del_fitxer]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [nom_del_fitxer]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [nom_del_fitxer]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key user-id"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key user-id"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key user-id [ordres]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
  msgstr "--sign-key user-id"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "l'enviament al servidor de claus ha fallat: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "la recepció des del servidor de claus ha fallat: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "l'exportació de la clau ha fallat: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "l'exportació de la clau ha fallat: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "ha fallat la cerca al servidor de claus: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "ha fallat el refresc des del servidor de claus: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "no s'ha pogut llevar l'armadura: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "no s'ha pogut crear l'armadura: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "l'algoritme de dispersió és invàlid «%s»\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[nom_del_fitxer]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Endavant, escriviu el missatge...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  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:5075
++#: g10/gpg.c:5181
  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:5108
++#: g10/gpg.c:5214
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "la URL de política de signatura donada no és vàlida\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "pren les claus d'aquest anell"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "fes els conflictes de marques de temps només un avís"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|escriu informació d'estat en aquest FD"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
  
  # Werner FIXME: should it use «Usage»?
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -3376,328 -2675,262 +3388,328 @@@ msgstr "No hi ha ajuda disponible
  msgid "No help available for '%s'"
  msgstr "No hi ha ajuda disponible per a `%s'"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "actualitza la base de dades de confiança"
  
- #: g10/import.c:147
++#: g10/import.c:160
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "actualitza la base de dades de confiança"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  msgid "show key during import"
  msgstr "mostra empremta"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "la clau secreta és inusable"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "es descarta un bloc de tipus %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "fins ara s'han processat %lu claus\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Nombre total processat: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr " claus noves descartades: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr " claus noves descartades: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "                sense ID: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "              importades: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "          no modificades: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "       ID d'usuaris nous: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "          subclaus noves: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        signatures noves: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "       noves revocacions: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr " claus privades llegides: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "claus privades importades: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "claus privades no canviades: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "              importades: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "        signatures noves: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr " claus privades llegides: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "signatura %s, algorisme de resum %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "clau %08lX: sense ID\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "es descarta «%s»: %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "clau %08lX: l'ID no és vàlid\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "açò pot ser causat per l'absència d'autosignatura\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "clau %08lX: clau nova - es descarta \n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "no s'ha trobat cap anell escrivible: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "clau %08lX: no correspon a la nostra còpia\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "clau %08lX: «%s» 1 signatura nova\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "clau %08lX: «%s» %d signatures noves\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "clau %08lX: «%s» 1 subclau nova\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "clau %08lX: «%s» %d subclaus noves\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "clau %08lX: «%s» %d signatures noves\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "clau %08lX: «%s» %d signatures noves\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "clau %08lX: «%s» no ha estat modificada\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "clau %08lX: s'ha importat la clau secreta\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "es descarta: la clau secreta ja és present\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
@@@ -3712,12 -2945,10 +3724,12 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
@@@ -3727,22 -2958,18 +3739,22 @@@
  # O «rebutjara»? ivb
  # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
  # «es rebutja» està bé. jm
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "clau %08lX: no hi ha ID per a la signatura\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
@@@ -3750,153 -2977,125 +3762,153 @@@
  "«%s»\n"
  "\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "clau %08lX: Subclau de revocació no vàlida\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "clau %08lX: es descarta l'ID d'usuari '"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "clau %08lX: es descarta la subclau\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr ""
  "clau %08lX: el certificat de revocació és en el lloc equivocat - es "
  "descarta\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr ""
  "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
  "descarta\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr ""
  "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació "
  "%08lX\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
  "present.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "error en crear l'anell «%s»: %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
  msgstr "error en crear l'anell «%s»: %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
  msgstr "s'ha creat l'anell «%s»\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
  msgstr "s'ha creat l'anell «%s»\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
@@@ -3909,35 -3106,33 +3921,41 @@@ msgstr "[revocació]
  msgid "[self-signature]"
  msgstr "[autosignatura]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "error en crear l'anell «%s»: %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "signatura %s, algorisme de resum %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Signatura correcta de \""
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "es descarta «%s»: %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "L'ID d'usuari «%s» està revocat."
  msgstr[1] "L'ID d'usuari «%s» està revocat."
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3945,7 -3140,6 +3963,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 signatura no comprovada per falta de clau\n"
  msgstr[1] "1 signatura no comprovada per falta de clau\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3953,21 -3147,18 +3971,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d signatures errònies\n"
  msgstr[1] "%d signatures errònies\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Signatura correcta de \""
  msgstr[1] "Signatura correcta de \""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3979,70 -3170,55 +3997,70 @@@ msgstr "
  "verificar les claus d'altres usuaris (mirant passaports,\n"
  "comprovant empremtes de diferents fonts...)?\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Hi confie marginalment\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Hi confie plenament\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "L'ID d'usuari «%s» està revocat."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Segur que encara voleu signarla? (s/N) "
  
  # O no s'ha pogut? ivb
  # FIXME: comprovar context. jm
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  No es pot signar.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "L'ID d'usuari «%s» ha caducat."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "L'ID d'usuari «%s» no està autosignat."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "L'ID d'usuari «%s» no està autosignat."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Signar realment? "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -4051,11 -3227,9 +4069,11 @@@ msgstr "
  "La vostra signatura en «%s»\n"
  "és una signatura d'estil PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4064,11 -3238,9 +4082,11 @@@ msgstr "
  "La vostra signatura actual en «%s»\n"
  "ha caducat.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4077,43 -3249,34 +4095,43 @@@ msgstr "
  "La vostra signatura en «%s»\n"
  "és una signatura local.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "«%s» ja estava signada amb la clau %08lX\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "No hi ha res que signar amb la clau %08lX\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "La clau ha caducat!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Aquesta clau caducarà el %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4123,32 -3286,26 +4141,32 @@@ msgstr "
  "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
  "contestar, entreu «0».\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) No vaig a contestar.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) No ho he comprovat en absolut.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) He fet algunes comprovacions.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) He fet comprovacions molt acurades.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4157,138 -3314,113 +4175,138 @@@ msgstr "
  "Esteu segur que voleu signar aquesta clau\n"
  "amb la vostra clau: \""
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Açò serà una autosignatura.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "AVÍS: la signatura no es marcarà com a inexportable.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "AVÍS: la signatura no es marcarà com a irrevocable.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "La signatura es marcarà com a inexportable.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "La signatura es marcarà com a irrevocable.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "No he comprovat aquesta clau en absolut.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "He fet algunes comprovacions a aquesta clau.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "He comprovat aquesta clau amb molta cura.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Signar realment? "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "Ha fallat el procés de signatura: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "desa i ix"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "mostra empremta"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Notació de signatura: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "llista claus i ID"
  
  # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
  # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "tria l'ID d'usuari N"
  
  # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
  # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  #, fuzzy
  msgid "select subkey N"
  msgstr "tria l'ID d'usuari N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "check signatures"
  msgstr "revoca signatures"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "signa la clau localment"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "afegeix un ID d'usuari"
  
@@@ -4296,139 -3428,110 +4314,139 @@@
  # Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
  # el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
  # i no hem unificat en català. Potser li ho diré a Werner. jm.
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "afegeix un photo ID"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "esborra un ID d'usuari"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "esborra una clau secundària"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "afegeix una clau de revocació"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr ""
  "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "No podeu canviar la data de caducitat de les claus v3\n"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "marca l'ID d'usuari com a primari"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "llista les preferències (expert)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "llista les preferències (detallat)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr ""
  "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr ""
  "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "canvia la contrasenya"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "canvia la confiança"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "revoca un ID d'usuari"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "revoca una clau secundària"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  #, fuzzy
  msgid "enable key"
  msgstr "activa una clau"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "disable key"
  msgstr "desactiva una clau"
  
  # Igual que dalt.  ivb
  # Idem :) jm
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "mostra el photo ID"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "La clau secreta està disponible.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Cal la clau secreta per a fer açò.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4436,284 -3539,225 +4454,284 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "La clau està revocada."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Realment voleu signar tots els ID d'usuari? "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Realment voleu signar tots els ID d'usuari? "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "la classe de signatura és desconeguda"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "No podeu esborrar l'últim ID d'usuari!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Realment voleu eliminar aquest ID d'usuari? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Heu de seleccionar, si més no, una clau.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "no s'ha pogut obrir «%s»: %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "error en crear l'anell «%s»: %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Heu de seleccionar, si més no, una clau.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Realment voleu eliminar les claus seleccionades? "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Realment voleu eliminar aquesta clau? "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Realment voleu eliminar aquest ID d'usuari? "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Realment voleu revocar aquesta clau? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Realment voleu revocar les claus seleccionades? "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Realment voleu revocar aquesta clau? "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "estableix la llista de preferències"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Realment voleu actualitzar les preferències? "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Voleu desar els canvis? "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Voleu eixir sense desar? "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "ha fallat l'actualització: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "La clau no ha canviat, per tant no cal actualització.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "La generació de claus ha fallat: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "error: l'empremta digital és invàlida\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "el valor no és vàlid\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Usuari inexistent.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "No hi ha res que signar amb la clau %08lX\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Resum: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Funcionalitats: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  #, fuzzy
  msgid "Notations: "
  msgstr "Notació: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following 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:3847
++#: g10/keyedit.c:3860
  #, 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:3853
++#: g10/keyedit.c:3866
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (sensible)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "no s'ha pogut creat %s: %s\n"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[revocada]"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [caduca: %s]"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [caduca: %s]"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr ""
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " confiança: %c/%c"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Aquesta clau ha estat desactivada"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4721,19 -3765,14 +4739,20 @@@ 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:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[revocada]"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4742,18 -3781,15 +4761,18 @@@ msgstr "
  "      causar que una ID d'usuari diferent esdevinga en la primària "
  "assumida.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
  msgstr "No podeu canviar la data de caducitat de les claus v3\n"
  
  # Photo ID com abans.  ivb
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4762,38 -3798,30 +4781,38 @@@ 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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  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:4298
++#: g10/keyedit.c:4311
  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"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
  # 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:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
  
  # Werner FIXME: use ngettext. jm
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4801,37 -3829,30 +4820,37 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "S'ha esborrat %d signatura.\n"
  msgstr[1] "S'ha esborrat %d signatura.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "No s'hi ha eliminat res.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "invàlida"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "L'ID d'usuari «%s» està revocat."
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
  msgstr[0] "L'ID d'usuari «%s» està revocat."
  msgstr[1] "L'ID d'usuari «%s» està revocat."
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "l'ID d'usuari «%s» ja està revocat\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "l'ID d'usuari «%s» ja està revocat\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4840,41 -3861,33 +4859,41 @@@ 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:4585
++#: g10/keyedit.c:4601
  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:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Introduïu l'ID d'usuari del revocador designat: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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:4642
++#: g10/keyedit.c:4658
  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:4664
++#: g10/keyedit.c:4680
  #, 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:4682
++#: g10/keyedit.c:4698
  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:4688
++#: g10/keyedit.c:4704
  #, 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:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4882,245 -3895,194 +4901,245 @@@
  msgstr ""
  "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  #, 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:4747
++#: g10/keyedit.c:4763
  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:4798
++#: g10/keyedit.c:4814
  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:4971
++#: g10/keyedit.c:4987
  #, 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:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Heu de seleccionar exactament un ID.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, 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:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Notació de signatura: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Voleu sobreescriure? (s/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "No hi ha cap ID amb l'índex %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, 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:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "No hi ha cap ID amb l'índex %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "No hi ha cap ID amb l'índex %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID d'usuari: «"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (no-exportable)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Aquesta signatura va caducar el %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  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:6005
++#: g10/keyedit.c:6021
  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:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr ""
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, 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:6094
++#: g10/keyedit.c:6110
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (no-exportable)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   revocat per %08lX el %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Esteu a punt de revocar aquestes signatures:\n"
  
  # (s/N)?  ivb
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Realment voleu crear els certificats de revocació? (s/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "ho hi ha clau secreta\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "l'ID d'usuari «%s» ja està revocat\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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:6370
++#: g10/keyedit.c:6386
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "l'ID d'usuari «%s» ja està revocat\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "l'ID d'usuari «%s» ja està revocat\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "la preferència %c%lu és duplicada\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "hi ha massa preferències «%c»\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "hi ha massa preferències «%c»\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "hi ha massa preferències «%c»\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "s'està escrivint una signatura directa\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "s'està escrivint l'autosignatura\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "s'està escrivint la signatura de comprovació de la clau\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  #, fuzzy
  msgid "Encrypt"
  msgstr "xifra dades"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr ""
  
@@@ -5134,157 -4096,126 +5153,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr ""
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Seleccioneu quin tipus de clau voleu:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (només signar)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (només signar)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (només xifrar)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (només signar)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (només signar)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (només signar)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (només xifrar)\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Notació de signatura: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "No hi ha cap ID amb l'índex %d\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "arrodonida fins a %u bits\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Quina grandària voleu? (1024) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Quina grandària voleu? (1024) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "La grandària sol·licitada és %u bits\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Seleccioneu quin tipus de clau voleu:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5300,7 -4231,6 +5319,7 @@@ msgstr "
  "      <n>m = la clau caduca als n mesos\n"
  "      <n>y = la clau caduca als n anys\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5316,42 -4246,34 +5335,42 @@@ msgstr "
  "      <n>m = la signatura caduca als n mesos\n"
  "      <n>y = la signatura caduca als n anys\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "Indiqueu la validesa de la clau (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Indiqueu la validesa de la signatura (0) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "el valor no és vàlid\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s no caduca en absolut\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s no caduca en absolut\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s caduca el %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Aquesta signatura caduca el %s\n"
  
  # Amb «it» es refereix a les dates?  ivb
  # Això vaig entendre jo. jm
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5359,12 -4281,10 +5378,12 @@@ msgstr "
  "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
  "Tanmateix, les tractarà bé fins l'any 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "És correcte? (s/n)"
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5375,7 -4295,6 +5394,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  #, fuzzy
  msgid ""
  "\n"
@@@ -5392,50 -4311,39 +5411,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Nom i cognoms: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "El nom no pot començar amb un dígit\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "Adreça electrònica: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "No és una adreça vàlida\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Comentari: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Esteu usant el joc de caràcters `%s'.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5446,7 -4354,6 +5465,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
  
@@@ -5463,35 -4370,28 +5482,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoXx"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Corregiu l'error primer\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5503,13 -4403,10 +5522,13 @@@ msgstr "
  "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
  "d'aconseguir prou entropia.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "La generació de claus ha fallat: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5517,69 -4414,56 +5536,69 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "«%s» ja està comprimida\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Voleu crear la clau de tota manera? "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Voleu crear la clau de tota manera? "
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "La generació de claus ha estat cancel·lada.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "no s'ha pogut crear «%s»: %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr ""
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "s'està escrivint la clau pública a «%s»\n"
  
  # Potser no hi haja cap anell! ivb
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "s'han creat i signat les claus pública i secreta.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5589,7 -4473,6 +5608,7 @@@ msgstr "
  "\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
  
  # Werner FIXME: Use ngettext. jm
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5598,7 -4481,6 +5617,7 @@@ msgstr "
  "amb el rellotge)\n"
  
  # Werner FIXME: use ngettext. jm
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5606,27 -4488,22 +5625,27 @@@ msgstr "
  "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
  "amb el rellotge)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Crear realment? "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "mai       "
  
@@@ -5677,30 -4545,24 +5696,30 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "Anell"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Empremtes digital de la clau primària:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "     Empremta digital de la subclau:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr " Empremta digital de la clau primària:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "      Empremta digital de la subclau:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  #, fuzzy
  msgid "      Key fingerprint ="
  msgstr "     Empremta digital ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr ""
  
@@@ -5739,112 -4596,89 +5758,112 @@@ msgstr[1] "1 signatura errònia\n
  msgid "%s: keyring created\n"
  msgstr "%s: s'ha creat l'anell\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  #, fuzzy
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "la URL de política de signatura donada no és vàlida\n"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  #, fuzzy
  msgid "disabled"
  msgstr "disable"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr ""
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr ""
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, fuzzy, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "%s: no és un ID vàlid\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
  msgstr[0] "s'està sol·licitant la clau %08lX de %s\n"
  msgstr[1] "s'està sol·licitant la clau %08lX de %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, fuzzy, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, fuzzy, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "no s'ha trobat la clau «%s»: %s\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  #, fuzzy
  msgid "key not found on keyserver\n"
  msgstr "no s'ha trobat la clau «%s»: %s\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, fuzzy, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "s'està sol·licitant la clau %08lX de %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, fuzzy, c-format
  msgid "requesting key %s from %s\n"
  msgstr "s'està sol·licitant la clau %08lX de %s\n"
  
  # «del servidor», «en el servidor»?  ivb
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  msgid "no keyserver known\n"
  msgstr "error de servidor de claus"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, fuzzy, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "es descarta «%s»: %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, fuzzy, c-format
  msgid "sending key %s to %s\n"
  msgstr "s'està sol·licitant la clau %08lX de %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  msgid "requesting key from '%s'\n"
  msgstr "s'està sol·licitant la clau %08lX de %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, fuzzy, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
@@@ -5950,133 -4764,106 +5969,133 @@@ msgstr "nom del fitxer original='%.*s'\
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Signatura correcta de \""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "Signatura INCORRECTA de \""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Signatura caducada de \""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Signatura correcta de \""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "s'ha eliminat la verificació de signatura\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "no es poden tractar aquestes signatures múltiples\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Aquesta signatura va caducar el %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "              alias \""
  
  # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "              alias \""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "La clau és disponible en: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[incert]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "              alias \""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Aquesta signatura va caducar el %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Aquesta signatura caduca el %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "signatura %s, algorisme de resum %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binari"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "mode text"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "desconeguda"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "l'algoritme de clau pública és desconegut"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "No s'ha pogut comprovar la signatura: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "no és una signatura separada\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "AVÍS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "signatura autònoma de classe 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "signatura de l'estil antic (PGP 2.x)\n"
  
@@@ -6182,26 -4950,21 +6201,26 @@@ msgstr "No comprimit
  msgid "uncompressed|none"
  msgstr "No comprimit"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "aquest missatge pot no ser usable per %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "s'estan llegint opcions de «%s»\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  msgid "unknown option '%s'\n"
  msgstr "el destinatari predeterminat és desconegut «%s»\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "la classe de signatura és desconeguda"
@@@ -6502,7 -5210,23 +6521,26 @@@ msgstr "Aquesta clau pertany probableme
  msgid "This key belongs to us\n"
  msgstr "Aquesta clau és nostra\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
+ "No s'han trobat certificats amb confiança no definida.\n"
+ "\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "NO és segur que la clau pertanya a la persona esmentada en\n"
+ "l'ID d'usuari. Si *realment* sabeu què feu, podeu respondre\n"
+ "«sí» a la següent pregunta\n"
+ "\n"
+ 
++#: g10/pkclist.c:489
  #, fuzzy
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
@@@ -6514,133 -5238,105 +6552,133 @@@ msgstr "
  "«sí» a la següent pregunta\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  #, fuzzy
  msgid "Use this key anyway? (y/N) "
  msgstr "Voleu usar de tota manera aquesta clau?"
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "AVÍS: S'està usant una clau no fiable!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  #, fuzzy
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
  "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
  "present.\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  #, fuzzy
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  #, fuzzy
  msgid "         This could mean that the signature is forged.\n"
  msgstr "      Açò podria significar que la signatura és falsificada.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "AVÍS: Aquesta subclau ha estat revocada pel propietari!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Nota: Aquesta clau ha estat desactivada.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Nota: La clau ha caducat!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
  "    No hi ha res que indique que la signatura pertany al seu propietari.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "AVÍS: La clau NO és de confiança!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "          Probablement la signatura és FALSA.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr "AVÍS: Aquesta clau no ve certificada per signatures prou fiables!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "No és segur que la signatura pertanya al seu propietari.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: es descarta: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: es descarta: la clau pública està desactivada\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: es descarta: la clau pública ja està present\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "no s'ha pogut connectar amb «%s»: %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "l'algoritme de dispersió és invàlid «%s»\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "l'algoritme de dispersió és invàlid «%s»\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr ""
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6648,37 -5344,29 +6686,37 @@@ msgstr "
  "\n"
  "Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Usuari inexistent.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "La clau pública està desactivada.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "es descarta: la clau pública ja està establida\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "el destinatari predeterminat és desconegut «%s»\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "no hi ha adreces vàlides\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "clau %08lX: sense ID\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "clau %08lX: sense ID\n"
@@@ -6931,34 -5573,28 +6969,34 @@@ msgstr "
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "AVÍS: conflicte de signatures digest en el missatge\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr ""
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, fuzzy, c-format
  msgid "please see %s for more information\n"
  msgstr " i = mostra més informació\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
  "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
  msgstr[0] "la clau pública %08lX és %lu segons anterior a la signatura\n"
  msgstr[1] "la clau pública %08lX és %lu segons anterior a la signatura\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
@@@ -6966,7 -5602,6 +7004,7 @@@ msgstr[0] "la clau pública %08lX és %
  msgstr[1] "la clau pública %08lX és %lu segons anterior a la signatura\n"
  
  # Werner FIXME: Use ngettext. jm
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6980,7 -5615,6 +7018,7 @@@ msgstr[1] "
  "amb el rellotge)\n"
  
  # Werner FIXME: Use ngettext. jm
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
@@@ -6992,30 -5626,25 +7030,30 @@@ msgstr[1] "
  "la clau s'ha creat %lu segon en el futur (salt en el temps o problemes\n"
  "amb el rellotge)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "NOTA: aquesta clau ha estat revocada!"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, fuzzy, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
  "es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític "
  "desconegut\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr ""
  "clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr ""
@@@ -7089,7 -5707,6 +7127,7 @@@ msgstr "
  "es descarta «%s»: és una clau ElGamal generada per PGP que no és segura per "
  "a signatures!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@@ -7137,12 -5746,10 +7175,12 @@@ msgstr "error en trobar el registre de 
  msgid "read error in '%s': %s\n"
  msgstr "error de lectura: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "no es pot crear el directori «%s»: %s\n"
@@@ -7174,7 -5776,6 +7212,7 @@@ msgid "%s: directory does not exist!\n
  msgstr "%s: el directori no existeix!\n"
  
  # No em passe! ;)  ivb
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "no s'ha pogut tancar «%s»: %s\n"
@@@ -7286,17 -5865,14 +7324,17 @@@ msgstr "no es poden tractar línies mé
  msgid "input line longer than %d characters\n"
  msgstr "la línia d'entrada és superior a %d caràcters\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
@@@ -7306,250 -5882,236 +7344,287 @@@
  # 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/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Algoritmes suportats:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: error en escriure el registre de directoris: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr ""
+ 
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "llista claus i ID"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Política: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "llista claus"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
  msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
+ #, c-format
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
+ # Werner FIXME: use ngettext. jm
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "S'han esborrat %d signatures.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|algo [fitxers]|imprimeix resums de missatges"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
+ msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "xifrat amb %lu contrasenyes\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
+ msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7563,113 -6125,101 +7638,125 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
  msgstr "«%s» no és un ID de clau llarg vàlid\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, fuzzy, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "clau %08lX: s'accepta com a clau fiable\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, fuzzy, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr ""
  "la clau %08lX apareix més d'una vegada en la base de dades de confiança\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, fuzzy, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr ""
  "clau %08lX: no hi ha una clau pública per a la clau fiable - es descarta\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, fuzzy, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "s'ha marcat la clau com a de confiança absoluta.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "registre de confiança %lu, tipus %d: no s'ha pogut llegir: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "el registre de confiança %lu no és del tipus demanat %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr ""
  "no és necessària una comprovació de la base de dades de confiança\n"
  "\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr ""
  "no és necessària una comprovació de la base de dades de confiança\n"
  "\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr ""
  "no és necessària una comprovació de la base de dades de confiança\n"
  "\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "no s'ha trobat la clau pública %08lX: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "si us plau, feu un --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "s'està comprovant la base de dades de confiança\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "fins ara s'han processat %lu claus\n"
  msgstr[1] "fins ara s'han processat %lu claus\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7677,23 -6227,19 +7764,23 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
  msgstr[1] "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "no s'han trobat claus amb confiança absoluta\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr ""
  "no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@@ -7808,143 -6333,113 +7895,145 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "canvia la contrasenya"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
  msgstr "canvia la contrasenya"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "Seleccioneu la raó de la revocació:\n"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "Seleccioneu la raó de la revocació:\n"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "error en crear «%s»: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, fuzzy, c-format
- msgid "reading public key failed: %s\n"
- msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "remove keys from the public keyring"
+ msgid "response does not contain the EC public key\n"
+ msgstr "elimina claus de l'anell públic"
+ 
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1551
+ #, fuzzy, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "l'enviament al servidor de claus ha fallat: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7954,26 -6449,21 +8043,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Seleccioneu la raó de la revocació:\n"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7981,118 -6471,94 +8070,118 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "canvia la contrasenya"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "error: l'empremta digital és invàlida\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  #, fuzzy
  msgid "key already exists\n"
  msgstr "«%s» ja està comprimida\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  #, fuzzy
  msgid "generating new key\n"
  msgstr "genera un nou parell de claus"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
  msgstr "genera un nou parell de claus"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
  
  # Ídem.  ivb
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "l'URI no és suportada"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "La generació de claus ha fallat: %s\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "La generació de claus ha fallat: %s\n"
  msgstr[1] "La generació de claus ha fallat: %s\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "signatura %s, algorisme de resum %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr ""
@@@ -8114,7 -6577,6 +8203,7 @@@ msgstr "Introduïu el nom d'usuari: 
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8170,16 -6621,13 +8259,16 @@@ msgid "
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8199,11 -6644,9 +8288,11 @@@ msgstr "gpg-agent no està disponible e
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  #, fuzzy
  msgid "shell"
  msgstr "ajuda"
@@@ -8236,221 -6673,174 +8325,221 @@@ msgstr "s'està escrivint la clau secre
  msgid "certificate policy not allowed"
  msgstr "s'està escrivint la clau secreta a «%s»\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
  msgstr "NOTA: aquesta clau ha estat revocada!"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
  msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, fuzzy, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "problema en la lectura del certificat: %s\n"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  #, fuzzy
  msgid "certificate not yet valid"
  msgstr "Certificat de revocació vàlid"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
  msgstr "Certificat de revocació vàlid"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  #, fuzzy
  msgid "intermediate certificate not yet valid"
  msgstr "Certificat de revocació vàlid"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
  msgstr "problema en la lectura del certificat: %s\n"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
  msgstr "problema en la lectura del certificat: %s\n"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
  msgstr "problema en la lectura del certificat: %s\n"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
  msgstr "problema en la lectura del certificat: %s\n"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
  msgstr "        signatures noves: %lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
  msgstr "S'ha creat el certificat de revocació.\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
  msgstr "Certificat de revocació vàlid"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "Empremta digital:"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  #, fuzzy
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  "No s'han trobat certificats amb confiança no definida.\n"
  "\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
  msgstr "Certificat correcte"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  #, fuzzy
  msgid "root certificate is not marked trusted"
  msgstr ""
  "No s'han trobat certificats amb confiança no definida.\n"
  "\n"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  #, fuzzy
  msgid "certificate chain too long\n"
  msgstr "Certificat de revocació vàlid"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  #, fuzzy
  msgid "issuer certificate not found"
  msgstr "Certificat de revocació vàlid"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "verifica una signatura"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "Certificat de revocació vàlid"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
  msgstr "certificat duplicat: esborrat"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
  msgstr ""
  "No s'han trobat certificats amb confiança no definida.\n"
  "\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8794,7 -7118,6 +8883,7 @@@ msgstr "
  msgid "certificate '%s' not found: %s\n"
  msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
  msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@@ -8819,135 -7138,105 +8908,135 @@@ msgstr "no s'ha pogut eliminar el bloc 
  msgid "no valid recipients given\n"
  msgstr "(No es va donar una descripció)\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
  msgstr "llista claus secretes"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
  msgstr "Certificat de revocació vàlid"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
  msgstr "Certificat correcte"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
  msgstr "Certificat correcte"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "crea eixida amb armadura ascii"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "no usa el terminal en absolut"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
  # Mode desatès (SC)  ivb
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "mode desatès: no pregunta mai"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "suposa «sí» en la majoria de les preguntes"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "suposa «no» en la majoria de les preguntes"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "afegeix aquest anell a la llista"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOM|usa NOM com a clau secreta predeterminada"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|usa aquest servidor per a cercar claus"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOM|usa l'algoritme de xifratge NOM"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8958,48 -7247,39 +9047,48 @@@ msgstr "
  "signa, comprova, xifra o desxifra\n"
  "l'operació predeterminada depén de les dades introduïdes\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "no s'ha pogut connectar amb «%s»: %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "el destinatari predeterminat és desconegut «%s»\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(No es va donar una descripció)\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " o = omet aquesta clau\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, 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:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
  # No em passe! ;)  ivb
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "no s'ha pogut tancar «%s»: %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -9017,7 -7294,6 +9106,7 @@@ msgstr "Certificat correcte
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "error en crear «%s»: %s\n"
@@@ -9032,32 -7306,26 +9121,32 @@@ msgstr "error en la creació de la cont
  msgid "error reading input: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
  msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
  msgstr "error en la creació de la contrasenya: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, fuzzy, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
  msgstr "error en la lectura de «%s»: %s\n"
@@@ -9957,112 -8048,88 +10046,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Voleu eixir sense desar? "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FITXER|carrega el mòdul d'extensió especificat"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10075,77 -8142,61 +10168,77 @@@ msgstr "
  "@\n"
  "(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "forma d'ús: gpg [opcions] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "%s no és permés amb %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "no s'ha pogut crear l'armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "no s'ha pogut crear l'armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "la línia és massa llarga\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "error: l'empremta digital és invàlida\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "error de lectura: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
@@@ -10154,17 -8205,14 +10247,17 @@@
  # Probablement és una clau, femení. jm
  # Werner FIXME: please add translator comment saying *what* is
  # uncompressed so we know the gender. jm
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "no forçat"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10345,13 -8357,6 +10438,7 @@@ msgstr "«%s» no és un fitxer JPEG\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "error en crear l'anell «%s»: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
  msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
@@@ -10609,77 -8562,61 +10696,77 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "Ha fallat el procés de signatura: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "Ha fallat el procés de signatura: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "error mentre s'enviava a «%s»: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "no s'ha pogut crear «%s»: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10727,7 -8655,6 +10814,7 @@@ msgstr "DSA requereix l'ús d'un algori
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "ix"
@@@ -10898,11 -8784,9 +10985,11 @@@ msgstr "|NOM|xifra per a NOM
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
@@@ -10936,148 -8813,121 +11023,156 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "error de la xarxa"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "la contrasenya és errònia"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "no s'ha trobat la clau pública"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
  msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
  msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "actualitza la base de dades de confiança"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "fitxer d'eixida"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
  msgstr "no s'ha trobat la clau pública"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr ""
  
diff --cc po/cs.po
index 8c5c751,56e61d9..6505c59
--- a/po/cs.po
+++ b/po/cs.po
@@@ -35,7 -35,6 +35,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg2 2.1.10\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2015-12-07 20:45+0100\n"
  "Last-Translator: Petr Pisar <petr.pisar at atlas.cz>\n"
  "Language-Team: Czech <gnupg-i18n at gnupg.org>\n"
@@@ -45,7 -44,6 +45,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "získání zámku pinetry se nezdařilo: %s\n"
@@@ -56,45 -54,35 +56,45 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|_Zrušit"
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|_Ano"
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|_Ne"
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|PIN:"
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|_Uložit do správce hesel"
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Opravdu chcete učinit heslo na obrazovce viditelným?"
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr "|pinentry-tt|Zviditelnit heslo"
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  msgid "|pinentry-tt|Hide passphrase"
  msgstr "|pinentry-tt|Skrýt heslo"
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr "Kvalita:"
  
@@@ -104,73 -92,57 +104,73 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  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:868
++#: agent/call-pinentry.c:902
  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:871
++#: agent/call-pinentry.c:905
  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:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Heslo:"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "neshodují se – zkuste to znovu"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (pokus %d z %d)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr "Znovu:"
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
  msgstr "PIN je příliš dlouhý"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
  msgstr "Heslo je příliš dlouhé"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
  msgstr "Neplatný znak v PINu"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr "PIN je příliš krátký"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "Špatný PIN"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
  msgstr "Špatné heslo"
  
@@@ -179,24 -150,10 +179,24 @@@
  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:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "nelze vytvořit „%s“: %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "nelze otevřít „%s“: %s\n"
@@@ -221,17 -174,6 +221,7 @@@ msgstr "na kartě není autentizační 
  msgid "no suitable card key found: %s\n"
  msgstr "nenalezen žádný vhodný klíč karty: %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "výroba stínového klíče se nezdařila: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "chyba při zápisu klíče: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -240,24 -182,19 +230,24 @@@ msgstr "
  "Proces SSH si vyžádal použití klíče%%0A  %s%%0A  (%s)%%0APřejete si to "
  "povolit?"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr "Povolit"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr "Zakázat"
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Prosím, vložte heslo pro SSH klíč%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Prosím, vložte toto heslo znovu"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -266,16 -203,13 +256,16 @@@ msgstr "
  "Prosím, vložte heslo, abyste ochránil(a) přijatý tajný klíč%%0A   %s%%0A   %s"
  "%%0Auvnitř úložiště klíčů gpg-agenta"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "ze socketu se nepodařilo se vytvořit proud (stream): %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr "Prosím, vložte kartu se sériovým číslem"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "Prosím, vyjměte kartu a vložte jinou se sériovým číslem"
  
@@@ -401,8 -311,6 +391,8 @@@ msgstr "Pro ochranu svého nového klí
  msgid "Please enter the new passphrase"
  msgstr "Prosím, zadejte nové heslo"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -410,132 -318,99 +400,138 @@@ msgstr "
  "@Volby:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "poběží v režimu démona (na pozadí)"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "poběží v režimu serveru (na popředí)"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "run in server mode"
+ msgid "run in supervised mode"
+ msgstr "pracovat v režimu serveru"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "upovídaný režim"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "být o trochu víc tichý"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr "vypisovat příkazy ve stylu sh"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr "vypisovat příkazy ve stylu csh"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|SOUBOR|načíst volby ze SOUBORU"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "neodpojovat se od konzole"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr "neuzurpovat si klávesnici a myš"
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
  msgstr "použít pro server soubor s protokolem"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
  msgstr "nepoužívat SCdémona"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NÁZEV|přijímat některé příkazy přes NÁZEV"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr "ignorovat požadavky na změnu TTY"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr "ignorovat požadavky na změnu X displeje"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr "|N|zahodit zapamatované PINy po N sekundách"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr "nepoužívat paměť PINů na podepisování"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  msgid "disallow the use of an external password cache"
  msgstr "nedovolit použít vnější úložiště na hesla"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "nedovolit klientům označovat klíče za „důvěryhodné“"
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
  msgstr "umožnit přednastavení hesla"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  #, fuzzy
  #| msgid "allow caller to override the pinentry"
  msgid "disallow caller to override the pinentry"
  msgstr "umožnit volajícímu přebít pinentry"
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr "umožnit zadání hesla skrze Emacs"
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  msgid "enable ssh support"
  msgstr "zapnout podporu pro OpenSSH"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
  msgstr "zapnout podporu pro PuTTY"
  
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  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 na <gnupg-i18n at gnupg.org>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Použití: @GPG_AGENT@ [volby] (-h pro nápovědu)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -543,137 -418,102 +539,137 @@@ msgstr "
  "Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
  "Správa tajných klíčů pro @GNUPG@\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "zadána neplatná úroveň ladění „%s“\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, 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:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "soubor s možnostmi „%s“: %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "čtou se možnosti z „%s“\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "Poznámka: „%s“ není uvažovaná možnost\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "socket nelze vytvořit: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "název socketu „%s“ je příliš dlouhý\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  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:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
  msgstr "chyba při získávání soli pro socket\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "chyba při přilepování socketu na „%s“: %s\n"
  
  # TODO: i18n of first %s
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Varování: přístupová práva %s „%s“ nejsou bezpečná\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "volání listen() selhalo: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "naslouchá se na socketu „%s“\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "nelze vytvořit adresář „%s“: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "adresář „%s“ vytvořen\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "volání stat() na „%s“ selhalo: %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "„%s“ nelze použít jako domovský adresář\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "chyba při čtení soli z deskriptoru %d: %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, 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:2312
++#: agent/gpg-agent.c:2603
  #, 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:2387
++#: agent/gpg-agent.c:2678
  #, 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:2392
++#: agent/gpg-agent.c:2683
  #, 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:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_pselect selhala: %s – čeká se 1 s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s pozastaveno\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "v této relaci neběží žádný gpg-agent\n"
  
@@@ -689,8 -527,6 +685,8 @@@ msgstr "
  "Syntaxe: gpg-preset-passphrase [volby] KEYGRIP\n"
  "Správa dočasné paměti pro hesla\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -698,9 -534,6 +694,9 @@@ msgstr "
  "@Příkazy:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -755,7 -580,6 +751,8 @@@ msgstr "zrušeno\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "chyba při ptaní se na heslo: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "chyba při otevírání „%s“: %s\n"
@@@ -815,8 -630,6 +812,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Ano"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "Ne"
  
@@@ -847,27 -657,22 +844,27 @@@ msgstr "V pořádku
  msgid "Wrong"
  msgstr "Špatně"
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr "Poznámka: Toto heslo nikdy nebylo změněno.%0AProsím, nyní jej změňte."
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr "Toto heslo se nezměnilo%%0Aod %.4s-%.2s-%.2s. Prosím, nyní jej změňte."
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
  msgstr "Změnit heslo"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr "Změním jej později"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@@ -875,11 -680,9 +872,11 @@@
  msgstr ""
  "Opravdu chcete smazat klíč určený pomocí keygripu%%0A  %s%%0A  %%C%%0A?"
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  msgid "Delete key"
  msgstr "Smazat klíč"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -896,12 -697,10 +893,12 @@@ msgstr "DSA vyžaduje, aby délka hash
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "%s klíč používá nebezpečný (%ubitový) hash\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "%zubitový hash není platný pro %ubitový %s klíč\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "kontrola vytvořeného podpisu se nepodařila: %s\n"
@@@ -925,85 -720,74 +922,97 @@@ msgstr "ochranný algoritmus %d (%s) ne
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "ochranný algoritmus %d (%s) není podporován\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "chyba při vytváření roury: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "chyba při vytváření proudu pro rouru: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "chyba při rozdvojování procesu: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- #| msgid "waiting for process %d to terminate failed: %s\n"
- msgid "waiting for processes to terminate failed: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
  msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "chyba při spouštění „%s“: pravděpodobně není nainstalován\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "chyba v běhu „%s“: návratový kód %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, c-format
  msgid "error running '%s': terminated\n"
  msgstr "chyba v běhu „%s“: násilně ukončeno\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "chyba při získání návratového kódu procesu %d: %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, c-format
  msgid "can't connect to '%s': %s\n"
  msgstr "nelze se připojit k „%s“: %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "problém v nastavování voleb gpg-agenta\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "nemohu vypnout vytváření core souborů: %s\n"
  
  # TODO: i18n of first %s
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Varování: vlastnictví %s „%s“ není nastaveno bezpečně\n"
  
  # TODO: i18n of first %s
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Varování: přístupová práva %s „%s“ nejsou bezpečná\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ #| msgid "waiting for the agent to come up ... (%ds)\n"
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "čeká se na agenta… (%d s)\n"
+ 
++#: common/sysutils.c:685
+ #, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "přejmenování „%s“ na „%s“ se nezdařilo: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "ano"
  
@@@ -1057,7 -830,6 +1066,7 @@@ msgstr "při pokusu alokovat %lu bajt�
  msgid "out of core while allocating %lu bytes"
  msgstr "při pokusu alokovat %lu bajtů došla paměť"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "chyba při alokování dostatečného množství paměti: %s\n"
@@@ -1077,35 -846,28 +1086,35 @@@ msgstr "VAROVÁNÍ: „%s%s“ je zasta
  msgid "unknown debug flag '%s' ignored\n"
  msgstr "neznámý ladicí příznak „%s“ se ignoruje\n"
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr "gpg-agent neběží – spouští se „%s“\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr "čeká se na agenta… (%d s)\n"
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr "spojení na agenta ustanoveno\n"
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  msgid "connection to agent is in restricted mode\n"
  msgstr "spojení na agenta je v omezeném režimu\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr "žádný dirmngr neběží – spouští se „%s“\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr "čeká se na dirmngr… (%d s)\n"
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr "spojení na dirmngr ustanoveno\n"
  
@@@ -1176,8 -922,6 +1185,8 @@@ msgstr "Vytvořen klíč relace
  msgid "algorithm: %s"
  msgstr "algoritmus: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "nepodporovaný algoritmus: %s"
@@@ -1252,11 -980,9 +1261,11 @@@ msgstr "Řetěz certifikátů je platn�
  msgid "Root certificate trustworthy"
  msgstr "Kořenový certifikát je důvěryhodný"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "pro certifikát nebyl nalezen žádný CRL"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
  msgstr "dostupný CRL je příliš starý"
  
@@@ -1293,7 -1011,6 +1302,7 @@@ msgstr "Nápověda pro „%s“ není d
  msgid "ignoring garbage line"
  msgstr "ignoruji řádek s nepořádkem"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[neuvedeno]"
  
@@@ -1364,7 -1066,6 +1373,7 @@@ msgid "command \"%.50s\" is ambiguous\n
  msgstr "příkaz „%.50s“ není jednoznačný\n"
  
  # Yet another expression for `not enough memory' :)
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
  msgstr "nedostatek paměti\n"
  
@@@ -1423,8 -1113,6 +1432,8 @@@ msgid "waiting for lock %s...\n
  msgstr "čekám na zámek %s…\n"
  
  # První argument je název knihovny
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s je příliš stará (potřeba %s, přítomna %s)\n"
@@@ -1508,13 -1178,11 +1517,13 @@@ msgstr "
  "neplatný znak (quoted-printable) v ASCII kódování – pravděpodobně byl použit "
  "špatný MTA\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "není v přímo čitelném formátu"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1522,25 -1190,20 +1531,25 @@@ msgstr "
  "symbolické jméno smí obsahovat pouze písmena, číslice, tečky nebo podtržítka "
  "a musí končit znakem „=“\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "zápis jména uživatele musí obsahovat znak „@“\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "jméno uživatele nesmí obsahovat více než jeden znak „@“\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "hodnota nemůže obsahovat žádné kontrolní znaky\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  #| msgid "a notation name must not contain more than one '@' character\n"
  msgid "a notation name may not contain an '=' character\n"
  msgstr "jméno uživatele nesmí obsahovat více než jeden znak „@“\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
@@@ -1550,49 -1213,38 +1559,48 @@@ msgstr "
  "symbolické jméno smí obsahovat pouze písmena, číslice, tečky nebo podtržítka "
  "a musí končit znakem „=“\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "VAROVÁNÍ: nalezen neplatný formát zápisu data\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr "předání dotazu %s klientovi se nezdařilo\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Vložte heslo: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring '%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "chyba při vytváření souboru klíčů (keyring) „%s“: %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: "
  msgid "WARNING: %s\n"
  msgstr "VAROVÁNÍ: "
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "OpenPGP karta není dostupná: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "Nalezena OpenPGP karta číslo %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "nelze provést v dávkovém módu\n"
  
@@@ -1600,14 -1251,9 +1608,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Tento příkaz je dostupný pouze pro karty verze 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
  msgstr "Resetační kód není nebo už není dostupný\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Váš výběr? "
  
@@@ -1635,119 -1275,89 +1643,119 @@@ msgstr "není vyžadováno
  msgid "forced"
  msgstr "vyžadováno"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr "Chyba: V současné verzi je povolenou pouze plain ASCII.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "Chyba: Znak „<“ nelze použít.\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "Chyba: Více mezer není povoleno.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "Příjmení držitele karty: "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "Jméno (křestní) držitele karty: "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr "Chyba: jméno a příjmení je příliš dlouhé (limit je %d znaků).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "URL pro získání veřejného klíče: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Chyba: URL je příliš dlouhé (limit je %d znaků).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "chyba při čtení „%s“: %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "chyba při zápisu do „%s“: %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "Login (jménu účtu): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr "Chyba: Login je příliš dlouhý (limit je %d znaků).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "Privátní DO data: "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr "Chyba: Privátní DO je příliš dlouhé (limit je %d znaků).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "Jazykové předvolby: "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
  msgstr "Chyba: neplatná délka řetězce s předvolbami.\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
  msgstr "Chyba: neplatný znak v řetězci s předvolbami\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "Zadejte pohlaví: M – mužské, F – ženské, nebo stiskněte mezerník: "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
  msgstr "Chyba: neplatná odpověď.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "Otisk CA: "
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "Chyba: chybně utvořené otisk.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "operace s klíčem není možná: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "toto není OpenPGP karta"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "chyba při získání informací o aktuálním klíči: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr "Přepsat existující klíč? (a/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
@@@ -1758,55 -1368,43 +1766,55 @@@ msgstr "
  "dokumentace\n"
  "          své karty, kde se dozvíte, jaké velikosti jsou dovoleny.\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Jakou délku klíče pro podepisování si přejete? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "Jakou délku klíče pro šifrování si přejete? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Jakou délku klíče pro autentizaci si přejete? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "zaokrouhleno na %u bitů\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "velikost klíče %s musí být v intervalu %u-%u\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr "Karta bude nyní přenastavena na generování klíče dlouhého %u bitů\n"
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "chyba při změně velikosti klíče %d na %u bitů: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr "Vytvořit zálohu šifrovacího klíče mimo kartu? (A/n) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  msgid "Note: keys are already stored on the card!\n"
  msgstr "Poznámka: na kartě jsou již klíče uloženy!\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr "Přepsat existující klíče? (a/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1817,139 -1415,104 +1825,139 @@@ msgstr "
  "   PIN = „%s“     PIN administrátora = „%s“\n"
  "Měli byste je změnit příkazem --change-pin\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "Prosím, vyberte druh klíče, který chcete generovat:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "   (1) Podepisovací klíč\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) Šifrovací klíč\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Autentizační klíč\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Neplatný výběr.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "Prosím vyberte místo pro uchování klíče:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "Volání KEYTOCARD selhalo: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  msgid "This command is not supported by this card\n"
  msgstr "Tento příkaz není touto kartou podporován\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "Poznámka: Tento příkaz zničí všechny klíče uložené na kartě!\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  msgid "Continue? (y/N) "
  msgstr "Pokračovat (a/N) "
  
  # The code expects non-localized "yes"
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr "Opravdu obnovit tovární nastavení (zadejte „yes“) "
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "ukončit toto menu"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
  msgstr "zobraz administrátorské příkazy"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "ukázat tuto pomoc"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "vypiš všechna dostupná data"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "změní jméno majitele karty"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "změní URL pro získání klíče"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "získá klíč specifikovaný v URL karty"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "změnit login name"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "změnit jazykové předvolby"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "změní pohlaví držitele karty"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "vypsat otisk certifikační autority"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr "zapnout/vypnout požadování PINu při každé self-sign operaci"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "vytvořit nový pár klíčů"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "nabídka pro změnu anebo odblokování PINu"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "ověř PIN a vypiš všechna data"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr "odblokovat PIN pomocí resetačního kódu"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr "zničit všechny klíče a data"
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr "gpg/karta> "
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "pouze administrátorské příkazy\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "administrátorské příkazy jsou povoleny\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "administrátorské příkazy nejsou povoleny\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Neplatný příkaz (zkuste „help“)\n"
  
@@@ -1957,22 -1519,14 +1965,22 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output pro tento příkaz není platný\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "„%s“ nelze otevřít\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "klíč „%s“ nenalezen: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "chyba při čtení bloku klíče: %s\n"
@@@ -2088,7 -1620,6 +2096,7 @@@ msgstr "vyžádaná symetrická šifra 
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s zašifrovaný pro: „%s“\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "použití %s není v módu %s dovoleno\n"
@@@ -2167,57 -1683,43 +2175,57 @@@ msgstr "VAROVÁNÍ: nelze smazat dočas
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "VAROVÁNÍ: nelze smazat dočasný adresář „%s“: %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
  msgstr "exportovat podpisy, které jsou označeny jako jen místní (local-only)"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr "exportovat atributy uživatelských ID (obecně ID fotografií)"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "exportovat revokační klíče označené jako „citlivé“"
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "odstranit nepoužitelné části z klíče při exportu"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "odstranit při exportu z klíče vše, co lze"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  msgid " - skipped"
  msgstr " – přeskočeno"
  
  # g10/import.c:766 g10/openfile.c:261#, c-format
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "zapisuje se do „%s“\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "klíč %s: tělo klíče je na kartě – přeskočeno\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "exportování tajného klíče není povoleno\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "klíč %s: PGP 2.x klíč – přeskočeno\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "chyba při vytváření „%s“: %s\n"
@@@ -2226,8 -1727,6 +2234,8 @@@
  msgid "[User ID not found]"
  msgstr "[ID uživatele nenalezeno]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, c-format
  msgid "(check argument of option '%s')\n"
  msgstr "(zkontrolujte argument volby „%s“)\n"
@@@ -2254,209 -1750,160 +2262,209 @@@ msgstr "chyba při zavírání chyba %s
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "chyba při prohledávání souboru klíčů (keyring): %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "„%s“ automaticky získáno přes %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "chyba při získávání „%s“ přes %s: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "Chybí otisk"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "tajný klíč „%s“ nenalezen: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "using \"%s\" as default secret key\n"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "jako výchozí tajný klíč se použije „%s“\n"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "using \"%s\" as default secret key\n"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "jako výchozí tajný klíč se použije „%s“\n"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
  # c-format
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr "Neplatný klíč %s změněn na platný pomocí --always-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "používám podklíč %s místo primárního klíče %s\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "vytvořit podpis"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
  msgstr "vytvořit podpis v čitelném dokumentu"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "vytvořit podpis oddělený od dokumentu"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "šifrovat data"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "šifrování pouze se symetrickou šifrou"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "dešifrovat data (implicitně)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verifikovat podpis"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "vypsat seznam klíčů"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "vypsat seznam klíčů a podpisů"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "vypsat a zkontrolovat podpisy klíčů"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "vypsat seznam klíčů a otisků"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "vypsat seznam tajných klíčů"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "vytvořit nový pár klíčů"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  msgid "quickly generate a new key pair"
  msgstr "rychle vytvořit nový pár klíčů"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  msgid "quickly add a new user-id"
  msgstr "rychle přidat novou identitu uživatele"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "quickly add a new user-id"
  msgid "quickly revoke a user-id"
  msgstr "rychle přidat novou identitu uživatele"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr "komplexní vytvoření páru klíčů"
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "vytvořit revokační certifikát"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "odstranit klíč ze souboru veřejných klíčů"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "odstranit klíč ze souboru tajných klíčů"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  msgid "quickly sign a key"
  msgstr "rychle podepsat klíč"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  msgid "quickly sign a key locally"
  msgstr "rychle lokálně podepsat klíč"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "podepsat klíč"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "podepsat klíč lokálně"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "podepsat nebo modifikovat klíč"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
  msgstr "změnit heslo"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "exportovat klíče"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "exportovat klíče na server klíčů"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "importovat klíče ze serveru klíčů"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "vyhledat klíče na serveru klíčů"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "aktualizovat všechny klíče ze serveru klíčů"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "importovat/sloučit klíče"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "vytisknout stav karty"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "změnit data na kartě"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "změnit PIN karty"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "aktualizovat databázi důvěry"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
  msgstr "vypsat hash zprávy"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "pracovat v režimu serveru"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  #, fuzzy
  #| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
  msgid "|VALUE|set the TOFU policy for a key"
@@@ -2464,43 -1911,33 +2472,43 @@@ msgstr "
  "|HODNOTA|nastavit TOFU politiku klíči (good [dobrý], unknown [neznámý], bad "
  "[špatný], ask [zeptat se], auto)"
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "vytvoř výstup zakódovaný pomocí ASCII"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  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:535
++#: g10/gpg.c:539
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "použít kanonický textový mód"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
  msgstr "|SOUBOR|zapsat výstup do SOUBORU"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "neprovádět žádné změny"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "vyžádat potvrzení před přepsáním"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr "použít chování striktně podle OpenPGP"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2508,7 -1945,6 +2516,7 @@@ msgstr "
  "@\n"
  "(Pro kompletní seznam všech příkazů a možností použijte manuálové stránky.)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2526,11 -1962,9 +2534,11 @@@ msgstr "
  " --list-keys [jména]        vypsat klíče\n"
  " --fingerprint [jména]      vypsat otisky\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2540,7 -1974,6 +2548,7 @@@ msgstr "
  "Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
  "Výchozí operace závisí na vstupních datech.\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2548,78 -1981,63 +2556,78 @@@ msgstr "
  "\n"
  "Podporované algoritmy:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "Veřejný klíč: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Šifra: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Komprese: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "použití: %s [přepínače] %s\n"
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "konfliktní příkazy\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "no = podpis nalezen v definici skupiny „%s“\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr ""
  "VAROVÁNÍ: vlastnictví domovského adresáře „%s“ není nastaveno bezpečně\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr ""
  "VAROVÁNÍ: vlastnictví konfiguračního souboru „%s“ není nastaveno bezpečně\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr ""
  "VAROVÁNÍ: vlastnictví rozšiřujícího modulu „%s“ není nastaveno bezpečně\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "VAROVÁNÍ: přístupová práva pro domovský adresář „%s“ nejsou bezpečná\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr ""
  "VAROVÁNÍ: přístupová práva pro konfigurační soubor „%s“ nejsou bezpečná\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "VAROVÁNÍ: přístupová práva rozšiřujícímu modulu „%s“ nejsou bezpečná\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr ""
  "VAROVÁNÍ: vlastnictví adresáře s domovským adresářem „%s“ není nastaveno "
  "nebezpečně\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2627,21 -2045,18 +2635,21 @@@ msgstr "
  "VAROVÁNÍ: vlastnictví adresáře „%s“ s konfiguračním souborem není nastaveno "
  "nebezpečně\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr ""
  "VAROVÁNÍ: vlastnictví adresáře „%s“ s rozšiřujícím modulem není nastaveno "
  "nebezpečně\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr ""
  "VAROVÁNÍ: přístupová práva k adresáři „%s“ s domovským adresářem nejsou "
  "nastavena bezpečně\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2649,7 -2064,6 +2657,7 @@@ msgstr "
  "VAROVÁNÍ: přístupová práva k adresáři „%s“ s konfiguračním souborem nejsou "
  "nastavena bezpečně\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr ""
@@@ -2657,514 -2071,405 +2665,522 @@@
  "nastavena bezpečně\n"
  
  # c-format
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "neznámá konfigurační položka „%s“\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "zobrazovat ID fotografií během výpisu klíčů"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  msgid "show key usage information during key listings"
  msgstr "ukazovat údaje o účelu klíče při výpisu klíčů"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr "ukazovat URL politik během výpisu podpisů"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "ukazovat všechny poznámky během výpisu podpisů"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  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:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  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:1905
++#: g10/gpg.c:1913
  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:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "ukazovat název souboru s klíči při výpisu klíčů"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "ukazovat data expirace během výpisu podpisů"
  
- #: g10/gpg.c:2011
- msgid "available TOFU policies:\n"
- msgstr "dostupné politiky TOFU:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "valid values for option '%s':\n"
+ msgstr "neplatný argument u volby „%.50s“\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "neznámá TOFU politika „%s“\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr "(možnosti lze vypsat příkazem „help“)\n"
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "invalid value for option '%s'\n"
+ msgstr "neplatný argument u volby „%.50s“\n"
+ 
++#: g10/gpg.c:2203
  #, 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:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, 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:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "„%s“ není platná doba expirace podpisu\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "řádek %d: neplatná e-mailová adresa\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "neplatný režim pinentry „%s“\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "„%s“ není platná znaková sada\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "nelze zpracovat URL serveru klíčů\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: neplatný parametr pro server klíčů\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "neplatný parametr pro server klíčů\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: neplatný parametr pro import\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "neplatný parametr pro import\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "neplatný parametr pro výpis\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: neplatný parametr pro export\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "neplatný parametr pro export\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: neplatný parametr pro výpis\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "neplatný parametr pro výpis\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "zobrazovat ID fotografií při ověřování podpisu"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr "ukazovat URL politik při ověřování podpisu"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "ukazovat všechny poznámky při ověřování podpisu"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  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:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
  msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  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:3111
++#: g10/gpg.c:3206
  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:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "ověřovat podpisy s daty PKA"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: neplatný parametr pro ověření\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "neplatný parametr pro ověření\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "nelze nastavit exec-path na %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: neplatný seznam auto-key-locate\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr "neplatný seznam auto-key-locate\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "VAROVÁNÍ: %s přepíše %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "Není dovoleno používat %s s %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s nedává s %s smysl!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr "VAROVÁNÍ: pracuji s podvrženým systémovým časem: "
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, 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:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "vybraný šifrovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "vybraný hashovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "vybraný kompresní algoritmus je neplatný\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "vybraný hashovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  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:3584
++#: g10/gpg.c:3682
  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:3586
++#: g10/gpg.c:3684
  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:3588
++#: g10/gpg.c:3686
  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:3590
++#: g10/gpg.c:3688
  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:3593
++#: g10/gpg.c:3691
  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:3597
++#: g10/gpg.c:3695
  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:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "neplatné implicitní předvolby\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "neplatné uživatelské předvolby pro šifrování\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "neplatné uživatelské předvolby pro hashování\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "neplatné uživatelské předvolby pro komprimaci\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s dosud není funkční s %s\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, 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 není dovoleno\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, 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 není dovoleno\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "použití kompresního algoritmu „%s“ v módu %s není dovoleno\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "nemohu inicializovat databázi důvěry: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  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:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [jméno souboru]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [jméno souboru]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [jméno souboru]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [jméno souboru]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  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:3918
++#: g10/gpg.c:4021
  #, 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:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [jméno souboru]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [jméno souboru]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [jméno souboru]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  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:3978
++#: g10/gpg.c:4081
  #, 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:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [jméno souboru]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [jméno souboru]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [jméno souboru]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key id_uživatele"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key id_uživatele"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key id_uživatele [příkazy]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
  msgstr "--passwd <id-uživatele>"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "odeslání na keyserver se nezdařilo: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "export klíče se nepodařil: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "export klíče se nepodařil: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "dekódování z ASCII formátu selhalo: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "kódování do ASCII formátu selhalo: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "neplatný hashovací algoritmus „%s“\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "chyba při rozboru názvu klíče „%s“: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr "„%s“ nevypadá jako platné ID klíče, otisk klíče nebo keygrip\n"
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[jméno souboru]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Začněte psát svou zprávu…\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "zadané URL pro certifikační politiku je neplatné\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "zadané URL pro podepisovací politiku je neplatné\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|SOUBOR|brát klíče z klíčenky (keyringu) SOUBOR"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "pouze varování při konfliktu časového razítka"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|zapsat informace o stavu do tohoto FD"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Použití: gpg [volby] [soubory] (-h pro pomoc)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3181,135 -2484,107 +3197,135 @@@ msgstr "Nápověda není k dispozici
  msgid "No help available for '%s'"
  msgstr "Pro „%s“ není dostupná žádná nápověda"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr "importovat podpisy, které jsou označeny jen jako místní"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr "opravit poškození vzniklá při importu z PKS serveru"
  
- #: g10/import.c:144
++#: g10/import.c:157
  msgid "do not clear the ownertrust values during import"
  msgstr "nemazat údaje o důvěře během importu"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "neaktualizovat databázi důvěry po importu"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "vypsat otisk klíče"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr "přijímat aktualizace pouze u existujících klíčů"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
  msgstr "odstranit z klíče po importu nepoužitelné části"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "odstranit po importu z klíče vše, co lze"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "blok typu %d byl přeskočen\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu klíče byly doposud zpracovány\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Celkový počet zpracovaných klíčů: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "           přeskočeny klíče PGP2: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "           přeskočeny nové klíče: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "                bez ID uživatele: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                     importováno: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                       beze změn: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "               nové ID uživatelů: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "                   nové podklíče: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "                    nové podpisy: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "             nové revokace klíčů: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "            přečtené tajné klíče: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "         importované tajné klíče: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "           tajné klíče nezměněny: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "                   neimportováno: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "              odstraněné podpisy: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "       odstraněné uživatelské ID: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3318,189 -2593,151 +3334,189 @@@ msgstr "
  "VAROVÁNÍ: klíč %s obsahuje předvolby pro nedostupné\n"
  "algoritmy na těchto ID uživatelů:\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": předvolby pro šifrovací algoritmus %s\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": předvolby pro podepisovací algoritmus %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": předvolby pro komprimační algoritmus %s\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "velmi doporučujeme aktualizaci nastavení vašich preferencí a\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "distribuci tohoto klíče aby jste předešel problémům s neshodou algoritmů\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr "nelze aktualizovat předvolby s: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "klíč %s: chybí identifikátor uživatele\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, c-format
  msgid "key %s: %s\n"
  msgstr "klíč %s: %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr "zamítnut kontrolou při importu"
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "klíč %s: poškození PKS podklíče opraveno\n"
  
  # c-format
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "klíč %s: přijat id uživatele \"%s\",který není podepsán jím samým\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "klíč %s: chybí platný identifikátor uživatele\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "může to být způsobeno chybějícím podpisem klíče jím samým\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "klíč %s: veřejný klíč nenalezen: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "klíč %s: nový klíč - přeskočen\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "nenalezen zapisovatelný soubor klíčů (keyring): %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "chyba při zápisu souboru klíčů (keyring) „%s“: %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "klíč %s: veřejný klíč „%s“ importován\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "klíč %s: neodpovídá naší kopii\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "klíč %s: nemohu najít originální blok klíče: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "klíč %s: nemohu číst originální blok klíče: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "klíč %s: „%s“ 1 nový identifikátor uživatele\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "klíč %s: „%s“ %d nových identifikátorů uživatele\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "klíč %s: „%s“ 1 nový podpis\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "klíč %s: „%s“ %d nových podpisů\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "klíč %s: „%s“ 1 nový podklíč\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "klíč %s: „%s“ %d nových podklíčů\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "klíč %s: „%s“ %d ID uživatele odstraněno\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "klíč %s: „%s“ %d ID uživatele odstraněno\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "klíč %s: „%s“ beze změn\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "klíč %s: tajný klíč importován\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "klíč %s: tajný klíč již existuje\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "klíč %s: chyba při odesílání dat agentovi: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "tajný klíč %s: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "import tajných klíčů není povolen\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "klíč %s: tajný klíč s neplatnou šifrou %d – přeskočeno\n"
@@@ -3515,174 -2752,140 +3531,174 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr "Pro migraci „%s“ u každé karty spusťte: %s\n"
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "klíč %s: chybí veřejný klíč – nemohu aplikovat revokační certifikát\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "klíč %s: neplatný revokační certifikát: %s – zamítnuto\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "klíč %s: „%s“ revokační certifikát importován\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "klíč %s: neexistuje id uživatele pro podpis\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "klíč %s: nepodporovaný algoritmus veřejného klíče u uživatelského ID „%s“\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "klíč %s neplatný podpis klíče jím samým u uživatelského ID „%s“\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "klíč %s: neplatný podpis klíče jím samým (direct key signature)\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "klíč %s: neexistuje podklíč pro vázání klíčů\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "klíč %s: neplatná vazba podklíče\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "klíč %s: smazána vícenásobná vazba podklíče\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "klíč %s: neexistuje podklíč pro revokaci klíče\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "klíč %s: neplatný revokační podklíč\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "klíč %s: smazána vícenásobná revokace podklíče\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "klíč %s: přeskočen identifikátor uživatele „%s“\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "klíč %s: podklíč přeskočen\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "klíč %s: podpis není exportovatelný (třída %02X) - přeskočeno\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "klíč %s: revokační certifikát na špatném místě - přeskočeno \n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "klíč %s: neplatný revokační certifikát: %s - přeskočen\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "klíč %s: podpis podklíče na špatném místě - přeskočeno \n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "klíč %s: neočekávaná podpisová třída (0x%02X) - přeskočeno\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "klíč %s: objeven duplikovaný identifikátor uživatele - sloučen\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "VAROVÁNÍ: klíč %s může být revokován: zkouším získat revokační klíč %s\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "VAROVÁNÍ: klíč %s může být revokován: revokační klíč %s nenalezen.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "klíč %s: „%s“ přidán revokační certifikát\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "klíč %s: podpis klíče jím samým (direct key signature) přidán\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "chyba při vytváření schránky na klíče (keybox) „%s“: %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, c-format
  msgid "error creating keyring '%s': %s\n"
  msgstr "chyba při vytváření souboru klíčů (keyring) „%s“: %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, c-format
  msgid "keybox '%s' created\n"
  msgstr "schránka na klíče (keybox) „%s“ vytvořena\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, c-format
  msgid "keyring '%s' created\n"
  msgstr "soubor klíčů (keyring) „%s“ vytvořen\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "zdroj bloku klíče „%s“: %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, c-format
  msgid "error opening key DB: %s\n"
  msgstr "chyba při otevírání databáze klíčů: %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "selhalo obnovení vyrovnávací paměti klíčů: %s\n"
@@@ -3695,32 -2896,31 +3711,38 @@@ msgstr "[revokace]
  msgid "[self-signature]"
  msgstr "[podpis klíče jím samým]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "chyba při alokování paměti: %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "karta nepodporuje hashovací algoritmus %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "Dobrý podpis od"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  #| msgid "key %s: %s\n"
  msgid "key %s:\n"
  msgstr "klíč %s: %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3729,7 -2929,6 +3751,7 @@@ msgstr[0] "Uživatelské ID „%s“: %
  msgstr[1] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
  msgstr[2] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3738,7 -2937,6 +3760,7 @@@ msgstr[0] "1 podpis neověřen, protož
  msgstr[1] "1 podpis neověřen, protože chybí klíč\n"
  msgstr[2] "1 podpis neověřen, protože chybí klíč\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3747,7 -2945,6 +3769,7 @@@ msgstr[0] "%d špatných podpisů\n
  msgstr[1] "%d špatných podpisů\n"
  msgstr[2] "%d špatných podpisů\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3756,14 -2953,12 +3778,14 @@@ msgstr[0] "Dobrý podpis od
  msgstr[1] "Dobrý podpis od"
  msgstr[2] "Dobrý podpis od"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3775,17 -2970,14 +3797,17 @@@ msgstr "
  "kontrolou otisků z různých zdrojů…)?\n"
  "\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = Důvěřuji částečně\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = Důvěřuji úplně\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3795,52 -2987,40 +3817,52 @@@ msgstr "
  "Hloubka větší než 1 umožňuje klíčům, které jste podepsal\n"
  "podepsat jiný klíč, který bude pro Vás důvěryhodný.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Prosím vložte doménu, pro kterou je podpis omezen nebo stiskněte enter pro "
  "podpis bez omezení na doménu.\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr "Přeskakuje se ID uživatele „%s“, což není textové ID.\n"
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Uživatelské ID „%s“ je revokováno."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Jste si jistý(á), že stále chcete podepsat tento klíč? (a/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  Nelze podepsat.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Vypršela platnost uživatelského ID „%s“."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "ID uživatele „%s“ není podepsáno jím samým."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "ID uživatele „%s“ je připraveno k podpisu."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
  msgstr "Podepsat? (a/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3849,11 -3029,9 +3871,11 @@@ msgstr "
  "Podpis klíče „%s“ jím samým je\n"
  "podpis formátu PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Přejete si jej změnit na formát OpenPGP? (a/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3862,13 -3040,11 +3884,13 @@@ msgstr "
  "Platnost vašeho podpisu na „%s“\n"
  "vypršela.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Chcete vytvořit nový podpis a nahradit jím ten, jehož platnost vypršela? (a/"
  "N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3877,43 -3053,34 +3899,43 @@@ msgstr "
  "Váš současný podpis na „%s“\n"
  "je pouze lokální.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Přejete si jej změnit na plně exportovatelný podpise? (a/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "„%s“ je již lokálně podepsán klíčem %s\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "„%s“ je již podepsán klíčem %s\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Chcete klíč přesto znova podepsat? (a/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nic k podepsání klíčem %s\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "Platnost klíče vypršela!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Platnost klíče vyprší %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Chcete, aby platnost Vašeho podpisu vypršela ve stejnou dobu? (A/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3923,31 -3090,25 +3945,31 @@@ msgstr "
  "patří výše uvedené osobě.\n"
  "Pokud neznáte odpověď, zadejte „0“.\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Neodpovím.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Částečně jsem to ověřil(a).%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Velmi pečlivě jsem to ověřil(a).%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Váš výběr? (pro podrobnosti zadejte „?“): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3956,221 -3117,167 +3978,221 @@@ msgstr "
  "Jste si jistý(á), že chcete podepsat tento klíč\n"
  "svým klíčem „%s“ (%s)\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
  msgstr "Jedná se o podpis klíče jím samým.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "VAROVÁNÍ: podpis nebude označen jako neexportovatelný.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "VAROVÁNÍ: podpis nebude označen jako neodvolatelný (non-revocable).\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Podpis bude označen jako neexportovatelný.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Podpis bude označen jako neodvolatelný (non-revocable).\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "Nijak jsem tento klíč neověřil.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "Částečně jsem ověřil tento klíč.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "Velmi pečlivě jsem ověřil tento klíč.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
  msgstr "Skutečně podepsat? (a/N) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "podepsání selhalo: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "K dispozici je jen kontrolní součet klíče nebo je klíč na kartě - passphrase "
  "nelze změnit.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "klíč %s: chyba při měnění hesla: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "uložit a ukončit"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "vypsat otisk klíče"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  msgid "show the keygrip"
  msgstr "ukázat keygrip"
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "vypsat seznam klíčů a id uživatelů"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "vyberte identifikátor uživatele N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "vyberte podklíč N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "kontrolovat podpisy"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "podepsat vybrané ID uživatele [* níže jsou uvedeny relevantní příkazy]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "podepsat vybrané uživatelské ID lokálně"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "podepsat vybrané uživatelské ID důvěryhodným podpisem"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "podepsat vybraná uživatelská ID neodvolatelným podpisem"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "přidat identifikátor uživatele"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "přidat fotografický ID"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "smazat vybrané ID uživatele"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "přidat podklíč"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "přidat klíč na kartu"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "přesunout klíč na kartu"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "přesunout záložní klíč na kartu"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "smazat vybrané podklíče"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "přidat revokační klíč"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "smazat podpisy z vybraných uživatelských ID"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "změnit datum expirace pro klíč nebo vybrané podklíče"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "označit vybrané uživatelské ID jako primární"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "vypsat seznam předvoleb (pro experty)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "vypsat seznam předvoleb (podrobně)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "nastavit sadu preferencí pro vybrané uživatelské ID"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "nastavit URL preferovaného serveru klíčů pro vybraná uživatelská ID"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
  msgstr "zadat poznámku pro vybraná uživatelská ID"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "změnit heslo"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "změnit důvěryhodnost vlastníka klíče"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "revokovat podpisu na vybraných uživatelských ID"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "revokovat vybrané uživatelské ID"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "revokovat klíč nebo vybrané podklíče"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "nastavit klíč jako platný (enable)"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "nastavit klíč jako neplatný (disable)"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "ukázat vybrané fotografické ID"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "směstnat nepoužitelná ID uživatelů a odstranit z klíče nepoužitelné podpisy"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr "směstnat nepoužitelná ID uživatelů a odstranit z klíče všechny podpisy"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "Tajný klíč je dostupný.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Pro provedení této operace je potřeba tajný klíč.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4181,258 -3288,199 +4203,258 @@@ msgstr "
  "  s „t“ pro důvěryhodný podpis (tsign) nebo „nr“ pro neodvolatelný\n"
  "  podpis (nrsign) nebo libovolnou jejich kombinací (ltsign, tnrsign, atd.).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "Klíč revokován."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Opravdu podepsat všechny id uživatele? (a/N) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Opravdu podepsat všechna textová ID uživatele? (a/N) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Nápověda: Vyberte id uživatele k podepsání\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "Neznámý typ podpisu „%s“\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Tento příkaz není v módů %s dovolený.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Musíte vybrat alespoň jeden id uživatele.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr "(Použijte příkaz „%s“.)\n"
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Nemůžete smazat poslední id uživatele!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Opravdu odstranit všechny vybrané id uživatele? (a/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
  msgstr "Opravdu odstranit tento id uživatele? (a/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
  msgstr "Opravdu přesunout primární klíč? (a/N) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "Musíte vybrat právě jeden klíč.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "Příkaz očekává jméno souboru jako argument\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "Nelze otevřít „%s“: %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Chyba při čtení záložního klíče z „%s“: %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Musíte vybrat alespoň jeden klíč.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Opravdu chcete smazat vybrané klíče? (a/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Opravdu chcete smazat tento klíč? (a/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Opravdu revokovat všechny vybrané id uživatele? (a/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Opravdu revokovat tento id uživatele? (a/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Opravdu chcete revokovat celý klíč? (a/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Opravdu chcete revokovat vybrané podklíče? (a/N) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Opravdu chcete revokovat tento podklíč? (a/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Důvěryhodnost vlastníka nelze měnit je-li používána databáze důvěry "
  "poskytnutá uživatelem\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "Nastavit seznam předvoleb:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Opravdu aktualizovat předvolby pro vybraný id uživatele? (a/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
  msgstr "Opravdu aktualizovat předvolby? (a/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
  msgstr "Uložit změny? (a/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
  msgstr "Ukončit bez uložení? (a/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "aktualizace selhala: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  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:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Vytvoření klíče se nepodařilo: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "„%s“ není otisk\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "„%s“ není primární otisk\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "read error in '%s': %s\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "chyba při čtení v „%s“: %s\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "No matching user IDs."
  msgstr "Žádný identifikátor uživatele neodpovídá."
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "Nothing to sign.\n"
  msgstr "Nic na podepsání.\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Hash: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Vlastnosti: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "Keyserver bez modifikace"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Preferovaný keyserver: "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "Poznámky: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "V %s byl následující klíč revokován %s klíčem %s\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, 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:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(citlivá informace)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "vytvořen: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "revokován: %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "platnost skončila: %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "platnost skončí: %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "použití: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "číslo karty: "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "důvěra: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "platnost: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Tento klíč byl označen za neplatný (disabled)"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4441,17 -3489,12 +4463,18 @@@ msgstr "
  "být nutně správné, dokud znova nespustíte program.\n"
  
  # status
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "odvolán"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "platnost skončila"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4459,15 -3502,12 +4482,15 @@@ 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:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "POZOR: Vašemu šifrovacímu podklíči brzy vyprší platnost.\n"
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  msgid "You may want to change its expiration date too.\n"
  msgstr "Dobu platnosti také můžete změnit.\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4476,35 -3516,27 +4499,35 @@@ 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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  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:4298
++#: g10/keyedit.c:4311
  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:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Takový identifikátor uživatele již u tohoto klíče existuje!\n"
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Smazat tento dobrý podpis? (a/N/u)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Smazat tento neplatný podpis? (a/N/u)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Smazat tento neznámý podpis? (a/N/u)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4513,20 -3545,16 +4536,20 @@@ msgstr[0] "Smazán %d podpis.\n
  msgstr[1] "Smazán %d podpis.\n"
  msgstr[2] "Smazán %d podpis.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Nic nebylo smazáno.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "neplatný"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4535,17 -3563,14 +4558,17 @@@ msgstr[0] "Uživatelské ID „%s“: %
  msgstr[1] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
  msgstr[2] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Uživatelské ID „%s“: je již minimalizované\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Uživatelské ID „%s“: je již odstraněné\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4554,265 -3579,206 +4577,265 @@@ 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:4585
++#: g10/keyedit.c:4601
  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:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Vložte identifikátor uživatele pověřeného revokací: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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:4642
++#: g10/keyedit.c:4658
  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:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
  msgstr "tento klíč již byl pověřen revokací\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  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:4688
++#: g10/keyedit.c:4704
  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:4739
++#: g10/keyedit.c:4755
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
  msgstr "Jste si jistí, že chcete změnit dobu expirace více podklíčům? (a/N) "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Měním dobu expirace podklíče.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Měním dobu expirace primárního klíče.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  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:4971
++#: g10/keyedit.c:4987
  #, 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:4977
++#: g10/keyedit.c:4993
  #, 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:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Prosím, vyberte právě jeden id uživatele .\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, 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:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "Vložte URL preferovaného serveru klíčů: "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  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:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "Vložte poznámku: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
  msgstr "Pokračovat (a/N)? "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Neexistuje uživatelské ID s hashem %s\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Neexistuje podklíč s ID klíče „%s“.\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Neexistuje podklíč s indexem %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID uživatele: „%s“\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (neexportovatelné)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Platnost podpisu vyprší %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  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:6005
++#: g10/keyedit.c:6021
  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:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr "Nepodepsáno vámi.\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, 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:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (neodvolatelné)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, 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:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Chystáte se revokovat tyto podpisy:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Opravdu vytvořit revokační certifikáty? (a/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "neexistuje tajný klíč\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "uživatelské ID „%s“ je již revokováno\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Klíč %s je již revokován.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Podklíč %s je již revokován.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Zobrazuji %s fotografický ID o velikosti %ld pro klíč %s (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "duplicita předvolby „%s“\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "příliš mnoho předvoleb pro šifrování\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "příliš mnoho předvoleb pro vzorkování\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
  msgstr "příliš mnoho předvoleb pro komprimaci\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "neplatná položka „%s“ v řetězci s předvolbami\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "zapisuji podpis klíče jím samým (direct signature)\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "zapisuji podpis klíče sebou samým\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "zapisuji „key-binding“ podpis\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "neplatná délka klíče; použiji %u bitů\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "délka klíče zaokrouhlena na %u bitů\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "VAROVÁNÍ: některé OpenPGP programy nedokáží zacházet s DSA klíčem s takto "
  "dlouhým hashem\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "Podepisování"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "Certifikování"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "Šifrování"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "Autentizace"
  
@@@ -4826,150 -3792,119 +4849,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Pro klíč %s lze provést: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "Aktuálně povolené akce: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Zapnout/vypnout schopnost šifrovat\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Konec\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Prosím, vyberte druh klíče, který chcete:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA a RSA (implicitní)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA a Elgamal\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (pouze pro podpis)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (pouze pro podpis)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (pouze pro šifrování)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (pouze pro šifrování)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (nastavit si vlastní použití)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (nastavit si vlastní použití)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC a ECC\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (pouze pro podpis)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (nastavit si vlastní použití)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (pouze pro šifrování)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) Existující klíč\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Vložte keygrip: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Není platným keygripem (očekáváno 40 šestnáctkových číslic)\n"
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Klíč s takovým keygripem neexistuje\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "zaokrouhleno na %u bitů\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "klíč %s může mít délku v intervalu %u až %u bitů.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Jakou délku podklíče si přejete? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Jakou délku klíče si přejete? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Požadovaná délka klíče je %u bitů.\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Prosím, vyberte, kterou eliptickou křivku chcete:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4985,7 -3920,6 +5008,7 @@@ msgstr "
  "      <n>m = doba platnosti klíče skončí za n měsíců\n"
  "      <n>y = doba platnosti klíče skončí za n let\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5001,38 -3935,30 +5024,38 @@@ msgstr "
  "      <n>m = doba platnosti podpisu skončí za n měsíců\n"
  "      <n>y = doba platnosti podpisu skončí za n let\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "Klíč je platný pro? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Podpis je platný pro? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "neplatná hodnota\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "Platnost klíče nikdy neskončí\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "Platnost podpisu nikdy neskončí\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Platnost klíče skončí v %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Platnost podpisu skončí v %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5040,11 -3966,9 +5063,11 @@@ msgstr "
  "Váš systém neumí zobrazit data po roce 2038.\n"
  "V každém případě budou data korektně zpracovávána do roku 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "Je to správně (a/N)? "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5059,7 -3983,6 +5082,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5075,49 -3998,38 +5098,49 @@@ msgstr "
  "    „Magda Prochazkova (student) <magda at domena.cz>“\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Jméno a příjmení: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Neplatný znak ve jméně\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "Znaky „%s“ a „%s“ se ve jméně nesmí objevit\n"
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "Jméno nemůže začínat číslicí\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "Jméno musí být dlouhé alespoň 5 znaků\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "E-mailová adresa: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "Neplatná e-mailová adresa\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Komentář: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Neplatný znak v komentáři\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Používáte znakovou sadu „%s“.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5128,7 -4040,6 +5151,7 @@@ msgstr "
  "    „%s“\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Do pole jméno nebo komentář nepište, prosím, e-mailovou adresu.\n"
  
@@@ -5143,33 -4054,26 +5166,33 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "jJkKeEPpUu"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Změnit (J)méno, (K)omentář, (E)-mail nebo (U)končit? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
  "Změnit (J)méno, (K)omentář, (E)-mail, (P)okračovat dál nebo (U)končit "
  "program? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Změnit (J)méno, (E)-mail nebo (U)končit? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Změnit (J)méno, (E)-mail, (P)okračovat dál nebo (U)končit? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Nejdřív, prosím, opravte chybu\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5182,13 -4086,10 +5205,13 @@@ msgstr "
  "používat disky); díky tomu má generátor lepší šanci získat dostatek "
  "entropie.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Vytvoření klíče se nepodařilo: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5199,62 -4100,49 +5222,62 @@@ msgstr "
  "    „%s“\n"
  "\n"
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr "Pokračovat (A/n) "
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Klíč pro „%s“ již existuje\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  msgid "Create anyway? (y/N) "
  msgstr "Přesto vytvořit? (a/N) "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  msgid "creating anyway\n"
  msgstr "přesto se vytváří\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr "Poznámka: Pro komplexní tvorbu klíče použijte „%s %s“.\n"
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "Vytváření klíče bylo zrušeno.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "záložní soubor „%s“ nelze vytvořit: %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "Poznámka: záloha klíče z karty uložena do „%s“\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "veřejný klíč se zapisuje do „%s“\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "nenalezen zapisovatelný soubor veřejných klíčů (pubring): %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "chyba při zápisu do souboru veřejných klíčů „%s“: %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "veřejný a tajný klíč byly vytvořeny a podepsány.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5262,7 -4150,6 +5285,7 @@@ msgstr "
  "Tento klíč nemůže být použitý pro šifrování. K vytvoření\n"
  "sekundárního klíče pro tento účel můžete použít příkaz „--edit-key“.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5270,7 -4157,6 +5293,7 @@@ msgstr "
  "klíč byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
  "je problém se systémovým časem)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5278,23 -4164,18 +5301,23 @@@ msgstr "
  "klíč byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
  "je problém se systémovým časem)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "Poznámka: vytvoření podklíčů pro klíče v3 není v souladu s OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Tajné části primárního klíče nejsou dostupné.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Tajná část primárního klíče jsou uloženy na kartě.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
  msgstr "Opravdu vytvořit? (a/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "nikdy     "
  
@@@ -5349,29 -4221,23 +5372,29 @@@ msgstr[2] "Pozor: %lu klíč(ů) přesk
  msgid "Keyring"
  msgstr "Soubor klíčů (keyring)"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Otisk primárního klíče:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "         Otisk podklíče:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr "  Otisk primárního klíče:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "          Otisk podklíče:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "          Otisk klíče ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr "  Sériové číslo karty ="
  
@@@ -5412,53 -4273,41 +5435,53 @@@ msgstr[2] "1 špatný podpis\n
  msgid "%s: keyring created\n"
  msgstr "%s: soubor klíčů (keyring) vytvořen\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr "přebít nastavení proxy pro dirmngr"
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr "zahrnout do výsledku hledání odvolané klíče"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr "zahrnout podklíče, když se hledá podle ID klíče"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr "přebít nastavení časového limitu pro dirmngr"
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr "automaticky získávat klíče při ověřování podpisů"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "respektovat URL upřednostňovaných serverů klíčů daného klíče"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr "respektovat PKA záznamy klíče při získávání klíčů"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "zneplatněn"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr "Vložte číslo (čísla), „N“ pro další, nebo „Q“ pro konec > "
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "neplatný protokol serveru klíčů (naše %d!=obsluha %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "„%s“ není ID klíče: přeskočeno\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  #| msgid "refreshing %d keys from %s\n"
  msgid "refreshing %d key from %s\n"
@@@ -5467,56 -4316,45 +5490,56 @@@ msgstr[0] "aktualizuji %d klíčů z %s
  msgstr[1] "aktualizuji %d klíčů z %s\n"
  msgstr[2] "aktualizuji %d klíčů z %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "VAROVÁNÍ: nelze aktualizovat klíč %s prostřednictvím %s: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "klíč „%s“ nebyl na serveru klíčů nalezen\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "klíč nebyl na serveru klíčů nalezen\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr "žádný server klíčů není znám (použijte volbu --keyserver)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "požaduji klíč %s ze %s server %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "požaduji klíč %s z %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  #| msgid "no keyserver action!\n"
  msgid "no keyserver known\n"
  msgstr "žádná operace se serverem klíčů!\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "přeskočen „%s“: %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "posílám klíč %s na %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, c-format
  msgid "requesting key from '%s'\n"
  msgstr "požaduje se klíč z „%s“\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "VAROVÁNÍ: URI %s nelze získat: %s\n"
@@@ -5619,130 -4437,103 +5642,130 @@@ msgstr "původní jméno souboru='%.*s'
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr "VAROVÁNÍ: zachyceno více prostých textů\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr ""
  "samostatný revokační certifikát – použijte „gpg --import“, chcete-li jej "
  "užít\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "nenalezen žádná podpis\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "ŠPATNÝ podpis od „%s“"
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Podpis s vypršenou platností od „%s“"
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Dobrý podpis od „%s“"
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "verifikace podpisu potlačena\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "neumím pracovat s těmito nejednoznačnými daty\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Podpis vytvořen %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               použití %s klíče %s\n"
  
  # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Podpis vytvořen %s pomocí klíče %s s ID uživatele %s\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                alias „%s“"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Klíč k dispozici na: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[nejistý]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                alias „%s“"
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Platnost podpisu skončila %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Platnost podpisu skončí %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "podpis %s, hashovací algoritmus %s%s%s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binární formát"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "textový formát"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "neznámý formát"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  msgid ", key algorithm "
  msgstr ", algoritmus klíče"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr "POZOR: nejedná se o oddělený podpis. Soubor „%s“ NEBYL ověřen!\n"
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Nemohu ověřit podpis: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "toto není podpis oddělený od dokumentu\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "VAROVÁNÍ: detekováno více podpisů. Kontrolován bude pouze první.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "samostatný podpis třídy 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "podpis starého typu (PGP 2.x)\n"
  
@@@ -5841,28 -4613,23 +5864,28 @@@ msgstr "Nezkomprimováno
  msgid "uncompressed|none"
  msgstr "nezkomprimováno|nic"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "tato zpráva nemusí být s %s použitelná\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "nejednoznačná volba „%s“\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, c-format
  msgid "unknown option '%s'\n"
  msgstr "neznámá volba „%s“\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  "U veřejného klíče ECDSA se očekává, že v kódování SEC bude délka násobkem 8 "
  "bitů\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "neznámý slabý hashovací algoritmus „%s“\n"
@@@ -6142,7 -4854,26 +6165,29 @@@ msgstr "Tento klíč pravděpodobně n�
  msgid "This key belongs to us\n"
  msgstr "Tento klíč náleží nám (máme odpovídající tajný klíč)\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ #| msgid "root certificate has now been marked as trusted\n"
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "kořenový certifikát byl nyní označen za důvěryhodný\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "NENÍ jisté, zda tento klíč patří osobě, jejíž jméno je uvedeno\n"
+ "v uživatelském ID. Pokud *skutečně* víte, co děláte, můžete na\n"
+ "následující otázku odpovědět ano\n"
+ "\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6153,129 -4884,101 +6198,129 @@@ msgstr "
  "následující otázku odpovědět ano\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "Použít přesto tento klíč? (a/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "VAROVÁNÍ: Je použit nedůvěryhodný klíč!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr "VAROVÁNÍ: tento klíč může být revokován (revokační klíč nenalezen)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "VAROVÁNÍ: Tento klíč byl revokován klíčem s pověřením k revokaci!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "VAROVÁNÍ: Tento klíč byl revokován svým vlastníkem!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
  msgstr "         To může znamenat, že podpis je padělaný.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "VAROVÁNÍ: Tento podklíč byl revokován svým vlastníkem!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Poznámka: Tento klíč byl označen jako neplatný (disabled).\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr "Poznámka: Podepisovatelova ověřená adresa je „%s“\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr "Poznámka: Podepisovatelova adresa „%s“ se neshoduje s DNS záznamem\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr "úroveň důvěry opravena na PLNOU, kvůli platné PKA informaci\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr "úroveň důvěry opravena na ŽÁDNOU, kvůli špatné PKA informaci\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Poznámka: Skončila platnost tohoto klíče!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr "VAROVÁNÍ: Tento klíč není certifikován důvěryhodným podpisem!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
  "         Nic nenaznačuje tomu, že tento podpis patří vlastníkovi klíče.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "VAROVÁNÍ: NEDŮVĚŘUJEME tomuto klíči!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "         Tento podpis je pravděpodobně PADĚLANÝ.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
  "VAROVÁNÍ: Tento klíč není certifikován dostatečně důvěryhodnými podpisy!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "         Není jisté, zda tento podpis patří vlastníkovi.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: přeskočeno: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: přeskočeno: veřejný klíč je neplatný (disabled)\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: přeskočeno: veřejný klíč je již obsažen v databázi\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to '%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "nelze se připojit k „%s“: %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "zadána volba „%s“, ale nezadány žádné platné výchozí klíče\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "zadána volba „%s“, ale chybí volba „%s“\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr ""
  "Nespecifikoval jste identifikátor uživatele (user ID). Můžete použít \"-r\"\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "Aktuální příjemci:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6283,37 -4986,29 +6328,37 @@@ msgstr "
  "\n"
  "Napište identifikátor uživatele (user ID). Ukončete prázdným řádkem: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Takový identifikátor uživatele neexistuje.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr "přeskočeno: veřejný klíč je už nastaven podle implicitního adresáta\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "Veřejný klíč je neplatný (disabled).\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "přeskočeno: veřejný klíč je již nastaven\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "neznámý implicitní adresát „%s“\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "žádné platné adresy\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Poznámka: klíči %s chybí vlastnost %s\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Poznámka: klíči %s chybí předvolby pro %s\n"
@@@ -6568,26 -5217,21 +6613,26 @@@ msgstr "%s klíč %s používá nebezpe
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr "%s klíč %s vyžaduje hash o délce %zu nebo více bitů (hash je %s)\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "VAROVÁNÍ: konflikt hashe podpisu ve zprávě\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "VAROVÁNÍ: podepisovací podklíč %s není křížově certifikován\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
  msgstr "více informací naleznete na adrese %s\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr "VAROVÁNÍ: podepisovací podklíč %s má neplatnou křížovou certifikaci\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu second newer than the signature\n"
@@@ -6596,7 -5240,6 +6641,7 @@@ msgstr[0] "veřejný klíč %s je o %l
  msgstr[1] "veřejný klíč %s je o %lu sekund novější než podpis\n"
  msgstr[2] "veřejný klíč %s je o %lu sekund novější než podpis\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu day newer than the signature\n"
@@@ -6605,7 -5248,6 +6650,7 @@@ msgstr[0] "veřejný klíč %s je o %l
  msgstr[1] "veřejný klíč %s je o %lu sekund novější než podpis\n"
  msgstr[2] "veřejný klíč %s je o %lu sekund novější než podpis\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6623,7 -5265,6 +6668,7 @@@ msgstr[2] "
  "klíč %s byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
  "je problém se systémovým časem)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6640,29 -5281,24 +6685,29 @@@ msgstr[2] "
  "klíč %s byl vytvořen %lu sekund v budoucnosti (došlo ke změně času nebo\n"
  "je problém se systémovým časem)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "Poznámka: podpisovému klíči %s skončila platnost v %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "Poznámka: podpisový klíč %s byl odvolán\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
  "předpokládám špatný podpis klíčem %s, protože je nastaven neznámý kritický "
  "bit\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr "klíč %s: neexistuje podklíč pro revokaci podklíče\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "klíč %s: podklíč který je svázán s podpisem neexistuje\n"
@@@ -6734,7 -5359,6 +6779,7 @@@ msgstr "
  "toto je PGP klíč vygenerovaný podle algoritmu Elgamal,\n"
  "podpisy vytvořené tímto klíčem nejsou bezpečné!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "záznam důvěry %lu, typ %d: zápis selhal: %s\n"
@@@ -6779,12 -5395,10 +6824,12 @@@ msgstr "chyba při hledání záznamu d
  msgid "read error in '%s': %s\n"
  msgstr "chyba při čtení v „%s“: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "databáze důvěry: synchronizace selhala %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "pro „%s“ nelze vytvořit zámek\n"
@@@ -6813,7 -5422,6 +6858,7 @@@ msgstr "transakce s databází důvěr
  msgid "%s: directory does not exist!\n"
  msgstr "%s: adresář neexistuje!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "k „%s“ nelze přistoupit: %s\n"
@@@ -6922,101 -5508,87 +6967,107 @@@ msgstr "nemohu pracovat s řádky delš
  msgid "input line longer than %d characters\n"
  msgstr "vstupní řádek je delší než %d znaků\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "chyba při odesílání standardního parametru: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "nepodporovaný algoritmus: %s"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "chyba při odesílání dat: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing base64 encoding: %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "chyba při zápisu kódování base64: %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "error initializing reader object: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "chyba při inicializaci čtecího objektu: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  #| msgid "error opening '%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "chyba při otevírání „%s“: %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "chyba při odesílání dat: %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr ""
+ 
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  #| msgid "error getting responder ID: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "chyba při zjišťování ID odpovídače: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "vypsat seznam klíčů a id uživatelů"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "platnost: %s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "chyba při získání uložených příznaků: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -7024,83 -5596,88 +7075,106 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "vypsat seznam klíčů"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "vypsat hash zprávy"
  msgstr[1] "vypsat hash zprávy"
  msgstr[2] "vypsat hash zprávy"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
+ #, c-format
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
+ 
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ #| msgid "error writing key: %s\n"
+ msgid "resetting keydb: %s\n"
+ msgstr "chyba při zápisu klíče: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  #| msgid "error setting OCSP target: %s\n"
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "chyba při nastavování cíle OCSP: %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
@@@ -7108,7 -5685,6 +7182,7 @@@ msgstr "chyba při vytváření roury: 
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
@@@ -7116,7 -5692,6 +7190,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
@@@ -7124,7 -5699,6 +7198,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
@@@ -7132,7 -5706,6 +7206,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
@@@ -7140,7 -5713,6 +7214,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
@@@ -7148,7 -5720,6 +7222,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
@@@ -7156,53 -5727,53 +7230,63 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Smazáno %d podpisů.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "vypsat hash zprávy"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "vypsat hash zprávy"
+ msgstr[1] "vypsat hash zprávy"
+ msgstr[2] "vypsat hash zprávy"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "zašifrováno s heslem %lu\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "vypsat hash zprávy"
+ msgstr[1] "vypsat hash zprávy"
+ msgstr[2] "vypsat hash zprávy"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7217,99 -5788,88 +7301,111 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "chyba při odesílání dat: %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring '%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "chyba při zápisu do souboru veřejných klíčů „%s“: %s\n"
+ 
++#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
  msgstr "„%s“ není platný dlouhý keyID\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "klíč %s: akceptován jako důvěryhodný klíč\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "klíč %s se v databázi důvěry vyskytuje více než jednou\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr "klíč %s: nenalezen veřejný klíč k důvěryhodnému klíči – přeskočeno\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "klíč %s označen jako absolutně důvěryhodný.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "záznam důvěry %lu, typ pož. %d: čtení selhalo: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "záznam důvěry %lu není požadovaného typu %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr "Databázi důvěry můžete zkusit znovu vytvořit pomocí těchto příkazů:\n"
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr "Pokud to nebude fungovat, prosím, nahlédněte do návodu\n"
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "nelze použít neznámý model důvěry (%d) – předpokládáme použití modelu %s\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "použití modelu důvěry %s\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "není nutné kontrolovat databázi důvěry\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "další kontrola databáze důvěry v %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "není nutné kontrolovat databázi důvěry s modelem „%s“\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "není nutné aktualizovat databázi důvěry s modelem „%s“\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "veřejný klíč %s nebyl nalezen: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "prosím proveďte --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "kontroluji databázi důvěry\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7318,7 -5878,6 +7414,7 @@@ msgstr[0] "%lu klíče byly doposud zpr
  msgstr[1] "%lu klíče byly doposud zpracovány\n"
  msgstr[2] "%lu klíče byly doposud zpracovány\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7327,16 -5886,13 +7423,16 @@@ msgstr[0] "zpracováno %d klíčů (%d 
  msgstr[1] "zpracováno %d klíčů (%d validit vymazáno)\n"
  msgstr[2] "zpracováno %d klíčů (%d validit vymazáno)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "žádný absolutně důvěryhodný klíč nebyl nalezen\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "veřejný klíč k absolutně důvěryhodnému klíči %s nebyl nalezen\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7344,7 -5900,6 +7440,7 @@@ msgstr "
  "hloubka: %d  platných: %3d  podepsaných: %3d  důvěra: %d-, %dq, %dn, %dm, "
  "%df, %du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "nelze aktualizovat záznam v databázi důvěry: chyba při zápisu: %s\n"
@@@ -7456,56 -5990,43 +7552,56 @@@ msgstr "
  "Syntaxe: kbxutil [volby] [soubory]\n"
  "Vypisuje, exportuje, importuje schránku na klíče (keybox).\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "schází RSA modulus nebo nemá velikost %d bitů\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "schází veřejný RSA exponent nebo je delší než %d bitů\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "funkce PIN callback skončila chybou: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr "NullPIN ještě nebyl změněn\n"
  
  # TRANSLATORS: Do not translate the "|*|" prefixes but keep
  # them verbatim at the start of the string.  */
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "|N|Prosím, zadejte nový PIN pro standardní klíče."
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
  msgstr "||Prosím, zadejte PIN pro standardní klíče."
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|NP|Prosím, zadejte nový kód pro odblokování (PUK) standardních klíčů."
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|P|Prosím, zadejte kód pro odblokování (PUK) standardních klíčů."
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  "|N|Prosím, zadejte nový PIN klíče určeného na tvorbu kvalifikovaných podpisů."
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  "||Prosím, zadejte PIN klíče určeného na tvorbu kvalifikovaných podpisů."
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7513,7 -6034,6 +7609,7 @@@ msgstr "
  "|NP|Prosím, zadejte nový kód pro odblokování (PUK) klíče určeného na tvorbu "
  "kvalifikovaných podpisů."
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7521,83 -6041,67 +7617,85 @@@ msgstr "
  "|NP|Prosím, zadejte kód pro odblokování (PUK) klíče určeného na tvorbu "
  "kvalifikovaných podpisů."
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "chyba při získání nového PINu: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "uložení otisku se nezdařilo: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "uložení data vytvoření se nezdařilo: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "čtení veřejného klíče se nezdařilo: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "odpověď neobsahuje veřejný klíč\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr "odpověď neobsahuje RSA modulus\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr "odpověď neobsahuje veřejný RSA exponent\n"
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "response does not contain the EC public point\n"
+ msgid "response does not contain the EC public key\n"
  msgstr "odpověď neobsahuje veřejný bod EC\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "odpověď neobsahuje veřejný klíč\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "čtení veřejného klíče se nezdařilo: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "používám implicitní PIN jako %s\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "použití implicitního PINu jako %s selhalo: %s – vypínám jeho budoucí "
  "použití\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Prosím vložte PIN%%0A[podpis hotov: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
  msgstr "||Prosím vložte PIN"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN pro CHV%d je příliš krátký; minimální délka je %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "ověření CHV%d se nezdařilo: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "chyba při získání CHV z karty\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr "karta je trvale uzamčena!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7612,24 -6116,19 +7710,24 @@@ msgstr[2] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Prosím, zadejte PIN správce%%0A[zbývá pokusů: %d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Prosím, zadejte PIN správce"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr "přístup k administrátorským příkazům není nakonfigurován\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Prosím, zadejte resetační kód karty"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Resetační kód je příliš krátký; minimální délka je %d\n"
@@@ -7637,77 -6136,59 +7735,77 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr "|RN|Nový resetační kód"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Nový PIN správce"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|Nový PIN"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Prosím, zadejte PIN správce a nový PIN správce"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Prosím, zadejte PIN a nový PIN"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
  msgstr "chyba při čtení aplikačních dat\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "chyba při čtení otisku DO\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "klíč již existuje\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr "existující klíč bude přepsán\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "generování nového klíče\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
  msgstr "nový klíč se zapisuje\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "chybí časové razítko vytvoření\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "schází RSA prime %s nebo nemá velikost %d bitů\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "nelze uložit klíč: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  msgid "unsupported curve\n"
  msgstr "nepodporovaná křivka\n"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "prosím počkejte než bude klíč vygenerován…\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
  msgstr "generování klíče se nezdařilo\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -7716,30 -6197,24 +7814,30 @@@ msgstr[0] "generování klíče dokonč
  msgstr[1] "generování klíče dokončeno (%d sekund)\n"
  msgstr[2] "generování klíče dokončeno (%d sekund)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "neplatná struktura OpenPGP karty (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr "otisk na kartě se neshoduje s požadovaným\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "karta nepodporuje hashovací algoritmus %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "dosud vytvořené podpisy: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "ověření PIN správce je nyní prostřednictvím tohoto příkazu zakázáno\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "přístup na %s se nezdařil – vadná OpenPGP karta?\n"
@@@ -7759,7 -6231,6 +7857,7 @@@ msgstr "|N|Prvotní nový PIN
  msgid "run in multi server mode (foreground)"
  msgstr "pracovat ve více serverové režimu (na popředí)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
  
@@@ -7811,17 -6271,14 +7909,17 @@@ msgstr "
  "Syntaxe: scdaemon [volby] [příkaz [argumenty]]\n"
  "Démon pro čipové karty (smartcard) pro @GNUPG@\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  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:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "obsluha pro deskriptor %d spuštěna\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "obsluha pro deskriptor %d ukončena\n"
@@@ -7840,11 -6294,9 +7938,11 @@@ msgstr "v této relaci neběží žád
  msgid "validation model requested by certificate: %s"
  msgstr "certifikátem vyžadovaný ověřovací model: %s"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr "řetězený"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr "jednovrstvý"
  
@@@ -7874,194 -6320,147 +7972,194 @@@ msgstr "Poznámka: nekritické certifik
  msgid "certificate policy not allowed"
  msgstr "certifikační politika není dovolena"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr "hledám vydavatele na jiném místě\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr "počet odpovídajících vydavatelů: %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr "hledám vydavatele ve vyrovnávací paměti Dirmngr\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "počet odpovídajících certifikátů: %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "hledání klíče pouze ve vyrovnávací paměti dirmngr neuspělo: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "alokace popisovače keyDB se nezdařila\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
  msgstr "certifikát byl odvolán"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "status certifikáty není znám"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr "prosím, ujistěte se, že „dirmngr“ je správně nainstalován\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
  msgstr "kontrola CRL se nezdařila: %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "certifikát s chybnou platností: %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr "certifikát ještě nenabyl platnosti"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
  msgstr "kořenový certifikát ještě nezačal platit"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr "mezilehlý certifikát ještě nezačal platit"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
  msgstr "certifikátu vypršela platnost"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
  msgstr "kořenový certifikát je prošlý"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
  msgstr "mezilehlý certifikát je prošlý"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr "chybí povinné atributy certifikátu: %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
  msgstr "certifikát s neplatnou platností"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr "podpis nebyl vytvořen v době životnosti certifikátu"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr "certifikát nebyl vytvořen v době životnosti vydavatele"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr "mezilehlý certifikát nebyl vytvořen v době životnosti vydavatele"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  (       podpis vytvořen "
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "  (   certifikát vytvořen "
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
  msgstr "  (   certifikát planý od "
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr "  (   vydavatel platný od "
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "otisk=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr "kořenový certifikát byl nyní označen za důvěryhodný\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr "v gpg-agentu není povoleno interaktivní označování za důvěryhodný\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr "interaktivní označovaní jako důvěryhodný je pro tuto relaci zakázáno\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr "VAROVÁNÍ: datum vytvoření podpisu není známo – předpokládám současnost"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "v certifikátu nebyl nalezen vydavatel"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr "certifikát podepsaný sám sebou má ŠPATNÝ podpis"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr "kořenový certifikát není označen jako důvěryhodný"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "kontrola seznamu důvěry se nepodařila: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr "řetěz certifikátů je příliš dlouhý\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "certifikát vydavatele nebyl nalezen"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
  msgstr "certifikát má ŠPATNÝ podpis"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr "nalezen jiný možný odpovídající certifikát autority – zkusí se znovu"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "řetěz certifikátů je delší než dovoluje CA (%d)"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "certifikát je v pořádku\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
  msgstr "mezilehlý certifikát je v pořádku\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
  msgstr "kořenový certifikát je v pořádku\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr "přepínám do řetězeného modelu"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr "použit ověřovací model: %s"
@@@ -8387,7 -6720,6 +8485,7 @@@ msgstr "(toto nevypadá jako zašifrova
  msgid "certificate '%s' not found: %s\n"
  msgstr "certifikát „%s“ nebyl nenalezen: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
  msgstr "chyba při zamykání schránky na klíče: %s\n"
@@@ -8411,123 -6739,93 +8509,123 @@@ msgstr "smazání certifikátu „%s�
  msgid "no valid recipients given\n"
  msgstr "(nebyli zadáni Žádní platní příjemci)\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
  msgstr "vypsat seznam externích klíčů"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
  msgstr "vypsat řetěz certifikátů"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
  msgstr "importovat certifikáty"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
  msgstr "exportovat certifikáty"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "zaregistrovat čipovou kartu"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "předat příkaz do dirmngr"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr "vyvolat gpg-protect-tool"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
  msgstr "vytvářet výstup zakódovaný pomocí Base-64"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr "předpokládat vstup ve formátu PEM"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr "předpokládat vstup ve formátu Base-64"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr "předpokládat vstup v binárním formátu"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr "nikdy nenahlížet do CRL"
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr "kontrolovat platnost pomocí OCSP"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr "|N|počet certifikátů, které zahrnout"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr "|SOUBOR|vzít politiky ze SOUBORU"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr "nekontrolovat politiky certifikátu"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr "stahovat chybějící certifikáty vydavatelů"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "vůbec nepoužívat terminál"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|SOUBOR|zapisovat protokol režimu server do SOUBORU"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
  msgstr "|SOUBOR|zapisovat auditní protokol do SOUBORU"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "dávkový režim: nikdy se neptat"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "předpokládat ano na většinu otázek"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "předpokládat ne na většinu otázek"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|SOUBOR|přidat klíčenku na seznam klíčenek"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|ID_UŽIVATELE|použít ID_UŽIVATELE jako implicitní tajný klíč"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|použít tento server pro dohledávání klíčů"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NÁZEV|použít šifrovací algoritmus NÁZEV"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NÁZEV|použít hashovací algoritmus NÁZEV"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Použití: @GPGSM@ [možnosti] [soubory] (-h pro pomoc)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8537,46 -6835,37 +8635,46 @@@ msgstr "
  "Podepisuje, ověřuje, šifruje nebo dešifruje pomocí protokolu S/MIME.\n"
  "Výchozí operace závisí na vstupních datech.\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "Poznámka: nebude možné šifrovat pro „%s“: %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "neznámý model ověřování „%s“\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: nebyl zadán název stroje\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: zadáno heslo bez uživatele\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: přeskakuji tento řádek\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
  msgstr "nelze rozebrat serveru klíčů\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "importují se běžné certifikáty „%s“\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "nelze podepsat pomocí „%s“: %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr "neplatný příkaz (neexistuje žádný implicitní příkaz)\n"
  
@@@ -8593,7 -6879,6 +8691,7 @@@ msgstr "chyba při ukládání certifik
  msgid "basic certificate checks failed - not imported\n"
  msgstr "základní kontrola certifikátu selhala – neimportováno\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "chyba při získání uložených příznaků: %s\n"
@@@ -8608,31 -6891,25 +8706,31 @@@ msgstr "chyba při importování certif
  msgid "error reading input: %s\n"
  msgstr "chyba při čtení vstupu: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
  msgstr "otisk se nepodařilo získat\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr "problém při hledání existujícího certifikátu: %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "chyba při hledání zapisovatelné keyDB: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
  msgstr "chyba při ukládání certifikátu: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "problém při opakovaném hledání certifikátu: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
  msgstr "chyba při ukládání příznaků: %s\n"
@@@ -9514,108 -7614,84 +9612,112 @@@ msgstr "očekáván absolutní název s
  msgid "looking up '%s'\n"
  msgstr "hledá se „%s“\n"
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr "vypíše obsah CRL keše"
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|SOUBOR|zavede CRL ze SOUBORU do keše"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|stáhne CRL z URL"
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr "vypne dirmngr"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr "vyprázdní keš"
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  msgid "run without asking a user"
  msgstr "běží bez dotazování se uživatele"
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr "vynutí zavedení zastaralých CRL"
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr "povolí odesílání OCSP dotazů"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr "zakáže použití HTTP"
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr "zakáže použití LDAP"
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr "ignoruje HTTP distribuční místa CRL "
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr "ignoruje LDAP distribuční místa CRL"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "ignoruje URL služby OCSP uvedené v certifikátu"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|všechny HTTP požadavky přesměruje na URL"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|STROJ|pro LDAP dotazy použije STROJ"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "nepoužije náhradní stroje s --ldap-proxy"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|SOUBOR|načte seznam LDAP serverů ze SOUBORU"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr "na seznam serverů přidá nové servery nalezené v místech distribuce CRL"
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|nastaví časový limit pro LDAP na N sekund"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|použije OCSP odpovídače na URL"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|OTISK|OCSP odpovědi podepsané podle OTISKU"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|nevrací více jak N položek na jeden dotaz"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|SOUBOR|pro HKP přes TLS použije certifikáty CA ze SOUBORU"
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr "směrovat veškerý síťový provoz skrz Tor"
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9624,11 -7700,9 +9726,11 @@@ msgstr "
  "@\n"
  "(Úplný seznam příkazů a voleb naleznete v „info“ manuálu.)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Použití: @DIRMNGR@ [volby] (-h pro nápovědu)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9636,78 -7710,61 +9738,78 @@@ msgstr "
  "Syntaxe: @DIRMNGR@ [volby] [příkaz [argumenty]]\n"
  "Přístup k serveru s klíči, CRL a OCSP z @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "platné úrovně ladění jsou: %s\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, c-format
  msgid "usage: %s [options] "
  msgstr "použití: %s [volby] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  msgid "colons are not allowed in the socket name\n"
  msgstr "dvojtečky v názvu socketu jsou nepřípustné\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "stahování CRL z „%s“ selhalo: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "zpracování CRL z „%s“ selhalo: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: řádek je příliš dlouhý – přeskočen\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: zjištěn neplatný otisk\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: chyba čtení: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: nepořádek na konci řádku ignorován\n"
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr "přijat SIGHUP – konfigurace bude znovu načtena a keš vyprázdněna\n"
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "přijat SIGUSR2 – žádná akce nedefinována\n"
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "přijat SIGTERM – vypíná se…\n"
  
  # TODO: plural
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "přijat SIGTERM – stále aktivních spojení: %d\n"
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  msgid "shutdown forced\n"
  msgstr "vypnutí vynuceno\n"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "přijat SIGINT – okamžité vypnutí\n"
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "přijat signál č. %d – žádná akce nedefinována\n"
@@@ -9877,13 -7898,6 +9979,7 @@@ msgstr "„%s“ není LDAP URL\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr "„%s“ není platné LDAP URL\n"
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, c-format
- msgid "error allocating memory: %s\n"
- msgstr "chyba při alokování paměti: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, c-format
  msgid "error printing log line: %s\n"
  msgstr "chyba při tisknutí řádku protokolu: %s\n"
@@@ -10133,76 -8095,60 +10229,76 @@@ msgstr "OCSP odpovídač vrátil ne sou
  msgid "OCSP responder returned an too old status\n"
  msgstr "OCSP odpovídač vrátil příliš starý stav\n"
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "volání assuan_inquire(%s) selhalo: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr "chybí ldapserver (LDAP server)"
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr "v ID certifikátu chybí serialno (sériové číslo)"
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "volání assuan_inquire selhalo: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "volání fetch_cert_by_url selhalo: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "chyba při odesílání dat: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "volání start_cert_fetch selhalo: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "volání fetch_next_cert selhalo: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies (max. odpovědí) %d překročeno\n"
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "řídící strukturu nelze alokovat: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "alokace kontextu assuan selhala: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "inicializace serveru selhala: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "registrace příkazu u Assuanu selhala: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "problém příjmu Assuanu: %s\n"
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "zpracování Assuanu se nezdařilo: %s\n"
@@@ -10244,7 -8181,6 +10340,7 @@@ msgstr "DSA požaduje použití 160bito
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "certifikát neměl být použit pro podepsání CRL\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "stručný výstup"
  
@@@ -10412,11 -8307,9 +10508,11 @@@ msgstr "|JMÉNO|šifrovat rovněž pro 
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|nastavit e-mailový alias"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr "Nastavení serverů klíčů"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|používat server klíčů na URL"
  
@@@ -10448,128 -8334,112 +10544,144 @@@ msgstr "Volby ovlivňující podobu vý
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Volby ovlivňující interaktivitu a vymáhání"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr "Volby ovlivňující použití Toru"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr "Nastavení HTTP serverů"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr "používat systémové nastavení HTTP proxy"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr "Nastavení používaných LDAP serverů"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr "Seznam LDAP serverů"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr "Nastavení OCSP"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ #, fuzzy
+ #| msgid "GPG for OpenPGP"
+ msgid "OpenPGP"
  msgstr "GPG pro OpenPGP"
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
- msgstr "Agent GPG"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
+ msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ #, fuzzy
+ #| msgid "Smartcard Daemon"
+ msgid "Smartcards"
  msgstr "Démon pro čipové karty"
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ #, fuzzy
+ #| msgid "GPG for S/MIME"
+ msgid "S/MIME"
  msgstr "GPG pro S/MIME"
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr "Stahovač klíčů"
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "chyba sítě"
  
- #: tools/gpgconf-comp.c:1068
- msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1071
+ #, fuzzy
+ #| msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "Zadávání kódu PIN a hesla"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  msgid "Component not suitable for launching"
  msgstr "Komponenta není vhodná pro spuštění"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Selhalo externí ověření komponenty %s"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr "Vezměte na vědomí, že určení skupiny se ignoruje\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr "vypsat všechny komponenty"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr "zkontrolovat všechny programy"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|KOMPONENTA|vypsat volby"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|KOMPONENTA|změnit volby"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|KOMPONENTA|zkontrolovat volby"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr "aplikovat globální implicitní hodnoty"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "získat adresáře s nastavením @GPGCONF@"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
  msgstr "vypsat globální konfigurační soubor"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
  msgstr "zkontrolovat globální konfigurační soubor"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "aktualizovat databázi důvěry"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr "znovu načíst všechny nebo zadané komponenty"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr "spustit zadanou komponentu"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr "zabít zadanou komponentu"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "použít jako výstupní soubor"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr "provést změny za běhu, pokud to lze"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Použití: @GPGCONF@ [volby] (-h pro nápovědu)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10577,15 -8447,12 +10689,15 @@@ msgstr "
  "Syntaxe: @GPGCONF@ [volby]\n"
  "Spravuje konfigurační volby nástrojů, které patří do systému @GNUPG@\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "Potřebuji jeden argument určující komponentu"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "Komponenta nenalezena"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr "Žádné argumenty nejsou povoleny"
  
diff --cc po/da.po
index 0567b70,018bab0..96dd231
--- a/po/da.po
+++ b/po/da.po
@@@ -14,7 -14,6 +14,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2012-11-01 20:27+0200\n"
  "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
  "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@@ -24,7 -23,6 +24,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "kunne ikke indhente pinentry-lås: %s\n"
@@@ -35,47 -33,38 +35,47 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr "_O.k."
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr "_Afbryd"
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_Yes"
  msgstr "_O.k."
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_No"
  msgstr "_O.k."
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  #, fuzzy
  #| msgid "|pinentry-label|_Cancel"
  msgid "|pinentry-label|_Save in password manager"
  msgstr "_Afbryd"
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "Enter new passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -83,7 -72,6 +83,7 @@@ msgstr "Indtast ny adgangsfrase
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr "Kvalitet:"
  
@@@ -93,7 -81,6 +93,7 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Denne række indikerer kvaliteten for ovenstående angivne adgangskode.\n"
@@@ -102,7 -89,6 +102,7 @@@
  "specialtegn. Spørg din administrator om mere præcis information om\n"
  "hvordan man anvender sikre adgangskoder."
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -110,7 -96,6 +110,7 @@@ msgstr "
  "Indtast venligst din PIN, så at den hemmelige nøgle kan låses op for denne "
  "session"
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -118,53 -103,40 +118,53 @@@ msgstr "
  "Indtast din adgangsfrase, så at den hemmelige nøgle kan låses op for denne "
  "session"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Adgangsfrase:"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "matcher ikke - prøv igen"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (forsøg %d af %d)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
  msgstr "PIN er for lang"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
  msgstr "Adgangsfrase er for lang"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
  msgstr "Ugyldige tegn i PIN"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr "PIN er for kort"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "Ugyldig PIN"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
  msgstr "Ugyldig adgangsfrase"
  
@@@ -173,25 -144,11 +173,25 @@@
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "kan ikke oprette »%s«: %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -218,17 -171,6 +218,7 @@@ msgstr "fejl ved indhentelse af standar
  msgid "no suitable card key found: %s\n"
  msgstr "ingen egnet kortnøgle fundet: %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "skygge for nøgle mislykkedes: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "fejl ved skrivning af nøgle: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -237,24 -179,19 +227,24 @@@ msgstr "
  "En ssh-proces anmodte om brugen af nøgle%%0A  %s%%0A  (%s)%%0AØnsker du at "
  "tillade dette"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr "Tillad"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr "Nægt"
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Indtast venligst adgangsfrasen for ssh-nøglen%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Genindtast venligst denne adgangsfrase"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -263,16 -200,13 +253,16 @@@ msgstr "
  "Indtast venligst en adgangsfrase for at beskytte den modtaget hemmelige nøgle"
  "%%0A   %s%%0A   %s%%0Ainden i gpg-agentens nøglelager"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr "Indsæt venligst kortet med serielnummeret"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "Fjern venligst det aktuelle kort og indsæt det med serielnummeret"
  
@@@ -420,8 -330,6 +410,8 @@@ msgstr "Indtast venligst adgangsfrasen 
  msgid "Please enter the new passphrase"
  msgstr "Indtast venligst den nye adgangsfrase"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -429,138 -337,105 +419,144 @@@ msgstr "
  "@Indstillinger:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "kør i dæmontilstand (baggrunden)"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "kør i servertilstand (forgrunden)"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "run in server mode"
+ msgid "run in supervised mode"
+ msgstr "kør i servertilstand"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "uddybende"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "vær mindre uddybende"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr "kommandoresultat i sh-stil"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr "kommandoresultat i csh-stil"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FIL|læs tilvalg fra FIL"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "frakobl ikke fra konsollen"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr "fang ikke tastatur og mus"
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
  msgstr "brug en logfil for serveren"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr "|PGM|brug PGM som PIN-Entry-program"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr "|PGM|brug PGM som SCdaemon-program"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
  msgstr "brug ikke SCdaemon'en"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|connect to Assuan socket NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NAME|forbind til Assuansokkel NAVN"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr "ignorer forespørgsler om at ændre TTY'en"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr "ignorer forespørgsler om at ændre X-skærmen"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr "|N|udløb mellemlagrede PIN'er efter N sekunder"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr "brug ikke PIN-mellemlageret når der underskrives"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  #| msgid "do not allow the reuse of old passphrases"
  msgid "disallow the use of an external password cache"
  msgstr "tillad ikke genbrug af gamle adgangsfraser"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  #, fuzzy
  #| msgid "allow clients to mark keys as \"trusted\""
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "tillad klienter at markere nøgler som »trusted« (troværdige)"
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
  msgstr "tillad forhåndsindstilling af adgangsfrase"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "enable ssh-agent emulation"
  msgid "enable ssh support"
  msgstr "aktiver ssh-agent-emulering"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
  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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Rapporter venligst fejl til <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -572,149 -447,114 +568,149 @@@ msgstr "
  "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
  "Hemmelig nøglehåndtering for GnuPG\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "invalid debug-level '%s' given\n"
  msgstr "ugyldigt fejlsøgningsniveau »%s« angivet\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "BEMÆRK: Ingen standardfil for tilvalg »%s«\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "tilvalgsfil »%s«: %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "læser tilvalg fra »%s«\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
  msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "kan ikke oprette sokkel: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, fuzzy, c-format
  #| msgid "socket name `%s' is too long\n"
  msgid "socket name '%s' is too long\n"
  msgstr "sokkelnavnet »%s« er for langt\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "en gpg-agent kører allerede - starter ikke en ny\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
  msgstr "fejl ved indhentelse af nonce for soklen\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error binding socket to '%s': %s\n"
  msgstr "fejl ved binding af sokkel til »%s«: %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() mislykkedes: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
  msgstr "lytter på sokkel »%s«\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "kan ikke oprette mappe »%s«: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "mappe »%s« oprettet\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  #| msgid "stat() failed for `%s': %s\n"
  msgid "stat() failed for '%s': %s\n"
  msgstr "stat() mislykkedes for »%s«: %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  #| msgid "can't use `%s' as home directory\n"
  msgid "can't use '%s' as home directory\n"
  msgstr "kan ikke bruge »%s« som hjemmemappe\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "fejl ved læsning af nonce på fd %d: %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "håndtering 0x%lx for fd %d startet\n"
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "håndtering 0x%lx for fd %d termineret\n"
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr "ssh-håndtering 0x%lx for fd %d startet\n"
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "ssh-håndtering 0x%lx for %d termineret\n"
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  #| msgid "pth_select failed: %s - waiting 1s\n"
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "pth_select mislykkeds: %s - venter 1s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s stoppet\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "ingen gpg-agent kører i denne session\n"
  
@@@ -730,8 -568,6 +726,8 @@@ msgstr "
  "Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
  "Adgangskode for mellemlagervedligeholdelse\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -739,9 -575,6 +735,9 @@@ msgstr "
  "@Kommandoer:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -798,7 -623,6 +794,8 @@@ msgstr "afbrudt\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "fejl ved oprettelse af adgangsfrasen: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -865,8 -680,6 +862,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Ja"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "Nej"
  
@@@ -898,12 -708,10 +895,12 @@@ msgstr "Korrekt
  msgid "Wrong"
  msgstr "Forkert"
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr "Bemærk: Denne adgangsfrase er aldrig blevet ændret.%0AÆndr den nu."
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@@ -912,15 -720,12 +909,15 @@@ msgstr "
  "Denne adgangsfrase er ikke blevet ændret%%0Asiden %.4s-%.2s-%.2s. Ændr den "
  "nu."
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
  msgstr "Ændr adgangsfrasen"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr "Jeg ændrer den senere"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -928,13 -733,11 +925,13 @@@
  "%%0A?"
  msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
  msgstr "aktiver nøgle"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -949,13 -750,11 +946,13 @@@ msgstr "DSA kræver at hashlængden ska
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "%s-nøglen bruger en usikker (%u bit) hash\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, fuzzy, c-format
  #| msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "en %u-bit-hash er ikke gyldig for en %u-bit %s-nøgle\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "kontrol af oprettet underskrift mislykkedes: %s\n"
@@@ -982,88 -777,78 +979,101 @@@ msgstr "beskyttelsesalgoritme %d%s er i
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "beskyttelsesalgoritme %d%s er ikke understøttet\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "fejl ved oprettelse af datakanal: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "fejl ved oprettelse af datakanal: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "fejl ved forgrening af proces: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- #| msgid "waiting for process %d to terminate failed: %s\n"
- msgid "waiting for processes to terminate failed: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
  msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  #| msgid "error running `%s': probably not installed\n"
  msgid "error running '%s': probably not installed\n"
  msgstr "fejl ved kørsel af »%s«: sikkert ikke installeret\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error running '%s': exit status %d\n"
  msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  #| msgid "error running `%s': terminated\n"
  msgid "error running '%s': terminated\n"
  msgstr "fejl ved kørsel af »%s«: termineret\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "fejl ved indhentelse af afslutningskode for proces %d: %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
  msgstr "kan ikke forbinde til »%s«: %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "problem ved angivelse af indstillinger for gpg-agent\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "kan ikke slå kernedump fra: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Advarsel: usikker ejerskab på %s »%s«\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ #| msgid "waiting %d seconds for the agent to come up\n"
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "venter %d sekunder på at agenten kommer frem\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ #| msgid "renaming `%s' to `%s' failed: %s\n"
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "ja"
  
@@@ -1117,7 -891,6 +1127,7 @@@ msgstr "ikke nok kerne i sikker hukomme
  msgid "out of core while allocating %lu bytes"
  msgstr "ikke nok kerne under allokering af %lu byte"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "fejl ved allokering af nok hukommelse: %s\n"
@@@ -1138,41 -908,34 +1148,41 @@@ msgstr "ADVARSEL: »%s« er en forælde
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, fuzzy, c-format
  #| msgid "no running gpg-agent - starting one\n"
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr "ingen kørende gpg-agent - starter en\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, fuzzy, c-format
  #| msgid "waiting %d seconds for the agent to come up\n"
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr "venter %d sekunder på at agenten kommer frem\n"
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  #| msgid "can't connect to the dirmngr - trying fall back\n"
  msgid "connection to agent is in restricted mode\n"
  msgstr "kan ikke forbinde til dirmngr - forsøger reserve\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, fuzzy, c-format
  #| msgid "no running dirmngr - starting `%s'\n"
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr "ingen kørende dirmngr - starter »%s«\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, fuzzy, c-format
  #| msgid "waiting %d seconds for the agent to come up\n"
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr "venter %d sekunder på at agenten kommer frem\n"
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  #, fuzzy
  #| msgid "can't connect to the dirmngr - trying fall back\n"
  msgid "connection to the dirmngr established\n"
@@@ -1245,8 -992,6 +1255,8 @@@ msgstr "Sessionsnøgle oprettet
  msgid "algorithm: %s"
  msgstr "algoritme: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "ikke understøttet algoritme: %s"
@@@ -1321,11 -1050,9 +1331,11 @@@ msgstr "Certifikatkæde er gyldig
  msgid "Root certificate trustworthy"
  msgstr "Rodcertifikat er troværdigt"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "ingen CRL fundet for certifikat"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
  msgstr "den tilgængelige CRL er for gammel"
  
@@@ -1363,7 -1082,6 +1373,7 @@@ msgstr "Ingen hjælp tilgængelig for �
  msgid "ignoring garbage line"
  msgstr "ignorerer affaldslinje"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[ingen]"
  
@@@ -1436,7 -1139,6 +1446,7 @@@ msgstr "tilvalg »%.50s« er tvetydigt\
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "kommando »%.50s« er tvetydig\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
  msgstr "uden for kerne\n"
  
@@@ -1499,8 -1190,6 +1509,8 @@@ msgstr "lås »%s« er ikke udført: %s
  msgid "waiting for lock %s...\n"
  msgstr "venter på lås %s ...\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s er for gammel (kræver %s, har %s)\n"
@@@ -1583,13 -1254,11 +1593,13 @@@ msgid "
  msgstr ""
  "citeret udskrivingstegn i panser - måske på grund af en fejlbehæftet MTA\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "kan ikke læses af mennesker"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1597,25 -1266,20 +1607,25 @@@ msgstr "
  "et notationsnavn må kun have udskrivningstegn eller mellemrum og skal "
  "sluttes med et »=«\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "et brugernotationsnavn skal indeholde tegnet »@«\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "et notationsnavn må ikke indeholde mere end et »@«-tegn\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  #| msgid "a notation name must not contain more than one '@' character\n"
  msgid "a notation name may not contain an '=' character\n"
  msgstr "et notationsnavn må ikke indeholde mere end et »@«-tegn\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
@@@ -1625,51 -1289,40 +1635,50 @@@ msgstr "
  "et notationsnavn må kun have udskrivningstegn eller mellemrum og skal "
  "sluttes med et »=«\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "ADVARSEL: Ingen notationsdata fundet\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr "kunne ikke proxy %s-forespørgsel til klient\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  #, fuzzy
  #| msgid "Enter passphrase\n"
  msgid "Enter passphrase: "
  msgstr "Indtast adgangsfrase\n"
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
  msgstr "ADVARSEL: %s overskriver %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "OpenPGP-kort er ikke tilgængeligt: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "OpenPGP-kortnr. %s detekteret\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "kan ikke udføre dette i jobtilstand\n"
  
@@@ -1677,14 -1329,9 +1686,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Denne kommando er kun tilgængelig for version 2-kort\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
  msgstr "Nulstillingskode er ikke eller ikke mere tilgængelig\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Dit valg? "
  
@@@ -1712,121 -1353,91 +1721,121 @@@ msgstr "ikke tvunget
  msgid "forced"
  msgstr "tvunget"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr "Fejl: Kun ren ASCII er tilladt i øjeblikket.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "Fejl: Tegnet »<« må ikke bruges.\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "Fejl: Dobbelt mellemrum er ikke tilladt.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "Kortholders efternavn: "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "Kortholders fornavn: "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr "Fejl: Kombineret navn er for langt (begrænsningen er på %d tegn).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "Adresse hvor offentlig nøgle skal hentes: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Fejl: Adresse er for lang (begrænsningen er %d tegn).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "fejl ved læsning af »%s«: %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  #| msgid "error writing `%s': %s\n"
  msgid "error writing '%s': %s\n"
  msgstr "fejl ved skrivning af »%s«: %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "Loginddata (kontonavn): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr "Fejl: Loginddata er for lange (begrænsningen er %d tegn).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "Private DO-data: "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr "Fejl: Privat DO er for lang (begrænsningen er %d tegn).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "Sprogpræferencer: "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
  msgstr "Fejl: ugyldig længde for præferencestreng.\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
  msgstr "Fejl: ugyldige tegn i præferencestreng.\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "Køn ((M)and, Kvinde(F) eller mellemrum): "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
  msgstr "Fejl: ugyldigt svar.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "CA-fingeraftryk: "
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "Fejl: Ugyldigt formateret fingeraftryk.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "nøglehandling er ikke mulig: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "ikke et OpenPGP-kort"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr "Erstat eksisterende nøgle? (j/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  #, fuzzy
  #| msgid ""
  #| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1842,58 -1453,46 +1851,58 @@@ msgstr "
  "        dokumentationen for dit kort for at se hvilke størrelser, der\n"
  "        er tilladt.\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Hvilken nøglestørrelse ønsker du for underskriftsnøglen (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "Hvilken nøglestørrelse ønsker du for krypteringsnøglen? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Hvilken nøglestørrelse ønsker du for godkendelsesnøglen? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "afrundet op til %u bit\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s nøglestørrelser skal være i intervallet %u-%u\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr "Kortet vil nu blive omkonfigureret til at oprette en nøgle på %u bit\n"
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "fejl ved ændring af størrelsen på nøglen %d til %u bit: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  "Lav sikkerhedskopi et andet sted end på kortet for krypteringsnøglen? (J/n) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  #| msgid "NOTE: keys are already stored on the card!\n"
  msgid "Note: keys are already stored on the card!\n"
  msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr "Erstat eksisterende nøgler (j/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, fuzzy, c-format
  #| msgid ""
  #| "Please note that the factory settings of the PINs are\n"
@@@ -1908,145 -1507,110 +1917,145 @@@ msgstr "
  "   PIN = »%s«     Admin-PIN = »%s«\n"
  "Du bør ændre dem med kommandoen --change-pin\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "Vælg venligst hvilken slags nøgle der skal oprettes:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "   (1) Underskriftsnøgle\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) Krypteringsnøgle\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Godkendelsesnøgle\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Ugyldigt valg.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "Vælg venligst hvor nøglen skal gemmes:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "KEYTOCARD failed: %s\n"
  msgstr "læsning mislykkedes: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
  msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  #| msgid "NOTE: keys are already stored on the card!\n"
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  #| msgid "Sign it? (y/N) "
  msgid "Continue? (y/N) "
  msgstr "Underskriv? (j/N) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "afslut denne menu"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
  msgstr "vis administratorkommandoer"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "vis denne hjælpetekst"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "vis alle tilgængelige data"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "ændr kortholders navn"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "ændr adresse for at indhente nøgle"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "hent nøglen angivet i kortadressen"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "ændr logindnavnet"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "ændr sprogpræferencerne"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "ændr kortholders køn"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "ændr et CA-fingeraftryk"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr "skift force PIN-flag for underskriften"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "opret nye nøgler"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "menu til at ændre eller fjerne blokering for PIN'en"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "verificer PIN'en og vis alle data"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr "fjern blokering for PIN'en med en nulstillingskode"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr "gpg/card> "
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "Kommandoer kun for administratoren\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "Administratorkommandoer er tilladt\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "Administratorkommandoer er ikke tilladt\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Ugyldig kommando (prøv »help«)\n"
  
@@@ -2054,23 -1617,15 +2063,23 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output virker ikke for denne kommando\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "kan ikke åbne »%s«\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "nøglen »%s« blev ikke fundet: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "fejl ved læsning af nøgleblok: %s\n"
@@@ -2191,7 -1724,6 +2200,7 @@@ msgstr "
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s krypteret for: »%s«\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "du kan ikke bruge %s i tilstanden %s\n"
@@@ -2275,59 -1792,45 +2284,59 @@@ msgstr "ADVARSEL: kan ikke fjerne midle
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "ADVARSEL: kan ikke fjerne midlertidig mappe »%s«: %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
  msgstr "eksportunderskrifter som er markeret som kun lokale"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr "bruger-id'er for eksportattributter (normalt billed-id'er)"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "tilbagekaldsnøgler for eksport markeret som »sensitive«"
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "fjern nøgledele der ikke kan bruges under eksport"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "fjern så meget som muligt fra nøglen under eksport"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: udelod: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "skriver til »%s«\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "nøgle %s: nøglemateriale på kort - udeladt\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "eksport af hemmelige nøgler er ikke tilladt\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "nøgle %s: nøgle i PGP 2.x-stil - udeladt\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "ADVARSEL: intet blev eksporteret\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2337,8 -1839,6 +2346,8 @@@ msgstr "fejl ved oprettelse af »%s«: 
  msgid "[User ID not found]"
  msgstr "[Bruger-id blev ikke fundet]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "(check argument of option '%s')\n"
@@@ -2361,258 -1858,199 +2370,258 @@@ msgstr "fejl ved lukning af %s: %s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  #| msgid "automatically retrieved `%s' via %s\n"
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "hentede automatisk »%s« via %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  #| msgid "error retrieving `%s' via %s: %s\n"
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "fejl ved indhentelse af »%s« via %s: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "Ingen fingeraftryk"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr "Ugyldig nøgle %s gjort gyldig med --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "bruger undernøgle %s i stedet for primær nøgle %s\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "opret en underskrift"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
  msgstr "opret en underskrift i klartekst"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "opret en separat underskrift"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "krypter data"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "krypter kun med symmetrisk chiffer"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "afkrypter data (standard)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "godkend en underskrift"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "vis nøgler"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "vis nøgler og underskrifter"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "vis og kontroller nøgleunderskrifter"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "vis nøgler og fingeraftryk"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "vis hemmelige nøgler"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "opret et nyt nøglepar"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "opret et nyt nøglepar"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "opret et nyt nøglepar"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "opret et nyt nøglepar"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "opret et tilbagekaldscertifikat"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "fjern nøgler fra den offentlige nøglering"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "fjern nøgler fra den hemmelige nøglering"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "underskriv en nøgle"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "underskriv en nøgle lokalt"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "underskriv en nøgle"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "underskriv en nøgle lokalt"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "underskriv eller rediger en nøgle"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
  msgstr "ændr en adgangsfrase"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "eksporter nøgler"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "eksporter nøgler til en nøgletjener"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "importer nøgler fra en nøgleserver"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "søg efter nøgler på en nøgleserver"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "opdater alle nøgler fra en nøgleserver"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "importer/sammenføj nøgler"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "udskriv kortstatus"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "ændr data på et kort"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "ændr et korts PIN"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "opdater troværdighedsdatabasen"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
  msgstr "vis beskedsammendrag"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "kør i servertilstand"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "opret ascii-pansrede uddata"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|USER-ID|krypter for BRUGER-ID"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "brug kanonisk teksttilstand"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|skriv resultat til FIL"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "lav ingen ændringer"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "spørg før overskrivning"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr "brug streng OpenPGP-opførsel"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2620,7 -2058,6 +2629,7 @@@ msgstr "
  "@\n"
  "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2640,14 -2077,12 +2649,14 @@@ msgstr "
  " --list-keys [navne]        vis nøgler\n"
  " --fingerprint [navne]      vis fingeraftryk\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  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 tilvalgene?
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2662,7 -2097,6 +2671,7 @@@ msgstr "
  "Sign, check, encrypt eller decrypt\n"
  "standardhandling afhænger af inddata\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2670,81 -2104,66 +2679,81 @@@ msgstr "
  "\n"
  "Understøttede algoritmer:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "Pubkey: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Chiffer: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Komprimering: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] %s\n"
  msgstr "brug: gpgsm [tilvalg] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "kommandoer er i konflikt\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  #| msgid "no = sign found in group definition `%s'\n"
  msgid "no = sign found in group definition '%s'\n"
  msgstr "ingen = tegn fundet i gruppedefinition »%s«\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "ADVARSEL: Usikker ejerskab af hjemmemappe »%s«\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "ADVARSEL: Usikker ejerskab på konfigurationsfil »%s«\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on extension `%s'\n"
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "ADVARSEL: Usikker ejerskab på udvidelse »%s«\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "ADVARSEL: Usikre rettigheder på hjemmemappe »%s«\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "ADVARSEL: Usikre rettigheder på konfigurationsfil »%s«\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on extension `%s'\n"
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "ADVARSEL: Usikre rettigheder på udvidelse »%s«\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på hjemmemappe »%s«\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2753,19 -2172,16 +2762,19 @@@ msgid "
  msgstr ""
  "ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på udvidelse »%s«\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "ADVARSEL: Usikre indelukkede mapperettigheder på hjemmemappe »%s«\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2775,535 -2191,423 +2784,541 @@@ msgid "
  msgstr ""
  "ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "ADVARSEL: Usikkert indelukket mapperettigheder på udvidelse »%s«\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
  msgstr "ukendt konfigurationspunkt »%s«\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "vis billed-id'er under nøglevisninger"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  #| msgid "show user ID validity during key listings"
  msgid "show key usage information during key listings"
  msgstr "vis bruger-id-validitet under nøglevisninger"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr "vil politikadresser under underskriftvisninger"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "vis alle notationer under underskriftvisninger"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr "vis IETF-standardnotationer under underskriftvisninger"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr "vis brugerangivne notationer under underskriftvisninger"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr "vis bruger-id-validitet under nøglevisninger"
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr "vis tilbagekaldte og udløbne bruger-id'er i nøglevisninger"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "vis nøgleringsnavnet i nøglevisninger"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "vis udløbsdatoer under underskriftvisninger"
  
- #: g10/gpg.c:2011
- #, fuzzy
- #| msgid "Available keys:\n"
- msgid "available TOFU policies:\n"
- msgstr "Tilgængelige nøgler:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "valid values for option '%s':\n"
+ msgstr "manglende parameter for indstilling »%.50s«\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "ukendt tilvalg »%s«\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "invalid value for option '%s'\n"
+ msgstr "manglende parameter for indstilling »%.50s«\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "BEMÆRK: Gammel standardfil for tilvalg »%s« blev ignoreret\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
  msgstr "BEMÆRK: %s er ikke til normal brug!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid signature expiration\n"
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "»%s« er ikke et gyldigt underskriftudløb\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "linje %d: ikke en gyldig e-post-adresse\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "invalid pinentry mode '%s'\n"
  msgstr "ugyldig landekode i »%s«, linje %d\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid character set\n"
  msgid "'%s' is not a valid character set\n"
  msgstr "»%s« er ikke et gyldigt tegnsæt\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "kunne ikke fortolke nøgleserveradresse\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "ugyldige indstillinger for nøgleserver\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: ugyldige importindstillinger\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "ugyldige importindstillinger\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "ugyldige listeindstillinger\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: ugyldige eksportindstillinger\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "ugyldige eksportindstillinger\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: ugyldige listeindstillinger\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "ugyldige listeindstillinger\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "vis billed-id'er under underskriftverificering"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr "vis politikadresser under underskriftverificering"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "vis alle notationer under underskriftverificering"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr "vis IETF-standardnotationer under underskriftverificering"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr "vis brugerangivne notationer under underskriftverificering"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
  msgstr "vis bruger-id-validitet under underskriftverificering"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  msgid "show only the primary user ID in signature verification"
  msgstr "vis kun den primære bruger-id i underskriftverificering"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "valider underskrifter med PKA-data"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "ugyldige verificeringsindstillinger\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "kunne ikke angive kørselssti til %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr "ugyldig liste for auto-key-locate\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "ADVARSEL: program kan oprette en kernefil!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "ADVARSEL: %s overskriver %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ikke tilladt med %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s er meningsløs sammen med %s!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr "ADVARSEL: kører med forfalsket systemtid: "
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "vil ikke køre med usikker hukommelse på grund af %s\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "valgt chifferalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "valgt sammendragsalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "valgt komprimeringsalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed skal være større end 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed skal være større end 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depth skal være i intervallet fra 1 til 255\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
  msgstr "ugyldigt default-cert-level; skal være 0, 1, 2 eller 3\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "ugyldigt min-cert-level; skal være 1, 2 eller 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "BEMÆRK: simpel S2K-tilstand (0) frarådes på det skarpeste\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "ugyldig S2K-tilstand; skal være 0, 1 eller 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "ugyldige standardpræferencer\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "ugyldige præferencer for personlig chiffer\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "ugyldige præferencer for personlig sammendrag\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "ugyldige præferencer for personlig komprimering\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s virker endnu ikke med %s\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "du må ikke bruge sammendragsalgoritmen »%s« i tilstanden %s\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "du må ikke bruge komprimeringsalgoritmen »%s« i tilstanden %s\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "kunne ikke initialisere TrustDB: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  "ADVARSEL: modtagere (-r) angivet uden brug af offentlig nøglekryptering\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [filnavn]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [filnavn]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  #| msgid "symmetric encryption of `%s' failed: %s\n"
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "symmetrisk kryptering af »%s« mislykkedes: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [filnavn]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [filnavn]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "du kan ikke bruge --symmetric --encrypt med --s2k-mode 0\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "du kan ikke bruge --symmetric --encrypt i tilstanden %s\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [filnavn]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [filnavn]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [filnavn]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr "du kan ikke bruge --symmetric --sign --encrypt med --s2k-mode 0\n"
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "du kan ikke bruge --symmetric --sign --encrypt i tilstanden %s\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [filnavn]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [filnavn]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [filnavn]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key bruger-id"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key bruger-id"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key bruger-id [kommandoer]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
  msgstr "--passwd <bruger-id>"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "nøgleserver send mislykkedes: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "nøgleserver modtag mislykkedes: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "nøgleeksport mislykkedes: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "nøgleeksport mislykkedes: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "nøgleserver søg mislykkedes: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "nøgleserver opdater mislykkedes: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "fjernelse af panser mislykkedes: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "påklædning af panser mislykkedes: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "ugyldig hash-algoritme »%s«\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error parsing key specification '%s': %s\n"
  msgstr "fejl ved lagring af certifikat: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[filnavn]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Gå til sagen og skriv meddelelsen ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FILE|tag nøglerne fra nøgleringsFILEN"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "giv kun tidsstempelkonflikter en advarsel"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|skriv statusinformation til denne FD"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Brug: gpgv [tilvalg] [filer] (-h for hjælp)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3321,138 -2623,110 +3336,138 @@@ msgstr "Ingen hjælp tilgængelig
  msgid "No help available for '%s'"
  msgstr "Ingen hjælp tilgængelig for »%s«"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr "importer underskrifter som er markeret som local-only"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr "reparer skade fra pks-nøgleserveren under import"
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "opdater ikke trustdb efter import"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "opdater ikke trustdb efter import"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "vis nøglefingeraftryk"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr "accepter kun opdateringer til eksisterende nøgler"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
  msgstr "fjern ubrugelige dele fra nøgle efter import"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "fjern så meget som muligt fra nøgle efter import"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "     udelader bloktype %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "     %lu-nøgler behandlet\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr " Totalt antal behandl.: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "   udeladte nye nøgler: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "   udeladte nye nøgler: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "      w/o bruger-id'er: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "           importerede: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "              uændrede: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "       nye bruger-id'er: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "       nye undernøgler: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "     nye underskrifter: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "  nye nøgletilbagekald: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr " hemmelige nøgler læst: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr " hemmel. nøgler import: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "hemmel. nøgler uændret: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "      ikke importerede: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "  underskrifter ryddet: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "   bruger-id'er ryddet: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3461,194 -2735,156 +3476,194 @@@ msgstr "
  "ADVARSEL: nøgle %s indeholder præferencer for utilgængelige\n"
  "algoritmer på disse bruger-id'er:\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "        »%s«: præference for chifferalgoritme %s\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "        »%s«: præference for sammendragsalgortime %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "        »%s«: præference for komprimeringsalgortime %s\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "det anbefales på det stærkeste, at du opdaterer dine præferencer og\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "gendistribuerer denne nøgle for at undgå potentielle problemer med rod i\n"
  "algoritmen\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr "du kan opdatere dine præferencer med: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "nøgle %s: ingen bruger-id\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
  msgstr "udelod »%s«: %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "nøgle %s: korruption af PKS-undernøgle er repareret!\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "nøgle %s: accepteret ikke egenunderskrevet bruger-id »%s«\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "nøgle %s: ingen gyldige bruger-id'er\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "dette kan skyldes en manglende egenunderskrift\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "nøgle %s: offentlig nøgle blev ikke fundet: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "nøgle %s: ny nøgle - udeladt\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "ingen skrivbar nøglering fundet: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "fejl ved skrivning af nøglering »%s«: %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "nøgle %s: offentlig nøgle »%s« importeret\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "nøgle %s: stemmer ikke med vores kopi\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "nøgle %s: kan ikke lokalisere original nøgleblok: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "nøgle %s: kan ikke læse original nøgleblok: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "nøgle %s: »%s« 1 ny bruger-id\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "nøgle %s: »%s« %d nye bruger-id'er\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "nøgle %s: »%s« 1 ny underskrift\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "nøgle %s: »%s« %d nye underskrifter\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "nøgle %s: »%s« 1 ny undernøgle\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "nøgle %s: »%s« %d nye undernøgler\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "nøgle %s: »%s« %d underskrift renset\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "nøgle %s: »%s« %d underskrifter renset\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "nøgle %s: »%s« %d bruger-id renset\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "nøgle %s: »%s« %d bruger-id'er renset\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "nøgle %s: »%s« ikke ændret\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "nøgle %s: hemmelig nøgle importeret\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "udelod: hemmelig nøgle er allerede til stede\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "key %s: error sending to agent: %s\n"
  msgstr "fejl under afsendelse af %s-kommando: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
  msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "import af hemmelige nøgler er ikke tilladt\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "nøgle %s: hemmelig nøgle med ugyldig chiffer %d - udeladt\n"
@@@ -3663,183 -2899,149 +3678,183 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "nøgle %s: ingen offentlig nøgle - kan ikke anvende tilbagekaldscertifikat\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - afvist\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "nøgle %s: »%s« tilbagekaldscertifikat importeret\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "nøgle %s: ingen bruger-id for underskrift\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "nøgle %s: ikke understøttet offentlig nøglealgoritme på bruger-id »%s«\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "nøgle %s: ugyldig egenunderskrift på bruger-id »%s«\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "nøgle %s: ugyldig direkte nøgleunderskrift\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "nøgle %s: ingen undernøgle for nøglebinding\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "nøgle %s: ugyldig undernøglebinding\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "nøgle %s: fjernet flerundernøglebinding\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "nøgle %s: ingen undernøgle for nøgletilbagekald\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "nøgle %s: ugyldig undernøgletilbagekald\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "nøgle %s: fjernet flerundernøgletilbagekald\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "nøgle %s: udeladt bruger-id »%s«\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "nøgle %s: udeladt undernøgle\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr ""
  "nøgle %s: underskrift der ikke kan eksporteres (klasse 0x%02X) - udeladt\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "nøgle %s: tilbagekaldscertifikat på forkert sted - udeladt\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - udeladt\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "nøgle %s: undernøgleunderskrift på forkert sted - udeladt\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "nøgle %s: uventet underskriftklasse (0x%02X) - udeladt\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "nøgle %s: duplikeret bruger-id detekteret - sammenføjet\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "ADVARSEL: nøgle %s kan tilbagekaldes: henter tilbagekaldsnøgle %s\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "ADVARSEL: nøgle %s kan tilbagekaldes: tilbagekaldsnøgle %s er ikke til "
  "stede.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "nøgle %s: »%s« tilbagekaldscertifikat tilføjet\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "nøgle %s: direkte nøgleunderskrift tilføjet\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  #| msgid "error creating keybox `%s': %s\n"
  msgid "error creating keybox '%s': %s\n"
  msgstr "fejl ved oprettelse af nøgleboks »%s«: %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
  msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  #| msgid "keybox `%s' created\n"
  msgid "keybox '%s' created\n"
  msgstr "nøgleboks »%s« oprettet\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
  msgstr "nøglering »%s« oprettet\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  #| msgid "keyblock resource `%s': %s\n"
  msgid "keyblock resource '%s': %s\n"
  msgstr "nøgleblokressource »%s«: %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening key DB: %s\n"
  msgstr "fejl ved åbning af »%s«: %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "kunne ikke genbygge nøgleringsmellemlager: %s\n"
@@@ -3852,32 -3052,32 +3867,39 @@@ msgstr "[tilbagekald]
  msgid "[self-signature]"
  msgstr "[egenunderskrift]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ #| msgid "error allocating enough memory: %s\n"
+ msgid "error allocating memory: %s\n"
+ msgstr "fejl ved allokering af nok hukommelse: %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "God underskrift fra"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
  msgstr "udelod »%s«: %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3885,7 -3085,6 +3907,7 @@@ msgid_plural "%d duplicate signatures r
  msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
  msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3893,7 -3092,6 +3915,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
  msgstr[1] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3901,7 -3099,6 +3923,7 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d ugyldige underskrifter\n"
  msgstr[1] "%d ugyldige underskrifter\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3909,14 -3106,12 +3931,14 @@@ msgid_plural "%d signatures reordered\n
  msgstr[0] "God underskrift fra"
  msgstr[1] "God underskrift fra"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3927,17 -3122,14 +3949,17 @@@ msgstr "
  "andre brugers nøgler\n"
  "(ved at kigge på pas, kontrollere fingeraftryk fra andre kilder etc.)\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = Marginal troværdighed\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = Fuld troværdighed\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3947,52 -3139,40 +3969,52 @@@ msgstr "
  "En dybde større end 1 giver nøglen du underskriver mulighed for\n"
  "at lavet troværdighedsunderskrifter på dine vegne.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Indtast venligst et domæne for at begrænse denne underskrift, eller retur "
  "for ingen.\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Bruger-id »%s« er tilbagekaldt."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Er du sikker på, at du stadig vil underskrive (j/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  Kunne ikke underskrive.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Bruger-id »%s« er udløbet."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Bruger-id »%s« er ikke egenunderskrevet."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Bruger-id »%s« kan underskrives.  "
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
  msgstr "Underskriv? (j/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -4001,11 -3181,9 +4023,11 @@@ msgstr "
  "Egenunderskriften på »%s«\n"
  "er en underskrift i PGP 2.x-stil.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Ønsker du at forfremme den til en OpenPGP-egenunderskrift? (j/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4014,12 -3192,10 +4036,12 @@@ msgstr "
  "Din aktuelle underskrift på »%s«\n"
  "er udløbet.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Ønsker du at udstede en ny underskrift for at erstatte den udløbne? (j/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4028,45 -3204,36 +4050,45 @@@ msgstr "
  "Din aktuelle underskrift på »%s«\n"
  "er en lokal underskrift.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Ønsker du at forfremme den til en fuld underskrift, der kan eksporteres (j/"
  "N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "»%s« var allerede underskrevet lokalt af nøgle %s\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "»%s« var allerede underskrevet af nøgle %s\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Ønsker du at underskrive den igen alligevel? (j/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Intet at underskrive med nøgle %s\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "Denne nøgle er udløbet!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Denne nøgle er ved at udløbe på %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Ønsker du at dine underskrifter skal udløbe på samme tidspunkt? (J/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4077,33 -3244,27 +4099,33 @@@ msgstr "
  "faktisk tilhører personen navngivet ovenfor? Hvis du ikke kender svaret, så "
  "indtast »0«.\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Jeg vil ikke svare.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Jeg har ingen kontrol udført.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Jeg har udført en overfladisk kontrol.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Jeg har foretaget en meget omhyggelig kontrol.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Dit valg? (indtast »?« for yderligere information): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4112,233 -3273,179 +4134,233 @@@ msgstr "
  "Er du sikker på, at du ønsker at underskrive denne nøgle\n"
  "med din nøgle »%s« (%s)\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
  msgstr "Dette vil være en egenunderskrift.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "ADVARSEL: Underskriften vil ikke blive markeret som ikke at kunne "
  "eksporteres.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "ADVARSEL: Underskriften vil ikke blive markereret som ikke at kunne "
  "tilbagekaldes.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Underskriften vil blive markeret som ikke at kunne eksporteres.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Underskriften vil blive markeret som ikke at kunne tilbagekaldes.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "Jeg har overhovedet ikke kontrolleret denne nøgle.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "Jeg har overfladisk kontrolleret denne nøgle.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "Jeg har omhyggeligt kontrolleret denne nøgle.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
  msgstr "Underskriv? (j/N) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "underskrift mislykkedes: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "Nøgle har kun stump eller ikkekort nøgleposter - ingen adgangsfrase at "
  "ændre.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "gem og afslut"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "vis nøglefingeraftryk"
  
  # key grip
  # chiefly  ( US ) See also grip the person in charge of moving and setting up camera
  # tracks and scenery in a film or television studio
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  #| msgid "Enter the keygrip: "
  msgid "show the keygrip"
  msgstr "Indtst nøglegrebet: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "vis nøgle og bruger-id'er"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "vælg bruger-id N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "vælg undernøgle N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "kontroller underskrifter"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  "underskriv valgte bruger-id'er [* se nedenfor for relaterede kommandoer]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "underskriv valgte bruger-id'er lokalt"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "underskriv valgte bruger-id'er med en troværdighedsunderskrift"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "underskriv bruger-id'er md en underskrift der ikke kan kaldes tilbage"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "tilføj bruger-id"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "tilføj billed-id"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "slet valgte bruger-id'er"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "tilføj en undernøgle"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "tilføj en nøgle til et smartkort"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "flyt en nøgle til et smartkort"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "flyt en sikkerhedskopinøgle til et smartkort"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "slet valgte undernøgler"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "tilføj en tilbagekaldsnøgle"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "slet underskrifter fra de valgte bruger-id'er"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "ændr udløbsdatoen for nøglen eller valgte undernøgler"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "marker den valgte bruger-id som primær"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "vis præferencer (ekspert)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "vis præferencer (uddybende)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "angiv præferenceliste for de valgte bruger-id'er"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "angiv den foretrukne nøgleserveradresse for de valgte bruger-id'er"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
  msgstr "angiv en notation for de valgte bruger-id'er"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "ændr adgangsfrasen"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "ændr ejertroværdigheden"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "tilbagekald underskrifter på de valgte bruger-id'er"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "tilbagekald valgte bruger-id'er"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "tilbagekald nøgle eller valgte undernøgler"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "aktiver nøgle"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "deaktiver nøgle"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "vis valgte billed-id'er"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "komprimer ubrugelige bruger-id'er og fjern ubrugelige underskrifter fra nøgle"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "komprimer ubrugelige bruger-id'er og fjern alle underskrifter fra nøgle"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "Hemmelig nøgle er tilgængelig.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Har brug for den hemmelige nøgle for dette.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4359,269 -3466,210 +4381,269 @@@ msgstr "
  "tnrsign\n"
  "  etc.).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "Nøglen er tilbagekaldt."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Fif: Vælg bruger-id'erne at underskrive\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "Ukendt underskrifttype »%s«\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Du skal vælge mindst en bruger-id.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Du kan ikke slette den sidste bruger-id!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Vil du virkelig fjerne alle valgte bruger-id'er? (j/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
  msgstr "Vil du virkelig fjerne denne bruger-id? (j/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
  msgstr "Vil du virkelig flytte den primære nøgle? (j/N) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "Du skal vælge præcis en nøgle.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "Kommando forventer en filnavnsparameter\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "Kan ikke åbne »%s«: %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Fejl ved læsning af sikkerhedskopinøgle fra »%s«: %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Du skal vælge mindst en nøgle.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Vil du virkelig slette denne nøgle? (j/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Vil du virkelig tilbagekalde alle valgte bruger-id'er? (j/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Vil du virkelig tilbagekalde dette bruger-id? (j/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Vil du virkelig tilbagekalde hele nøglen? (j/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Vil du virkelig tilbagekalde de valgte undernøgler? (j/N) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Vil du virkelig tilbagekalde denne undernøgle? (j/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Ejertroværdighed kan ikke indstilles, når der bruges en brugerleveret "
  "troværdighedsdatabase\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "Angiv præferenceliste til:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Opdater præferencerne for de valgte bruger-id'er (j/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
  msgstr "Opdater præferencerne? (j/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
  msgstr "Gem ændringer? (j/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
  msgstr "Afslut uden at gemme? (j/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "opdatering mislykkedes: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "Nøgle ikke ændret så ingen opdatering krævet.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Nøgleoprettelse mislykkedes: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "ugyldig fingeraftryk"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  #| msgid "failed to get the fingerprint\n"
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "kunne ikke indhente fingeraftrykket\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "ugyldig værdi\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Ingen sådan bruger-id.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "Nothing to sign with key %s\n"
  msgid "Nothing to sign.\n"
  msgstr "Intet at underskrive med nøgle %s\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Sammendrag: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Funktioner: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "Nøgleserver no-modify"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Fortrukken nøgleserver: "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "Notationer: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr "Der er ingen præferencer på en bruger-id i PGP 2.x-stil.\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Den følgende nøgle blev tilbagekaldt den %s af %s nøgle %s\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "Denne nøgle er tilbagekaldt af %s nøgle %s"
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(sensitiv)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "oprettet: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "tilbagekaldt: %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "udløbet: %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "udløber: %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "brug: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "kortnr.: "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "troværdighed: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "validitet: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Denne nøgle er blevet deaktiveret"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4629,17 -3677,12 +4651,18 @@@ msgstr "
  "Bemærk venligst at den viste nøglevaliditet ikke nødvendigvis er\n"
  "korrekt med mindre du genstarter programmet.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "tilbagekaldt"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "udløbet"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4647,17 -3690,14 +4670,17 @@@ msgstr "
  "ADVARSEL: Intet bruger-id er blevet markeret som primær. Denne kommando\n"
  "        kan medføre at et anden bruger-id bliver den formodede primære.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
  msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4667,35 -3707,27 +4690,35 @@@ msgstr "
  "medføre at\n"
  "          nogle version af PGP afviser denne nøgle.\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Er du sikker på, at du stadig ønsker at tilføje den? (j/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "Du må ikke tilføje et billed-id til en nøgle i PGP2-stil.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Slet denne gode underskrift? (j/N/a)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Slet denne ugyldige underskrift? (j/N/a)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Slet denne ukendte underskrift? (j/n/a)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Virkelig slette denne egenunderskrift? (j/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4703,20 -3735,16 +4726,20 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Slettede %d underskrift.\n"
  msgstr[1] "Slettede %d underskrift.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Intet slettet.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "ugyldig"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Bruger-id »%s« komprimeret: %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4724,17 -3752,14 +4747,17 @@@ msgid_plural "User ID \"%s\": %d signat
  msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
  msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Bruger-id »%s«: allerede minimeret\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Bruger-id »%s«: allerede ryddet\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4744,41 -3769,33 +4767,41 @@@ msgstr "
  "tilbagekalder\n"
  "          kan medføre at nogle versioner af PGP afviser denne nøgle.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr ""
  "Du må ikke tilføje en dedikeret tilbagekalder til en nøgle i PGP 2.x-stil.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr "kan ikke udpege en nøgle i PGP 2.x-stil som dedikeret tilbagekalder\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "du kan ikke udpege en nøgle som dets egen dedikerede tilbagekalder\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
  msgstr "denne nøgle er allerede blevet dedikeret som en tilbagekalder\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr ""
  "ADVARSEL: Udpegning af en nøgle som en dedikeret tilbagekalder kan ikke "
  "fortrydes!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr ""
  "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
  "tilbagekalder? (j/N) "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4789,234 -3806,183 +4812,234 @@@ msgstr "
  "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
  "tilbagekalder? (j/N) "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "underskriftsundernøgle %s er allerede krydscertificeret\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  "undernøgle %s underskriver ikke og skal derfor ikke være krydscertificeret\n"
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Vælg venligst præcis en bruger-id.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "Indtast din foretrukne nøglerserveradresse: "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Er du sikker på, at du ønsker at erstatte den? (j/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Er du sikker på, at du ønsker at slette den? (j/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "Indtast notationen: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
  msgstr "Fortsæt? (j/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Ingen bruger-id med indeks %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Ingen bruger-id med hash %s\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Ingen undernøgle med indeks %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Ingen undernøgle med indeks %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "bruger-id: »%s«\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "underskrevet af din nøgle %s den %s%s%s\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (kan ikke eksporteres)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Denne underskrift udløb den %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Er du sikker på, at du ønsker at tilbagekalde den? (j/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Opret et tilbagekaldscertifikat for denne underskrift? (j/N) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr "Ikke underskrevet af dig.\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Du har underskrevet disse bruger-id'er på nøgle %s:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (kan ikke tilbagekaldes)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "tilbagekaldt af din nøgle %s på %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Du er i gang med at tilbagekalde disse underskrifter:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Opret tilbagekaldscertifikaterne? (j/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "ingen hemmelig nøgle\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "bruger-id »%s« er allerede tilbagekaldt\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr ""
  "ADVARSEL: En bruger-id-underskrift er dateret %d sekunder inde i fremtiden\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Nøgle %s er allerede tilbagekaldt.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Viser %s billed'id med størrelse %ld for nøgle %s (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "præference »%s« duplikeret\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "for mange chifferpræferencer\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "for mange sammendragpræferencer\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
  msgstr "for mange komprimeringspræferencer\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
  msgstr "ugyldigt punkt »%s« i præferencestreng\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "skriver direkte underskrift\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "skriver egenunderskrift\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "skriver underskrift for nøglebinding\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "nøglestørrelse er ugyldig; bruger %u bit\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "nøglestørrelse afrundet op til %u bit\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "ADVARSEL: Nogle OpenPGP-programmer kan ikke håndtere en DS-nøgle med denne\n"
  "sammendragsstørrelse\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "Underskriv"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "Certificer"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "Krypter"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "Godkend"
  
@@@ -5030,108 -3996,87 +5053,108 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "UuKkGfAa"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Mulige handligner for en %s-nøgle: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "Aktuelt tilladte handlinger: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Skift evnen til at underskrive\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Skift evnen til at kryptere\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Skift evnen til at godkende\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Afsluttet\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA og RSA (standard)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA og Elgamal\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (kun underskriv)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (kun underskriv)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (kun krypter)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (kun krypter)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (angiv dine egne evner)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (angiv dine egne evner)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  #| msgid "   (%d) DSA and Elgamal\n"
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA og Elgamal\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (kun underskriv)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (angiv dine egne evner)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (kun krypter)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
@@@ -5140,51 -4085,41 +5163,51 @@@ msgstr "   (%d) Eksisterende nøgle\n
  # key grip
  # chiefly  ( US ) See also grip the person in charge of moving and setting up camera
  # tracks and scenery in a film or television studio
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Indtst nøglegrebet: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Ikke et gyldigt nøglegreb (forventer 40 hex cifre)\n"
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Ingen nøgle med dette nøglegreb\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "afrundet op til %u bit\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s nøgler kan være mellem %u og %u bit lange.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Hvilken nøglestørrelse ønsker du for undernøglen? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Hvilken nøglestørrelse ønsker du? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Ønsket nøglestørrelse er %u bit\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5200,7 -4135,6 +5223,7 @@@ msgstr "
  "      <n>m = nøgle udløber om n måneder\n"
  "      <n>y = nøgle udløber om n år\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5216,38 -4150,30 +5239,38 @@@ msgstr "
  "      <n>m = underskriften udløber om n måneder\n"
  "      <n>y = underskriften udløber om n år\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "Nøgle er gyldig for? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Underskrift er gyldig for? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "ugyldig værdi\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "Nøglen udløber aldrig\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "Underskriften udløber aldrig\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Nøglen udløber den %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Underskriften udløber den %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5255,11 -4181,9 +5278,11 @@@ msgstr "
  "Dit system kan ikke vise datoer efter 2038.\n"
  "Det vil dog blive korrekt håndteret op til 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "Er dette korrekt? (j/N) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5273,7 -4197,6 +5296,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5289,50 -4212,39 +5312,50 @@@ msgstr "
  "    »Heinrich Heine (digteren) <heinrichh at duesseldorf.de>«\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Fødselsnavn: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Ugyldige bogstaver i navn\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "Navn må ikke starte med et tal\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "Navn skal være mindst 5 bogstaver langt\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "E-post-adresse: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "Ikke en gyldig e-post-adresse\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Kommentar: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Ugyldigt tegn i kommentar\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Du bruger tegnsættet »%s«.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5343,7 -4255,6 +5366,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Placer ikke e-post-adressen i fødselsnavnet eller kommentaren\n"
  
@@@ -5358,35 -4269,28 +5381,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Ændr (N)avn, (K)ommentar, (E)-post eller afslut(Q)? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/afslut(Q)? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Ændr (N)avn, (K)ommentar, (E)-post eller afslut(Q)? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/afslut(Q)? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Ret venligst fejlen først\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5398,13 -4302,10 +5421,13 @@@ msgstr "
  "under oprettelse af primtallet; dette giver det vilkårlig\n"
  "taloprettelsesprogram en bedre mulighed for at opnå nok entropi.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Nøgleoprettelse mislykkedes: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5412,71 -4313,58 +5435,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "nøgle findes allerede\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  #| msgid "Use this key anyway? (y/N) "
  msgid "Create anyway? (y/N) "
  msgstr "Brug denne nøgle alligevel? (j/N) "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "opretter ny nøgle\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "Nøgleoprettelse annulleret.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
  msgstr "kan ikke oprette sikkerhedskopifil »%s«: %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "BEMÆRK: sikkerhedskopi af kortnøgle gemt på »%s«\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "skriver offentlig nøgle til »%s«\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "ingen skrivbar offentlig nøglering fundet: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "fejl ved skrivning af offentlig nøglering »%s«: %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5484,7 -4372,6 +5507,7 @@@ msgstr "
  "Bemærk at denne nøgle ikke kan bruges til kryptering. Du kan bruge\n"
  "kommandoen »--edit-key« til at oprette en undernøgle til dette formål.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5492,7 -4379,6 +5515,7 @@@ msgstr "
  "nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
  "urproblem)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5500,26 -4386,21 +5523,26 @@@ msgstr "
  "nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
  "urproblem)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr ""
  "BEMÆRK: Oprettelse af undernøgler for v3-nøgler overholder ikke OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Hemmelige dele for primær nøgle er ikke tilgængelige.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Hemmelige dele for primær nøgle gemmes på kortet.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
  msgstr "Vil du virkelig oprette? (j/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "aldrig    "
  
@@@ -5570,29 -4442,23 +5593,29 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "Nøglering"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Primær nøglefingeraftryk:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "     Undernøglefingeraftryk:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr "Primær nøglefingeraftryk:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "  Undernøglefingeraftryk:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "    Nøglefingeraftryk ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr "   Serielnr. for kort ="
  
@@@ -5630,53 -4491,41 +5653,53 @@@ msgstr[1] "1 ugyldig underskrift\n
  msgid "%s: keyring created\n"
  msgstr "%s: nøglering oprettet\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr "inkluder tilbagekaldte nøgler i søgeresultater"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr "inkluder undernøgler når der søges efter nøgle-id"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr "hent automatisk nøgler når der verificeres underskrifter"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "overhold den foretrukne nøglerserveradresse angivet på nøglen"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr "overhold PKA-posten angivet på en nøgle når der hentes nøgler"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "deaktiveret"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr "Indtal tal, N)æste eller Q) for Afslut > "
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "ugyldig nøgleserverprotokol (os %d!=håndtag %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "»%s« er ikke et nøgle-id: udelader\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  #| msgid "refreshing %d keys from %s\n"
  msgid "refreshing %d key from %s\n"
@@@ -5684,57 -4533,46 +5707,57 @@@ msgid_plural "refreshing %d keys from %
  msgstr[0] "opdaterer %d nøgler fra %s\n"
  msgstr[1] "opdaterer %d nøgler fra %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "ADVARSEL: Kan ikke opdatere nøgle %s via %s: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "nøgle »%s« blev ikke fundet på nøgleserver\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "nøgle blev ikke fundet på nøgleserver\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr "ingen kendt nøgleserver (brug tilvalget --keyserver)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "anmoder om nøgle %s fra %s server %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "anmoder om nøgle %s fra %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  #| msgid "no keyserver action!\n"
  msgid "no keyserver known\n"
  msgstr "ingen nøgleserverhandling!\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "udelod »%s«: %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "sender nøgle %s til %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  #| msgid "requesting key %s from %s\n"
  msgid "requesting key from '%s'\n"
  msgstr "anmoder om nøgle %s fra %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "ADVARSEL: kan ikke hente URI %s: %s\n"
@@@ -5835,132 -4653,105 +5858,132 @@@ msgstr "oprindeligt filnavn=»%.*s«\n
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr "ADVARSEL: flere klartekster set\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "uafhængig tilbagekald - brug »gpg --import« for at anvende\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "ingen underskrift fundet\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "UGYLDIG underskrift fra »%s«"
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Udløbet underskrift fra »%s«"
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "God underskrift fra »%s«"
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "underskriftverificering undertrykt\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "kan ikke håndtere disse tvetydige underskriftdata\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Underskrift lavet %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               bruger %s nøgle %s\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Underskrift lavet %s med %s nøgle-id %s\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "       også kendt som »%s«"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Nøgle tilgængelig på: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[usikker]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "       også kendt som »%s«"
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Underskrift udløbet %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Underskrift udløber %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s underskrift, sammendragsalgoritme %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binær"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "tekstilstand"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "ukendt"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "algorithm: %s"
  msgid ", key algorithm "
  msgstr "algoritme: %s"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Kan ikke kontrollere underskrift: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "ikke en frakoblet underskrift\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "ADVARSEL: flere underskrifter detekteret. Kun den første vil blive "
  "kontrolleret.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "uafhængig underskrift for klasse 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "gammeldags (PGP 2.x) underskrift\n"
  
@@@ -6063,30 -4835,25 +6086,30 @@@ msgstr "Ukomprimeret
  msgid "uncompressed|none"
  msgstr "ukomprimeret|ingen"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "denne besked kan nok ikke bruges af %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  #| msgid "ambiguous option `%s'\n"
  msgid "ambiguous option '%s'\n"
  msgstr "tvetydigt tilvalg »%s«\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown option '%s'\n"
  msgstr "ukendt tilvalg »%s«\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  #, fuzzy
  #| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr "DSA kræver at hashlængden skal gå op i 8 bit\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "unknown weak digest '%s'\n"
@@@ -6390,7 -5102,25 +6413,28 @@@ msgstr "Denne nøgle tilhører sikkert 
  msgid "This key belongs to us\n"
  msgstr "Denne nøgle tilhører os\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ #| msgid "root certificate has now been marked as trusted\n"
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "rodcertifikat er nu blevet markeret som troværdig\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "Det er IKKE sikkert, at nøglen tilhører personen navngivet\n"
+ "i bruger-id'et. Hvis du *virkelig* ved hvad du gør,\n"
+ "så kan du besvare det næste spørgsmål med ja.\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6400,139 -5130,111 +6444,139 @@@ msgstr "
  "i bruger-id'et. Hvis du *virkelig* ved hvad du gør,\n"
  "så kan du besvare det næste spørgsmål med ja.\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "Brug denne nøgle alligevel? (j/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "ADVARSEL: Bruger nøgle uden troværdighed!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
  "ADVARSEL: Denne nøgle kan tilbagekaldes (tilbagekaldsnøgle er ikke til "
  "stede)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr ""
  "ADVARSEL: Denne nøgle er blevet tilbagekaldt af dens designmæssige "
  "tilbagekalder!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "ADVARSEL: Denne nøgle er blevet tilbagekaldt af dets ejer!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
  msgstr "         Dette kan betyde at underskriften er forfalsket.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "ADVARSEL: Denne undernøgle er blevet tilbagekaldt af dens ejer!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Bemærk: Denne nøgle er blevet deaktiveret.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, fuzzy, c-format
  #| msgid "Note: Verified signer's address is `%s'\n"
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr "Bemærk: Verificeret underskriftsejers adresse er »%s«\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, fuzzy, c-format
  #| msgid "Note: Signer's address `%s' does not match DNS entry\n"
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr "Bemærk: Underskriftejers adresse »%s« matcher ikke DNS-post\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  "troværdighedsniveau justeret til FULL på grund af gyldig PKA-information\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  "troværdighedsniveau justeret til NEVER på grund af ugyldig PKA-information\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Bemærk: Denne nøgle er forældet!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr ""
  "ADVARSEL: Denne nøgle er ikke certificeret med en troværdig underskrift!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr "         Intet tyder på at denne signatur tilhører ejeren.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "ADVARSEL: Vi tror IKKE på denne nøgle!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "         Signaturen er formentlig FORFALSKET.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
  "ADVARSEL: Denne nøgle er ikke certificeret med tilstrækkelig troværdige "
  "underskrifter!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "         Det er ikke sikkert at signaturen tilhører ejeren.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: udelod: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: udelod: offentlig nøgle er slået fra\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: udelod: offentlig nøgle er allerede til stede\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "kan ikke forbinde til »%s«: %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "linje %d: ugyldig algoritme\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "linje %d: ugyldig algoritme\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "Du angav ikke et bruger-id. (du kan bruge »-r«)\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "Aktuelle modtagere:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6540,37 -5242,29 +6584,37 @@@ msgstr "
  "\n"
  "Indtast bruger-id'et. Slut med en tom linje: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Ingen sådan bruger-id.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr "udeladt: offentlig nøgle er allerede valgt som standardmodtager\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "Offentlig nøgle er slået fra.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "udelod: offentlig nøgle er allerede angivet\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "ukendt standardmodtager »%s«\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "ingen gyldige adresser\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Bemærk: nøgle %s har ingen %s-funktion\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Bemærk: nøgle %s har ingen præference for %s\n"
@@@ -6817,27 -5465,22 +6861,27 @@@ msgstr "%s-nøglen bruger en usikker (%
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr "DSA-nøgle %s kræver en %u bit eller større hash\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "ADVARSEL: konflikt for underskriftssammendrag i besked\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "ADVARSEL: underskriftsundernøgle %s er ikke krydscertificeret\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
  msgstr "se venligst %s for yderligere information\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
  "ADVARSEL: underskriftsundernøgle %s har en ugyldig krydscertificering\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu second newer than the signature\n"
@@@ -6845,7 -5488,6 +6889,7 @@@ msgid_plural "public key %s is %lu seco
  msgstr[0] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
  msgstr[1] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu day newer than the signature\n"
@@@ -6853,7 -5495,6 +6897,7 @@@ msgid_plural "public key %s is %lu day
  msgstr[0] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
  msgstr[1] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6868,7 -5509,6 +6912,7 @@@ msgstr[1] "
  "nøgle %s blev oprettet %lu sekund inde i fremtiden (tidsforskydning eller et "
  "problem med uret)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6882,31 -5522,26 +6926,31 @@@ msgstr[1] "
  "nøgle %s blev oprettet %lu sekund inde i fremtiden (tidsforskydning eller et "
  "problem med uret)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  #| msgid "NOTE: signature key %s expired %s\n"
  msgid "Note: signature key %s expired %s\n"
  msgstr "BEMÆRK: underskriftnøgle %s udløb %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  #| msgid "NOTE: signature key %s has been revoked\n"
  msgid "Note: signature key %s has been revoked\n"
  msgstr "BEMÆRK: underskriftnøgle %s er blevet tilbagekaldt\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
  "antager ugyldig underskrift fra nøgle %s på grund af en ukendt kritisk del\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr ""
  "nøgle %s: ingen undernøgle til tilbagekaldsunderskrift for undernøgle\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "nøgle %s: ingen undernøgle til bindingsunderskrift for undernøgle\n"
@@@ -6975,7 -5599,6 +7019,7 @@@ msgid "this is a PGP generated Elgamal 
  msgstr ""
  "dette er en PGP-oprettet Elgamalnøgle som ikke er sikker for underskrifter!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "stol på post %lu, type %d: skrivning mislykkedes: %s\n"
@@@ -7023,12 -5638,10 +7067,12 @@@ msgstr "fejl under forsøg på at find
  msgid "read error in '%s': %s\n"
  msgstr "læsefejl i »%s«: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: synkronisering mislykkedes: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  #| msgid "can't create lock for `%s'\n"
  msgid "can't create lock for '%s'\n"
@@@ -7059,7 -5667,6 +7103,7 @@@ msgstr "transaktion for trustdb er for 
  msgid "%s: directory does not exist!\n"
  msgstr "%s: mappe findes ikke!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
@@@ -7171,179 -5756,170 +7215,208 @@@ msgstr "kan ikke håndtere tekstlinjer 
  msgid "input line longer than %d characters\n"
  msgstr "inddatalinje er længere end %d tegn\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "fejl under afsendelse af standardtilvalg: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "ikke understøttet algoritme: %s"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "fejl under afsendelse af %s-kommando: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "fejl ved skrivning af hemmelig nøglering »%s«: %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: fejl ved skrivning af mappepost: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "fejl ved åbning af »%s«: %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "fejl under afsendelse af %s-kommando: %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
+ msgstr ""
+ 
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "fejl ved indhentelse af ny PIN: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "vis nøgle og bruger-id'er"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "validitet: %s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "fejl ved indhentelse af gemte flag: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "vis nøgler"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "vis beskedsammendrag"
  msgstr[1] "vis beskedsammendrag"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
+ #, c-format
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ #| msgid "error writing key: %s\n"
+ msgid "resetting keydb: %s\n"
+ msgstr "fejl ved skrivning af nøgle: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "fejl ved lagring af flag: %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
@@@ -7351,94 -5927,87 +7424,103 @@@ msgstr "fejl ved oprettelse af datakana
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Slettede %d underskrifter.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "vis beskedsammendrag"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "vis beskedsammendrag"
+ msgstr[1] "vis beskedsammendrag"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "krypteret med %lu adgangsfraser\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "vis beskedsammendrag"
+ msgstr[1] "vis beskedsammendrag"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7452,104 -6021,93 +7534,116 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "fejl under afsendelse af %s-kommando: %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "fejl ved skrivning af offentlig nøglering »%s«: %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
  msgstr "»%s« er ikke et gyldigt nøgle-id\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "nøgle %s: accepteret som troværdig nøgle\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "nøgle %s fremgår mere end en gang i trustdb\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr "nøgle %s: ingen offentlig nøgle for troværdig nøgle - udeladt\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "nøgle %s markeret som ultimativ troværdig\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "troværdighedspost %lu, req-type %d: læsning mislykkedes: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "troværdighedspost %lu er ikke af den anmodne type %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr "Du kan forsøge at genskabe trustdb med kommandoerne:\n"
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr "Hvis det ikke virker, så se venligst manualen\n"
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "kan ikke bruge ukendt troværdighedsmodel (%d) - antager %s "
  "troværdighedsmodel\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "bruger %s troværdighedsmodel\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "intet behov for kontrol af trustdb\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "næste kontrol af trustdb sker den %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  #| msgid "no need for a trustdb check with `%s' trust model\n"
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "intet behov for kontrol af trustdb med troværdighedsmodellen »%s«\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  #| msgid "no need for a trustdb update with `%s' trust model\n"
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr ""
  "intet behov for en opdatering af trustdb med troværdighedsmodellen »%s«\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "offentlig nøgle %s blev ikke fundet: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "udfør venligst en --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "kontrollerer trustdb\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7557,7 -6115,6 +7651,7 @@@ msgid_plural "%d keys processed
  msgstr[0] "     %lu-nøgler behandlet\n"
  msgstr[1] "     %lu-nøgler behandlet\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7565,16 -6122,13 +7659,16 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d nøgler behandlet (%d validiteter ryddet)\n"
  msgstr[1] "%d nøgler behandlet (%d validiteter ryddet)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "ingen ultimativ troværdige nøgler fundet\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "offentlig nøgle for ultimativ troværdig nøgle %s blev ikke fundet\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7582,7 -6136,6 +7676,7 @@@ msgstr "
  "dybde: %d  gyldig: %3d  underskrevet: %3d  troværdighed: %d-, %dq, %dn, %dm, "
  "%df, %du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "kan ikke opdatere trustdb-versionspost: skrivning mislykkedes: %s\n"
@@@ -7695,57 -6227,44 +7789,57 @@@ msgstr "
  "Syntaks: kbxutil [tilvalg] [filer]\n"
  "Vis, eksporter, importer Keybox-data\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSA-modulus mangler eller har ikke størrelsen %d bit\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "RSA offentlig eksponent mangler eller større end %d bit\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN-tilbagekald returnerede fejl: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr "NullPIN'en er endnu ikke ændret\n"
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "|N|Indtast venligst en ny PIN for standardnøglerne."
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
  msgstr "||Indtast venligst PIn'en for standardnøglerne."
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr ""
  "|NP|Indtast venligst en ny PIN Unblocking Code (PUK) for standardnøglerne."
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|P|Indtast venligst PIN Unblocking Code (PUK) for standardnøglerne."
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  "|N|Indtast venligst en ny PIN for nøglen til at oprette kvalificerede "
  "underskrifter."
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  "||Indtast venligst PIN'en for nøglen til at oprette kvalificerede "
  "underskrifter."
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7753,7 -6272,6 +7847,7 @@@ msgstr "
  "|NP|Indtast venligst en ny PIN Unblocking Code (PUK) for nøglen til at "
  "oprette kvalificerede underskrifter."
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7761,85 -6279,67 +7855,85 @@@ msgstr "
  "|P|Indtast venligst PIN Unblocking Code (PUK) for nøglen til at oprette "
  "kvalificerede underskrifter."
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "fejl ved indhentelse af ny PIN: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "kunne ikke gemme fingeraftrykket: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "læsning af offentlig nøgle mislykkedes: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "svar indeholder ikke data for offentlig nøgle\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr "svar indeholder ikke RSA modulus'erne\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
  
- #: scd/app-openpgp.c:1322
++#: scd/app-openpgp.c:1353
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
- msgid "response does not contain the EC public point\n"
+ msgid "response does not contain the EC public key\n"
  msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "svar indeholder ikke data for offentlig nøgle\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "læsning af offentlig nøgle mislykkedes: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "bruger standard-PIN som %s\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "kunne ikke bruge standard-PIN som %s: %s - deaktiverer yderligere "
  "standardbrug\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Indtast venligst PIN%%0A[sigs færdig: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
  msgstr "||Indtast venligst PIN'en"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN for CHV%d er for kort; minimumlængde er %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "verificering af CHV%d mislykkedes: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "fejl ved indhentelse af CHV-status fra kort\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr "kort er permanent låst!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7850,24 -6350,19 +7944,24 @@@ msgstr[1] "%d PIN-forsøg for administr
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Ændr venligst administrator-PIN%%0A[tilbageværende forsøg: %d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Indtast venligst administrator-PIN'en"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr "adgang til administratorkommandoer er ikke konfigureret\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Indtast venligst nulstillingskoden for kortet"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Nulstillingskode er for kort; minimumlængde er %d\n"
@@@ -7875,79 -6370,61 +7969,79 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr "|RN|Ny nulstillingskode"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Ny administrator-PIN"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|Ny PIN"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Indtast venligst administrator-PIN'en og ny administrator-PIN"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Indtast venligst PIN'en og ny PIN"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
  msgstr "fejl ved læsning af programdata\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "fejl ved læsning af fingeraftryk DO\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "nøgle findes allerede\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr "eksisterende nøgle vil blive erstattet\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "opretter ny nøgle\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
  msgstr "skriver ny nøgle\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "oprettelsestidsstempel mangler\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA-primtal %s mangler eller har ikke størrelsen %d bit\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "kunne ikke gemme nøglen: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported curve\n"
  msgstr "ikke understøttet algoritme: %s"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "vent venligst mens nøglen bliver oprettet ...\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
  msgstr "oprettelse af nøgle mislykkedes\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -7955,32 -6432,26 +8049,32 @@@ msgid_plural "key generation completed 
  msgstr[0] "nøgleoprettelse færdig (%d sekunder)\n"
  msgstr[1] "nøgleoprettelse færdig (%d sekunder)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "ugyldig struktur for OpenPGP-kort (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr "fingeraftryk på kort matcher ikke den anmodte\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "underskrifter oprettet indtil videre: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "verifikation af administrator-PIN er i øjeblikket forbudt via denne "
  "kommando\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "kan ikke tilgå %s - ugyldig OpenPGP-kort?\n"
@@@ -8000,7 -6468,6 +8094,7 @@@ msgstr "|N|Oprindelig ny PIN
  msgid "run in multi server mode (foreground)"
  msgstr "kør i flerservertilstand (forgrund)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
  
@@@ -8058,7 -6514,6 +8152,7 @@@ msgstr "
  "Syntaks: scdaemon [tilvalg] kommando [parametre]]\n"
  "Smartcard-dæmon for GnuPG\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  #, fuzzy
  #| msgid ""
  #| "please use the option `--daemon' to run the program in the background\n"
@@@ -8066,12 -6521,10 +8160,12 @@@ msgid "please use the option '--daemon
  msgstr ""
  "brug venligst tilvalget »--daemon« til at køre programmet i baggrunden\n"
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "håndtering for fd %d startet\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "håndtering for fd %d termineret\n"
@@@ -8092,11 -6542,9 +8186,11 @@@ msgstr "ingen gpg-agent kører i denne 
  msgid "validation model requested by certificate: %s"
  msgstr "anmodt om valideringsmodel af certifikat: %s"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr "kæde"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr "skal"
  
@@@ -8129,197 -6571,150 +8223,197 @@@ msgstr "bemærk: ikkekritisk certifikat
  msgid "certificate policy not allowed"
  msgstr "certifikatpolitik er ikke tilladt"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr "slår udsteder op på ekstern placering\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr "antallet af udstedere der matcher: %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr "slår udsteder op fra Dirmngr-mellemlageret\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "antallet af matchende certifikater: %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "dirmngr cache-only-nøgleopslag mislykkedes: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "kunne ikke allokere keyDB-håndtag\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
  msgstr "certifikat er blevet tilbagekaldt"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "status for certifikatet er ukendt"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr "sikr dig at »dirmngr« er korrekt installeret\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
  msgstr "kontrol af CRL'en mislykkedes: %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "certifikat med ugyldig validitet: %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr "certifikat er endnu ikke gyldigt"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
  msgstr "rodcertifikat er endnu ikke gyldigt"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr "mellemliggende certifikat er endnu ikke gyldigt"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
  msgstr "certifikat er udløbet"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
  msgstr "rodcertifikat er udløbet"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
  msgstr "mellemliggende certifikat er udløbet"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr "krævede certifikatattributter mangler: %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
  msgstr "certifikat med ugyldig validitet"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr "underskrift blev ikke oprettet under certifikatets livsforløb"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr "certifikat blev ikke oprettet under udsteders livsforløb"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  "mellemliggende certifikat blev ikke oprettet under udsteders livsforløb"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  (underskr. oprettet den "
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "  (certifkat oprettet den "
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
  msgstr "  (certifikat gyldigt fra "
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr "  (   udsteder gyldig fra "
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "fingeraftryk=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr "rodcertifikat er nu blevet markeret som troværdig\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr "interaktiv markering som troværdig er ikke aktiveret i gpg-agent\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr "interaktiv markering som troværdig deaktiveret for denne session\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  "ADVARSEL: oprettelsestidspunkt for underskrift er ukendt - antager aktuelt "
  "tidspunkt"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "ingen udsteder fundet i certifikat"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr "egenunderskrevet certifikat har en UGYLDIG underskrift"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr "rodcertifikat er ikke markeret som troværdig"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr "certifikatkæde er for lang\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "udstedercertifikat blev ikke fundet"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
  msgstr "certifikat har en UGYLDIG underskrift"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr "fandt et andet mulig matchende CA-certifikat - prøver igen"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "certifikatkæde er længere end tilladt af CA (%d)"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "certifikat er gyldigt\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
  msgstr "mellemliggende certifikat er gyldigt\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
  msgstr "rodcertifikat er gyldigt\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr "skifter til kædemodel"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr "valideringsmodel brugt: %s"
@@@ -8662,7 -6991,6 +8756,7 @@@ msgstr "(dette ser ikke ud til at vær
  msgid "certificate '%s' not found: %s\n"
  msgstr "certifikat »%s« blev ikke fundet: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
  msgstr "fejl ved låsning af nøgleboks: %s\n"
@@@ -8688,125 -7012,95 +8782,125 @@@ msgstr "sletning af certifikat »%s« m
  msgid "no valid recipients given\n"
  msgstr "ingen gyldige modtagere angivet\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
  msgstr "vis eksterne nøgler"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
  msgstr "vis certifikatkæde"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
  msgstr "importer certifikater"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
  msgstr "eksporter certifikater"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "registrer et smartkort"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "send en kommando til dirmngr'en"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr "opstart gpg-protect-tool"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
  msgstr "opret base-64-kodet resultat"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr "antag inddata er i PEM-format"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr "antag inddata er i base-64-format"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr "antag inddata er i binært format"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr "konsulter aldrig en CRL"
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr "kontroller validitet med OCSP"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr "|N|antal certifikater der skal inkluderes"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr "|FILE|tag politikinformation fra FIL"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr "kontroller ikke certifikatpolitikker"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr "hent manglende udstedercertifikater"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "brug overhovedet ikke terminalen"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FILE|skriv en servertilstandslog til FIL"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FILE|skriv en revisionslog til FIL"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "kørselstilstand: spørg aldrig"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "forvent ja til de fleste spørgsmål"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "forvent nej til de fleste spørgsmål"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FILE|tilføj nøglering til nøgleringslisten"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|USER-ID|brug BRUGER-ID som hemmelig standardnøgle"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|brug denne nøgleserver til at slå nøgler op"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAME|brug chifferalgoritme NAVN"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAME|brug beskedsammendragsalgoritme NAVN"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgsm [options] [files]\n"
@@@ -8821,50 -7115,41 +8915,50 @@@ msgstr "
  "Sign, check, encrypt eller decrypt med S/MIME-protokollen\n"
  "standardhandling afhænger af inddata\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  #| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "BEMÆRK: kan ikke kryptere til »%s«: %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  #| msgid "unknown validation model `%s'\n"
  msgid "unknown validation model '%s'\n"
  msgstr "ukendt valideringsmodel »%s«\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: intet værtsnavn angivet\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: adgangskode angivet uden bruger\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: udelader denne linje\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
  msgstr "kunne ikke fortolke nøgleserver\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  #| msgid "importing common certificates `%s'\n"
  msgid "importing common certificates '%s'\n"
  msgstr "importerer gængse certifikater »%s«\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  #| msgid "can't sign using `%s': %s\n"
  msgid "can't sign using '%s': %s\n"
  msgstr "kan ikke underskrive med »%s«: %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr "ugyldig kommando (der er ingen implict kommando)\n"
  
@@@ -8881,7 -7163,6 +8975,7 @@@ msgstr "fejl ved lagring af certifikat\
  msgid "basic certificate checks failed - not imported\n"
  msgstr "grundlæggende certifikatkontroller mislykkedes - ikke importeret\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "fejl ved indhentelse af gemte flag: %s\n"
@@@ -8896,31 -7175,25 +8990,31 @@@ msgstr "fejl under import af certifikat
  msgid "error reading input: %s\n"
  msgstr "fejl ved læsning af inddata: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
  msgstr "kunne ikke indhente fingeraftrykket\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr "problem under udkig efter eksisterende certifikat: %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "fejl under søgning efter skrivbar keyDB (nøgledatabase): %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
  msgstr "fejl ved lagring af certifikat: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "problem under gensøgning af certifikat: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
  msgstr "fejl ved lagring af flag: %s\n"
@@@ -9899,122 -7995,98 +9993,126 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "|FILE|run commands from FILE on startup"
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|kør kommandoer fra FIL ved opstart"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "send en kommando til dirmngr'en"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FILE|skriv servertilstandslogge til FIL"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "Afslut uden at gemme? (j/N) "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "tillad PKA-opslag (DNS-forespørgsler)"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  #| msgid "|FILE|read options from FILE"
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FIL|læs tilvalg fra FIL"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  #| msgid "|URL|use keyserver at URL"
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|brug nøgleserver på adressen"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10027,13 -8099,11 +10125,13 @@@ msgstr "
  "@\n"
  "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10045,88 -8115,71 +10143,88 @@@ msgstr "
  "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
  "Hemmelig nøglehåndtering for GnuPG\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "valid debug levels are: %s\n"
  msgstr "ugyldigt fejlsøgningsniveau »%s« angivet\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "brug: gpgsm [tilvalg] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "%s ikke tilladt med %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  #| msgid "conversion from `%s' to `%s' failed: %s\n"
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "konvertering fra »%s« til »%s« mislykkedes: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  #| msgid "line too long - skipped\n"
  msgid "%s:%u: line too long - skipped\n"
  msgstr "linje er for lang - udeladt\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "ugyldig fingeraftryk"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "%s:%u: read error: %s\n"
  msgstr "læsefejl i »%s«: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "ikke tvunget"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10316,14 -8333,6 +10414,7 @@@ msgstr "»%s« er ikke en JPEG-fil\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- #| msgid "error allocating enough memory: %s\n"
- msgid "error allocating memory: %s\n"
- msgstr "fejl ved allokering af nok hukommelse: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  #| msgid "error writing to %s: %s\n"
  msgid "error printing log line: %s\n"
@@@ -10611,86 -8568,70 +10702,86 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "afsendelse af linje mislykkedes: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire failed: %s\n"
  msgstr "afsendelse af linje mislykkedes: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "select mislykkedes: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error sending data: %s\n"
  msgstr "fejl under afsendelse af %s-kommando: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "start_cert_fetch failed: %s\n"
  msgstr "select mislykkedes: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_next_cert failed: %s\n"
  msgstr "select mislykkedes: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  #| msgid "cannot allocate outfile string: %s\n"
  msgid "can't allocate control structure: %s\n"
  msgstr "kan ikke allokere outfile-streng: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  #| msgid "failed to create stream from socket: %s\n"
  msgid "failed to allocate assuan context: %s\n"
  msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "kunne ikke initialisere TrustDB: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  #| msgid "failed to store the creation date: %s\n"
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10746,7 -8678,6 +10837,7 @@@ msgstr "
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "certifikat burde ikke være brugt for underskrift\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "stille"
  
@@@ -10925,11 -8815,9 +11016,11 @@@ msgstr "|NAME|krypter også til bruger-
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|opsæt e-post-aliasser"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr "Konfiguration for nøgleservere"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|brug nøgleserver på adressen"
  
@@@ -10961,144 -8842,118 +11052,150 @@@ msgstr "Tilvalg der kontrollerer format
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Tilvalg der kontrollerer interaktiviteten og tvang"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Tilvalg der kontrollerer sikkerheden"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr "Konfiguration for HTTP-servere"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr "brug systemets HTTP-proxyopsætning"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr "Konfiguraiton af LDAP-servere der skal bruges"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr "LDAP-serverliste"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr "Konfiguration for OCSP"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
++#: tools/gpgconf-comp.c:1070
+ msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
  #| msgid "Bad Passphrase"
- msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "Ugyldig adgangsfrase"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Komponent blev ikke fundet"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Ekstern verifikation af komponent %s mislykkedes"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr "Bemærk at gruppespecifikationer ignoreres\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr "vis alle komponenter"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr "kontroller alle programmer"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|COMPONENT|vis indstillinger"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|COMPONENT|ændr indstillinger"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|COMPONENT|kontroller indstillinger"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr "anvend globale standardværdier"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  #, fuzzy
  #| msgid "get the configuration directories for gpgconf"
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "hent konfigurationsmapperne for gpgconf"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
  msgstr "vis global konfigurationsfil"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
  msgstr "kontroller global konfigurationsfil"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "opdater troværdighedsdatabasen"
+ 
++#: tools/gpgconf.c:86
  #, fuzzy
  #| msgid "list all components"
  msgid "reload all or a given component"
  msgstr "vis alle komponenter"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  #| msgid "list all components"
  msgid "launch a given component"
  msgstr "vis alle komponenter"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  #, fuzzy
  #| msgid "list all components"
  msgid "kill a given component"
  msgstr "vis alle komponenter"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "brug som uddatafil"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr "aktiver ændringer ved kørselstid, hvis muligt"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgconf [options]\n"
@@@ -11110,15 -8965,12 +11207,15 @@@ msgstr "
  "Syntaks: gpgconf [tilvalg]\n"
  "Håndter konfigurationsindstillinger for værktøjer i GnuPG-systemet\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "Kræver en kompomentparameter"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "Komponent blev ikke fundet"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr "Ingen parameter tilladt"
  
diff --cc po/de.po
index c98cdd5,aad4cd1..ff91186
--- a/po/de.po
+++ b/po/de.po
@@@ -9,8 -9,7 +9,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg-2.1.0\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
- "PO-Revision-Date: 2016-08-18 16:52+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
+ "PO-Revision-Date: 2016-11-18 15:40+0100\n"
  "Last-Translator: Werner Koch <wk at gnupg.org>\n"
  "Language-Team: German <de at li.org>\n"
  "Language: de\n"
@@@ -19,7 -18,6 +19,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=n != 1;\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
@@@ -30,47 -28,37 +30,47 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr "_OK"
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr "_Abbrechen"
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr "_Ja"
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr "_Nein"
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr "Im Passwordmanager _speichern"
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr ""
  "Möchten Sie die eingegebene Passphrase wirklich auf dem Bildschirm sichtbar "
  "machen?"
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr "Die Passphrase sichtbar machen"
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  msgid "|pinentry-tt|Hide passphrase"
  msgstr "Passphrase unsichtbar machen"
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr "Qualität:"
  
@@@ -80,14 -68,12 +80,14 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Die Qualität der Passphrase, die Sie oben eingegeben haben.\n"
  "Bitte fragen sie Ihren Systembeauftragten nach den\n"
  "Kriterien für die Messung der Qualität."
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -95,7 -81,6 +95,7 @@@ msgstr "
  "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
  "kann"
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -103,53 -88,40 +103,53 @@@ msgstr "
  "Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
  "werden kann."
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Passphrase:"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "Keine Übereinstimmung - bitte nochmal versuchen."
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (Versuch %d von %d)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr "Nochmal:"
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
  msgstr "Die PIN ist zu lang"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
  msgstr "Das Mantra (Passphrase) ist zu lang!"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
  msgstr "Ungültige Zeichen in der PIN!"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr "Die PIN ist zu kurz!"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "Falsche PIN!"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
  msgstr "Falsche Passphrase!"
  
@@@ -158,24 -129,10 +158,24 @@@
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "'%s' kann nicht erzeugt werden: %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@@ -200,17 -153,6 +200,7 @@@ msgstr "Auf der Karte ist kein Authenti
  msgid "no suitable card key found: %s\n"
  msgstr "keine passender Kartenschlüssel gefunden: %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "\"Shadowing\" des Schlüssels schlug fehl: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "Fehler beim Schreiben des Schlüssels: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -219,26 -161,21 +209,26 @@@ msgstr "
  "Ein SSH Processs möchte folgenden Schlüssel verwenden:%%0A  %s%%0A  "
  "(%s)%%0AErlauben Sie dies?"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr "Erlauben"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr "Verweigern"
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr ""
  "Bitte geben Sie die Passphrase für den SSH-Schlüssel%%0A  %F%%0A  "
  "(%c)%%0Aein."
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -248,16 -185,13 +238,16 @@@ msgstr "
  "Schlüssel%%0A   %s%%0A  %s%%0Aim Schlüsselspeicher des Gpg-Agenten zu "
  "schützen."
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr "Die legen Sie die Karte mit der folgenden Seriennummer ein:"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  "Bitte entfernen Sie die vorhanden Karte und legen Sie die mit der folgenden "
@@@ -390,8 -300,6 +380,8 @@@ msgstr "Bitte geben Sie die Passphrase 
  msgid "Please enter the new passphrase"
  msgstr "Bitte geben Sie die Passphrase ein:"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -399,130 -307,95 +389,134 @@@ msgstr "
  "@Optionen:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "Im Daemon Modus ausführen"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "Im Server Modus ausführen"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ msgid "run in supervised mode"
+ msgstr "Im \"Supervised\" Modus ausführen"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "Detaillierte Informationen"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "Reduzierte Informationen"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr "Ausgabe für /bin/sh"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr "Ausgabe für /bin/csh"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "Im Vordergrund laufen lassen"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr "Tastatur und Maus nicht \"grabben\""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
  msgstr "Logausgaben in eine Datei umlenken"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr "|PGM|Benutze PGM as PIN-Entry"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr "|PGM|Benutze PGM als SCdaemon"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
  msgstr "Den SCdaemon-basierten Kartenzugriff nicht nutzen"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NAME|Einige Kommandos über NAME annehmen"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr "Ignoriere Anfragen, das TTY zu wechseln"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr "|N|Lasse PINs im Cache nach N Sekunden verfallen"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr "Benutze PINs im Cache nicht beim Signieren"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  msgid "disallow the use of an external password cache"
  msgstr "Verbiete die Verwendung eines externen Passwordmanagers"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "Verbiete Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
  msgstr "Erlaube ein \"preset\" von Passphrases"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr "Aufrufer darf das Pinentry nicht ersetzen"
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr "Erlaube die Eingabe einer Passphrase über Emacs"
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  msgid "enable ssh support"
  msgstr "SSH Unterstützung einschalten"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
  msgstr "PuTTY Unterstützung einschalten"
  
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "Berichte über Programmfehler bitte in englisch an <@EMAIL@>.\n"
  "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de at li.org>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Gebrauch: @GPG_AGENT@ [Optionen] [Kommando [Argumente]]"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -530,135 -403,100 +524,135 @@@ msgstr "
  "Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
  "Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "ungültige Debugebene `%s' angegeben\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "Optionendatei '%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "Optionen werden aus '%s' gelesen\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "Socket kann nicht erzeugt werden: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "Der Name des Sockets `%s' ist zu lang\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "Ein gpg-agent läuft bereits - ein weiterer wird nicht gestartet\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
  msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Zugriffsrechte für '%s' können nicht gesetzt werden: %s\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "Es wird auf Socket `%s' gehört\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "Verzeichnis `%s' erzeugt\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "Die Datei `%s' kann nicht als Home-Verzeichnis benutzt werden\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "Fehler beim Lesen der \"Nonce\" von FD %d: %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "Handhabungsroutine 0x%lx für fd %d gestartet\n"
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "Handhabungsroutine 0x%lx für den fd %d beendet\n"
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr "SSH-Handhabungsroutine 0x%lx für fd %d gestartet\n"
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "SSH-Handhabungsroutine 0x%lx für fd %d beendet\n"
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s angehalten\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "Der gpg-agent läuft nicht für diese Session\n"
  
@@@ -674,8 -510,6 +668,8 @@@ msgstr "
  "Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
  "Kennwortpuffer-Pflege\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -683,9 -517,6 +677,9 @@@ msgstr "
  "@Befehle:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -741,7 -564,6 +735,8 @@@ msgstr "Vom Benutzer abgebrochen\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "Fehler beim Öffnen von `%s': %s\n"
@@@ -805,8 -618,6 +800,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Ja"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "Nein"
  
@@@ -838,14 -646,12 +833,14 @@@ msgstr "Korrekt
  msgid "Wrong"
  msgstr "Falsch"
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  "Hinweis: Diese Passphrase wurde noch nie geändert/%0ABitte ändern Sie sie "
  "jetzt."
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@@ -854,15 -660,12 +849,15 @@@ msgstr "
  "Diese Passphrase wurde seit dem %.4s-%.2s-%.2s nicht%%0A\n"
  "mehr geändert.  Bitte ändern Sie sie jetzt."
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
  msgstr "Die Passphrase ändern"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr "Ich werde sie später ändern"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@@ -871,11 -674,9 +866,11 @@@ msgstr "
  "Möchten Sie den Schlüssel mit dem \"Keygrip\"%%0A  %s%%0A  %%C%%0Awirklich "
  "entfernen?"
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  msgid "Delete key"
  msgstr "Schlüssel löschen"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -893,13 -692,11 +888,13 @@@ msgstr "Für DSA muß die Hashlänge ei
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "%s-Schlüssel verwendet ein unsicheres (%u-Bit) Hashverfahren\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  "Ein %zu-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "Prüfung der erstellten Signatur ist fehlgeschlagen: %s\n"
@@@ -923,82 -716,70 +918,93 @@@ msgstr "Schutzverfahren %d (%s) wird ni
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "Schutzverfahrenshash %d (%s) wird nicht unterstützt\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "Fehler beim Erzeugen eines \"streams\" zu einer \"pipe\": %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
  #, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "Das Warten auf die Beendigung von Prozessen schlug fehl: %s\n"
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "Fehler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, c-format
  msgid "error running '%s': terminated\n"
  msgstr "Fehler bei Ausführung von `%s': beendet\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
  #, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "Das Warten auf die Beendigung von Prozessen schlug fehl: %s\n"
  
- #: common/exechelp-w32ce.c:767
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, c-format
  msgid "can't connect to '%s': %s\n"
  msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "Beim Setzen der gpg-agent Optionen ist ein Problem aufgetreten\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "WARNUNG: Unsichere Besitzrechte für %s \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "WARNUNG: Unsichere Zugriffsrechte für %s \"%s\"\n"
  
++#: common/sysutils.c:659
+ #, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "Warte bis auf die Datei '%s' zugegriffen werden kann ...\n"
+ 
++#: common/sysutils.c:685
+ #, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "umbenennen von `%s' nach `%s' schlug fehl: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "ja"
  
@@@ -1053,7 -823,6 +1059,7 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr "Kein Speicher mehr vorhanden, als %lu Byte zugewiesen werden sollten"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
@@@ -1073,35 -839,28 +1079,35 @@@ msgstr "WARNUNG: \"%s%s\" ist eine vera
  msgid "unknown debug flag '%s' ignored\n"
  msgstr "Unbekanntes Debug Flag '%s' wird ignoriert\n"
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr "Kein aktiver gpg-agent - `%s' wird gestartet\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr "Warte bis der gpg-agent bereit ist ... (%ds)\n"
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr "Verbindung zum gpg-agent aufgebaut\n"
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  msgid "connection to agent is in restricted mode\n"
  msgstr "Verbindung zum gpg-agent ist im eingeschränkten Modus.\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr "Kein aktiver Dirmngr - `%s' wird gestartet\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr "Warte bis der Dirmngr bereit ist ... (%ds)\n"
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr "Verbindung zum Dirmngr aufgebaut\n"
  
@@@ -1172,8 -915,6 +1178,8 @@@ msgstr "Sitzungsschlüssel erzeugt
  msgid "algorithm: %s"
  msgstr "Verfahren: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "Nicht unterstütztes Verfahren: %s"
@@@ -1248,11 -973,9 +1254,11 @@@ msgstr "Zertifikatkette gültig
  msgid "Root certificate trustworthy"
  msgstr "Wurzelzertifikat vertrauenswürdig"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "Keine CRL für das Zertifikat gefunden"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
  msgstr "Die vorhandene CRL ist zu alt"
  
@@@ -1289,7 -1004,6 +1295,7 @@@ msgstr "Keine Hilfe für '%s' vorhanden
  msgid "ignoring garbage line"
  msgstr "Zeile mit nicht identifizierten Zeichen wird ignoriert"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[keine]"
  
@@@ -1359,7 -1058,6 +1365,7 @@@ msgstr "Option \"%.50s\" ist mehrdeutig
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "Befehl \"%.50s\" ist mehrdeutig\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
  msgstr "Nicht genügend Speicher\n"
  
@@@ -1417,8 -1104,6 +1423,8 @@@ msgstr "Dateisperre %s konnte nicht ein
  msgid "waiting for lock %s...\n"
  msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
@@@ -1502,12 -1169,10 +1508,12 @@@ msgstr "
  "\"quoted printable\" Zeichen in der ASCII-Hülle gefunden - möglicherweise\n"
  " war ein fehlerhafter Email-Transporter(\"MTA\") die Ursache\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, c-format
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "[ Nicht als Klartext darstellbar (%zu bytes: %s%s) ]"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1515,69 -1180,53 +1521,68 @@@ msgstr "
  "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
  "enthalten und muß mit einem '=' enden\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen maximal einmal verwenden\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  msgid "a notation name may not contain an '=' character\n"
  msgstr "Ein \"notation\"-Wert darf das '='-Zeichen nicht verwenden\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr ""
  "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
  "enthalten\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr "Die %s \"inquiry\" konnte nicht an den Client weitergeleitet werden\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Geben Sie die Passphrase ein: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, c-format
  msgid "error getting version from '%s': %s\n"
  msgstr "Fehler beim Holen der Version von '%s': %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr "Der Server '%s' is älter als wir selbst (Version %s < %s)"
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, c-format
  msgid "WARNING: %s\n"
  msgstr "WARNUNG: %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "OpenPGP Karte Nr. %s erkannt\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
  
@@@ -1585,14 -1233,9 +1590,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Dieser Befehl ist nur für Karten ab Version 2 möglich.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
  msgstr "Der Rückstellcode ist nicht vorhanden\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Ihre Auswahl? "
  
@@@ -1620,120 -1257,90 +1625,120 @@@ msgstr "nicht zwingend
  msgid "forced"
  msgstr "zwingend"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "Familienname des Kartenbesitzers:"
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "Vorname des Kartenbesitzers:"
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr ""
  "Fehler: Der zusammengesetzte Name ist zu lang (Grenze beträgt %d Zeichen).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "URL um den öffentlichen Schlüssel zu holen: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "Fehler beim Lesen von `%s': %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "Fehler beim Schreiben von %s: %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "Logindaten (Kontenname): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr "Fehler: Logindaten sind zu lang (Grenze beträgt %d Zeichen).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "Geheime DO-Daten: "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze beträgt %d Zeichen).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "Spracheinstellungen"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
  msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
  msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "Geschlecht: (Männlich (M), Weiblich (F) oder Leerzeichen): "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
  msgstr "Fehler: ungültige Antwort.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "CA-Fingerabdruck: "
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "Schlüsseloperation nicht möglich: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "Keine gültige OpenPGP-Karte"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
@@@ -1745,60 -1352,48 +1750,60 @@@ msgstr "
  "         fehlschlagen, so ziehen Sie bitte die Dokumentation Ihrer Karte\n"
  "         zu Rate.\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Welche Schlüssellänge wünschen Sie für den Signatur-Schlüssel? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr ""
  "Welche Schlüssellänge wünschen Sie für den Verschlüsselungs-Schlüssel? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr ""
  "Welche Schlüssellänge wünschen Sie für den Authentisierungs-Schlüssel? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "aufgerundet auf %u Bit\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  "Die Karte wird nun rekonfiguriert, um einen Schlüssel von %u Bit zu "
  "erzeugen\n"
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "Fehler bem Ändern der Länge des Schlüssels %d auf %u Bit: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  "Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  msgid "Note: keys are already stored on the card!\n"
  msgstr "Hinweis: Auf der Karte sind bereits Schlüssel gespeichert!\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1809,140 -1404,105 +1814,140 @@@ msgstr "
  "   PIN = '%s'     Admin-PIN = '%s'\n"
  "Sie sollten sie mittels des Befehls --change-pin ändern\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "   (1) Signatur-Schlüssel\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) Verschlüsselungs-Schlüssel\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Authentisierungs-Schlüssel\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Ungültige Auswahl.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "Wählen Sie den Speicherort für den Schlüssel:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "Das KEYTOCARD Kommando schlug fehl: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  msgid "This command is not supported by this card\n"
  msgstr "Dieser Befehl wird von dieser Karte nicht unterstützt.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr ""
  "Hinweis: Dieses Kommando zerstörrt alle auf der Karte gespeicherten "
  "Schlüssel!\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  msgid "Continue? (y/N) "
  msgstr "Fortsetzen? (j/N) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr "Möchten Sie die Karte wirklich komplett löschen? (\"yes\" eingeben) "
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "Menü verlassen"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
  msgstr "Zeige Admin-Befehle"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "Diese Hilfe zeigen"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "Alle vorhandenen Daten auflisten"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "Kartenbesitzernamen ändern"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "Schlüssel-holen-URL ändern"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "Holen des Schlüssels mittels der URL auf der Karte"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "Ändern der Logindaten"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "Ändern der Spracheinstellungen"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "Ändern des Geschlechts des Kartenbesitzers"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "Ändern des CA-Fingerabdrucks"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr "Umschalten des \"Signature-force-PIN\"-Schalters"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "neue Schlüssel erzeugen"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "Menü für Ändern oder Entsperren der PIN"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "überprüfe die PIN und liste alle Daten auf"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr "die PIN mit dem Rückstellcode wieder freigeben"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr "alle Schlüssel und Daten löschen"
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr "gpg/card> "
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "nur-Admin Befehl\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "Admin-Befehle sind erlaubt\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "Admin-Befehle sind nicht erlaubt\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
  
@@@ -1950,22 -1509,14 +1955,22 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output funktioniert nicht bei diesem Befehl\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "'%s' kann nicht geöffnet werden\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n"
@@@ -2085,7 -1614,6 +2090,7 @@@ msgstr "
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s verschlüsselt für: %s\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
@@@ -2166,56 -1679,42 +2171,56 @@@ msgstr "
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "WARNUNG: Temporäres Verzeichnis `%s' kann nicht entfernt werden: %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
  msgstr "Exportiere auch Signaturen die als nicht exportfähig markiert sind"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr "Exportiere Attribute von User-IDs (i.A. Foto-IDs)"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "Exportiere Widerrufsschlüssel die als \"sensitiv\" markiert sind"
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "Unbrauchbare Teile des Schlüssel während des Exports entfernen"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "Während des Exports soviel wie möglich vom Schlüssel entfernen"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  msgid " - skipped"
  msgstr " - übersprungen"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "Schreiben nach '%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "Schlüssel %s: Schlüsselmaterial ist auf einer Karte - übersprungen\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "Exportieren geheimer Schlüssel ist nicht erlaubt\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "Schlüssel %s: PGP 2.x-artiger Schlüssel - übersprungen\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "WARNUNG: Nichts exportiert\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "Fehler beim Erstellen von `%s': %s\n"
@@@ -2224,8 -1722,6 +2229,8 @@@
  msgid "[User ID not found]"
  msgstr "[User-ID nicht gefunden]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, c-format
  msgid "(check argument of option '%s')\n"
  msgstr "(Prüfe das Argument der Option '%s')\n"
@@@ -2246,247 -1739,188 +2251,247 @@@ msgstr "Fehler beim Nachschlagen von: %
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "WARNUNG: %s ist %d mal im Schlüsselbund vorhanden\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "`%s' automatisch via %s geholt\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "Fehler beim automatischen holen von `%s' über `%s': %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "Kein Fingerabdruck vorhanden"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, c-format
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr ""
  "WARNUNG: \"%s\" wird nicht als voreingestellter geheimer Schlüssel benutzt: "
  "%s\n"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, c-format
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "\"%s\" wird als voreingestellter geheimer Signaturschlüssel benutzt\n"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr "Alle für '%s' angegebenen Werte wurden ignoriert\n"
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
  "Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "der Unterschlüssel %s wird anstelle des Hauptschlüssels %s verwendet\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "Eine Signatur erzeugen"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
  msgstr "Eine Klartextsignatur erzeugen"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "Eine abgetrennte Signatur erzeugen"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "Daten verschlüsseln"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "Daten symmetrisch verschlüsseln"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "Daten entschlüsseln (Voreinstellung)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "Signatur prüfen"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "Liste der Schlüssel"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "Liste der Schlüssel und ihrer Signaturen"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "Signaturen der Schlüssel auflisten und prüfen"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "Liste der geheimen Schlüssel"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "Ein neues Schlüsselpaar erzeugen"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  msgid "quickly generate a new key pair"
  msgstr "Schnell ein neues Schlüsselpaar erzeugen"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  msgid "quickly add a new user-id"
  msgstr "Schnell eine neue User-ID anfügen"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  msgid "quickly revoke a user-id"
  msgstr "Schnell eine User-ID widerrufen"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  msgid "quickly sign a key"
  msgstr "Schlüssel schnell signieren"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  msgid "quickly sign a key locally"
  msgstr "Schlüssel schnell nur für diesen Rechner signieren"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "Schlüssel signieren"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "Schlüssel nur für diesen Rechner signieren"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "Signieren oder bearbeiten eines Schlüssels"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
  msgstr "Die Passphrase ändern"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "Schlüssel exportieren"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "Schlüssel zu einem Schlü.server exportieren"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "Schlüssel von einem Schlü.server importieren"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "Schlüssel auf einem Schlü.server suchen"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "alle Schlüssel per Schlü.server aktualisieren"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "Schlüssel importieren/kombinieren"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "den Karten-Status ausgeben"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "Daten auf einer Karte ändern"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "PIN einer Karte ändern"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "Ändern der \"Trust\"-Datenbank"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
  msgstr "Hashwerte für die Dateien ausgeben"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "Im Server Modus ausführen"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr "|WERT|Setze die TOFU-Politik für einen Schlüssel"
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "Ausgabe mit ASCII-Hülle versehen"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|USER-ID|Verschlüsseln für USER-ID"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "Textmodus benutzen"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
  msgstr "|DATEI|Ausgabe auf DATEI schreiben"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "Keine wirklichen Änderungen durchführen"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "vor Überschreiben nachfragen"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr "OpenPGP-Verhalten strikt beachten"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2495,7 -1929,6 +2500,7 @@@ msgstr "
  "(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
  "Optionen)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2515,11 -1948,9 +2520,11 @@@ msgstr "
  " --list-keys [Namen]        Schlüssel anzeigen\n"
  " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Aufruf: @GPG@ [Optionen] [Dateien] (-h für Hilfe)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2529,7 -1960,6 +2534,7 @@@ msgstr "
  "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
  "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2537,74 -1967,59 +2542,74 @@@ msgstr "
  "\n"
  "Unterstützte Verfahren:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "Öff. Schlüssel: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Verschlü.: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Komprimierung: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "Aufruf: %s [Optionen] %s\n"
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "Widersprüchliche Befehle\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr ""
  "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses für Home-"
  "Verzeichnis `%s'\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2612,20 -2027,17 +2617,20 @@@ msgstr "
  "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
  "Konfigurationsdatei '%s'\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr ""
  "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses `%s'\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr ""
  "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
  "Verzeichnisses `%s'\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2633,525 -2045,413 +2638,531 @@@ msgstr "
  "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
  "Konfigurationsdatei '%s'\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr ""
  "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
  "Erweiterung `%s'\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "Unbekanntes Konfigurationselement `%s'\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  msgid "show key usage information during key listings"
  msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr "Richtlinien-URL mit den Signaturen anlisten"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "Alle Notationen mit den Signaturen anlisten"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr "Standard Notationen mit den Signaturen anlisten"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr "Benutzer-Notationen mit den Signaturen anlisten"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "Das Ablaufdatum mit den Signaturen anlisten"
  
- #: g10/gpg.c:2011
- msgid "available TOFU policies:\n"
- msgstr "Vorhandene TOFU Regeln:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "Gültige Argumente für Option '%s':\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "Unbekannte TOFU Regel '%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "Ungültiges Argument für Option '%s'\n"
+ 
++#: g10/gpg.c:2203
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "\"%s\" ist keine gültige E-Mailadresse\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "Ungültiger Subjekt-Name '%s'\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "`%s' ist kein gültiger Zeichensatz\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "Ungültige Schlüsselserver-Option\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: ungültige Import-Option\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "Ungültige Import-Option\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "Ungültige Filter-Option: %s\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: ungültige Export-Option.\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "Ungültige Export-Option\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: ungültige Listen-Option.\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "Ungültige Listen-Option\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "Foto-ID während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "Alle Notationen während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
  msgstr ""
  "Die URL für den bevorzugten Schlüsselserver während der Signaturprüfung "
  "anzeigen"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
  msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "Zeige widerrufene und verfallene User-IDs während der Signaturprüfung"
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  msgid "show only the primary user ID in signature verification"
  msgstr "Zeige nur die Haupt-User-ID während der Signaturprüfung"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "Werte das Vertrauen zu Signaturen durch gültige PKA-Daten auf"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "Ungültige Überprüfungs-Option\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr "ungültige \"auto-key-locate\"-Liste\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "WARNUNG: %s ersetzt %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed müssen größer als 0 sein\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed müssen größer als 1 sein\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
  msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "ungültige Standard-Voreinstellungen\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "ungültige private Hashvoreinstellungen\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "ungültige private Komprimierungsvoreinstellungen\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s arbeitet noch nicht mit %s zusammen\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr ""
  "Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht "
  "erlaubt.\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr ""
  "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [Dateiname]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [Dateiname]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [Dateiname]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [Dateiname]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [Dateiname]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [Dateiname]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [Dateiname]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
  "werden\n"
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr ""
  "Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [Dateiname]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [Dateiname]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [Dateiname]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key User-ID"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key User-ID"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key User-ID [Befehle]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
  msgstr "--passwd User-ID"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "Schlüsselexport fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "Ungültiges Hashverfahren '%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "Fehler in der Schlüsselangabe '%s': %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  "'%s\" sieht nicht nach einer gültigen Schlüssel-ID, einem Fingerabdruck oder "
  "einem \"Keygrip\" aus\n"
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[Dateiname]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Auf geht's - Botschaft eintippen ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|DATEI|Schlüssel aus der Schlüsselbund DATEI nehmen"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "differierende Zeitangaben sind kein Fehler"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr "|ALGO|Weise mit ALGO erstellte Signaturen zurück"
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h für Hilfe)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3168,133 -2466,105 +3179,133 @@@ msgstr "Keine Hilfe vorhanden.
  msgid "No help available for '%s'"
  msgstr "Keine Hilfe für '%s' vorhanden."
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr "Importiere Signaturen, die als nicht exportfähig markiert sind"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr "Beseitige Beschädigung durch den Schlüsselserver während des Imports"
  
- #: g10/import.c:144
++#: g10/import.c:157
  msgid "do not clear the ownertrust values during import"
  msgstr "die \"Ownertrust\" Werte beim Import nicht löschen"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "ändern Sie die \"Trust\"-Datenbank nach dem Import nicht"
  
- #: g10/import.c:150
++#: g10/import.c:163
  msgid "show key during import"
  msgstr "Schlüssel beim Import anzeigen"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr "Nur Änderungen bereits existierender Schlüssel vornehmen"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
  msgstr "entferne nach dem Import unbrauchbare Teile des Schlüssels"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "nach dem Import soviel wie möglich aus dem Schlüssel entfernen"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr "Import-Filter anwenden und Schlüssel direkt exportieren"
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "überspringe den Block vom Typ %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu Schlüssel bislang bearbeitet\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "             ignorierte PGP-2 Schlüssel: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "              ignorierte neue Schlüssel: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "                           ohne User-ID: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                             importiert: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                            unverändert: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "                          neue User-IDs: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "                    neue Unterschlüssel: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "                        neue Signaturen: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "                neue Schlüsselwiderrufe: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "             gelesene geheime Schlüssel: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "           geheime Schlüssel importiert: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "                unveränderte geh. Schl.: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "                       nicht importiert: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "    Signaturen bereinigt: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "      User-IDs bereinigt: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3303,191 -2573,153 +3314,191 @@@ msgstr "
  "WARNUNG: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n"
  "Verfahren für folgende User-ID:\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": Einstellungen des Verschlüsselungsverfahren %s\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": Einstellungen der Hashmethode %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": Einstellungen der Komprimierungsverfahren %s\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "es ist extrem empfehlenswert Ihre Einstellungen zu ändern und\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "diesen Schlüssel wieder zu verteilen, um mögliche Probleme durch unpassende "
  "Verfahrenskombinationen zu vermeiden\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "Sie können Ihren Einstellungen mittels \"gpg --edit-key %s updpref save\" "
  "ändern\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "Schlüssel %s: Keine User-ID\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, c-format
  msgid "key %s: %s\n"
  msgstr "Schlüssel %s: %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr "vom Import-Aufpasser zurückgewiesen"
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "Schlüssel %s: PKS Unterschlüsseldefekt repariert\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "Schlüssel %s: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "Schlüssel %s: Keine gültigen User-IDs\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "Schlüssel %s: Öffentlicher Schlüssel nicht gefunden: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "Schlüssel %s: Öffentlicher Schlüssel \"%s\" importiert\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "Schlüssel %s: Stimmt nicht mit unserer Kopie überein\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "Schlüssel %s: der originale Schlüsselblock wurde nicht gefunden: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "Schlüssel %s: Lesefehler im originalen Schlüsselblock: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "Schlüssel %s: \"%s\" %d neue User-IDs\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "Schlüssel %s: \"%s\" 1 neue Signatur\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "Schlüssel %s: \"%s\" %d neue Signaturen\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "Schlüssel %s: \"%s\" 1 neuer Unterschlüssel\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "Schlüssel %s: \"%s\" %d neue Unterschlüssel\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "Schlüssel %s: \"%s\" %d User-ID bereinigt\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "Schlüssel %s: \"%s\" %d User-IDs bereinigt\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "Schlüssel %s: geheimer Schlüssel bereits vorhanden\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "Schlüssel %s: Fehler beim Senden zum gpg-agent: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "Geheimer Schlüssel %s: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr ""
@@@ -3504,181 -2736,147 +3515,181 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  "Um '%s' zu migrieren sollte für jede Smartcard \"%s\" aufgerufen werden.\n"
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "Schlüssel %s: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann nicht "
  "angebracht werden\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "Schlüssel %s: Keine User-ID für Signatur\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s\"\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "Schlüssel %s: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "Schlüssel %s: Ungültige \"direct-key\"-Signatur\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindung\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "Schlüssel %s: Kein Unterschlüssel für Schlüsselwiderruf\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr ""
  "Schlüssel %s: Nicht exportfähige Signatur (Klasse %02x) - übersprungen\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "Schlüssel %s: Widerrufzertifikat an falschem Platz - übersprungen\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr ""
  "Schlüssel %s: Unterschlüssel-Widerrufzertifikat an falschem Platz - "
  "übersprungen\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "Schlüssel %s: unerwartete Signaturklasse (0x%02x) - übersprungen\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "Schlüssel %s: Doppelte User-ID entdeckt - zusammengeführt\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "WARNUNG: Schlüssel %s ist u.U. widerrufen: hole Widerrufschlüssel %s\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "WARNUNG: Schlüssel %s ist u.U. widerrufen: Widerrufschlüssel %s ist nicht "
  "vorhanden\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "Die \"Keybox\" `%s' konnte nicht erstellt werden: %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, c-format
  msgid "error creating keyring '%s': %s\n"
  msgstr "Fehler beim Erzeugen des Schlüsselbundes `%s': %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, c-format
  msgid "keybox '%s' created\n"
  msgstr "Die \"Keybox\" `%s' wurde erstellt\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, c-format
  msgid "keyring '%s' created\n"
  msgstr "Schlüsselbund `%s' erstellt\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "Schlüsselblockhilfsmittel`%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, c-format
  msgid "error opening key DB: %s\n"
  msgstr "Fehler beim Öffnen der Schlüsseldatenbank: %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n"
@@@ -3691,14 -2887,16 +3702,20 @@@ msgstr "[Widerruf]
  msgid "[self-signature]"
  msgstr "[Eigenbeglaubigung]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "Fehler beim Allozieren von Speicher: %s\n"
+ 
++#: g10/keyedit.c:629
  #, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr ""
  "Die Signatur mit den nicht unterstützten Public-Key-Verfahren (%d) kann "
  "nicht geprüft werden: %s\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
@@@ -3706,44 -2904,37 +3723,44 @@@ msgstr "
  "Die Signatur mit der nicht unterstützten Hashmethode (%d) kann nicht\n"
  "geprüft werden: %s.\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  msgid " (reordered signatures follow)"
  msgstr " (neu geordnete Signaturen folgen)"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, c-format
  msgid "key %s:\n"
  msgstr "Schlüssel %s:\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "%d doppelte Signatur entfernt\n"
  msgstr[1] "%d doppelte Signaturen entfernt\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, c-format
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
  msgstr[0] "%d Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
  msgstr[1] "%d Beglaubigungen wegen fehlender Schlüssel nicht geprüft\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, c-format
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
  msgstr[0] "%d falsche Beglaubigung\n"
  msgstr[1] "%d falsche Beglaubigungen\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "%d Signatur neu eingeordnet\n"
  msgstr[1] "%d Signaturen neu eingeordnet\n"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3752,7 -2943,6 +3769,7 @@@ msgstr "
  "WARNUNG: Es wurden Fehler gefunden aber nur Eigenbeglaubigungen geprüft; um "
  "alle Beglaubigungen zu prüfen das Kommando '%s' verwenden.\n"
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3765,17 -2955,14 +3782,17 @@@ msgstr "
  "unterschiedlichen Quellen ...)?\n"
  "\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Ich vertraue ihm marginal\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Ich vertraue ihm vollständig\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3785,52 -2972,40 +3802,52 @@@ msgstr "
  "Eine Tiefe größer 1 erlaubt dem zu signierenden Schlüssel\n"
  "Trust-Signatures für Sie zu machen.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Geben Sie bitte eine Domain ein, um die Signatur einzuschränken\n"
  "oder nur die Eingabetaste für keine Domain\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr "Überspringe User-ID \"%s\" da es keine textbasierte ID ist.\n"
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "User-ID \"%s\" ist widerrufen."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  Beglaubigen ist nicht möglich.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "User-ID \"%s\" ist abgelaufen."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "User-ID \"%s\" ist signierbar."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
  msgstr "Wirklich signieren? (j/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3839,11 -3014,9 +3856,11 @@@ msgstr "
  "Die Eigenbeglaubigung von \"%s\"\n"
  "ist eine PGP 2.x artige Signatur.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung geändert werden? (j/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3852,13 -3025,11 +3869,13 @@@ msgstr "
  "Ihre derzeitige Beglaubigung von \"%s\"\n"
  "ist abgelaufen.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Soll eine neue Beglaubigung als Ersatz für die abgelaufene erstellt werden? "
  "(J/n) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3867,44 -3038,35 +3884,44 @@@ msgstr "
  "Die derzeitige Beglaubigung von \"%s\"\n"
  "ist nur für diesen Rechner gültig.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" wurde bereits durch Schlüssel %s lokal beglaubigt\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" wurde bereits durch Schlüssel %s beglaubigt\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nichts zu beglaubigen für Schlüssel %s\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "Dieser Schlüssel ist verfallen!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Dieser Schlüssel wird %s verfallen.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3914,32 -3076,26 +3931,32 @@@ msgstr "
  "wollen, wirklich der o.g. Person gehört?\n"
  "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Ich antworte nicht.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Ich habe es überhaupt nicht überprüft.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Ich habe es flüchtig überprüft.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Ich habe es sehr sorgfältig überprüft.%s\n"
  
  # translated by wk
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Ihre Auswahl? ('?' für weitere Informationen): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3948,227 -3104,173 +3965,227 @@@ msgstr "
  "Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n"
  "Schlüssel \"%s\" (%s) beglaubigen wollen\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
  msgstr "Dies wird eine Eigenbeglaubigung sein.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "WARNUNG: Die Signatur wird nicht als nicht-exportierbar markiert werden.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "WARNUNG: Die Signatur wird nicht als unwiderrufbar markiert werden.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Die Signatur wird als nicht-exportfähig markiert werden.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Die Signatur wird als unwiderrufbar markiert werden.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "Ich habe diesen Schlüssel überhaupt nicht überprüft.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "Ich habe diesen Schlüssel flüchtig überprüft.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
  msgstr "Wirklich signieren? (j/N) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "Beglaubigung fehlgeschlagen: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- "
  "keine Passphrase ist zu ändern.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "Schlüssel %s: Fehler beim Ändern der Passphrase: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "speichern und Menü verlassen"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "Fingerabdruck des Schlüssels anzeigen"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  msgid "show the keygrip"
  msgstr "\"Keygrip\" des Schlüssels anzeigen"
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "Schlüssel und User-IDs auflisten"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "User-ID N auswählen"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "Unterschlüssel N auswählen"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "Signaturen prüfen"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "die ausgewählten User-IDs beglaubigen [* für verwandte Befehle s.u.]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "Die ausgewählte User-ID nur für diesen Rechner beglaubigen"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "Die ausgewählte User-ID mit einer \"Trust\"-Signatur beglaubigen"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "die ausgewählten User-IDs unwiderrufbar beglaubigen"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "Eine User-ID hinzufügen"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "Eine Foto-ID hinzufügen"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "ausgewählte User-IDs entfernen"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "einen Unterschlüssel hinzufügen"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "der Smartcard einen Schlüssel hinzufügen"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "einen Schlüssel auf die Smartcard schieben"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "eine Sicherungskopie des Schlüssels auf die Smartcard schieben"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "ausgewählte Unterschlüssel entfernen"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "Einen Widerrufschlüssel hinzufügen"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "Beglaubigungen der ausgewählten User-IDs entfernen"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr ""
  "das Verfallsdatum des Schlüssel oder ausgewählter Unterschlüssels ändern"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "User-ID als Haupt-User-ID kennzeichnen"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "Liste der Voreinstellungen (für Experten)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "Liste der Voreinstellungen (ausführlich)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "ändern der Voreinstellungsliste der ausgewählten User-IDs"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
  "Setze die URL des bevorzugten Schlüsselservers für die ausgewählten User-IDs"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
  msgstr "Eine Notation für die ausgewählten User-IDs setzen"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "Die Passphrase ändern"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "Den \"Ownertrust\" ändern"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "Beglaubigungen der ausgewählten User-IDs widerrufen"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "Ausgewählte User-ID widerrufen"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "Schlüssel oder ausgewählten Unterschlüssel widerrufen"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "Schlüssel anschalten"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "Schlüssel abschalten"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "ausgewählte Foto-IDs anzeigen"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "unbrauchbare User-IDs verkleinern und unbrauchbare Signaturen aus dem "
  "Schlüssel entfernen"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "unbrauchbare User-IDs verkleinern und alle Signaturen aus dem Schlüssel "
  "entfernen"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "Geheimer Schlüssel ist vorhanden.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4181,259 -3283,200 +4198,259 @@@ msgstr "
  "Signaturen\n"
  " (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "Schlüssel wurde widerrufen."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Wirklich alle User-IDs beglaubigen? (j/N) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Wirklich alle textbasierten User-IDs beglaubigen? (j/N) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "Unbekannter Signaturtyp `%s'\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Dieser Befehl ist im %s-Modus nicht erlaubt.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr "(Benutze den '%s' Befehl.)\n"
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? (j/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
  msgstr "Diese User-ID wirklich entfernen? (j/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
  msgstr "Den Hauptschlüssel wirklich verschieben? (j/N) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "Sie müssen genau einen Schlüssel auswählen.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "Befehl benötigt einen Dateinamen als Argument\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "'%s' kann nicht geöffnet werden: %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Fehler beim Lesen der Sicherungskopie des Schlüssels von `%s': %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? (j/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? (j/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? (j/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Diese User-ID wirklich widerrufen? (j/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? (j/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr ""
  "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? (j/N) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? (j/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "\"Owner trust\" kann nicht gesetzt werden, wenn eine anwendereigene 'Trust'-"
  "Datenbank benutzt wird\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "Setze die Liste der Voreinstellungen auf:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
  "(j/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
  msgstr "Die Voreinstellungen wirklich ändern? (j/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
  msgstr "Änderungen speichern? (j/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
  msgstr "Beenden ohne zu speichern? (j/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "Änderung fehlgeschlagen: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, c-format
  msgid "User ID revocation failed: %s\n"
  msgstr "Widerufen der User-ID fehlgeschlagen: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "\"%s\" ist kein Fingerabdruck\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "\"%s\" ist nicht der Fingerabdruck des Hauptschlüssels\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, c-format
  msgid "Invalid user ID '%s': %s\n"
  msgstr "Ungültige User-ID '%s': %s\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "No matching user IDs."
  msgstr "Keine passende User-ID"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "Nothing to sign.\n"
  msgstr "Nichts zu beglaubigen\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Digest: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Eigenschaften: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "Keyserver no-modify"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Bevorzugter Schlüsselserver:"
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "\"Notationen\": "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Der folgende Schlüssel wurde am %s von %s Schlüssel %s widerrufen\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "Dieser Schlüssel kann von %s-Schlüssel %s widerrufen werden"
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(empfindlich)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "erzeugt: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "widerrufen: %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "verfallen: %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "verfällt: %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "Aufruf: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "Kartennummer:"
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "Vertrauen: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "Gültigkeit: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4441,18 -3484,13 +4458,19 @@@ msgstr "
  "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
  "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "widerrufen"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "verfallen"
  
  # translated by wk
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4460,15 -3498,12 +4478,15 @@@ msgstr "
  "WARNUNG: Keine User-ID ist als primär markiert.  Dieser Befehl kann\n"
  "dazu führen, daß eine andere User-ID als primär angesehen wird.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "WARNUNG: Ihr Unterschlüssel zum Verschlüsseln wird bald verfallen.\n"
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  msgid "You may want to change its expiration date too.\n"
  msgstr "Bitte erwägen Sie, dessen Verfallsdatum auch zu ändern.\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4478,72 -3513,57 +4496,72 @@@ msgstr "
  "könnte\n"
  "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "Sie können einem PGP2-artigen Schlüssel keine Foto-ID hinzufügen.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Solch eine User-ID ist bereits für den Schlüssel vorhanden!\n"
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, c-format
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
  msgstr[0] "%d Beglaubigung entfernt.\n"
  msgstr[1] "%d Beglaubigungen entfernt.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Nichts entfernt.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "ungültig"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
  msgstr[0] "User-ID \"%s\": %d Signatur entfernt\n"
  msgstr[1] "User-ID \"%s\": %d Signaturen entfernt\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "User-ID \"%s\": bereits minimiert\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "User-ID \"%s\": bereits sauber\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4553,276 -3573,217 +4571,276 @@@ msgstr "
  "         Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
  "         des Schlüssels führen.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr ""
  "Sie können einem PGP2-artigen Schlüssel keine vorgesehenen Widerrufer "
  "hinzufügen.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr ""
  "Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer "
  "eingetragen werden\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
  msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr ""
  "WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann "
  "nicht rückgangig gemacht werden!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr ""
  "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer festlegen? "
  "(j/N): "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
  msgstr ""
  "Möchten Sie wirklich die Verfallsdaten aller Unterschlüssel ändern? (j/N): "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  "Unterschlüssel %s ist des Signieren nicht mächtig und braucht deshalb keine "
  "Rücksignatur\n"
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Bitte genau eine User-ID auswählen.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "Geben Sie die \"Notation\" ein: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
  msgstr "Fortfahren (j/N)? "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Keine User-ID mit Index %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Keine User-ID mit Hash %s\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Kein Unterschlüssel mit Schlüssel-ID '%s'.\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Kein Unterschlüssel mit Index %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "User-ID: \"%s\"\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "   beglaubigt durch Ihren Schlüssel %s am %s%s%s\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (nicht-exportierbar)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Diese Signatur ist seit %s verfallen.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr "Nicht von Ihnen signiert.\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Sie haben folgende User-IDs des Schlüssels %s beglaubigt:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (unwiderrufbar)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "Kein geheimer Schlüssel\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr "Versuch eine nicht-User-ID zu widerrufen: %s\n"
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "User-ID \"%s\" ist bereits widerrufen\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr ""
  "WARNUNG: Eine User-ID-Signatur datiert mit %d Sekunden aus der Zukunft\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Schlüssel %s ist bereits widerrufen\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Unterschlüssel %s ist bereits widerrufen\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "Voreinstellung `%s' ist doppelt\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "zu viele Verschlüsselungeinstellungen\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "zu viele Hashvoreinstellungen\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
  msgstr "zu viele Komprimierungsvoreinstellungen\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "Die Eigenbeglaubigung wird geschrieben\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "Schreiben der \"key-binding\" Signatur\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "WARNUNG: Einige OpenPGP-Programme können einen DSA-Schlüssel dieser "
  "Digestlänge nicht verwenden\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "Signieren"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "Zertif."
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "Verschl."
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "Authentisierung"
  
@@@ -4836,150 -3797,119 +4854,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "UuVvAaQq"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Mögliche Vorgänge eines %s-Schlüssels: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "Derzeit erlaubte Vorgänge: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Umschalten der Signaturfähigkeit\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Umschalten der Verschlüsselungsfähigkeit\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Umschalten der Authentisierungsfähigkeit\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Beenden\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA und RSA (voreingestellt)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA und Elgamal\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (nur verschlüsseln)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (nur verschlüsseln)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (Leistungsfähigkeit selber einstellbar)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (Leistungsfähigkeit selber einstellbar)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "  (%d) ECC und ECC\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (nur signieren)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (Leistungsfähigkeit selber einstellbar)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (nur verschlüsseln)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Vorhandener Schlüssel\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Geben Sie den \"Keygrip\" ein: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Kein gültiger \"Keygrip\" (40 Hex-Ziffern werden erwartet)\n"
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Kein Schlüssel mit diesem \"Keygrip\"\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "gerundet auf %u Bit\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s-Schlüssel können zwischen %u und %u Bit lang sein.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Welche Schlüssellänge wünschen Sie für den Unterschlüssel? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Bitte wählen Sie, welche elliptische Kurve Sie möchten:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4995,7 -3925,6 +5013,7 @@@ msgstr "
  "      <n>m = Schlüssel verfällt nach n Monaten\n"
  "      <n>y = Schlüssel verfällt nach n Jahren\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5011,38 -3940,30 +5029,38 @@@ msgstr "
  "      <n>m = Schlüssel verfällt nach n Monaten\n"
  "      <n>y = Schlüssel verfällt nach n Jahren\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "Ungültiger Wert.\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "Schlüssel verfällt nie\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "Signature verfällt nie\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Key verfällt am %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Signatur verfällt am %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5050,11 -3971,9 +5068,11 @@@ msgstr "
  "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
  "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "Ist dies richtig? (j/N) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5068,7 -3987,6 +5086,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5084,49 -4002,38 +5102,49 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Ihr Name (\"Vorname Nachname\"): "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Ungültiges Zeichen im Namen\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "Die Zeichen '%s' und '%s' dürfen in einem Namen nicht vorkommen\n"
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "Email-Adresse: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "Diese Email-Adresse ist ungültig\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Kommentar: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Ungültiges Zeichen im Kommentar.\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Sie benutzen den Zeichensatz `%s'\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5137,7 -4044,6 +5155,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
  
@@@ -5152,31 -4058,24 +5170,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnKkEeFfAa"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (A)bbrechen? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(A)bbrechen? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Ändern: (N)ame, (E)-Mail oder (A)bbrechen? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Ändern: (N)ame, (E)-Mail oder (F)ertig/(A)bbrechen? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5187,13 -4086,10 +5205,13 @@@ msgstr "
  "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
  "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5204,62 -4100,49 +5222,62 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr "Fortsetzen? (J/n) "
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Ein Schlüssel für \"%s\" existiert bereits\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  msgid "Create anyway? (y/N) "
  msgstr "Trotzdem erzeugen? (j/N) "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  msgid "creating anyway\n"
  msgstr "wird trotzdem erzeugt\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr "Hinweis: \"%s %s\" ruft den erweiterten Dialog auf.\n"
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "Schlüsselerzeugung abgebrochen.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5268,7 -4151,6 +5286,7 @@@ msgstr "
  "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
  "Unterschlüssel für diesem Zweck erzeugen.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5276,7 -4158,6 +5294,7 @@@ msgstr "
  "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
  "stimmen nicht überein)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5284,23 -4165,18 +5302,23 @@@ msgstr "
  "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
  "Uhren stimmen nicht überein)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "Hinweis: Unterschlüssel für v3-Schlüssel sind nicht OpenPGP-konform\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Geheime Teile des Hauptschlüssels sind auf der Karte gespeichert.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
  msgstr "Wirklich erzeugen? (j/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "niemals   "
  
@@@ -5349,29 -4216,23 +5367,29 @@@ msgstr[1] "WARNUNG: %lu Schlüssel übe
  msgid "Keyring"
  msgstr "Schlüsselbund"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Haupt-Fingerabdruck  ="
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "Unter-Fingerabdruck  ="
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr " Haupt-Fingerabdruck  ="
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr " Unter-Fingerabdruck  ="
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "  Schl.-Fingerabdruck ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr "      Kartenseriennr. ="
  
@@@ -5406,108 -4262,85 +5424,108 @@@ msgstr[1] " (%lu Beglaubigungen)\n
  msgid "%s: keyring created\n"
  msgstr "%s: Schlüsselbund erstellt\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr "In Dirmngr gesetzte Proxy Optionen ersetzen"
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr "Widerrufene Schlüssel in den Suchergebnissen aufführen"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr "Unterschlüssel in der Suche über Schlüssel-IDs aufführen"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr "In Dirmngr gesetzte Zeitüberschreitungsoptionen ersetzen"
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr "Schlüssel für die Signaturprüfung automatisch holen"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr ""
  "Die im Schlüssel enthaltene bevorzugte URL für Schlüsselserver beachten"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr "Die im Schlüssel enthaltenen PKA-Daten beim Schlüsselholen beachten"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "abgeschaltet"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr "Eingabe von Nummern, Nächste (N) oder Abbrechen (Q) > "
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
  msgstr[0] "%d Schlüssel wird per %s aktualisiert\n"
  msgstr[1] "%d Schlüssel werden per %s aktualisiert\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "WARNUNG: Schlüssel %s kann per %s nicht aktualisiert werden: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "Schlüssel \"%s\" wurde auf dem Schlüsselserver nicht gefunden\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "fordere Schlüssel %s von %s-Server %s an\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "fordere Schlüssel %s von %s an\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  msgid "no keyserver known\n"
  msgstr "Kein Schlüsselserver bekannt\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "übersprungen \"%s\": %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "sende Schlüssel %s auf %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, c-format
  msgid "requesting key from '%s'\n"
  msgstr "fordere Schlüssel von %s an\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
@@@ -5609,130 -4422,103 +5627,130 @@@ msgstr "Ursprünglicher Dateiname='%.*s
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr ""
  "Einzelner Widerruf - verwenden Sie \"gpg --import\", um ihn anzuwenden\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "Keine Signatur gefunden\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "FALSCHE Signatur von \"%s\""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Verfallene Signatur von \"%s\""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Korrekte Signatur von \"%s\""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "Signaturüberprüfung unterdrückt\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "diese mehrdeutige Signaturdaten können nicht bearbeitet werden\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Signatur vom %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               mittels %s-Schlüssel %s\n"
  
  # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Signatur vom %s mittels %s-Schlüssel ID %s\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "               Aussteller \"%s\"\n"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Schlüssel erhältlich bei: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[ungewiß]  "
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                    alias \"%s\""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Diese Signatur ist seit %s verfallen.\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Diese Signatur verfällt am %s.\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s Signatur, Hashmethode %s%s%s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "Binäre"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "Textmodus"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "unbekannt"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  msgid ", key algorithm "
  msgstr ", Schlüsselverfahren "
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  "WARNUNG: Keine abgetrennte Signatur; die Datei '%s' wurde NICHT überprüft!\n"
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Signatur kann nicht geprüft werden: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "keine abgetrennte Signatur\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "WARNUNG: Mehrfache Signaturen erkannt.  Es wird nur die erste geprüft.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "Einzelne Signatur der Klasse 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "Signatur nach alter (PGP 2.x) Art\n"
  
@@@ -5835,28 -4602,23 +5853,28 @@@ msgstr "nicht komprimiert
  msgid "uncompressed|none"
  msgstr "unkomprimiert|kein|keine"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "Mehrdeutige Option '%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, c-format
  msgid "unknown option '%s'\n"
  msgstr "Unbekannte Option '%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  "Der öffentliche ECDSA Schlüssel muß ein Vielfaches von 8 Bit als Länge "
  "haben\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "Unbekanntes schwache Hashverfahren '%s'\n"
@@@ -6159,7 -4866,25 +6177,28 @@@ msgstr "
  "Dieser Schlüssel gehört uns (da wir nämlich den geheimen Schlüssel dazu "
  "haben)\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ #| msgid "root certificate has now been marked as trusted\n"
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "Das Wurzelzertifikat wurde nun als vertrauenswürdig markiert\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "Es ist NICHT sicher, daß der Schlüssel zu dem in der User-ID\n"
+ "Genannten gehört. Wenn Sie *wirklich* wissen, was Sie tun,\n"
+ "können Sie die nächste Frage mit ja beantworten\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6169,135 -4894,107 +6208,135 @@@ msgstr "
  "Genannten gehört. Wenn Sie *wirklich* wissen, was Sie tun,\n"
  "können Sie die nächste Frage mit ja beantworten\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "Diesen Schlüssel trotzdem benutzen? (j/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "WARNUNG: Ein Schlüssel ohne gesichertes Vertrauen wird benutzt!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
  "WARNUNG: Dieser Schlüssel ist u.U. widerrufen: Widerrufschlüssel ist nicht "
  "vorhanden\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr ""
  "WARNUNG: Dieser Schlüssel wurde vom vorgesehen Widerrufer widerrufen!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "WARNUNG: Dieser Schlüssel wurde von seinem Besitzer widerrufen!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
  msgstr "         Das könnte bedeuten, daß die Signatur gefälscht ist.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "WARNUNG: Dieser Unterschlüssel wurde von seinem Besitzer widerrufen!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Hinweis: Dieser Schlüssel wurde abgeschaltet.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr "Hinweis: Überprüfte Adresse des Unterzeichners ist `%s'\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr "Hinweis: Adresse des Unterzeichners `%s' passt nicht zum DNS-Eintrag\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr "\"Trust\"-Ebene auf VOLLSTÄNDIG geändert (wg. gültiger PKA-Info)\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr "\"Trust\"-Ebene auf NIEMALS geändert (wg. falscher PKA-Info)\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Hinweis: Dieser Schlüssel ist verfallen!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr "WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
  "         Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen "
  "Besitzer gehört.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "         Die Signatur ist wahrscheinlich eine FÄLSCHUNG.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
  "WARNUNG: Dieser Schlüssel ist nicht durch hinreichend vertrauenswürdige "
  "Signaturen zertifiziert!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr ""
  "         Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen "
  "Besitzer gehört.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: übersprungen: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, c-format
  msgid "can't encrypt to '%s'\n"
  msgstr "Verschlüsseln an '%s' ist nicht möglich\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "Option '%s' ohne gültige Standardschlüssel angegeben\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "Option '%s' ohne Verwendung der Option '%s' angegeben\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr ""
  "Sie haben keine User-ID angegeben (Sie können die Option \"-r\" verwenden).\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "Derzeitige Empfänger:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6305,38 -5002,30 +6344,38 @@@ msgstr "
  "\n"
  "Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Keine solche User-ID vorhanden.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr ""
  "übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "Keine gültigen Adressaten\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Hinweis: Schlüssel %s besitzt nicht die %s Eigenschaft\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
@@@ -6594,26 -5237,21 +6633,26 @@@ msgid "%s key %s requires a %zu bit or 
  msgstr ""
  "%s-Schlüssel %s benötigt einen mindestens %zu Bit langen Hash (Hash ist %s)\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "WARNUNG: Signaturunterschlüssel %s hat keine Rücksignatur\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
  msgstr "Siehe %s für weitere Infos\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr "WARNUNG: Signaturunterschlüssel %s hat eine ungültige Rücksignatur\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
@@@ -6621,14 -5259,12 +6660,14 @@@ msgstr[0] "Öffentlicher Schlüssel %s 
  msgstr[1] ""
  "Öffentlicher Schlüssel %s ist %lu Sekunden jünger als die Signatur\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
  msgstr[0] "Öffentlicher Schlüssel %s ist %lu Tag jünger als die Signatur\n"
  msgstr[1] "Öffentlicher Schlüssel %s ist %lu Tage jünger als die Signatur\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6641,7 -5277,6 +6680,7 @@@ msgstr[1] "
  "Schlüssel %s wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
  "Uhrenproblem)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
@@@ -6653,31 -5288,26 +6692,31 @@@ msgstr[1] "
  "Schlüssel %s wurde %lu Tage in der Zukunft erzeugt (Zeitreise oder "
  "Uhrenproblem)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "Hinweis: Signaturschlüssel %s ist am %s verfallen\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "Hinweis: Signaturschlüssel %s wurde widerrufen\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
  "Vermutlich eine FALSCHE Signatur von Schlüssel %s, wegen unbekanntem "
  "\"critical bit\"\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr ""
  "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselwiderruf-"
  "Beglaubigung\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr ""
@@@ -6751,7 -5370,6 +6790,7 @@@ msgstr "
  "Dies ist ein durch PGP erzeugter Elgamal-Schlüssel. Das ist für Signaturen "
  "NICHT sicher genug!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "Vertrauenssatz %lu, Typ %d: Schreiben fehlgeschlagen: %s\n"
@@@ -6796,12 -5406,10 +6835,12 @@@ msgstr "Fehler beim Suchen des \"Trust 
  msgid "read error in '%s': %s\n"
  msgstr "Lesefehler in `%s': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "Datei `%s' konnte nicht gesperrt werden\n"
@@@ -6830,7 -5433,6 +6869,7 @@@ msgstr "trustdb Transaktion zu groß\n
  msgid "%s: directory does not exist!\n"
  msgstr "%s: Verzeichnis existiert nicht!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "kann auf `%s' nicht zugreifen: %s\n"
@@@ -6939,152 -5519,151 +6978,181 @@@ msgstr "Textzeilen länger als %d Zeich
  msgid "input line longer than %d characters\n"
  msgstr "Eingabezeile ist länger als %d Zeichen\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "Fehler beim Starten einer Transaktion auf der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr "Fehler beim Committen einer Transaktion auf der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  "Fehler beim Zurückrollen einer Transaktion auf der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr "Nicht unterstützte TOFU Datenbank Version: %s\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "Fehler beim Lesen der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, c-format
  msgid "error determining TOFU database's version: %s\n"
  msgstr "Fehler beim Feststellen der TOFU Datenbank Version: %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, c-format
  msgid "error initializing TOFU database: %s\n"
  msgstr "Fehler beim Initialisieren der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "Fehler beim Öffner der TOFU Datenbank '%s': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "Fehler beim Schreiben der TOFU Datenbank: %s\n"
  
- #: g10/tofu.c:1118
- #, c-format
- msgid "The binding %s is NOT known."
- msgstr "Die Bindung %s ist NICHT bekannt."
- 
- #: g10/tofu.c:1128
- #, c-format
++#: g10/tofu.c:1239
+ #, fuzzy, c-format
+ #| msgid "The email address \"%s\" is associated with %d key:\n"
+ #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ "This is the first time the email address \"%s\" is being used with key %s."
+ msgstr "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
+ 
++#: g10/tofu.c:1247
+ #, fuzzy, c-format
+ #| msgid "The email address \"%s\" is associated with %d key:\n"
+ #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
+ 
++#: g10/tofu.c:1251
+ #, fuzzy
+ #| msgid ""
+ #| "The key with fingerprint %s raised a conflict with the binding %s.  Since "
+ #| "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  "Der Schlüssel mit dem Fingerabdruck %s steht im Konflikt mit der Bindung "
  "(%s).  Die Richtlinie dieser Bindung wurde deswegen von 'auto' auf 'ask' "
  "geändert."
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
- "Bitte geben Sie Ihre Einschätzung, ob die Bindung %s%s legitim (der "
- "Schlüssel gehört dem angegebenen Besitzer) oder eine Fälschung (ungültig) "
- "ist."
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "Fehler beim Einsammeln der übrigen User-IDs: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr "Bekannte, mit diesem Schlüssel assozierte, User-IDs:\n"
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "Schlüssel und User-IDs auflisten"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, c-format
  msgid "policy: %s"
  msgstr "Richtlinie: %s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "Fehler beim Einsammeln der Signaturstatistik: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
  msgstr[1] "Die Email-Adresse \"%s\" ist mit %d Schlüsseln assoziert:\n"
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr "Statistik für Schlüssel mit der Email-Adresse \"%s\":\n"
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  msgid "this key"
  msgstr "dieser Schlüssel"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] "%ld Nachricht in der Zukunft signiert."
- msgstr[1] "%ld Nachrichten in der Zukunf signiert."
++#: g10/tofu.c:1715
+ #, fuzzy, c-format
+ #| msgid "Verified %ld messages signed by \"%s\"."
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "%ld überprüfte Nachrichten von \"%s\"."
+ msgstr[1] "%ld überprüfte Nachrichten von \"%s\"."
  
- #: g10/tofu.c:1351
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "%ld Nachricht signiert"
- msgstr[1] "%ld Nachrichten signiert"
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1357
- #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
++#: g10/tofu.c:1734
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] " innerhalb des letzten Tages."
  msgstr[1] " innerhalb der letzten %ld Tage."
  
- #: g10/tofu.c:1361
- #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
- msgstr[0] " innerhalb der letzten Woche."
- msgstr[1] " innerhalb der letzten %ld Wochen."
- 
- #: g10/tofu.c:1365
- #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
++#: g10/tofu.c:1740
+ #, fuzzy, c-format
+ #| msgid " over the past %ld month."
+ #| msgid_plural " over the past %ld months."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] " innerhalb des letzten Monats."
  msgstr[1] " innerhalb der letzten %ld Monate."
  
++#: g10/tofu.c:1746
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
+ msgstr[0] " innerhalb des letzten Tages."
+ msgstr[1] " innerhalb der letzten %ld Tage."
+ 
++#: g10/tofu.c:1752
+ #, fuzzy
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid " in the past."
+ msgstr " innerhalb des letzten Tages."
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  "Normalerweise ist lediglich ein Schlüssel mit einer Email-Adresse "
@@@ -7098,95 -5677,87 +7166,104 @@@
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr "gGaAuUlLfF"
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr "(G)ut, einmal (A)kzeptieren, (U)nbekannt, einmal ab(L)ehnen, (F)alsch?"
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ #| msgid "error writing key: %s\n"
+ msgid "resetting keydb: %s\n"
+ msgstr "Fehler beim Schreiben des Schlüssels: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "Fehler beim Setzen der TOFU Binding Vertrauensstufe auf %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "Fehler beim Ändern der TOFU Richtlinie: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] "%d~Jahr"
  msgstr[1] "%d~Jahre"
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] "%d~Monat"
  msgstr[1] "%d~Monate"
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] "%d~Tag"
  msgstr[1] "%d~Tage"
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] "%d~Stunde"
  msgstr[1] "%d~Stunden"
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] "%d~Minute"
  msgstr[1] "%d~Minuten"
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] "%d~Sekunde"
  msgstr[1] "%d~Sekunden"
  
- #: g10/tofu.c:1947
- #, c-format
- msgid "Have never verified a message signed by key %s!\n"
- msgstr "Es wurde noch keine Nachricht mit dem Schlüssel %s überprüft!\n"
- 
- #: g10/tofu.c:1976
++#: g10/tofu.c:2802
  #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
+ msgid "%s: "
  msgstr ""
- "Signaturstatistiken für \"%s\" (Schlüssel %s) konnten nicht gesammelt "
- "werden\n"
  
- #: g10/tofu.c:1996
- #, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "%ld überprüfte Nachrichten von \"%s\"."
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "%d Beglaubigungen entfernt.\n"
  
- #: g10/tofu.c:2007
- #, c-format
- msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
++#: g10/tofu.c:2816
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Verified %ld message signed by \"%s\"\n"
+ #| "in the past %s."
+ #| msgid_plural ""
+ #| "Verified %ld messages signed by \"%s\"\n"
+ #| "in the past %s."
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
  msgstr[0] ""
  "%ld überprüfte Nachricht von \"%s\"\n"
  "in den letzten %s."
@@@ -7194,27 -5765,72 +7271,79 @@@ msgstr[1] "
  "%ld überprüfte Nachrichten von \"%s\"\n"
  "in den letzten %s."
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
- msgstr "Die neueste Nachricht wurde vor %s überprüft."
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "Verschlüsselt mit %lu Passphrases\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Verified %ld message signed by \"%s\"\n"
+ #| "in the past %s."
+ #| msgid_plural ""
+ #| "Verified %ld messages signed by \"%s\"\n"
+ #| "in the past %s."
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] ""
+ "%ld überprüfte Nachricht von \"%s\"\n"
+ "in den letzten %s."
+ msgstr[1] ""
+ "%ld überprüfte Nachrichten von \"%s\"\n"
+ "in den letzten %s."
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2880
+ #, fuzzy
+ #| msgid "Warning: we've have yet to see a message signed by this key!\n"
+ msgid ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  "WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
  "sehen.\n"
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2883
+ #, fuzzy
+ #| msgid "Warning: we've only seen a single message signed by this key!\n"
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  "WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Nachricht "
  "gesehen.\n"
  
- #: g10/tofu.c:2077
- #, c-format
++#: g10/tofu.c:2887
+ #, fuzzy
+ #| msgid "Warning: we've have yet to see a message signed by this key!\n"
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
+ msgstr ""
+ "WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
+ "sehen.\n"
+ 
++#: g10/tofu.c:2890
+ #, fuzzy
+ #| msgid "Warning: we've only seen a single message signed by this key!\n"
+ msgid "Warning: you have only encrypted one message to this key!\n"
+ msgstr ""
+ "WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Nachricht "
+ "gesehen.\n"
+ 
++#: g10/tofu.c:2919
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Warning: if you think you've seen more than %ld message signed by this "
+ #| "key, then this key might be a forgery!  Carefully examine the email "
+ #| "address for small variations.  If the key is suspect, then use\n"
+ #| "  %s\n"
+ #| "to mark it as being bad.\n"
+ #| msgid_plural ""
+ #| "Warning: if you think you've seen more than %ld messages signed by this "
+ #| "key, then this key might be a forgery!  Carefully examine the email "
+ #| "address for small variations.  If the key is suspect, then use\n"
+ #| "  %s\n"
+ #| "to mark it as being bad.\n"
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7240,103 -5856,92 +7369,115 @@@ msgstr[1] "
  "  %s\n"
  "um den Schlüssel als Fälschung zu markieren.\n"
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "Fehler beim Öffnen der TOFU Datenbank: %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring '%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
+ 
++#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
  msgstr "'%s' ist keine gültige lange Schlüssel-ID\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "Schlüssel %s: Als vertrauenswürdiger Schlüssel akzeptiert\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "Schlüssel %s tritt mehr als einmal in der \"trustdb\" auf\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr ""
  "Schlüssel %s: kein öffentlicher Schlüssel für den vertrauenswürdigen "
  "Schlüssel - übersprungen\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "Schlüssel %s ist als ultimativ vertrauenswürdig gekennzeichnet\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "trust record %lu, req type %d: read failed: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  "Sie können versuchen die Vertrauensdatenbank durch folgende Befehle\n"
  "wiederherzustellen:\n"
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr "Falls dies nicht funktioniert, sehen Sie bitte im Handbuch nach\n"
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "kann unbekanntes Vertrauensmodell nicht verwenden (%d) - verwende "
  "Vertrauensmodell %s\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "verwende Vertrauensmodell %s\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "\"Trust-DB\"-Überprüfung ist beim `%s'-Vertrauensmodell nicht nötig\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "\"Trust-DB\"-Änderung ist beim `%s'-Vertrauensmodell nicht nötig\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "Bitte ein --check-trustdb durchführen\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "\"Trust-DB\" wird überprüft\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
@@@ -7344,23 -5949,19 +7485,23 @@@ msgstr[0] "%d Schlüssel bislang bearbe
  msgstr[1] "%d Schlüssel bislang bearbeitet"
  
  # translated by wk
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
  msgstr[0] " (%d Validity Zähler gelöscht)\n"
  msgstr[1] " (%d Validity Zähler gelöscht)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "keine ultimativ vertrauenswürdigen Schlüssel gefunden\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "öff. Schlüssel des ultimativ vertrauten Schlüssel %s nicht gefunden\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7368,7 -5969,6 +7509,7 @@@ msgstr "
  "Tiefe: %d  gültig: %3d  signiert: %3d  Vertrauen: %d-, %dq, %dn, %dm, %df, "
  "%du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7479,59 -6058,46 +7620,59 @@@ msgstr "
  "Syntax: kbxutil [Optionen] [Dateien]\n"
  "Anlisten exportieren und Importieren von KeyBox Dateien\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "Der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN-Callback meldete Fehler: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr "Die Nullpin wurde noch nicht geändert\n"
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "|N|Bitte eine neue PIN für den Standard-Schlüssel eingeben."
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
  msgstr "||Bitte die PIN für den Standard-Schlüssel eingeben."
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr ""
  "|NP|Bitte geben Sie einen neuen PIN Entsperrcode (PUK) für den Standard-"
  "Schlüssel ein."
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr ""
  "|P|Bitte geben Sie den PIN Entsperrcode (PUK) für den Standard-Schlüssel ein."
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  "|N|Bitte geben Sie eine neue PIN für den Schlüssel zur Erstellung "
  "qualifizierter Signaturen ein."
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  "||Bitte geben Sie die PIN für den Schlüssel zur Erstellung qualifizierter "
  "Signaturen ein."
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7539,7 -6105,6 +7680,7 @@@ msgstr "
  "|NP|Bitte geben Sie einen neuen PIN Entsperrcode (PUK) für den Schlüssel zur "
  "Erstellung qualifizierter Signaturen ein."
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7547,83 -6112,65 +7688,83 @@@ msgstr "
  "|N|Bitte geben Sie den PIN Entsperrcode (PUK) für den Schlüssel zur "
  "Erstellung qualifizierter Signaturen ein."
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
- msgstr "Der öffentlichen EC Punkt fehlt in der Antwort\n"
++#: scd/app-openpgp.c:1353
+ msgid "response does not contain the EC public key\n"
+ msgstr "Der EC Schlüssel fehlt in der Antwort\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "Die Standard PIN wird für %s benutzt\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "Die Standard PIN für %s konnte nicht benutzt werden: %s - Die Standard PIN "
  "wird nicht weiter benutzt\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
  msgstr "||Bitte die PIN eingeben"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr "Karte ist dauerhaft gesperrt!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7633,24 -6180,19 +7774,24 @@@ msgstr[1] "Noch %d Admin-PIN-Versuche, 
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Bitte die Admin-PIN eingeben.%%0A[Verbliebene Versuche: %d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Bitte die Admin-PIN eingeben."
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
  msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Der Rückstellcode ist zu kurz; die Mindestlänge beträgt %d\n"
@@@ -7658,109 -6200,85 +7799,109 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr "|RN|Neuer Rückstellcode"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Neue Admin-PIN"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|Neue PIN"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "|A|Bitte die Admin-PIN sowie die neue Admin-PIN eingeben."
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Bitte die PIN sowie die neue PIN eingeben"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
  msgstr "Fehler beim Lesen der Anwendungsdaten\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "Schlüssel existiert bereits\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr "Existierender Schlüssel wird ersetzt werden\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "neue Schlüssel werden erzeugt\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
  msgstr "der neue Schlüssel wird geschrieben\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "Erzeugungsdatum fehlt\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  msgid "unsupported curve\n"
  msgstr "Nicht unterstützte Kurve\n"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
  msgstr "Schlüsselerzeugung fehlgeschlagen\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Schlüsselerzeugung abgeschlossen (%d Sekunde)\n"
  msgstr[1] "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "Die Überprüfung der Admin PIN ist momentan durch einen Befehl verboten "
  "worden\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@@ -7780,7 -6295,6 +7921,7 @@@ msgstr "|N|Erstmalige neue PIN
  msgid "run in multi server mode (foreground)"
  msgstr "Im Multiserver Modus ausführen"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NAME|Die Debugstufe auf NAME setzen"
  
@@@ -7832,18 -6335,15 +7973,18 @@@ msgstr "
  "Syntax: @SCDAEMON@ [Optionen] [Befehl [Argumente]]\n"
  "Smartcard Daemon für @GNUPG@\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  "Bitte die Option `--daemon' nutzen, um das Programm im Hintergund "
  "auszuführen\n"
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "Handhabungsroutine für fd %d gestartet\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "Handhabungsroutine für den fd %d beendet\n"
@@@ -7862,11 -6359,9 +8003,11 @@@ msgstr "Der Dirmngr läuft nicht für d
  msgid "validation model requested by certificate: %s"
  msgstr "Durch Zertifikat angefordertes Gültigkeitsmodell: %s"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr "Kette"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr "Schale"
  
@@@ -7896,205 -6385,158 +8037,205 @@@ msgstr "Hinweis: Die unkritische Zertif
  msgid "certificate policy not allowed"
  msgstr "Die Zertifikatsrichtlinie ist nicht erlaubt"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr "Der Herausgeber wird von einer externen Stelle gesucht\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr "Anzahl der übereinstimmenden Herausgeber: %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr "Der Herausgeber wird im Cache des Dirmngr gesucht\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "Anzahl der übereinstimmenden Zertifikate: %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "Schlüsselsuche im Cache des Dirmngr schlug fehl: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "Kann keinen KeyDB Handler bereitstellen\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
  msgstr "Das Zertifikat wurde widerrufen"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "Der Status des Zertifikats ist nicht bekannt"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  "Bitte vergewissern Sie sich, daß der \"dirmngr\" richtig installiert ist\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
  msgstr "Die CRL konnte nicht geprüft werden: %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "Zertifikat mit unzulässiger Gültigkeit: %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr "Das Zertifikat ist noch nicht gültig"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
  msgstr "Das Wurzelzertifikat ist noch nicht gültig"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr "Das Zwischenzertifikat ist noch nicht gültig"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
  msgstr "Das Zertifikat ist abgelaufen"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
  msgstr "Das Wurzelzertifikat ist abgelaufen"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
  msgstr "Das Zwischenzertifikat ist abgelaufen"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr "Notwendige Zertifikatattribute fehlen: %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
  msgstr "Zertifikat mit unzulässiger Gültigkeit"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr "Die Signatur wurde nicht in der Gültigkeitszeit des Zertifikat erzeugt"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  "Das Zertifikat wurde nicht während der Gültigkeitszeit des Herausgebers "
  "erzeugt"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  "Das Zwischenzertifikat wurde nicht während der Gültigkeitszeit des "
  "Herausgebers erzeugt"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  (    Signatur erzeugt am "
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "  (  Zertifikat erzeugt am "
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
  msgstr "  (  Zertifikat gültig von "
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr "  ( Herausgeber gültig von "
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "Fingerprint=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr "Das Wurzelzertifikat wurde nun als vertrauenswürdig markiert\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  "Interaktives vertrauenswürdig-Markieren ist in gpg-agent ausgeschaltet\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  "Interaktives vertrauenswürdig-Markieren ist in dieser Sitzung ausgeschaltet\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  "WARNUNG: Der Erzeugungszeitpunkt der Signatur ist nicht bekannt - Nehme die "
  "aktuelle Zeit an"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "Im Zertifikat ist kein Herausgeber enthalten"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr "Der Zertifikatkette ist zu lang\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "Herausgeberzertifikat nicht gefunden"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
  msgstr "Das Zertifikat hat eine FALSCHE Signatur"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  "Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche "
  "nochmal"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "Das Zertifikat ist korrekt\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
  msgstr "Das Zwischenzertifikat ist korrekt\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
  msgstr "Das Wurzelzertifikat ist korrekt\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr "Umgeschaltet auf das Kettenmodell"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr "Benutztes Gültigkeitsmodell: %s"
@@@ -8421,7 -6797,6 +8562,7 @@@ msgstr "(dies ist wahrscheinlich keine 
  msgid "certificate '%s' not found: %s\n"
  msgstr "Zertifikat `%s' nicht gefunden: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
  msgstr "Fehler beim Sperren der Keybox: %s\n"
@@@ -8445,123 -6816,93 +8586,123 @@@ msgstr "Fehler beim Löschen des Zertif
  msgid "no valid recipients given\n"
  msgstr "Keine gültigen Empfänger angegeben\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
  msgstr "Externe Schlüssel anzeigen"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
  msgstr "Schlüssel mit Zertifikatekette anzeigen"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
  msgstr "Zertifikate importieren"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
  msgstr "Zertifikate exportieren"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "Smartcard registrieren"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "Das Kommando an den Dirmngr durchreichen"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr "Rufe das gpg-protect-tool auf"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
  msgstr "Ausgabe im Basis-64 Format erzeugen"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr "Eingabedaten sind im PEM Format"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr "Eingabedaten sind im Basis-64 Format"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr "Eingabedaten sind im Binärformat"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr "Niemals eine CRL konsultieren"
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr "Die Gültigkeit mittels OCSP prüfen"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr "|N|Sende N Zertifikate mit"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr "Zertifikatsrichtlinien nicht überprüfen"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr "Fehlende Zertifikate automatisch holen"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "das Terminal gar nicht benutzen"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
  msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "Stapelmodus: Keine Abfragen"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "\"Ja\" als Standardantwort annehmen"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "\"Nein\" als Standardantwort annehmen"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|DATEI|DATEI als öffentlichen Schlüsselbund mitbenutzen"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAME|Hashverfahren NAME benutzen"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Aufruf: @GPGSM@ [Optionen] [Dateien] (-h für Hilfe)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8570,46 -6911,37 +8711,46 @@@ msgstr "
  "Syntax: @GPGSM@ [Optionen] [Dateien]\n"
  "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: Kein Server-Name angegeben\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: Passwort ohne Benutzer\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: Zeile wird übersprungen\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
  msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "Importiere allgemeine Zertifikate: %s\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "Signieren mit `%s' nicht möglich: %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
  
@@@ -8626,7 -6955,6 +8767,7 @@@ msgstr "Fehler beim Speichern des Zerti
  msgid "basic certificate checks failed - not imported\n"
  msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
@@@ -8641,31 -6967,25 +8782,31 @@@ msgstr "Fehler beim Importieren des Zer
  msgid "error reading input: %s\n"
  msgstr "Fehler beim Lesen der Eingabe: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
  msgstr "Kann den Fingerprint nicht ermitteln\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr "Problem bei der Suche nach vorhandenem Zertifikat: %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "Fehler bei der Suche nach einer schreibbaren KeyDB: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
  msgstr "Fehler beim Speichern des Zertifikats: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "Problem bei Wiederfinden des Zertifikats: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
  msgstr "Fehler beim Speichern der Flags: %s\n"
@@@ -9571,108 -7714,84 +9712,112 @@@ msgstr "Absoluter Dateiname erwartet\n
  msgid "looking up '%s'\n"
  msgstr "Auffinden von `%s'\n"
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr "Den Inhalt des CRL Zwischenspeichers anzeigen"
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|DATEI|Lade die CRL aus der DATEI in den Zwischenspeicher"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|Hole eine CRL von dieser URL"
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr "Den Dirmngr herunterfahren"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr "Den Zwischenspeicher löschen"
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  msgid "run without asking a user"
  msgstr "Ausführung ohne Benutzernachfrage"
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr "Laden von abgelaufenen CRLs erzwingen"
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr "OCSP Anfragen erlauben"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr "Online Softwareversionstest erlauben"
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr "Sperre die Benutzung von HTTP"
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr "Sperre die Benutzung von LDAP"
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr "Übergehe HTTP CRL Distribution Points"
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr "Übergehe LDAP CRL Distribution Points"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "Übergehe im Zertifikat enthaltene OCSP Service URLs"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|Leite alle HTTP Anfragen über URL"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HOST|Benutze HOST für LDAP Anfragen"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "Keine Benutzung der Rückgriffshosts mit --ldap-proxy"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr "Füge neue Server aus den CRL Distribution Points der Serverliste hinzu"
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|Setze die LDAP Zeitüberschreitung auf N Sekunden"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|Benutze den OCSP Responder mit dieser URL"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|Nicht mehr als N Angaben in einer Anfrage zurückgeben"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|DATEI|Benutze die CA Zertifikate in DATEI für HKP über TLS"
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr "Netzzugriff nur über Tor"
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9682,11 -7801,9 +9827,11 @@@ msgstr "
  "(Im \"info\"-Handbuch findet sich eine vollständige Liste aller Kommandos "
  "und Optionen)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Gebrauch: @DIRMNGR@ [Optionen]"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9694,79 -7811,62 +9839,79 @@@ msgstr "
  "Syntax: @DIRMNGR@ [Optionen] [Kommando [Argumente]]\n"
  "Keyserver, CRL und OCSP Zugriff für @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "Gültige Debugebenen sind: %s\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, c-format
  msgid "usage: %s [options] "
  msgstr "Aufruf: %s [Optionen] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  msgid "colons are not allowed in the socket name\n"
  msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: ungültiger Fingerabdruck erkannt\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: Lesefehler: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: Müll am Ende der Zeile wird ignoriert\n"
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  "SIGHUP empfangen - lese die Konfiguration erneut und lösche die "
  "Zwischenspeicher\n"
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  msgid "shutdown forced\n"
  msgstr "Herunterfahren wurde erzwungen\n"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "Signal %d empfangen - keine Aktion definiert\n"
@@@ -9936,13 -8000,6 +10081,7 @@@ msgstr "`%s' ist kein LDAP URL\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr "`%s' ist ein ungültiger LDAP URL\n"
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, c-format
- msgid "error allocating memory: %s\n"
- msgstr "Fehler beim Allozieren von Speicher: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, c-format
  msgid "error printing log line: %s\n"
  msgstr "Fehler beim Schreiben einer Logzeile: %s\n"
@@@ -10192,76 -8197,60 +10331,76 @@@ msgstr "OCSP Responder gab einen nicht 
  msgid "OCSP responder returned an too old status\n"
  msgstr "OCSP Responder gab einen zu alten Status zurück\n"
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "assuan_inquire(%s) fehlgeschlagen: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr "LDAP Server fehlt"
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr "Seriennummer fehlt in der Cert-ID"
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "assuan_inquire fehlgeschlagen: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "fetch_cert_by_url() fehlgeschlagen: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "Fehler beim Senden der Daten: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "start_cert_fetch fehlgeschlagen: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "fetch_next_cert fehlgeschlagen: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d überschritten\n"
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "Fehler beim Initialisieren des Servers: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "Fehler beim Registrieren der Kommandos gegen Assuan: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "Assuan accept Problem: %s\n"
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@@ -10306,7 -8286,6 +10445,7 @@@ msgid "certificate should not have bee
  msgstr ""
  "Das Zertifikat hätte nicht zum Signieren einer CRL benutzt werden sollen\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "Reduzierte Informationen"
  
@@@ -10472,11 -8410,9 +10611,11 @@@ msgstr "|NAME|Auch an NAME verschlüsse
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|Email Alias festlegen"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr "Konfiguration der Schlüsselserver"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
  msgstr "Benutze Schlüsselserver unter der URL"
  
@@@ -10510,128 -8439,100 +10649,132 @@@ msgstr "Optionen zum Einstellen der Aus
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr "Optionen zur Benutzung von Tor"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr "Konfiguration für HTTP Server"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr "Benutze die HTTP Proxy Einstellung des Systems"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr "Konfiguration der zu nutzenden LDAP-Server"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr "Liste der LDAP Server"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr "Konfiguration zu OCSP"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
- msgstr "GPG für OpenPGP"
- 
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
- msgstr "GPG Agent"
- 
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
- msgstr "Smartcard Daemon"
- 
 +#: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
- msgstr "GPG für S/MIME"
+ msgid "OpenPGP"
+ msgstr "OpenPGP"
  
 +#: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr "Schlüsselzugriff"
+ msgid "Private Keys"
+ msgstr "Geheime Schlüssel"
  
 +#: tools/gpgconf-comp.c:1068
- msgid "PIN and Passphrase Entry"
- msgstr "PIN und Passphrase Eingabe"
+ msgid "Smartcards"
+ msgstr "Smartcard"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
+ msgstr "S/MIME"
+ 
++#: tools/gpgconf-comp.c:1070
+ msgid "Network"
+ msgstr "Netz"
+ 
++#: tools/gpgconf-comp.c:1071
+ msgid "Passphrase Entry"
+ msgstr "Passphrase Eingabe"
+ 
++#: tools/gpgconf-comp.c:1225
  msgid "Component not suitable for launching"
  msgstr "Komponente unterstützt kein direktes starten"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr "Liste aller Komponenten"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr "Prüfe alle Programme"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|KOMPONENTE|Zeige die Optionen an"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|KOMPONENTE|Ändere die Optionen"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|KOMPONENTE|Prüfe die Optionen"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr "Wende die gobalen Voreinstellungen an"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "Hole die Einstellungsverzeichnisse von @GPGCONF@"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
  msgstr "Zeige die globale Konfigurationsdatei an"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
  msgstr "Prüfe die globale Konfigurationsdatei"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ msgid "query the software version database"
+ msgstr "Abfrage der Datenbank mit Softwareversionen"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr "\"reload\" an alle oder eine Komponente senden"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr "Die angegebene Komponente starten"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr "\"kill\" an eine Komponente senden"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "Als Ausgabedatei benutzen"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr "Aktiviere Änderungen zur Laufzeit; falls möglich"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Gebrauch: @GPGCONF@ [Optionen] (-h für Hilfe)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10639,15 -8540,12 +10782,15 @@@ msgstr "
  "Syntax: @GPGCONF@ {Optionen]\n"
  "Verwalte Konfigurationsoptionen für Programme des @GNUPG@ Systems\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "Benötige ein Komponentenargument"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "Komponente nicht gefunden"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr "Argumente sind nicht erlaubt"
  
diff --cc po/el.po
index 7c487f3,705cc78..cfb8e39
--- a/po/el.po
+++ b/po/el.po
@@@ -8,19 -8,17 +8,19 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg-1.1.92\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2003-06-27 12:00+0200\n"
  "Last-Translator: Dokianakis Theofanis <madf at hellug.gr>\n"
  "Language-Team: Greek <nls at tux.hellug.gr>\n"
  "Language: el\n"
  "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-7\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
- msgstr "�������� ������������� ��� TrustDB: %s\n"
+ msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
  #. TRANSLATORS: These are labels for buttons etc used in
  #. Pinentries.  An underscore indicates that the next letter
@@@ -28,40 -26,31 +28,40 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
- msgstr "������� ������ �� ���������� �� ���������� �������; "
+ msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -69,7 -58,6 +69,7 @@@ msgstr "μη έγκυρη φράση κ
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr ""
  
@@@ -79,180 -67,126 +79,170 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
- msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+ msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
- msgstr "���� ����� ������"
+ msgstr "κακή φράση κλειδί"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
- msgstr "� ������ ����� ���� ������\n"
+ msgstr "η γραμμή είναι πολύ μεγάλη\n"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
- msgstr "� ����� ������ ����� ���� ������\n"
+ msgstr "η φράση κλειδί είναι πολύ μεγάλη\n"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
- msgstr "�� ������� ���������� ��� �����\n"
+ msgstr "Μη έγκυρος χαρακτήρας στο όνομα\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
- msgstr "���� MPI"
+ msgstr "κακό MPI"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
- msgstr "���� ����� ������"
+ msgstr "κακή φράση κλειδί"
  
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
  #, fuzzy, c-format
  msgid "ssh keys greater than %d bits are not supported\n"
- msgstr "��� ������������� � ���������� ���������� %d%s\n"
+ msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
- msgstr "�������� ����������� ��� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
- msgstr "�������� ��������� ��� `%s': %s\n"
+ msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
  
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: agent/command-ssh.c:2419
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
 +#: agent/command-ssh.c:2424
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
- msgstr "�������� �������� �������� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
  
 +#: agent/command-ssh.c:2444
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
- msgstr "�� ������� ��������� ������� ����������: %s\n"
+ msgstr "δε βρέθηκε εγγράψιμη μυστική κλειδοθήκη: %s\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "�������� �������� ��� ����������� `%s': %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
- msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+ msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
- msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+ msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
- msgstr "%s: �������� ����������� hashtable: %s\n"
+ msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -275,62 -205,50 +265,62 @@@ msgstr "
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
 +#: agent/divert-scd.c:291
  #, fuzzy
  msgid "Repeat this Reset Code"
- msgstr "����������� �� ����� ������: "
+ msgstr "Επαναλάβετε τη φράση κλειδί: "
  
 +#: agent/divert-scd.c:293
  #, fuzzy
  msgid "Repeat this PUK"
- msgstr "����������� �� ����� ������: "
+ msgstr "Επαναλάβετε τη φράση κλειδί: "
  
 +#: agent/divert-scd.c:294
  #, fuzzy
  msgid "Repeat this PIN"
- msgstr "����������� �� ����� ������: "
+ msgstr "Επαναλάβετε τη φράση κλειδί: "
  
 +#: agent/divert-scd.c:299
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
- msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
+ msgstr "η φράση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
  
 +#: agent/divert-scd.c:301
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
- msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
+ msgstr "η φράση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
  
 +#: agent/divert-scd.c:302
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
- msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
+ msgstr "η φράση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
  
 +#: agent/divert-scd.c:314
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
 +#: agent/genkey.c:110 sm/certreqgen-ui.c:394
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: agent/genkey.c:117
  #, fuzzy, c-format
  msgid "error writing to temporary file: %s\n"
- msgstr "������� ���  `%s'\n"
+ msgstr "εγγραφή στο  `%s'\n"
  
 +#: agent/genkey.c:158 agent/genkey.c:164
  #, fuzzy
  msgid "Enter new passphrase"
- msgstr "�������������� �� ����� ������\n"
+ msgstr "Πληκτρολογήστε τη φράση κλειδί\n"
  
 +#: agent/genkey.c:172
  #, fuzzy
  msgid "Take this one anyway"
- msgstr "����� ���������� ����� ��� ��������; "
+ msgstr "Χρήση οπωσδήποτε αυτού του κλειδιού; "
  
 +#: agent/genkey.c:202
  #, c-format
  msgid ""
  "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@@ -352,10 -267,9 +342,10 @@@ msgstr "
  #| msgid "Name must be at least 5 characters long\n"
  msgid "A passphrase should be at least %u character long."
  msgid_plural "A passphrase should be at least %u characters long."
- msgstr[0] "�� ����� ������ �� ���� ����������� 5 ����������\n"
- msgstr[1] "�� ����� ������ �� ���� ����������� 5 ����������\n"
+ msgstr[0] "Το όνομα πρέπει να έχει τουλάχιστον 5 χαρακτήρες\n"
+ msgstr[1] "Το όνομα πρέπει να έχει τουλάχιστον 5 χαρακτήρες\n"
  
 +#: agent/genkey.c:252
  #, c-format
  msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
  msgid_plural ""
@@@ -376,137 -287,108 +366,143 @@@ msgstr "
  #, fuzzy, c-format
  msgid "Please enter the passphrase to%0Aprotect your new key"
  msgstr ""
- "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
+ "Χρειάζεστε μια Φράση κλειδί για να προστατεύσετε το μυστικό κλειδί.\n"
  "\n"
  
 +#: agent/genkey.c:606
  #, fuzzy
  msgid "Please enter the new passphrase"
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
  " "
  msgstr ""
  "@\n"
- "��������:\n"
+ "Επιλογές:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "Το κλειδί έχει παρακαμθεί"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
- msgstr "���������"
+ msgstr "αναλυτικά"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
- msgstr "����� ������"
+ msgstr "ήσυχη έξοδος"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
- msgstr "|������|������� ��� ���������� ��������� ������"
+ msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
- msgstr "��������� �������� �� ��� ���������� ��������"
+ msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
- msgstr "�������� ��� ����� ��������� ������������"
+ msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|accept some commands via NAME"
- msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
+ msgstr "|ΟΝΟΜΑ|καθορισμός του σετ χαρακτήρων τερματικού σε ΟΝΟΜΑ"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
- msgstr "��� �������������"
+ msgstr "δεν υποστηρίζεται"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -515,220 -397,166 +511,220 @@@ 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
- msgstr "��������� �� ���������� ��� <gnupg-bugs at gnu.org>\n"
+ msgstr "Αναφέρετε τα προβλήματα στο <gnupg-bugs at gnu.org>\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
- msgstr "��������: �� �������������� ������ �������� `%s'\n"
+ msgstr "ΣΗΜΕΙΩΣΗ: μη προκαθορισμένο αρχείο επιλογών `%s'\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
- msgstr "������ �������� `%s': %s\n"
+ msgstr "αρχείο επιλογών `%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
- msgstr "�������� �������� ��� `%s'\n"
+ msgstr "ανάγνωση επιλογών από `%s'\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
- msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
- msgstr "�������� ����������� ��� %s: %s\n"
+ msgstr "αδυναμία δημιουργίας του %s: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, fuzzy
  msgid "a gpg-agent is already running - not starting a new one\n"
- msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
+ msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
- msgstr "������ ��� �������� ���� �� `%s': %s\n"
+ msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
- msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
- msgstr "� ��������� �������: %s\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
- msgstr "�������� ����������� ��������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
- msgstr "%s: ��������� �������������\n"
+ msgstr "%s: κατάλογος δημιουργήθηκε\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
- msgstr "trustdb: read ������� (n=%d): %s\n"
+ msgstr "trustdb: read απέτυχε (n=%d): %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
- msgstr "%s: �������� ����������� ���������: %s\n"
+ msgstr "%s: αδυναμία δημιουργίας καταλόγου: %s\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
- msgstr "� ��������� �������� �������: %s\n"
+ msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
- msgstr "%s: ������������: %s\n"
+ msgstr "%s: παραλείφθηκε: %s\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
- msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
+ msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
  
 +#: agent/preset-passphrase.c:99
  #, fuzzy
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
 +#: agent/preset-passphrase.c:102
  msgid ""
  "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
  msgstr ""
- "@�������:\n"
+ "@Εντολές:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
  " "
  msgstr ""
  "@\n"
- "��������:\n"
+ "Επιλογές:\n"
  " "
  
 +#: agent/protect-tool.c:154
  #, fuzzy
  msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
 +#: agent/protect-tool.c:156
  msgid ""
  "Syntax: gpg-protect-tool [options] [args]\n"
  "Secret key maintenance tool\n"
  msgstr ""
  
 +#: agent/protect-tool.c:693
  #, fuzzy
  msgid "Please enter the passphrase to unprotect the PKCS#12 object."
- msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+ msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
 +#: agent/protect-tool.c:698
  #, fuzzy
  msgid "Please enter the passphrase to protect the new PKCS#12 object."
- msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+ msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
 +#: agent/protect-tool.c:704
  msgid ""
  "Please enter the passphrase to protect the imported object within the GnuPG "
  "system."
@@@ -739,54 -566,44 +735,55 @@@ msgstr "
  msgid ""
  "Please enter the passphrase or the PIN\n"
  "needed to complete this operation."
- msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+ msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
  #, fuzzy
  msgid "cancelled\n"
- msgstr "�������"
+ msgstr "Ακύρωση"
  
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
  #, fuzzy, c-format
  msgid "error while asking for the passphrase: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
  #, fuzzy, c-format
  msgid "file '%s', line %d: %s\n"
- msgstr "�� ������ '%s' �� �������: %s\n"
+ msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
 +#: agent/trustlist.c:192 agent/trustlist.c:200
  #, fuzzy, c-format
  msgid "statement \"%s\" ignored in '%s', line %d\n"
- msgstr "������ ���������: %s\n"
+ msgstr "σφάλμα ανάγνωσης: %s\n"
  
 +#: agent/trustlist.c:206
  #, fuzzy, c-format
  msgid "system trustlist '%s' not available\n"
- msgstr "������� ��� �������� �������� ��� ����� ���������\n"
+ msgstr "τμήματα του μυστικού κλειδιού δεν είναι διαθέσιμα\n"
  
 +#: agent/trustlist.c:250
  #, fuzzy, c-format
  msgid "bad fingerprint in '%s', line %d\n"
- msgstr "������ ���������: %s\n"
+ msgstr "σφάλμα ανάγνωσης: %s\n"
  
 +#: agent/trustlist.c:275 agent/trustlist.c:282
  #, fuzzy, c-format
  msgid "invalid keyflag in '%s', line %d\n"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
 +#: agent/trustlist.c:316 common/helpfile.c:136
  #, fuzzy, c-format
  msgid "error reading '%s', line %d: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: agent/trustlist.c:434 agent/trustlist.c:503
  msgid "error reading list of trusted root certificates\n"
  msgstr ""
  
@@@ -805,13 -621,10 +802,13 @@@ msgid "
  "certificates?"
  msgstr ""
  
 +#: agent/trustlist.c:673 common/audit.c:467
  #, fuzzy
  msgid "Yes"
- msgstr "���|���"
+ msgstr "ναι|ναί"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -841,40 -651,33 +838,40 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
- msgstr "������� ������ �� ���������� �� ���������� �������; "
+ msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  msgid "Delete key"
- msgstr "����������� ��� ������"
+ msgstr "ενεργοποιεί ένα κλειδί"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -889,138 -690,115 +886,149 @@@ msgstr "
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
- msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+ msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
 +#: agent/cvt-openpgp.c:338
  msgid "secret key parts are not available\n"
- msgstr "������� ��� �������� �������� ��� ����� ���������\n"
+ msgstr "τμήματα του μυστικού κλειδιού δεν είναι διαθέσιμα\n"
  
 +#: agent/cvt-openpgp.c:344
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "public key algorithm %d (%s) is not supported\n"
- msgstr "��� ������������� � ���������� ���������� %d%s\n"
+ msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
  
 +#: agent/cvt-openpgp.c:448
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection algorithm %d (%s) is not supported\n"
- msgstr "��� ������������� � ���������� ���������� %d%s\n"
+ msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
  
 +#: agent/cvt-openpgp.c:455
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection hash algorithm %d (%s) is not supported\n"
- msgstr "��� ������������� � ���������� ���������� %d%s\n"
+ msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "� ��������� �������: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
  #, fuzzy, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "�������� �������� �������� ����������� `%s': %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
+ #, fuzzy, c-format
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
- msgstr "�������� �������� ��� `%s': %s\n"
+ msgstr "αδυναμία σύνδεσης στο `%s': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  #, fuzzy
  msgid "problem setting the gpg-agent options\n"
- msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
+ msgstr "πρόβλημα με τον agent: agent επιστρέφει 0x%lx\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
- msgstr "�������� ��������������� ��� core dump: %s\n"
+ msgstr "αδυναμία απενεργοποίησης των core dump: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
- msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
- msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
+ 
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "θωράκιση απέτυχε: %s\n"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
- msgstr "���|���"
+ msgstr "ναι|ναί"
  
 +#: common/yesno.c:46 common/yesno.c:87
  msgid "yY"
  msgstr "yY"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:48 common/yesno.c:84
  msgid "no"
- msgstr "���|���"
+ msgstr "όχι|οχι"
  
 +#: common/yesno.c:49 common/yesno.c:88
  msgid "nN"
  msgstr "nN"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:86
  msgid "quit"
- msgstr "�����������"
+ msgstr "τερματισμός"
  
 +#: common/yesno.c:89
  msgid "qQ"
  msgstr "qQ"
  
@@@ -1053,56 -825,45 +1061,56 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
 +#: common/miscellaneous.c:143
  #, c-format
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
  msgstr ""
  
 +#: common/miscellaneous.c:146
  #, fuzzy, c-format
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
- msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
  
 +#: common/miscellaneous.c:554
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  msgid "connection to agent is in restricted mode\n"
- msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
+ msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1120,83 -878,66 +1128,83 @@@ msgstr "
  msgid "|audit-log-result|Not supported"
  msgstr ""
  
 +#: common/audit.c:481
  #, fuzzy
  msgid "|audit-log-result|No certificate"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: common/audit.c:483
  #, fuzzy
  msgid "|audit-log-result|Not enabled"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: common/audit.c:485
  msgid "|audit-log-result|Error"
  msgstr ""
  
 +#: common/audit.c:487
  #, fuzzy
  msgid "|audit-log-result|Not used"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: common/audit.c:489
  #, fuzzy
  msgid "|audit-log-result|Okay"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: common/audit.c:491
  #, fuzzy
  msgid "|audit-log-result|Skipped"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: common/audit.c:493
  #, fuzzy
  msgid "|audit-log-result|Some"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: common/audit.c:726
  #, fuzzy
  msgid "Certificate chain available"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: common/audit.c:733
  #, fuzzy
  msgid "root certificate missing"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: common/audit.c:759
  msgid "Data encryption succeeded"
  msgstr ""
  
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
  #, fuzzy
  msgid "Data available"
- msgstr "������ ��������� ���: "
+ msgstr "Κλειδί διαθέσιμο στο: "
  
 +#: common/audit.c:767
  #, fuzzy
  msgid "Session key created"
- msgstr "%s: ���������� �������������\n"
+ msgstr "%s: κλειδοθήκη δημιουργήθηκε\n"
  
 +#: common/audit.c:772 common/audit.c:912 common/audit.c:919
  #, fuzzy, c-format
  msgid "algorithm: %s"
- msgstr "��������: %s\n"
+ msgstr "θωράκιση: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
  "\n"
- "��������������� ����������:\n"
+ "Υποστηριζόμενοι αλγόριθμοι:\n"
  
 +#: common/audit.c:778 common/audit.c:925
  #, fuzzy
  msgid "seems to be not encrypted"
- msgstr "�� ���������������"
+ msgstr "μη κρυπτογραφημένο"
  
 +#: common/audit.c:784 common/audit.c:933
  msgid "Number of recipients"
  msgstr ""
  
@@@ -1209,95 -948,76 +1217,95 @@@ msgstr "
  msgid "Data signing succeeded"
  msgstr ""
  
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
  #, fuzzy, c-format
  msgid "data hash algorithm: %s"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: common/audit.c:862
  #, fuzzy, c-format
  msgid "Signer %d"
- msgstr "�������� ����� ���� %s.\n"
+ msgstr "Υπογραφή έληξε στις %s.\n"
  
 +#: common/audit.c:866 common/audit.c:1065
  #, fuzzy, c-format
  msgid "attr hash algorithm: %s"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: common/audit.c:901
  msgid "Data decryption succeeded"
  msgstr ""
  
 +#: common/audit.c:910
  #, fuzzy
  msgid "Encryption algorithm supported"
- msgstr "��� ������������� � ���������� ���������� %d%s\n"
+ msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
  
 +#: common/audit.c:993
  #, fuzzy
  msgid "Data verification succeeded"
- msgstr "��������� ��������� ���������\n"
+ msgstr "καταστολή ανάκλησης υπογραφής\n"
  
 +#: common/audit.c:1002
  #, fuzzy
  msgid "Signature available"
- msgstr "�������� ����� ���� %s.\n"
+ msgstr "Υπογραφή έληξε στις %s.\n"
  
 +#: common/audit.c:1024
  #, fuzzy
  msgid "Parsing data succeeded"
- msgstr "���� �������� ��� \""
+ msgstr "Καλή υπογραφή από \""
  
 +#: common/audit.c:1036
  #, fuzzy, c-format
  msgid "bad data hash algorithm: %s"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: common/audit.c:1051
  #, fuzzy, c-format
  msgid "Signature %d"
- msgstr "�������� ����� ���� %s.\n"
+ msgstr "Υπογραφή έληξε στις %s.\n"
  
 +#: common/audit.c:1079
  #, fuzzy
  msgid "Certificate chain valid"
- msgstr "���� �� ������ ���� �����!"
+ msgstr "Αυτό το κλειδί έχει λήξει!"
  
 +#: common/audit.c:1090
  #, fuzzy
  msgid "Root certificate trustworthy"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
- msgstr "������ ��������� ���: "
+ msgstr "Κλειδί διαθέσιμο στο: "
  
 +#: common/audit.c:1119
  #, fuzzy
  msgid "CRL/OCSP check of certificates"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: common/audit.c:1139
  #, fuzzy
  msgid "Included certificates"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: common/audit.c:1194
  msgid "No audit log entries."
  msgstr ""
  
 +#: common/audit.c:1243
  #, fuzzy
  msgid "Unknown operation"
- msgstr "������� ������"
+ msgstr "άγνωστη έκδοση"
  
 +#: common/audit.c:1261
  msgid "Gpg-Agent usable"
  msgstr ""
  
@@@ -1305,88 -1024,71 +1313,88 @@@
  msgid "Dirmngr usable"
  msgstr ""
  
 +#: common/audit.c:1307
  #, fuzzy, c-format
  msgid "No help available for '%s'."
- msgstr "��� ������� ��������� ������� ��� `%s'"
+ msgstr "Δεν υπάρχει διαθέσιμη βοήθεια για `%s'"
  
 +#: common/helpfile.c:90
  #, fuzzy
  msgid "ignoring garbage line"
- msgstr "������ ��� ������ trailer\n"
+ msgstr "σφάλμα στη γραμμή trailer\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
- msgstr "�������"
+ msgstr "άγνωστο"
  
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
 +#: common/argparse.c:367
  #, fuzzy
  msgid "read error"
- msgstr "������ ��������� �������"
+ msgstr "σφάλμα ανάγνωσης αρχείου"
  
 +#: common/argparse.c:369
  #, fuzzy
  msgid "keyword too long"
- msgstr "� ������ ����� ���� ������\n"
+ msgstr "η γραμμή είναι πολύ μεγάλη\n"
  
 +#: common/argparse.c:371
  #, fuzzy
  msgid "missing argument"
- msgstr "�� ������ ������"
+ msgstr "μη έγκυρο όρισμα"
  
 +#: common/argparse.c:373
  #, fuzzy
  #| msgid "invalid armor"
  msgid "invalid argument"
- msgstr "�� ������ ��������"
+ msgstr "μη έγκυρη θωράκιση"
  
 +#: common/argparse.c:375
  #, fuzzy
  msgid "invalid command"
- msgstr "������������� �������\n"
+ msgstr "συγκρουόμενες εντολές\n"
  
 +#: common/argparse.c:377
  #, fuzzy
  msgid "invalid alias definition"
- msgstr "�� ������� �������� ���������\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
 +#: common/argparse.c:379
  #, fuzzy
  msgid "out of core"
- msgstr "�� �������������"
+ msgstr "μη επεξεργασμένο"
  
 +#: common/argparse.c:381
  #, fuzzy
  msgid "invalid option"
- msgstr "�� ������� �������� ���������\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
 +#: common/argparse.c:389
  #, c-format
  msgid "missing argument for option \"%.50s\"\n"
  msgstr ""
  
 +#: common/argparse.c:391
  #, fuzzy, c-format
  msgid "invalid argument for option \"%.50s\"\n"
- msgstr "�� ������� �������� ���������\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
 +#: common/argparse.c:393
  #, c-format
  msgid "option \"%.50s\" does not expect an argument\n"
  msgstr ""
  
 +#: common/argparse.c:395
  #, fuzzy, c-format
  msgid "invalid command \"%.50s\"\n"
- msgstr "�� ������ ������  (��������� \"help\")\n"
+ msgstr "Μη έγκυρη εντολή  (δοκιμάστε \"help\")\n"
  
 +#: common/argparse.c:397
  #, c-format
  msgid "option \"%.50s\" is ambiguous\n"
  msgstr ""
@@@ -1396,260 -1097,203 +1404,259 @@@
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
- msgstr "�� �������������"
+ msgstr "μη επεξεργασμένο"
  
 +#: common/argparse.c:403
  #, fuzzy, c-format
  msgid "invalid option \"%.50s\"\n"
- msgstr "�� ������� �������� ���������\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
 +#: common/utf8conv.c:123
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' not available\n"
- msgstr "�������� �������: %s\n"
+ msgstr "θωράκιση απέτυχε: %s\n"
  
 +#: common/utf8conv.c:131
  #, fuzzy, c-format
  msgid "iconv_open failed: %s\n"
- msgstr "�������� ��������� ��� �������: %s\n"
+ msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
  
 +#: common/utf8conv.c:385 common/utf8conv.c:651
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' failed: %s\n"
- msgstr "�������� �������: %s\n"
+ msgstr "θωράκιση απέτυχε: %s\n"
  
 +#: common/dotlock.c:707
  #, fuzzy, c-format
  msgid "failed to create temporary file '%s': %s\n"
- msgstr "�������� ����������� ��������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
  
 +#: common/dotlock.c:771
  #, fuzzy, c-format
  msgid "error writing to '%s': %s\n"
- msgstr "�������� �������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
  
 +#: common/dotlock.c:1116
  #, c-format
  msgid "removing stale lockfile (created by %d)\n"
  msgstr ""
  
 +#: common/dotlock.c:1152
  #, fuzzy, c-format
  msgid "waiting for lock (held by %d%s) %s...\n"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
 +#: common/dotlock.c:1153
  msgid "(deadlock?) "
  msgstr ""
  
 +#: common/dotlock.c:1192
  #, fuzzy, c-format
  msgid "lock '%s' not made: %s\n"
- msgstr "�� ������� ������ %08lX ��� �������: %s\n"
+ msgstr "το δημόσιο κλειδί %08lX δεν βρέθηκε: %s\n"
  
 +#: common/dotlock.c:1219
  #, fuzzy, c-format
  msgid "waiting for lock %s...\n"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
  
 +#: g10/armor.c:424
  #, c-format
  msgid "armor: %s\n"
- msgstr "��������: %s\n"
+ msgstr "θωράκιση: %s\n"
  
 +#: g10/armor.c:463
  msgid "invalid armor header: "
- msgstr "�� ������ ����������� ���������: "
+ msgstr "μη έγκυρη επικεφαλίδα θωράκισης: "
  
 +#: g10/armor.c:474
  msgid "armor header: "
- msgstr "����������� ���������: "
+ msgstr "επικεφαλίδα θωράκισης: "
  
 +#: g10/armor.c:487
  msgid "invalid clearsig header\n"
- msgstr "�� ������ ����������� clearsig\n"
+ msgstr "μη έγκυρη επικεφαλίδα clearsig\n"
  
 +#: g10/armor.c:500
  #, fuzzy
  msgid "unknown armor header: "
- msgstr "����������� ���������: "
+ msgstr "επικεφαλίδα θωράκισης: "
  
 +#: g10/armor.c:553
  msgid "nested clear text signatures\n"
- msgstr "����������� �� ���������������� ���������\n"
+ msgstr "φωλιασμένες μη κρυπτογραφημένες υπογραφές\n"
  
 +#: g10/armor.c:688
  #, fuzzy
  msgid "unexpected armor: "
- msgstr "�� ����������� ��������:"
+ msgstr "μη αναμενόμενη θωράκιση:"
  
 +#: g10/armor.c:701
  msgid "invalid dash escaped line: "
- msgstr "�� ������ dash escaped ������: "
+ msgstr "μη έγκυρη dash escaped γραμμή: "
  
 +#: g10/armor.c:873 g10/armor.c:1490
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
- msgstr "�� ������� radix64 ���������� %02x ���������\n"
+ msgstr "μη έγκυρος radix64 χαρακτήρας %02x παράβλεψη\n"
  
 +#: g10/armor.c:916
  msgid "premature eof (no CRC)\n"
- msgstr "������ ����� ������� (������� CRC)\n"
+ msgstr "πρόωρο τέλος αρχείου (απουσία CRC)\n"
  
 +#: g10/armor.c:950
  msgid "premature eof (in CRC)\n"
- msgstr "������ ����� ������� (����� CRC)\n"
+ msgstr "πρόωρο τέλος αρχείου (εντός CRC)\n"
  
 +#: g10/armor.c:958
  msgid "malformed CRC\n"
- msgstr "����� ����� CRC\n"
+ msgstr "λάθος μορφή CRC\n"
  
 +#: g10/armor.c:962 g10/armor.c:1527
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
- msgstr "������ CRC: %06lx - %06lx\n"
+ msgstr "σφάλμα CRC: %06lx - %06lx\n"
  
 +#: g10/armor.c:982
  #, fuzzy
  msgid "premature eof (in trailer)\n"
- msgstr "������ ����� ������� (��� �railer)\n"
+ msgstr "πρόωρο τέλος αρχείου (στο Τrailer)\n"
  
 +#: g10/armor.c:986
  msgid "error in trailer line\n"
- msgstr "������ ��� ������ trailer\n"
+ msgstr "σφάλμα στη γραμμή trailer\n"
  
 +#: g10/armor.c:1303
  msgid "no valid OpenPGP data found.\n"
- msgstr "�� �������� ������ OpenPGP ��������.\n"
+ msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
  
 +#: g10/armor.c:1308
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
- msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
+ msgstr "μη έγκυρη θωράκιση: η γραμμή είναι πάνω από %d χαρακτήρες\n"
  
 +#: g10/armor.c:1312
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
- "�����������, �� ����������, ���������� ��� �������� - ���� ����� ����� "
- "������������� MTA\n"
+ "εκτυπώσιμος, σε εισαγωγικά, χαρακτήρας στη θωράκιση - ίσως έγινε χρήση "
+ "προβληματικού MTA\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
- msgstr "�� ����������"
+ msgstr "μη αναγνώσιμο"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr ""
- "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
- "��� �� ����� �� ��� '='\n"
+ "ένα όνομα σημείωσης μπορεί να περιέχει μόνο εκτυπώσιμους χαρακτήρες και κενά "
+ "και να λήγει με ένα '='\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
- msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
+ msgstr "το όνομα σημείωσης χρήστη πρέπει να περιέχει το '@' χαρακτήρα\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  #, fuzzy
  msgid "a notation name must not contain more than one '@' character\n"
- msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
+ msgstr "το όνομα σημείωσης χρήστη πρέπει να περιέχει το '@' χαρακτήρα\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
- msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
+ msgstr "η τιμή σημείωσης πρέπει να μη χρησιμοποιεί χαρακτήρες control\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  msgid "a notation name may not contain an '=' character\n"
- msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
+ msgstr "το όνομα σημείωσης χρήστη πρέπει να περιέχει το '@' χαρακτήρα\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
  #| "with an '='\n"
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr ""
- "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
- "��� �� ����� �� ��� '='\n"
+ "ένα όνομα σημείωσης μπορεί να περιέχει μόνο εκτυπώσιμους χαρακτήρες και κενά "
+ "και να λήγει με ένα '='\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
- msgstr "�������������: �������� �� ������ �������� ���������\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: βρέθηκαν μη έγκυρα δεδομένα σημείωσης\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr ""
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
- msgstr "�������������� �� ����� ������: "
+ msgstr "Πληκτρολογήστε τη φράση κλειδί: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
- msgstr "�������������: �� %s ����������� �� %s\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s παρακάμπτει το %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, fuzzy, c-format
  msgid "OpenPGP card not available: %s\n"
- msgstr "�� ������� ������ ��� ����� ���������"
+ msgstr "το μυστικό κλειδί δεν είναι διαθέσιμο"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  #, fuzzy
  msgid "can't do this in batch mode\n"
- msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
+ msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
  
 +#: g10/card-util.c:107
  #, fuzzy
  msgid "This command is only available for version 2 cards\n"
- msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
+ msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
- msgstr "������� ��� �������� �������� ��� ����� ���������\n"
+ msgstr "τμήματα του μυστικού κλειδιού δεν είναι διαθέσιμα\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
- msgstr "� ������� ���; "
+ msgstr "Η επιλογή σας; "
  
 +#: g10/card-util.c:279 g10/card-util.c:330
  msgid "[not set]"
  msgstr ""
  
@@@ -1663,198 -1305,153 +1670,198 @@@ msgstr "enable
  msgid "female"
  msgstr "enable"
  
 +#: g10/card-util.c:534
  #, fuzzy
  msgid "unspecified"
- msgstr "��� ���� ������� �����"
+ msgstr "Δεν έχει οριστεί αιτία"
  
 +#: g10/card-util.c:561
  #, fuzzy
  msgid "not forced"
- msgstr "�� �������������"
+ msgstr "μη επεξεργασμένο"
  
 +#: g10/card-util.c:561
  msgid "forced"
  msgstr ""
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr ""
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr ""
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr ""
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  #, fuzzy
  msgid "URL to retrieve public key: "
- msgstr "������ ��������� ������� ������: %s\n"
+ msgstr "κανένα αντίστιχο δημόσιο κλειδί: %s\n"
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
- msgstr "�������� �������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr ""
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr ""
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  #, fuzzy
  msgid "Language preferences: "
- msgstr "����������� ��������"
+ msgstr "αναωεωμένες επιλογές"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  #, fuzzy
  msgid "Error: invalid length of preference string.\n"
- msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
+ msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  #, fuzzy
  msgid "Error: invalid characters in preference string.\n"
- msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
+ msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr ""
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  #, fuzzy
  msgid "Error: invalid response.\n"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  #, fuzzy
  msgid "CA fingerprint: "
- msgstr "���������� ��� fingerprint"
+ msgstr "απεικόνιση του fingerprint"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  #, fuzzy
  msgid "Error: invalid formatted fingerprint.\n"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, fuzzy, c-format
  msgid "key operation not possible: %s\n"
- msgstr "� ���������� �������� �������: %s\n"
+ msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  #, fuzzy
  msgid "not an OpenPGP card"
- msgstr "�� �������� ������ OpenPGP ��������.\n"
+ msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
- msgstr "�������� �������� �������� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
- msgstr "�� ������� �������� �� ������; (1024) "
+ msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
- msgstr "�� ������� �������� �� ������; (1024) "
+ msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
- msgstr "�� ������� �������� �� ������; (1024) "
+ msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
- msgstr "����������������� ��� �� %u bits\n"
+ msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
- msgstr "������ ��� �������� ���� �� `%s': %s\n"
+ msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
- msgstr "������������: ������� ������ ��� �����\n"
+ msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1862,213 -1459,162 +1869,213 @@@
  "You should change them using the command --change-pin\n"
  msgstr ""
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  #, fuzzy
  msgid "Please select the type of key to generate:\n"
- msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
+ msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  #, fuzzy
  msgid "   (1) Signature key\n"
- msgstr "�������� ����� ���� %s.\n"
+ msgstr "Υπογραφή έληξε στις %s.\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  #, fuzzy
  msgid "   (2) Encryption key\n"
- msgstr "   (%d) RSA (��� ������������� ����)\n"
+ msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
- msgstr "�� ������ �������.\n"
+ msgstr "Μη έγκυρη επιλογή.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  #, fuzzy
  msgid "Please select where to store the key:\n"
- msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
+ msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
- msgstr "� ��������� �������: %s\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
- msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
+ msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
- msgstr "������������: ������� ������ ��� �����\n"
+ msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  msgid "Continue? (y/N) "
- msgstr "������� �� ���������; "
+ msgstr "Σίγουρα να υπογραφεί; "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
- msgstr "����������� ����� ��� �����"
+ msgstr "τερματισμός αυτού του μενού"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  #, fuzzy
  msgid "show admin commands"
- msgstr "������������� �������\n"
+ msgstr "συγκρουόμενες εντολές\n"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
- msgstr "���������� ����� ��� ��������"
+ msgstr "απεικόνιση αυτής της βοήθειας"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  #, fuzzy
  msgid "list all available data"
- msgstr "������ ��������� ���: "
+ msgstr "Κλειδί διαθέσιμο στο: "
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr ""
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr ""
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr ""
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  #, fuzzy
  msgid "change the login name"
- msgstr "������ ��� ����������� �����"
+ msgstr "αλλαγή της ημερομηνίας λήξης"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  #, fuzzy
  msgid "change the language preferences"
- msgstr "������ ��� ������������ ���������"
+ msgstr "αλλαγή της εμπιστοσύνης ιδιοκτήτη"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr ""
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  #, fuzzy
  msgid "change a CA fingerprint"
- msgstr "���������� ��� fingerprint"
+ msgstr "απεικόνιση του fingerprint"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr ""
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  #, fuzzy
  msgid "generate new keys"
- msgstr "���������� ���� ���� ������� ��������"
+ msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr ""
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr ""
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  #, fuzzy
  msgid "Admin-only command\n"
- msgstr "������������� �������\n"
+ msgstr "συγκρουόμενες εντολές\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  #, fuzzy
  msgid "Admin commands are allowed\n"
- msgstr "������������� �������\n"
+ msgstr "συγκρουόμενες εντολές\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  #, fuzzy
  msgid "Admin commands are not allowed\n"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
- msgstr "�� ������ ������  (��������� \"help\")\n"
+ msgstr "Μη έγκυρη εντολή  (δοκιμάστε \"help\")\n"
  
 +#: g10/decrypt.c:191 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
- msgstr "--output ��� ���������� ��� ���� ��� ������\n"
+ msgstr "--output δεν λειτουργεί για αυτή την εντολή\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
- msgstr "�������� ��������� ��� `%s'\n"
+ msgstr "αδυναμία πρόσβασης του `%s'\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
- msgstr "�� ������ '%s' �� �������: %s\n"
+ msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
- msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
  
 +#: g10/delkey.c:118 g10/getkey.c:579
  #, fuzzy, c-format
  msgid "key \"%s\" not found\n"
- msgstr "�� ������ '%s' �� �������: %s\n"
+ msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
 +#: g10/delkey.c:129 g10/delkey.c:136
  msgid "(unless you specify the key by fingerprint)\n"
- msgstr "(����� ��� ������������� ��� ������ ��� ���������)\n"
+ msgstr "(εκτός εάν προσδιορίσετε ένα κλειδί από αποτύπωμα)\n"
  
 +#: g10/delkey.c:135
  #, fuzzy
  msgid "can't do this in batch mode without \"--yes\"\n"
- msgstr "��� ������ �� ����� ���� �� ��������� ������ ����� �� \"--yes\"\n"
+ msgstr "δεν μπορεί να γίνει αυτό σε κατάσταση δέσμης χωρίς το \"--yes\"\n"
  
 +#: g10/delkey.c:148
  #, fuzzy
  msgid "Delete this key from the keyring? (y/N) "
- msgstr "�������� ����� ��� �������� ��� �� ����������; "
+ msgstr "Διαγραφή αυτού του κλειδιού από τη κλειδοθήκη; "
  
 +#: g10/delkey.c:158
  #, fuzzy
  msgid "This is a secret key! - really delete? (y/N) "
- msgstr "���� ����� ��� ������� ������! - ������� �� ���������; "
+ msgstr "Αυτό είναι ένα μυστικό κλειδί! - Σίγουρα να διαγραφεί; "
  
 +#: g10/delkey.c:201
  #, fuzzy, c-format
  msgid "deleting secret %s failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: g10/delkey.c:203
  msgid "key"
  msgstr "key"
  
@@@ -2076,533 -1621,423 +2083,533 @@@
  #, fuzzy
  #| msgid "Pubkey: "
  msgid "subkey"
- msgstr "�����������:"
+ msgstr "ΔημοσΚλειδί:"
  
 +#: g10/delkey.c:226
  #, c-format
  msgid "deleting keyblock failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: g10/delkey.c:239
  msgid "ownertrust information cleared\n"
- msgstr "���������� ����������� ������������-���������\n"
+ msgstr "καθαρισμός πληροφοριών εμπιστοσύνης-ιδιοκτήτη\n"
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
- msgstr "������� ��� ������� ������ ��� �� ������� ������ \"%s\"!\n"
+ msgstr "υπάρχει ένα μυστικό κλειδί για το δημόσιο κλειδί \"%s\"!\n"
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr ""
- "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
+ "χρησιμοποιείστε πρώτα την επιλογή \"--delete-secret-key\" για διαγραφή του.\n"
  
 +#: g10/encrypt.c:232 g10/sign.c:1292
  #, c-format
  msgid "error creating passphrase: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: g10/encrypt.c:239
  msgid "can't use a symmetric ESK packet due to the S2K mode\n"
- msgstr "�������� ������ ���� ����������� ������� ESK ���� ��� ���������� S2K\n"
+ msgstr "αδυναμία χρήσης ενός συμμετρικού πακέτου ESK λόγω της κατάστασης S2K\n"
  
 +#: g10/encrypt.c:253
  #, c-format
  msgid "using cipher %s\n"
- msgstr "����� ��� ���������������: %s\n"
+ msgstr "χρήση του κρυπταλγόριθμου: %s\n"
  
 +#: g10/encrypt.c:263 g10/encrypt.c:624
  #, fuzzy, c-format
  #| msgid "`%s' already compressed\n"
  msgid "'%s' already compressed\n"
- msgstr "`%s' ��� �����������\n"
+ msgstr "`%s' ήδη συμπιέστηκε\n"
  
 +#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
- msgstr "�������������: `%s' ����� ��� ����� ������\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: `%s' είναι ένα άδειο αρχείο\n"
  
 +#: g10/encrypt.c:557
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "reading from '%s'\n"
- msgstr "�������� ��� `%s'\n"
+ msgstr "ανάγνωση από `%s'\n"
  
 +#: g10/encrypt.c:605
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
- "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
- "�������� ��� ���������\n"
+ "ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
+ "επιλογές του παραλήπτη\n"
  
 +#: g10/encrypt.c:707 g10/sign.c:984
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
  "preferences\n"
  msgstr ""
- "� ������������ ������ ��� ���������� ��������� %s (%d) ���������� ���\n"
- "�������� ��� ���������\n"
+ "ο εξαναγκασμός χρήσης του αλγορίθμου συμπίεσης %s (%d) παραβιάζει τις\n"
+ "επιλογές του παραλήπτη\n"
  
 +#: g10/encrypt.c:817
  #, c-format
  msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
- "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
- "�������� ��� ���������\n"
+ "ο εξαναγκασμός συμμετρικού αλγόριθμου %s (%d) παραβιάζει τις\n"
+ "επιλογές του παραλήπτη\n"
  
 +#: g10/encrypt.c:903
  #, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
- msgstr "%s/%s ��������������� ���: \"%s\"\n"
+ msgstr "%s/%s κρυπτογραφήθηκε για: \"%s\"\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
- msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
+ msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
  
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
  #, c-format
  msgid "%s encrypted data\n"
- msgstr "%s ��������������� ��������\n"
+ msgstr "%s κρυπτογραφημένα δεδομένα\n"
  
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
  #, c-format
  msgid "encrypted with unknown algorithm %d\n"
- msgstr "��������������� �� ������� ��������� %d\n"
+ msgstr "κρυπτογραφημένο με άγνωστο αλγόριθμο %d\n"
  
 +#: g10/decrypt-data.c:164 sm/decrypt.c:127
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
- "�������������: �� ������ ��������������� �� ������� ������ ���\n"
- "���������� ��������������.\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το μήνυμα κρυπτογραφήθηκε με αδύναμο κλειδί στο\n"
+ "συμμετρικό κρυπταλγόριθμο.\n"
  
 +#: g10/decrypt-data.c:176
  msgid "problem handling encrypted packet\n"
- msgstr "�������� ��� �������� ���������������� �������\n"
+ msgstr "πρόβλημα στο χειρισμό κρυπτογραφημένου πακέτου\n"
  
 +#: g10/exec.c:60
  msgid "no remote program execution supported\n"
- msgstr "��� ������������ � ������������� �������� ������������\n"
+ msgstr "δεν υποστηρίζετε η απομακρυσμένη εκτέλεση προγράμματος\n"
  
 +#: g10/exec.c:319
  msgid ""
  "external program calls are disabled due to unsafe options file permissions\n"
  msgstr ""
- "�� ������� ���������� ������������ ����������������� ���� ��������� ������\n"
- "�������\n"
+ "οι κλήσεις εξωτερικών προγραμμάτων απενεργοποιήθηκαν λόγω ανασφαλών αδειών\n"
+ "αρχείου\n"
  
 +#: g10/exec.c:349
  #, fuzzy
  msgid "this platform requires temporary files when calling external programs\n"
  msgstr ""
- "���� � ��������� ������� ������. ������ ���� ����� ���������� ������������\n"
+ "αυτή η πλατφόρμα απαιτεί προσωρ. αρχεία στην κλήση εξωτερικών προγραμμάτων\n"
  
 +#: g10/exec.c:427
  #, fuzzy, c-format
  msgid "unable to execute program '%s': %s\n"
- msgstr "�������� ��������� ��� %s \"%s\": %s\n"
+ msgstr "αδυναμία εκτέλεσης του %s \"%s\": %s\n"
  
 +#: g10/exec.c:430
  #, fuzzy, c-format
  msgid "unable to execute shell '%s': %s\n"
- msgstr "�������� ��������� ��� %s \"%s\": %s\n"
+ msgstr "αδυναμία εκτέλεσης του %s \"%s\": %s\n"
  
 +#: g10/exec.c:521
  #, c-format
  msgid "system error while calling external program: %s\n"
- msgstr "������ ���������� ���� ��� ����� ���������� ������������: %s\n"
+ msgstr "σφάλμα συστήματος κατά την κλήση εξωτερικού προγράμματος: %s\n"
  
 +#: g10/exec.c:532 g10/exec.c:599
  msgid "unnatural exit of external program\n"
- msgstr "������� ������ ��� ���������� ������������\n"
+ msgstr "αφύσικη έξοδος του εξωτερικού προγράμματος\n"
  
 +#: g10/exec.c:547
  msgid "unable to execute external program\n"
- msgstr "�������� ��������� ��� ���������� ������������\n"
+ msgstr "αδυναμία εκτέλεσης του εξωτερικού προγράμματος\n"
  
 +#: g10/exec.c:564
  #, c-format
  msgid "unable to read external program response: %s\n"
- msgstr "�������� ��������� ��� ��������� ��� ���������� ������������: %s\n"
+ msgstr "αδυναμία ανάγνωσης της απάντησης του εξωτερικού προγράμματος: %s\n"
  
 +#: g10/exec.c:610 g10/exec.c:617
  #, fuzzy, c-format
  #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
  msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
- msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγραφής tempfile (%s) `%s': %s\n"
  
 +#: g10/exec.c:622
  #, fuzzy, c-format
  #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
- msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγραφής προσωρινού φακέλου `%s': %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  #, fuzzy
  msgid "export signatures that are marked as local-only"
  msgstr ""
  "\n"
- "� �������� �� ��������� ��� ��-�����������.\n"
+ "Η υπογραφή θα σημειωθεί σαν μη-ανακαλέσιμη.\n"
  "\n"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  #, fuzzy
  msgid "export revocation keys marked as \"sensitive\""
- msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
+ msgstr "δε βρέθηκαν κλειδιά ανάκλησης για το `%s'\n"
  
- #: g10/export.c:108
++#: g10/export.c:112
  #, fuzzy
  msgid "remove unusable parts from key during export"
- msgstr "�� ��������������� ������� ������"
+ msgstr "μη χρησιμοποιήσιμο μυστικό κλειδί"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
- msgstr "%s: ������������: %s\n"
+ msgstr "%s: παραλείφθηκε: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
- msgstr "������� ���  `%s'\n"
+ msgstr "εγγραφή στο  `%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr ""
- "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
+ "κλειδί %08lX: η υπογραφή του υποκλειδιού σε λάθος σημείο - παραλείφθηκε\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
- msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
+ msgstr "κλειδί %08lX:  κλειδί τύπου PGP 2.x - παραλείφθηκε\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
- msgstr "�������������: ��� ����� ������ �������\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έγινε καμμία εξαγωγή\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
- msgstr "������ ���� �� ���������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
  
 +#: g10/getkey.c:257
  #, fuzzy
  msgid "[User ID not found]"
- msgstr "[User id ��� �������]"
+ msgstr "[User id δεν βρέθηκε]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
- msgstr "�� ������� �������� ���������\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
 +#: g10/getkey.c:516
  #, c-format
  msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
  msgstr ""
  
 +#: g10/getkey.c:546
  #, fuzzy, c-format
  msgid "error looking up: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: g10/getkey.c:636
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "Warning: %s appears in the keyring %d times\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  msgid "automatically retrieved '%s' via %s\n"
- msgstr "������ ���� �� ���������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
- msgstr "������ ���� �� ���������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
- msgstr "���������� ��� fingerprint"
+ msgstr "απεικόνιση του fingerprint"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
- msgstr "�� ������� ������ `%s' �� �������: %s\n"
+ msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
- msgstr "|�����|����� �������� ��� �������������� ������� ������"
+ msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
- msgstr "|�����|����� �������� ��� �������������� ������� ������"
+ msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, fuzzy, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
- "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
+ "Μη έγκυρο κλειδί %08lX έγινε έγκυρο από το --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, fuzzy, c-format
  msgid "using subkey %s instead of primary key %s\n"
- msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
+ msgstr "χρήση του δευτερεύοντος κλειδιού %08lX αντί του πρωτεύοντος %08lX\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
- msgstr "���������� ���� �� ������������� ���������"
+ msgstr "δημιουργία μιας μη προσαρτημένης υπογραφής"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
- msgstr "|[������]|���������� ���� �� ���������������� ���������"
+ msgstr "|[αρχείο]|δημιουργία μιας μη κρυπτογραφημένης υπογραφής"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
- msgstr "���������� ���� �� ������������� ���������"
+ msgstr "δημιουργία μιας μη προσαρτημένης υπογραφής"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
- msgstr "������������� ���������"
+ msgstr "κρυπτογράφηση δεδομένων"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
- msgstr "������������� �� ����� ���� ����������� ����������"
+ msgstr "κρυπτογράφηση με χρήση μόνο συμμετρικών αλγορίθμων"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
- msgstr "���������������� ��������� (��������������)"
+ msgstr "αποκρυπτογράφηση δεδομένων (προκαθορισμένο)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
- msgstr "���������� ���� ���������"
+ msgstr "επαλήθευση μιας υπογραφής"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
- msgstr "���������� ��� ������ ��������"
+ msgstr "απεικόνιση της λίστας κλειδιών"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
- msgstr "���������� ��� ������ �������� ��� ���������"
+ msgstr "απεικόνιση της λίστας κλειδιών και υπογραφών"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  #, fuzzy
  msgid "list and check key signatures"
- msgstr "������� ��������� ��������"
+ msgstr "έλεγχος υπογραφής κλειδιού"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
- msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
+ msgstr "απεικόνιση της λίστας κλειδιών και αποτυπωμάτων (fingerprints)"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
- msgstr "���������� ��� ������ �������� ��������"
+ msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
- msgstr "���������� ���� ���� ������� ��������"
+ msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
- msgstr "���������� ���� ���� ������� ��������"
+ msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
- msgstr "���������� ���� ���� ������� ��������"
+ msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
- msgstr "���������� ���� ���� ������� ��������"
+ msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
- msgstr "���������� ���� �������������� ���������"
+ msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
- msgstr "�������� ��� �������� ��� �� ������� ����������"
+ msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
- msgstr "�������� ��� �������� ��� �� ������� ����������"
+ msgstr "αφαίρεση των κλειδιών από τη μυστική κλειδοθήκη"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
- msgstr "�������� ���� ��������"
+ msgstr "υπογραφή ενός κλειδιού"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
- msgstr "�������� ���� �������� ������"
+ msgstr "υπογραφή ενός κλειδιού τοπικά"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
- msgstr "�������� ���� ��������"
+ msgstr "υπογραφή ενός κλειδιού"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
- msgstr "�������� ���� �������� ������"
+ msgstr "υπογραφή ενός κλειδιού τοπικά"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
- msgstr "�������� � ����������� ���� ��������"
+ msgstr "υπογραφή ή επεξεργασία ενός κλειδιού"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
- msgstr "������� ��������"
+ msgstr "εξαγωγή κλειδιών"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
- msgstr "������� �������� �� ��� ���������� ��������"
+ msgstr "εξαγωγή κλειδιών σε ένα διακομιστή κλειδιών"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
- msgstr "�������� �������� ��� ��� ���������� ��������"
+ msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
- msgstr "��������� �������� �� ��� ���������� ��������"
+ msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
- msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
+ msgstr "ανανέωση όλων των κλειδιών από ένα διακομιστή κλειδιών"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
- msgstr "��������/���������� ��������"
+ msgstr "εισαγωγή/συγχώνευση κλειδιών"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
- msgstr "�������� ��� ����� ��������� ������������"
+ msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
- msgstr "|����� [������]| ���������� ���������� ��� ���������"
+ msgstr "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
- msgstr "���������� ascii ������������ ������"
+ msgstr "δημιουργία ascii θωρακισμένης εξόδου"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
- msgstr "|�����|������������� ��� �����"
+ msgstr "|ΟΝΟΜΑ|κρυπτογράφηση για ΟΝΟΜΑ"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
- msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
+ msgstr "χρήση αυτής της ταυτότητας (user id) για υπογραφή ή αποκρυπτογράφηση"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
- msgstr "|N|���������� �������� ��������� N (0 �������������)"
+ msgstr "|N|καθορισμός επιπέδου συμπίεσης N (0 απενεργοποιεί)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
- msgstr "����� ��������� ���������� ��������"
+ msgstr "χρήση κανονικής κατάστασης κειμένου"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
- msgstr "|������|������� ��� ���������� ��������� ������"
+ msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
- msgstr "�� �� ����� ������ ������"
+ msgstr "να μη γίνει καμμία αλλαγή"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
- msgstr "������� ���� ��� ���������"
+ msgstr "ερώτηση πριν την επικάλυψη"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
  msgstr ""
  "@\n"
- "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
+ "(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2614,21 -2049,19 +2621,21 @@@
  " --fingerprint [names]      show fingerprints\n"
  msgstr ""
  "@\n"
- "������������:\n"
+ "Παραδείγματα:\n"
  "\n"
- " -se -r Bob [������]          �������� ��� ������������� ��� �� Bob\n"
- " --clearsign [������]         ���������� �� ���������������� ���������\n"
- " --detach-sign [������]       ���������� ����������� ���������\n"
- " --list-keys [�������]        ���������� ��������\n"
- " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
+ " -se -r Bob [αρχείο]          υπογραφή και κρυπτογράφηση για το Bob\n"
+ " --clearsign [αρχείο]         δημιουργία μη κρυπτογραφημένης υπογραφής\n"
+ " --detach-sign [αρχείο]       δημιουργία αποκομμένης υπογραφής\n"
+ " --list-keys [ονόματα]        απεικόνιση κλειδιών\n"
+ " --fingerprint [ονόματα]      απεικόνιση αποτυπωμάτων (fingerprints)\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2639,989 -2072,789 +2646,994 @@@ msgid "
  "Sign, check, encrypt or decrypt\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "�������: gpg [��������] [������]\n"
- "��������, �������, ������������� � ����������������\n"
- "� �������������� ���������� ��������� ��� �� �������� �������\n"
+ "Σύνταξη: gpg [επιλογές] [αρχεία]\n"
+ "υπογραφή, έλεγχος, κρυπτογράφηση ή αποκρυπτογράφηση\n"
+ "η προκαθορισμένη λειτουργία εξαρτάται από τα δεδομένα εισόδου\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
  msgstr ""
  "\n"
- "��������������� ����������:\n"
+ "Υποστηριζόμενοι αλγόριθμοι:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
- msgstr "�����������:"
+ msgstr "ΔημοσΚλειδί:"
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
- msgstr "���������������: "
+ msgstr "Κρυπταλγόριθμος: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
- msgstr "��������: "
+ msgstr "Συμπίεση: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
- msgstr "�����: gpg [��������] "
+ msgstr "χρήση: gpg [επιλογές] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
- msgstr "������������� �������\n"
+ msgstr "συγκρουόμενες εντολές\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  msgid "no = sign found in group definition '%s'\n"
- msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
+ msgstr "δεν βρέθηκε το σύμβολο = στον ορισμό της ομάδας \"%s\"\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
- msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
- msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
- msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
- msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
- msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
- msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr ""
- "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr ""
- "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr ""
- "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
- msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
- msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
- msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
- msgstr "������� ����������� ��������� \"%s\"\n"
+ msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  msgid "show key usage information during key listings"
- msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
+ msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  #, fuzzy
  msgid "show all notations during signature listings"
- msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
+ msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
- msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
+ msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  #, fuzzy
  msgid "show the keyring name in key listings"
- msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
+ msgstr "απεικόνιση της κλειδοθήκης στην οποία αναφέρετε το κλειδί"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  #, fuzzy
  msgid "show expiration dates during signature listings"
- msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
+ msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "������������� ��� ������"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
- msgstr "�������� ��������������� ���������� `%s'\n"
+ msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
- msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
+ msgstr "ΣΗΜΕΙΩΣΗ: αγνοήθηκε το παλιό αρχείο προκαθορισμένων επιλογών `%s'\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
- msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
+ msgstr "ΣΗΜΕΙΩΣΗ: το %s δεν είναι για κανονική χρήση!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
- msgstr "�� %s ��� ����� ������ ��� ����������\n"
+ msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
- msgstr "�� ������ ��������� Email\n"
+ msgstr "Μη έγκυρη διεύθυνση Email\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
- msgstr "�� %s ��� ����� ������ ��� ����������\n"
+ msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  #, fuzzy
  msgid "could not parse keyserver URL\n"
- msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
+ msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
- msgstr "%s:%d: �� ������� �������� ��������\n"
+ msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  #, fuzzy
  msgid "invalid keyserver options\n"
- msgstr "�� ������� �������� ��������\n"
+ msgstr "μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
- msgstr "%s:%d: �� ������� �������� ���������\n"
+ msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
- msgstr "�� ������� �������� ���������\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
- msgstr "�� ������� �������� ���������\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
- msgstr "%s:%d: �� ������� �������� ��������\n"
+ msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
- msgstr "�� ������� �������� ��������\n"
+ msgstr "μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
- msgstr "%s:%d: �� ������� �������� ���������\n"
+ msgstr "%s:%d: μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  #, fuzzy
  msgid "invalid list options\n"
- msgstr "�� ������� �������� ���������\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  #, fuzzy
  msgid "show all notations during signature verification"
- msgstr "�� %s ��� ����� ������ ��� ����������\n"
+ msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
- msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
+ msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "show user ID validity during signature verification"
- msgstr "�� %s ��� ����� ������ ��� ����������\n"
+ msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
- msgstr "�� %s ��� ����� ������ ��� ����������\n"
+ msgstr "το %s δεν είναι έγκυρο σετ χαρακτήρων\n"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
- msgstr "%s:%d: �� ������� �������� ��������\n"
+ msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  #, fuzzy
  msgid "invalid verify options\n"
- msgstr "�� ������� �������� ��������\n"
+ msgstr "μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
- msgstr "�������� ������� ��� exec-path �� %s\n"
+ msgstr "αδυναμία ορισμού του exec-path σε %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
- msgstr "%s:%d: �� ������� �������� ��������\n"
+ msgstr "%s:%d: μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
- msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το πρόγραμμα ίσως δημιουργήσει αρχείο core!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
- msgstr "�������������: �� %s ����������� �� %s\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s παρακάμπτει το %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
- msgstr "�� %s ��� ����������� �� �� %s!\n"
+ msgstr "το %s δεν επιτρέπεται με το %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
- msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
+ msgstr "το %s δεν έχει καμμία έννοια μαζί με το %s!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
- msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
+ msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
- msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
+ msgstr "ο επιλεγμένος αλγόριθμος περίληψης δεν είναι έγκυρος\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
- msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
+ msgstr "ο επιλεγμένος αλγόριθμος κρυπτογράφησης δεν είναι έγκυρος\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr ""
- "� ����������� ���������� ��������� ��� �����������\n"
- "��� ����� �������\n"
+ "ο επιλεγμένος αλγόριθμος περίληψης για πιστοποίηση\n"
+ "δεν είναι έγκυρος\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
- msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
+ msgstr "completes-needed πρέπει να είναι μεγαλύτερα από 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
- msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
+ msgstr "marginals-needed πρέπει να είναι μεγαλύτερα από 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  #, fuzzy
  msgid "max-cert-depth must be in the range from 1 to 255\n"
- msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
+ msgstr "max-cert-depth πρέπει να είναι μεταξύ 1 και 255\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
- msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
+ msgstr "μη έγκυρο default-cert-level· πρέπει να είναι 0, 1, 2, ή 3\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
- msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
+ msgstr "μη έγκυρο min-cert-level· πρέπει να είναι 0, 1, 2, ή 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
- msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
+ msgstr "ΣΗΜΕΙΩΣΗ: η απλή S2K κατάσταση (0) πρέπει να αποφεύγεται\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
- msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
+ msgstr "μη έγκυρη κατάσταση S2K; πρέπει να είναι 0, 1 ή 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
- msgstr "�� ������� �����������\n"
+ msgstr "μη έγκυρες προεπιλογές\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
- msgstr "�� ������� ����������� ���������� ���������������\n"
+ msgstr "μη έγκυρες προεπιλογές προσωπικού κρυπταλγόριθμου\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
- msgstr "�� ������� ����������� ���������� ���������� ���������\n"
+ msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου περίληψης\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
- msgstr "�� ������� ����������� ���������� ���������� ���������\n"
+ msgstr "μη έγκυρες προεπιλογές προσωπικού αλγόριθμου συμπίεσης\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
- msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
+ msgstr "το %s ακόμα δε λειτουργεί μαζί με το %s\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, fuzzy, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
- msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
+ msgstr "απαγορεύετε η χρήση του κρυπταλγόριθμου \"%s\" στην κατάσταση %s\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, fuzzy, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr ""
- "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
+ "απαγορεύετε η χρήση του αλγόριθμου περίληψης \"%s\" στην κατάσταση %s\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, fuzzy, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr ""
- "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
+ "απαγορεύετε η χρήση του αλγόριθμου συμπίεσης \"%s\" στην κατάσταση %s\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
- msgstr "�������� ������������� ��� TrustDB: %s\n"
+ msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
- "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
- "�������� ��������\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δώθηκαν παραλήπτες (-r) χώρις χρήση κρυπτογράφησης\n"
+ "δημοσίου κλειδιού\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
- msgstr "--store [����� �������]"
+ msgstr "--store [όνομα αρχείου]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
- msgstr "--symmetric [����� �������]"
+ msgstr "--symmetric [όνομα αρχείου]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
- msgstr "���������������� �������: %s\n"
+ msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
- msgstr "--encrypt [����� �������]"
+ msgstr "--encrypt [όνομα αρχείου]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  #, fuzzy
  msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [����� �������]"
+ msgstr "--sign --encrypt [όνομα αρχείου]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
- msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
+ msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
- msgstr "--sign [����� �������]"
+ msgstr "--sign [όνομα αρχείου]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [����� �������]"
+ msgstr "--sign --encrypt [όνομα αρχείου]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  #, fuzzy
  msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [����� �������]"
+ msgstr "--sign --encrypt [όνομα αρχείου]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
- msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
+ msgstr "απαγορεύετε η χρήση του %s στην κατάσταση %s.\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [����� �������]"
+ msgstr "--sign --symmetric [όνομα αρχείου]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
- msgstr "--clearsign [����� �������]"
+ msgstr "--clearsign [όνομα αρχείου]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
- msgstr "--decrypt [����� �������]"
+ msgstr "--decrypt [όνομα αρχείου]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key user-id"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key user-id"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
- msgstr "--edit-key user-id [�������]"
+ msgstr "--edit-key user-id [εντολές]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
  msgstr "--sign-key user-id"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
- msgstr "keyserver �������� �������: %s\n"
+ msgstr "keyserver αποστολή απέτυχε: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
- msgstr "keyserver ���� �������: %s\n"
+ msgstr "keyserver λήψη απέτυχε: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
- msgstr "������� �������� �������: %s\n"
+ msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
- msgstr "������� �������� �������: %s\n"
+ msgstr "εξαγωγή κλειδιού απέτυχε: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
- msgstr "keyserver ��������� �������: %s\n"
+ msgstr "keyserver αναζήτηση απέτυχε: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
- msgstr "keyserver �������� �������: %s\n"
+ msgstr "keyserver ανανέωση απέτυχε: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
- msgstr "����������� �������: %s\n"
+ msgstr "αποθωράκιση απέτυχε: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
- msgstr "�������� �������: %s\n"
+ msgstr "θωράκιση απέτυχε: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
- msgstr "[����� �������]"
+ msgstr "[όνομα αρχείου]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
- msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
+ msgstr "Μπορείτε τώρα να εισαγάγετε το μήνυμα σας ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
- msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
+ msgstr "το URL πολιτικής πιστοποιητικού που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
- msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
+ msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
- msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
+ msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
- msgstr "������� ��� �������� ��� ���� �� ����������"
+ msgstr "εξαγωγή των κλειδιών από αυτή τη κλειδοθήκη"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
- msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
+ msgstr "ορισμός των συγκρούσεων ώρας (timestamp) μόνο σαν προειδοποίηση"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
- msgstr "|FD|������� ��� ����������� ���������� ��� FD"
+ msgstr "|FD|εγγραφή των πληροφοριών κατάστασης στο FD"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
- msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpgv [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
  msgstr ""
- "�������: gpg [��������] [������]\n"
- "������� ��������� �� �������� �� ������ ������������ �������\n"
+ "Σύνταξη: gpg [επιλογές] [αρχεία]\n"
+ "Έλεγχος υπογραφών σε σύγκριση με γνωστά εμπιστευμένα κλειδιά\n"
  
 +#: g10/helptext.c:72
  msgid "No help available"
- msgstr "��� ������� ��������� �������"
+ msgstr "Δεν υπάρχει διαθέσιμη βοήθεια"
  
 +#: g10/helptext.c:82
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "No help available for '%s'"
- msgstr "��� ������� ��������� ������� ��� `%s'"
+ msgstr "Δεν υπάρχει διαθέσιμη βοήθεια για `%s'"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
- msgstr "�������� ��� ����� ��������� ������������"
+ msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
  
- #: g10/import.c:147
++#: g10/import.c:160
  #, fuzzy
  msgid "do not update the trustdb after import"
- msgstr "�������� ��� ����� ��������� ������������"
+ msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  msgid "show key during import"
- msgstr "���������� ��� fingerprint"
+ msgstr "απεικόνιση του fingerprint"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  #, fuzzy
  msgid "remove unusable parts from key after import"
- msgstr "�� ��������������� ������� ������"
+ msgstr "μη χρησιμοποιήσιμο μυστικό κλειδί"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
- msgstr "��������� �������� ��� ����� %d\n"
+ msgstr "παράλειψη τμήματος του τύπου %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
- msgstr "%lu ������� ����� ����� ���� ������������\n"
+ msgstr "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
- msgstr "��������� ������� ��� ��������������: %lu\n"
+ msgstr "Συνολικός αριθμός που επεξεργάστηκαν: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
- msgstr "      ��� ������� ��� �������������: %lu\n"
+ msgstr "      νέα κλειδιά που παραλείφθηκαν: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
- msgstr "      ��� ������� ��� �������������: %lu\n"
+ msgstr "      νέα κλειδιά που παραλείφθηκαν: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
- msgstr "          ����� user ID: %lu\n"
+ msgstr "          χωρίς user ID: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
- msgstr "              ����������: %lu"
+ msgstr "              εισαχθέντα: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
- msgstr "             ����������: %lu\n"
+ msgstr "             αμετάβλητα: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
- msgstr "          ��� user ID: %lu\n"
+ msgstr "          νέα user ID: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
- msgstr "           ��� ����������: %lu\n"
+ msgstr "           νέα υποκλειδιά: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
- msgstr "        ���� ���������: %lu\n"
+ msgstr "        νέες υπογραφές: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
- msgstr "   ���� ���������� ��������: %lu\n"
+ msgstr "   νέες ανακλήσεις κλειδιών: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
- msgstr "      ����������� ������� �������: %lu\n"
+ msgstr "      αναγνωσμένα μυστικά κλειδιά: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
- msgstr "  ���������� ������� �������: %lu\n"
+ msgstr "  εισαχθέντα μυστικά κλειδιά: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
- msgstr " ���������� ������� �������: %lu\n"
+ msgstr " αμετάβλητα μυστικά κλειδιά: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
- msgstr "          ��  ����������: %lu\n"
+ msgstr "          μη  εισαχθέντα: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
- msgstr "        ���� ���������: %lu\n"
+ msgstr "        νέες υπογραφές: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
- msgstr "      ����������� ������� �������: %lu\n"
+ msgstr "      αναγνωσμένα μυστικά κλειδιά: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
- msgstr "%s ��������, ���������� ��������� %s\n"
+ msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
- msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
+ msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  msgid "key %s: %s\n"
- msgstr "������������ `%s': %s\n"
+ msgstr "παραλείφθηκε `%s': %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
- msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
+ msgstr "κλειδί %08lX: επιδιόρθωση φθαρμένου υποκλειδιού HKP\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
- msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
+ msgstr "κλειδί %08lX: δεκτό μη ιδιο-υπογεγραμμένο user ID '%s'\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
- msgstr "������ %08lX: ��� ���� ������ user ID\n"
+ msgstr "κλειδί %08lX: δεν έχει έγκυρα user ID\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
- msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
+ msgstr "αυτό μπορεί να συνέβει από μια απούσα ιδιοϋπογραφή\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
- msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
+ msgstr "κλειδί %08lX: μυστικό κλειδί που δε βρέθηκε: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
- msgstr "������ %08lX:  ��� ������ - ������������\n"
+ msgstr "κλειδί %08lX:  νέο κλειδί - παραλείφθηκε\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
- msgstr "��� ������� ��������� ����������: %s\n"
+ msgstr "δεν βρεθηκε εγγράψιμη κλειδοθήκη: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
- msgstr "�������� �������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
- msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
+ msgstr "κλειδί %08lX: το δημόσιο κλειδί \"%s\" έχει εισαχθεί\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
- msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
+ msgstr "κλειδί %08lX: δεν ταιριάζει με το αντίγραφο μας\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
- msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
+ msgstr "κλειδί %08lX: αδυναμία εντοπισμού του αρχικού τμήματος κλειδιού: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
- msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
+ msgstr "κλειδί %08lX: αδυναμία ανάγνωσης του αρχικού τμήματος κλειδιού: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
- msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
+ msgstr "κλειδί %08lX: \"%s\" 1 νέο user ID\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
- msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
+ msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
- msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
+ msgstr "κλειδί %08lX: \"%s\" 1 νέα υπογραφή\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
- msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
+ msgstr "κλειδί %08lX: \"%s\" %d νέες υπογραφές\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
- msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
+ msgstr "κλειδί %08lX: \"%s\" 1 νέο υποκλειδί\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
- msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
+ msgstr "κλειδί %08lX: \"%s\" %d νέα υποκλειδιά\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
- msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
+ msgstr "κλειδί %08lX: \"%s\" %d νέες υπογραφές\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
- msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
+ msgstr "κλειδί %08lX: \"%s\" %d νέες υπογραφές\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
- msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
+ msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
- msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
+ msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
- msgstr "������ %08lX: \"%s\" ����������\n"
+ msgstr "κλειδί %08lX: \"%s\" αμετάβλητο\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
- msgstr "������ %08lX: ������� ������ ���������\n"
+ msgstr "κλειδί %08lX: μυστικό κλειδί εισήχθηκε\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
- msgstr "������������: ������� ������ ��� �����\n"
+ msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
- msgstr "������ ��� �������� ���� �� `%s': %s\n"
+ msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
- msgstr "�� ������� ������ `%s' �� �������: %s\n"
+ msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  #, fuzzy
  msgid "importing secret keys not allowed\n"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
- msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
+ msgstr "κλειδί %08lX: μυστικό κλειδί με άκυρο κρυπταλγ. %d - παραλείφθηκε\n"
  
  #. TRANSLATORS: For smartcard, each private key on
  #. host has a reference (stub) to a smartcard and
@@@ -3633,255 -2866,213 +3645,261 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
- "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
- "���������\n"
+ "κλειδί %08lX: όχι δημόσιο κλειδί - αδυναμία εφαρμογής πιστοποιητικού "
+ "ανάκλησης\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
- msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
+ msgstr "κλειδί %08lX: μη έγκυρο πιστοποιητικό ανάκλησης: %s - απόρριψη\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
- msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
+ msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης εισήχθηκε\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
- msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
+ msgstr "κλειδί %08lX: δεν υπάρχει user ID για την υπογραφή\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
- "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id "
+ "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού στο user id "
  "\"%s\"\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
- msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
+ msgstr "κλειδί %08lX: μη έγκυρη ιδιο-υπογραφή στο user id \"%s\"\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
- msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
+ msgstr "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
- msgstr "������ %08lX: ����� �������� �������� ����������\n"
+ msgstr "κλειδί %08lX: άμεση υπογραφή κλειδιού προστέθηκε\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
- msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
+ msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για τη δέσμευση κλειδιού\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
- msgstr "������ %08lX: �� ������ �������� �����������\n"
+ msgstr "κλειδί %08lX: μη έγκυρη δέσμευση υποκλειδιού\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
- msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
+ msgstr "κλειδί %08lX: αφαιρέθηκε η δέσμευση πολλαπλού υποκλειδιού\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
- msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
+ msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για την ανάκληση κλειδιού\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
- msgstr "������ %08lX: �� ������ �������� �����������\n"
+ msgstr "κλειδί %08lX: μη έγκυρη ανάκληση υποκλειδιού\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
- msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
+ msgstr "κλειδί %08lX: αφαιρέθηκε η ανάκληση πολλαπλού υποκλειδιού\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
- msgstr "������ %08lX: ������������ user ID '"
+ msgstr "κλειδί %08lX: παραλείφθηκε user ID '"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
- msgstr "������ %08lX: ������������ ���������\n"
+ msgstr "κλειδί %08lX: παραλείφθηκε υποκλειδί\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
- msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
+ msgstr "κλειδί %08lX: μη εξαγόμενη υπογραφή (κλάση %02x) - παραλείφθηκε\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr ""
- "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
+ "κλειδί %08lX: το πιστοποιητικό ανάκλησης σε λάθος σημείο - παραλείφθηκε\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
- msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
+ msgstr "κλειδί %08lX: μη έγκυρο πιστοποιητικό ανάκλησης: %s - παραλείφθηκε\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr ""
- "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
+ "κλειδί %08lX: η υπογραφή του υποκλειδιού σε λάθος σημείο - παραλείφθηκε\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
- msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
+ msgstr "κλειδί %08lX: μη αναμενώμενη κλάση υπογραφής (0x%02x) - παραλείφθηκε\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
- msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
+ msgstr "κλειδί %08lX: εντοπίστηκε διπλό user ID - ενώθηκαν\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
- "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� "
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: κλειδί %08lX μπορεί να ανακληθεί: λήψη κλειδιού ανάκλησης "
  "%08lX\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
- "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
- "��� ����� �����.\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: κλειδί %08lX μπορεί να ανακληθεί: το κλειδί ανάκλησης %08lX\n"
+ "δεν είναι παρών.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
- msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
+ msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης προστέθηκε\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
- msgstr "������ %08lX: ����� �������� �������� ����������\n"
+ msgstr "κλειδί %08lX: άμεση υπογραφή κλειδιού προστέθηκε\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
- msgstr "���������� `%s' �������������\n"
+ msgstr "κλειδοθήκη `%s' δημιουργήθηκε\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
- msgstr "���������� `%s' �������������\n"
+ msgstr "κλειδοθήκη `%s' δημιουργήθηκε\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  msgid "keyblock resource '%s': %s\n"
- msgstr "������ ���� �� ���������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
- msgstr "�������� ������������ ��� cache �����������: %s\n"
+ msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
  
 +#: g10/keyedit.c:264
  msgid "[revocation]"
- msgstr "[��������]"
+ msgstr "[ανάκληση]"
  
 +#: g10/keyedit.c:264
  msgid "[self-signature]"
- msgstr "[����-��������]"
+ msgstr "[ιδιο-υπογραφή]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
+ msgstr "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "%s ��������, ���������� ��������� %s\n"
+ msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  msgid " (reordered signatures follow)"
- msgstr "���� �������� ��� \""
+ msgstr "Καλή υπογραφή από \""
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  msgid "key %s:\n"
- msgstr "������������ `%s': %s\n"
+ msgstr "παραλείφθηκε `%s': %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "�� user ID \"%s\" ����������."
- msgstr[1] "�� user ID \"%s\" ����������."
+ msgstr[0] "Το user ID \"%s\" ανακαλείτε."
+ msgstr[1] "Το user ID \"%s\" ανακαλείτε."
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 �������� ��� ��������� ���� ������� ��������\n"
- msgstr[1] "1 �������� ��� ��������� ���� ������� ��������\n"
+ msgstr[0] "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
+ msgstr[1] "1 υπογραφή δεν ελέγχθηκε λόγω χαμένου κλειδιού\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
- msgstr[0] "%d ����� ���������\n"
- msgstr[1] "%d ����� ���������\n"
+ msgstr[0] "%d κακές υπογραφές\n"
+ msgstr[1] "%d κακές υπογραφές\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
- msgstr[0] "���� �������� ��� \""
- msgstr[1] "���� �������� ��� \""
+ msgstr[0] "Καλή υπογραφή από \""
+ msgstr[1] "Καλή υπογραφή από \""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3889,452 -3080,364 +3907,452 @@@
  "(by looking at passports, checking fingerprints from different sources, "
  "etc.)\n"
  msgstr ""
- "�������� ���������� ���� ���� ������������ ���� ��\n"
- "������, ���� �� ������ �� ���������� ������� ����� (�� ��\n"
- "�� �������� passports ��� fingerprints ��� �������� �����...);\n"
+ "Παρακαλώ αποφασίστε πόσο καλά εμπιστεύεστε αυτό το\n"
+ "χρήστη, ώστε να μπορεί να επαληθεύει κλειδιά άλλων (με το\n"
+ "να κοιτάζει passports και fingerprints από διάφορες πηγές...);\n"
  "\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
- msgstr " %d = ��� ������ �����������\n"
+ msgstr " %d = Έχω μερική εμπιστοσύνη\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
- msgstr " %d = ��� ����� �����������\n"
+ msgstr " %d = Έχω πλήρη εμπιστοσύνη\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
- msgstr "�� user ID \"%s\" ����������."
+ msgstr "Το user ID \"%s\" ανακαλείτε."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
- msgstr "������� ������ ����� �� �� ����������; (y/N) "
+ msgstr "Σίγουρα θέλετε ακόμα να το υπογράψετε; (y/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
- msgstr "  �������� ���������.\n"
+ msgstr "  Αδυναμία υπογραφής.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
- msgstr "�� user ID \"%s\" ���� �����."
+ msgstr "Το user ID \"%s\" έχει έληξε."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
- msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το user ID \"%s\" δεν έχει ιδιο-υπογραφεί."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
- msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το user ID \"%s\" δεν έχει ιδιο-υπογραφεί."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  #, fuzzy
  msgid "Sign it? (y/N) "
- msgstr "������� �� ���������; "
+ msgstr "Σίγουρα να υπογραφεί; "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
  "is a PGP 2.x-style signature.\n"
  msgstr ""
- "� ����-�������� ��� \"%s\"\n"
- "����� ��� �������� ����� PGP 2.x.\n"
+ "Η ιδιο-υπογραφή στο \"%s\"\n"
+ "είναι μια υπογραφή τύπου PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
- msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
+ msgstr "Θέλετε να τη προάγετε σε μια OpenPGP ιδιο-υπογραφή; (y/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "has expired.\n"
  msgstr ""
- "� ������������ �������� ��� ��� \"%s\"\n"
- "���� �����.\n"
+ "Η προυπάρχουσα υπογραφή σας στο \"%s\"\n"
+ "έχει λήξει.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
- "������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
+ "Θέλετε να ορίσετε μια νέα υπογραφή προς αντικατάσταση της ληγμένης; (y/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "is a local signature.\n"
  msgstr ""
- "� ������������ �������� ��� ��� \"%s\"\n"
- "����� ��� ������ ��������.\n"
+ "Η προυπάρχουσα υπογραφή σας στο \"%s\"\n"
+ "είναι μια τοπική υπογραφή.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
- msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
+ msgstr "Θέλετε να τη προάγετε σε μια πλήρη εξαγώγιμη υπογραφή; (y/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
- msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
+ msgstr "\"%s\" ήδη υπογράφθηκε από το κλειδί %08lX\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
- msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
+ msgstr "\"%s\" ήδη υπογράφθηκε από το κλειδί %08lX\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
- msgstr "������� ������ ����� �� �� ��������������; (y/N) "
+ msgstr "Σίγουρα θέλετε ακόμα να το ξαναυπογράψετε; (y/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
- msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
+ msgstr "Τίποτα για να υπογραφεί με το κλειδί  %08lX\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
- msgstr "���� �� ������ ���� �����!"
+ msgstr "Αυτό το κλειδί έχει λήξει!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
- msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
+ msgstr "Αυτό το κλειδί πρόκειτε να λήξει στις %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
- msgstr "������ � ���������� �� ����� ����������;  (Y/n) "
+ msgstr "Θέλετε η υπογαφήσας να λήξει ταυτόχρονα;  (Y/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
  "to the person named above?  If you don't know what to answer, enter \"0\".\n"
  msgstr ""
- "����� �������� ��� �������� ���������� ��� �� ������ ��� ����� ������� ��\n"
- "������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
- "�������\"0\".\n"
+ "Είστε σίγουροι ότι ελέγξατε προσεκτικά ότι το κλειδί που είστε έτοιμοι να\n"
+ "ανήκει πράγματι στο προανφερθέν άτομο; Εάν δεν ξέρετε τι να απαντήσετε "
+ "πατήστε\"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
- msgstr "   (0) ��� ������.%s\n"
+ msgstr "   (0) Δεν απαντώ.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
- msgstr "   (1) ��� ��� ������� �������.%s\n"
+ msgstr "   (1) Δεν έχω ελέγξει καθόλου.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
- msgstr "   (2) ��� ����� ��� ������ ������.%s\n"
+ msgstr "   (2) Έχω κάνει τον συνήθη έλεγχο.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
- msgstr "   (3) ��� ����� ���������� ������.%s\n"
+ msgstr "   (3) Έχω κάνει εκτεταμένο έλεγχο.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
- msgstr "� ������� ���; (�������������� ? ��� �����������): "
+ msgstr "Η επιλογή σας; (πληκτρολογήστε ? για πληροφορίες): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr ""
- "������� ������ �� ���������� ���� �� ������\n"
- "�� �� ������ ���: \""
+ "Σίγουρα θέλετε να υπογράψετε αυτό το κλειδί\n"
+ "με το κλειδί σας: \""
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
- "���� �� ����� ��� ����-��������.\n"
+ "Αυτή θα είναι μια ιδιο-υπογραφή.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
- "�������������: � �������� �� �� ��������� ��� ��-���������.\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: η υπογραφή δε θα σημειωθεί σαν μη-εξαγώγιμη.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
- "�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η υπογραφή δε θα σημειωθεί σαν μη-ανακαλέσιμη.\n"
  "\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
- "� �������� �� ��������� ��� ��-���������.\n"
+ "Η υπογραφή θα σημειωθεί σαν μη-εξαγώγιμη.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
- "� �������� �� ��������� ��� ��-�����������.\n"
+ "Η υπογραφή θα σημειωθεί σαν μη-ανακαλέσιμη.\n"
  "\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
- "��� ��� ������� ������� ���� �� ������.\n"
+ "Δεν έχω ελέγξει καθόλου αυτό το κλειδί.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
- "��� ����� ����������� ������ �� ���� �� ������.\n"
+ "Έχω κάνει συνηθισμένο έλεγχο σε αυτό το κλειδί.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
- "��� ������� ���� ���������� ���� �� ������.\n"
+ "Έχω ελέγξει πολύ προσεκτικά αυτό το κλειδί.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  #, fuzzy
  msgid "Really sign? (y/N) "
- msgstr "������� �� ���������; "
+ msgstr "Σίγουρα να υπογραφεί; "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
- msgstr "� �������� �������: %s\n"
+ msgstr "η υπογραφή απέτυχε: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
- msgstr "���������� ��� ������"
+ msgstr "αποθήκευση και έξοδος"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  #, fuzzy
  msgid "show key fingerprint"
- msgstr "���������� ��� fingerprint"
+ msgstr "απεικόνιση του fingerprint"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
- msgstr "�������� ���������: "
+ msgstr "Σημείωση υπογραφής: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
- msgstr "���������� ��� �������� ��� ��� user ID"
+ msgstr "απεικόνιση των κλειδιών και των user ID"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
- msgstr "������� user ID N"
+ msgstr "επιλογή user ID N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  #, fuzzy
  msgid "select subkey N"
- msgstr "������� user ID N"
+ msgstr "επιλογή user ID N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "check signatures"
- msgstr "�������� ���������"
+ msgstr "ανάκληση υπογραφών"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  #, fuzzy
  msgid "sign selected user IDs locally"
- msgstr "�������� ��� �������� ������"
+ msgstr "υπογραφή του κλειδιού τοπικά"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
- msgstr "��������: �������� �� user ID ��� ��������\n"
+ msgstr "Συμβουλή: Επιλέξτε το user ID για υπογραφή\n"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
- msgstr "�������� ���� user ID"
+ msgstr "προσθήκη ενός user ID"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
- msgstr "�������� ���� photo ID"
+ msgstr "προσθήκη ενός photo ID"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  #, fuzzy
  msgid "delete selected user IDs"
- msgstr "�������� ���� user ID"
+ msgstr "διαγραφή ενός user ID"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  #, fuzzy
  msgid "delete selected subkeys"
- msgstr "�������� ���� ������������� ��������"
+ msgstr "διαγραφή ενός δευτερεύοντος κλειδιού"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
- msgstr "�������� ���� �������� ���������"
+ msgstr "προσθήκη ενός κλειδιού ανάκλησης"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr ""
- "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
+ "Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
- msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
+ msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  #, fuzzy
  msgid "flag the selected user ID as primary"
- msgstr "�������� ��� user ID ��� ��������"
+ msgstr "σημείωση του user ID σαν πρωτεύων"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
- msgstr "���������� ����������� (�������)"
+ msgstr "απεικόνιση προεπιλογών (ειδικές)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
- msgstr "���������� �������� (���������)"
+ msgstr "απεικόνιση επιλογών (αναλυτικά)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr ""
- "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
+ "Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
- msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
+ msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr ""
- "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
+ "Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
- msgstr "������ ��� ������������ ���������"
+ msgstr "αλλαγή της εμπιστοσύνης ιδιοκτήτη"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
- msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
+ msgstr "Σίγουρα θέλετε να ανακληθούν όλα τα επιλεγμένα user ID; "
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  #, fuzzy
  msgid "revoke selected user IDs"
- msgstr "�������� ���� user ID"
+ msgstr "ανάκληση ενός user ID"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  #, fuzzy
  msgid "revoke key or selected subkeys"
- msgstr "�������� ���� ������������� ��������"
+ msgstr "ανάκληση ενός δευτερεύοντος κλειδιού"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  #, fuzzy
  msgid "enable key"
- msgstr "����������� ��� ������"
+ msgstr "ενεργοποιεί ένα κλειδί"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "disable key"
- msgstr "������������� ��� ������"
+ msgstr "απενεργοποιεί ένα κλειδί"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  #, fuzzy
  msgid "show selected photo IDs"
- msgstr "���������� photo ID"
+ msgstr "απεικόνιση photo ID"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
- msgstr "�� ������� ������ ����� ���������.\n"
+ msgstr "Το μυστικό κλειδί είναι διαθέσιμο.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
- msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
+ msgstr "Απαιτείται το μυστικό κλειδί για να γίνει αυτό.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4342,687 -3445,546 +4360,688 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
- msgstr "�� ������ ����������."
+ msgstr "Το κλειδί ανακλήθηκε."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
- msgstr "������� �� ���������� ��� �� user ID; "
+ msgstr "Σίγουρα να υπογραφούν όλα τα user ID; "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
- msgstr "������� �� ���������� ��� �� user ID; "
+ msgstr "Σίγουρα να υπογραφούν όλα τα user ID; "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
- msgstr "��������: �������� �� user ID ��� ��������\n"
+ msgstr "Συμβουλή: Επιλέξτε το user ID για υπογραφή\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
- msgstr "������� ����� ���������"
+ msgstr "άγνωστη κλάση υπογραφής"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
- msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
+ msgstr "Αυτή η εντολή απαγορεύετε σε αυτή την κατάσταση %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
- msgstr "������ �� ��������� �� �������� ��� user ID.\n"
+ msgstr "Πρέπει να επιλέξετε το λιγότερο ένα user ID.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
- msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
+ msgstr "Δεν μπορείτε να διαγράψετε το τελευταίο user ID!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
- msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
+ msgstr "Σίγουρα θέλετε να διαγραφούν όλα τα επιλεγμένα user ID; "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
- msgstr "������� ������ �� ��������� ���� �� user ID; "
+ msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το user ID; "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
- msgstr "������� ������ �� ��������� ���� �� user ID; "
+ msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το user ID; "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  #, fuzzy
  msgid "You must select exactly one key.\n"
- msgstr "������ �� ��������� ����������� ��� ������.\n"
+ msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
- msgstr "�������� ��������� ��� `%s': %s\n"
+ msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
- msgstr "������ �� ��������� ����������� ��� ������.\n"
+ msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
- msgstr "������� ������ �� ���������� �� ���������� �������; "
+ msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
- msgstr "������� ������ �� ��������� ���� �� ������; "
+ msgstr "Σίγουρα θέλετε να διαγραφεί αυτό το κλειδί; "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
- msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
+ msgstr "Σίγουρα θέλετε να ανακληθούν όλα τα επιλεγμένα user ID; "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
- msgstr "������� ������ �� ��������� ���� �� user ID; "
+ msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το user ID; "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
- msgstr "������� ������ �� ��������� ���� �� ������; "
+ msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgstr "������� ������ �� ���������� �� ���������� �������; "
+ msgstr "Σίγουρα θέλετε να ανακληθούν τα επιλεγμένα κλειδιά; "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
- msgstr "������� ������ �� ��������� ���� �� ������; "
+ msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  #, fuzzy
  msgid "Set preference list to:\n"
- msgstr "������� ����������� ��������"
+ msgstr "ορισμός απεικόνισης επιλογών"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
- "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
+ "Σίγουρα θέλετε να ανανεωθούν οι προεπιλογές για το επιλεγμένο user ID; "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
- msgstr "������� �� ���������� �� �����������;"
+ msgstr "Σίγουρα να ανανεωθούν οι προεπιλογές;"
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  #, fuzzy
  msgid "Save changes? (y/N) "
- msgstr "���������� ��� �������; "
+ msgstr "Αποθήκευση των αλλαγών; "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  #, fuzzy
  msgid "Quit without saving? (y/N) "
- msgstr "����������� ����� ����������; "
+ msgstr "Τερματισμός χωρίς αποθήκευση; "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
- msgstr "� ��������� �������: %s\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
- msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
+ msgstr "Το κλειδί δεν άλλαξε οπότε δεν χρειάζεται ενημέρωση.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
- msgstr "� ���������� �������� �������: %s\n"
+ msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
- msgstr "�������� ������������� ��� TrustDB: %s\n"
+ msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
- msgstr "�� ������ ����\n"
+ msgstr "μη έγκυρη τιμή\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
- msgstr "��� ������� ���� �� user ID.\n"
+ msgstr "Δεν υπάρχει αυτό το user ID.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  msgid "Nothing to sign.\n"
- msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
+ msgstr "Τίποτα για να υπογραφεί με το κλειδί  %08lX\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
- msgstr "��������: "
+ msgstr "Περίληψη: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
- msgstr "����������: "
+ msgstr "Δυνατότητε: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  #, fuzzy
  msgid "Notations: "
- msgstr "��������: "
+ msgstr "Σημείωση: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
- msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
+ msgstr "Δεν υπάρχουν προεπιλογές σε ένα user ID τύπου PGP 2.x.\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
- msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
+ msgstr "Αυτό το κλειδί μπορεί να ανακληθεί από %s κλειδί "
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, fuzzy, c-format
  msgid "This key may be revoked by %s key %s"
- msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
+ msgstr "Αυτό το κλειδί μπορεί να ανακληθεί από %s κλειδί "
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  #, fuzzy
  msgid "(sensitive)"
- msgstr " (���������)"
+ msgstr " (ευαίσθητο)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
- msgstr "�������� ����������� ��� %s: %s\n"
+ msgstr "αδυναμία δημιουργίας του %s: %s\n"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
- msgstr "[����������]"
+ msgstr "[ανακλημένο]"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
- msgstr " [�����: %s]"
+ msgstr " [λήγει: %s]"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
- msgstr " [�����: %s]"
+ msgstr " [λήγει: %s]"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "usage: %s"
- msgstr " �����������: %c/%c"
+ msgstr " εμπιστοσύνη: %c/%c"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, fuzzy, c-format
  msgid "trust: %s"
- msgstr " �����������: %c/%c"
+ msgstr " εμπιστοσύνη: %c/%c"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
- msgstr "���� �� ������ ���� ���������������"
+ msgstr "Αυτό το κλειδί έχει απενεργοποιηθεί"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  msgstr ""
- "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
- "����� ��� ��� �������������� �� ���������.\n"
+ "Η εγγυρότητα του απεικονιζόμενου κλειδιού δεν είναι απαραίτητα σωστή\n"
+ "εκτός και εάν επανακκινήσετε το πρόγραμμα.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
- msgstr "[����������]"
+ msgstr "[ανακλημένο]"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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 ""
- "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
- "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει σημειωθεί ID χρήστη σαν πρωτεύων.  Αυτή η εντολή\n"
+ "              μπορεί να κάνει ένα άλλο ID χρήστη να γίνει το πρωτεύων.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
- msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
+ msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  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 ""
- "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
- "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό έιναι ένα κλειδί τύπου PGP2. Η προσθήκη ενός photo ID\n"
+ "               μπορεί να κάνει μερικές εκδόσεις PGP να το απορρίψουν.\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
- msgstr "������� ����� ������ �� �� ����������; (y/N) "
+ msgstr "Σίγουρα ακόμα θέλετε να το προσθέσετε; (y/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  msgid "You may not add a photo ID to a PGP2-style key.\n"
- msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
+ msgstr "Δεν μπορείτε να προσθέσετε μια photo ID σε ένα κλειδί τύπου PGP2.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
- msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
+ msgstr "Διαγραφή αυτής της καλής υπογραφής; (y/N/q)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
- msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
+ msgstr "Διαγραφή αυτής της μη έγκυρης υπογραφής; (y/N/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
- msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
+ msgstr "Διαγραφή αυτής της άγνωστης υπογραφής; (y/N/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
- msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
+ msgstr "Σίγουρα να διαγραφεί αυτή η ιδιο-υπογραφή; (y/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
- msgstr[0] "����������� %d ��������.\n"
- msgstr[1] "����������� %d ��������.\n"
+ msgstr[0] "Διαγράφτηκε %d υπογραφή.\n"
+ msgstr[1] "Διαγράφτηκε %d υπογραφή.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
- msgstr "������ ��� �����������.\n"
+ msgstr "Τίποτα δεν διαγράφτηκε.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  #, fuzzy
  msgid "invalid"
- msgstr "�� ������ ��������"
+ msgstr "μη έγκυρη θωράκιση"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
- msgstr "�� user ID \"%s\" ����������."
+ msgstr "Το user ID \"%s\" ανακαλείτε."
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
- msgstr[0] "�� user ID \"%s\" ����������."
- msgstr[1] "�� user ID \"%s\" ����������."
+ msgstr[0] "Το user ID \"%s\" ανακαλείτε."
+ msgstr[1] "Το user ID \"%s\" ανακαλείτε."
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
- msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+ msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
- msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+ msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  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 ""
- "�������������: ���� ����� ��� ������ ����� PGP 2.x. � �������� ����\n"
- "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
- "               �� �� ����������.\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό έιναι ένα κλειδί τύπου PGP 2.x. Η προσθήκη ενός\n"
+ "               καθορισμένου ανακλητή μπορεί να κάνει μερικές εκδόσεις PGP\n"
+ "               να το απορρίψουν.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr ""
- "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
+ "Δεν μπορείτε να προσθέσετε ένα καθορισμένο ανακλητή σε κλειδί τύπου PGP2.x.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
- msgstr "�������������� �� user ID ��� ����������� ��������: "
+ msgstr "Πληκτρολογήστε το user ID του διορισμένου ανακλητή: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr ""
- "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
+ "αδυναμία ορισμού ενός κλειδιού τύπου PGP 2.x, σαν διορισμένου ανακλητή\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr ""
- "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
+ "δε μπορείτε να ορίσετε ένα κλειδί σαν το διορισμένο ανακλητή του εαυτού του\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  #, fuzzy
  msgid "this key has already been designated as a revoker\n"
  msgstr ""
- "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί έχει ανακληθεί από τον ορισμένο ανακλητή!\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr ""
- "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
- "���������!\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εάν ορίσετε ένα κλειδί σαν διορισμένο ανακλητή δεν μπορεί να "
+ "επανέλθει!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  #, fuzzy
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr ""
- "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
+ "Είστε σίγουροι ότι θέλετε να ορίσετε ένα κλειδί σαν διορισμένο ανακλητή; (y/"
  "N): "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
  msgstr ""
- "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
+ "Είστε σίγουροι ότι θέλετε να ορίσετε ένα κλειδί σαν διορισμένο ανακλητή; (y/"
  "N): "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
- msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
+ msgstr "Αλλαγή ημερομηνίας λήξης για ένα δευτερεύον κλειδί.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
- msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
+ msgstr "Αλλαγή ημερομηνίας λήξης για ένα πρωτεύον κλειδί.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
- msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
+ msgstr "Δεν μπορείτε να αλλάξετε την ημερομηνία λήξης σε ένα v3 κλειδί\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr ""
- "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
- "������������\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογράφων υποκλειδί %08lX δεν έχει κατ' αντιπαράσταση "
+ "πιστοποιηθεί\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
- msgstr "������ �� ��������� ������� ��� user ID.\n"
+ msgstr "Πρέπει να επιλέξετε ακριβώς ένα user ID.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, fuzzy, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
- msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
+ msgstr "παραλείφθηκε η v3 ιδιο-υπογραφή στο user id \"%s\"\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
- msgstr "������� ������ ����� �� �� ���������������; (y/N) "
+ msgstr "Σίγουρα θέλετε ακόμα να το χρησιμοποιήσετε; (y/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
- msgstr "������� ������ ����� �� �� ���������������; (y/N) "
+ msgstr "Σίγουρα θέλετε ακόμα να το χρησιμοποιήσετε; (y/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  #, fuzzy
  msgid "Enter the notation: "
- msgstr "�������� ���������: "
+ msgstr "Σημείωση υπογραφής: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  #, fuzzy
  msgid "Proceed? (y/N) "
- msgstr "��������� (y/N); "
+ msgstr "Επικάλυψη (y/N); "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
- msgstr "��� ������� user ID �� ������ %d\n"
+ msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
- msgstr "��� ������� user ID �� ������ %d\n"
+ msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
- msgstr "��� ������� user ID �� ������ %d\n"
+ msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
- msgstr "��� ������� user ID �� ������ %d\n"
+ msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "user ID: \""
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, fuzzy, c-format
  msgid "signed by your key %s on %s%s%s\n"
- msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
+ msgstr "   υπογράφθηκε από %08lX στις %s%s%s\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
- msgstr " (��-���������)"
+ msgstr " (μη-εξαγώγιμο)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
- msgstr "���� � �������� ����� ���� %s.\n"
+ msgstr "Αυτή η υπογραφή έληξε στις %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
- msgstr "������� ������ �� ��������� ���� �� ������; "
+ msgstr "Σίγουρα θέλετε να ανακληθεί αυτό το κλειδί; "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
- msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
+ msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτή την υπογραφή; (y/N)"
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  #, fuzzy
  msgid "Not signed by you.\n"
- msgstr "   ����������� ��� %08lX ���� %s%s\n"
+ msgstr "   υπογράφθηκε από %08lX στις %s%s\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, fuzzy, c-format
  msgid "You have signed these user IDs on key %s:\n"
- msgstr "����� ��������� ���� �� user ID:\n"
+ msgstr "Έχετε υπογράψει αυτά τα user ID:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  #, fuzzy
  msgid " (non-revocable)"
- msgstr " (��-���������)"
+ msgstr " (μη-εξαγώγιμο)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
- msgstr "   ���������� ��� %08lX ���� %s\n"
+ msgstr "   ανακλήθηκε από %08lX στις %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
- msgstr "��������� �� ����������� ����� ��� ���������:\n"
+ msgstr "Σκοπεύετε να ανακαλέσετε αυτές τις υπογραφές:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
- msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
+ msgstr "Σίγουρα να δημιουργηθούν τα πιστοποιητικά ανάκλησης; (y/N)"
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
- msgstr "������ ������� ������\n"
+ msgstr "κανένα μυστικό κλειδί\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
- msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+ msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr ""
- "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μια υπογραφή user ID έχει ημερομηνία %d δεύτερα στο μέλλον\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
- msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+ msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
- msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+ msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, 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"
+ msgstr "Απεικόνιση %s photo ID μεγέθους %ld για το κλειδί 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
- msgstr "� ���������� %c%lu ������������\n"
+ msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  #, fuzzy
  msgid "too many cipher preferences\n"
- msgstr "���� ������ `%c' �����������\n"
+ msgstr "πάρα πολλές `%c' προεπιλογές\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  #, fuzzy
  msgid "too many digest preferences\n"
- msgstr "���� ������ `%c' �����������\n"
+ msgstr "πάρα πολλές `%c' προεπιλογές\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  #, fuzzy
  msgid "too many compression preferences\n"
- msgstr "���� ������ `%c' �����������\n"
+ msgstr "πάρα πολλές `%c' προεπιλογές\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
- msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
+ msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
- msgstr "������� ������ ���������\n"
+ msgstr "εγγραφή άμεσης υπογραφής\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
- msgstr "������� ����-���������\n"
+ msgstr "εγγραφή ιδιο-υπογραφής\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
- msgstr "������� ��������� \"�������\" ��������\n"
+ msgstr "εγγραφή υπογραφής \"δέσιμου\" κλειδιού\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
- msgstr "�� ������ ������� ��������, ����� %u bits\n"
+ msgstr "μη έγκυρο μέγεθος κλειδιού, χρήση %u bits\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
- msgstr "��������������� ��� ������� �������� ��� %u bits\n"
+ msgstr "στρογγυλοποίηση του μέγεθος κλειδιού έως %u bits\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  #, fuzzy
  msgid "Encrypt"
- msgstr "������������� ���������"
+ msgstr "κρυπτογράφηση δεδομένων"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr ""
  
@@@ -5036,157 -3998,126 +5055,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
- msgstr "   (%d) ElGamal (��� ������������� ����)\n"
+ msgstr "   (%d) ElGamal (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
- msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
+ msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
- msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
+ msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
- msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
+ msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
- msgstr "   (%d) DSA (��� �������� ����)\n"
+ msgstr "   (%d) DSA (για υπογραφή μόνο)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
- msgstr "   (%d) RSA (��� �������� ����)\n"
+ msgstr "   (%d) RSA (για υπογραφή μόνο)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
- msgstr "   (%d) ElGamal (��� ������������� ����)\n"
+ msgstr "   (%d) ElGamal (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
- msgstr "   (%d) RSA (��� ������������� ����)\n"
+ msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (��� ������������� ����)\n"
+ msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (��� ������������� ����)\n"
+ msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
- msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
+ msgstr "   (%d) DSA και ElGamal (προκαθορισμένο)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
- msgstr "   (%d) DSA (��� �������� ����)\n"
+ msgstr "   (%d) DSA (για υπογραφή μόνο)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
- msgstr "   (%d) RSA (��� ������������� ����)\n"
+ msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
- msgstr "   (%d) RSA (��� ������������� ����)\n"
+ msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
- msgstr "   (%d) RSA (��� ������������� ����)\n"
+ msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
- msgstr "�������� ���������: "
+ msgstr "Σημείωση υπογραφής: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
- msgstr "��� ������� user ID �� ������ %d\n"
+ msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
- msgstr "����������������� ��� �� %u bits\n"
+ msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
- msgstr "�� ������� �������� �� ������; (1024) "
+ msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
- msgstr "�� ������� �������� �� ������; (1024) "
+ msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
- msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
+ msgstr "Το μέγεθος κλειδιού που ζητήθηκε είναι %u bits\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
- msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
+ msgstr "Παρακαλώ επιλέξτε τον τύπο του κλειδιού που θέλετε:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5195,14 -4126,13 +5214,14 @@@
  "      <n>m = key expires in n months\n"
  "      <n>y = key expires in n years\n"
  msgstr ""
- "�������� ������ ��� ���� ����� �� ������ �� ����� ������.\n"
- "         0 = �� ������ ��� ����� ����\n"
- "      <n>  = �� ������ ����� �� n �����\n"
- "      <n>w = �� ������ ����� �� n ���������\n"
- "      <n>m = �� ������ ����� �� n �����\n"
- "      <n>y = �� ������ ����� �� n ���\n"
+ "Παρακαλώ ορίστε για πόσο καιρό το κλειδί θα είναι έγκυρο.\n"
+ "         0 = το κλειδί δεν λήγει ποτέ\n"
+ "      <n>  = το κλειδί λήγει σε n μέρες\n"
+ "      <n>w = το κλειδί λήγει σε n εβδομάδες\n"
+ "      <n>m = το κλειδί λήγει σε n μήνες\n"
+ "      <n>y = το κλειδί λήγει σε n έτη\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5211,60 -4141,50 +5230,60 @@@
  "      <n>m = signature expires in n months\n"
  "      <n>y = signature expires in n years\n"
  msgstr ""
- "�������� ������ ��� ���� ����� �� ������ �� ����� ������.\n"
- "         0 = �� ������ ��� ����� ����\n"
- "      <n>  = �� ������ ����� �� n �����\n"
- "      <n>w = �� ������ ����� �� n ���������\n"
- "      <n>m = �� ������ ����� �� n �����\n"
- "      <n>y = �� ������ ����� �� n ���\n"
+ "Παρακαλώ ορίστε για πόσο καιρό το κλειδί θα είναι έγκυρο.\n"
+ "         0 = το κλειδί δεν λήγει ποτέ\n"
+ "      <n>  = το κλειδί λήγει σε n μέρες\n"
+ "      <n>w = το κλειδί λήγει σε n εβδομάδες\n"
+ "      <n>m = το κλειδί λήγει σε n μήνες\n"
+ "      <n>y = το κλειδί λήγει σε n έτη\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
- msgstr "�� ������ ����� ������ ���; (0) "
+ msgstr "Το κλειδί είναι έγκυρο για; (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
- msgstr "� �������� ����� ������ ���; (0) "
+ msgstr "Η υπογραφή έιναι έγκυρη για; (0) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
- msgstr "�� ������ ����\n"
+ msgstr "μη έγκυρη τιμή\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  #, fuzzy
  msgid "Key does not expire at all\n"
- msgstr "�� %s ��� ����� ����\n"
+ msgstr "το %s δεν λήγει ποτέ\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  #, fuzzy
  msgid "Signature does not expire at all\n"
- msgstr "�� %s ��� ����� ����\n"
+ msgstr "το %s δεν λήγει ποτέ\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
- msgstr "�� %s ����� ���� %s\n"
+ msgstr "το %s λήγει στις %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
- msgstr "�������� ����� ���� %s.\n"
+ msgstr "Υπογραφή λήγει στις %s.\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
- "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
- "����, �� ����������� ����� ��� �� 2106.\n"
+ "Το σύστημα σας δεν μπορεί να απεικονίσει ημερομηνίες πέρα του 2038.\n"
+ "Όμως, θα χειρίζονται σωστά έως το 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  #, fuzzy
  msgid "Is this correct? (y/N) "
- msgstr "����� ���� ����� (y/n); "
+ msgstr "Είναι αυτό σωστό (y/n); "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5275,7 -4195,6 +5294,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  #, fuzzy
  msgid ""
  "\n"
@@@ -5292,50 -4211,39 +5311,50 @@@ msgstr "
  "    \"Nikolaoy Nikos (toy Ioanni) <nikoln at athens.gr>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
- msgstr "������� �����: "
+ msgstr "Αληθινό Όνομα: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
- msgstr "�� ������� ���������� ��� �����\n"
+ msgstr "Μη έγκυρος χαρακτήρας στο όνομα\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
- msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
+ msgstr "Το όνομα δεν επιτρέπεται να ξεκινά με αριθμητικό ψηφίο\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
- msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
+ msgstr "Το όνομα πρέπει να έχει τουλάχιστον 5 χαρακτήρες\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
- msgstr "��������� Email: "
+ msgstr "Διεύθυνση Email: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
- msgstr "�� ������ ��������� Email\n"
+ msgstr "Μη έγκυρη διεύθυνση Email\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
- msgstr "������: "
+ msgstr "Σχόλιο: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
- msgstr "�� ������� ���������� ��� ������\n"
+ msgstr "Μη έγκυρος χαρακτήρας στο σχόλιο\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
- msgstr "�������������� �� `%s' ��� ����������.\n"
+ msgstr "Χρησιμοποιείτε το `%s' σετ χαρακτήρων.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5346,9 -4254,8 +5365,9 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
- msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
+ msgstr "Παρακαλώ μην τοποθετείτε την διεύθυνση email στο όνομα ή στο σχόλιο\n"
  
  #. TRANSLATORS: These are the allowed answers in
  #. lower and uppercase.  Below you will find the matching
@@@ -5361,53 -4268,43 +5380,53 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
- msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
+ msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τερματισμός; "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
- msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
+ msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τερματισμός; "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
- msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
+ msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τερματισμός; "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
- msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
+ msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τερματισμός; "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
- msgstr "��������, ��������� ����� �� ������\n"
+ msgstr "Παρακαλώ, διορθώστε πρώτα το σφάλμα\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
  "disks) during the prime generation; this gives the random number\n"
  "generator a better chance to gain enough entropy.\n"
  msgstr ""
- "������ �� ������������� ����� ������ bytes. ����� ���� ���� �� ������\n"
- "������ ������� (��������������, ����������� �� �������, ��������������\n"
- "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
- "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
+ "Πρέπει να δημιουργηθούν πολλά τυχαία bytes. Είναι καλή ιδέα να κάνετε\n"
+ "κάποια εργασία (πληκτρολογήστε, μετακινήστε το ποντίκι, χρησιμοποιήστε\n"
+ "τους δίσκους) κατα τη διάρκεια υπολογισμού πρώτων αριθμών. Αυτό δίνει\n"
+ "στη γεννήτρια τυχαίων αριθμών μια ευκαιρία να μαζέψει αρκετή εντροπία.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
- msgstr "� ���������� �������� �������: %s\n"
+ msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5415,205 -4312,167 +5434,205 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
- msgstr "`%s' ��� �����������\n"
+ msgstr "`%s' ήδη συμπιέστηκε\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  msgid "Create anyway? (y/N) "
- msgstr "����� ���������� ����� ��� ��������; "
+ msgstr "Χρήση οπωσδήποτε αυτού του κλειδιού; "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  msgid "creating anyway\n"
- msgstr "���������� ���� ���� ������� ��������"
+ msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
- msgstr "� ���������� �������� ����������.\n"
+ msgstr "Η δημιουργία κλειδιού αναβλήθηκε.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
- msgstr "�������� ����������� ��� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
- msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
+ msgstr "ΣΗΜΕΙΩΣΗ: το μυστικό κλειδί %08lX έληξε στις %s\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του δημοσίου κλειδιού στο `%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
- msgstr "�� ������� ��������� ������� ����������: %s\n"
+ msgstr "δε βρέθηκε εγγράψιμη δημόσια κλειδοθήκη: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
- msgstr "�������� �������� �������� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής δημόσιας κλειδοθήκης `%s': %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
- msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
+ msgstr "το δημόσιο και το μυστικό κλειδί δημιουργήθηκαν και υπογράφηκαν.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
  msgstr ""
- "��������� ��� ���� �� ������ ��� ������ �� �������������� ��� "
- "�������������.\n"
- "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
- "��� ���������� ������ ��� ���� �� ����.\n"
+ "Σημειώστε ότι αυτό το κλειδί δεν μπορεί να χρησιμοποιηθεί για "
+ "κρυπτογράφηση.\n"
+ "Μπορείτε να χρησιμοποιήσετε την εντολή \"--edit-key\" για να δημιουργηθεί\n"
+ "ένα δευτερεύον κλειδί για αυτό το λόγο.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr ""
- "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
- "����� �������� ��� �����)\n"
+ "το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
+ "απλώς πρόβλημα στο ρολόι)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr ""
- "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
- "����� �������� ��� �����)\n"
+ "το κλειδί δημιουργήθηκε %lu δευτερόλεπτα στο μέλλον (χρονοδίνη ή\n"
+ "απλώς πρόβλημα στο ρολόι)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr ""
- "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
- "�� �� OpenPGP\n"
+ "ΣΗΜΕΙΩΣΗ: η δημιουργία υποκλειδιών για κλειδιά v3 δεν είναι σύμφωνο\n"
+ "με το OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
- msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
+ msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
- msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
+ msgstr "Μυστικά τμήματα του κύριου κλειδιού δεν είναι διαθέσιμα.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  #, fuzzy
  msgid "Really create? (y/N) "
- msgstr "������� �� ������������; "
+ msgstr "Σίγουρα να δημιουργηθεί; "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
- msgstr "����     "
+ msgstr "ποτέ     "
  
 +#: g10/keylist.c:331
  msgid "Critical signature policy: "
- msgstr "�������� �������� ���������: "
+ msgstr "Πολιτική κρίσιμης υπογραφής: "
  
 +#: g10/keylist.c:333
  msgid "Signature policy: "
- msgstr "�������� ���������: "
+ msgstr "Πολιτική υπογραφής: "
  
 +#: g10/keylist.c:375
  msgid "Critical preferred keyserver: "
  msgstr ""
  
 +#: g10/keylist.c:428
  msgid "Critical signature notation: "
- msgstr "�������� �������� ���������: "
+ msgstr "Σημείωση κρίσιμης υπογραφής: "
  
 +#: g10/keylist.c:430
  msgid "Signature notation: "
- msgstr "�������� ���������: "
+ msgstr "Σημείωση υπογραφής: "
  
 +#: g10/keylist.c:472
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d good signature\n"
  msgid_plural "%d good signatures\n"
- msgstr[0] "%d ����� ���������\n"
- msgstr[1] "%d ����� ���������\n"
+ msgstr[0] "%d κακές υπογραφές\n"
+ msgstr[1] "%d κακές υπογραφές\n"
  
 +#: g10/keylist.c:485
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to an error\n"
  msgid "%d signature not checked due to an error\n"
  msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 �������� ��� ��������� ���� ���� ���������\n"
- msgstr[1] "1 �������� ��� ��������� ���� ���� ���������\n"
+ msgstr[0] "1 υπογραφή δεν ελέγχθηκε λόγο ενός σφάλματος\n"
+ msgstr[1] "1 υπογραφή δεν ελέγχθηκε λόγο ενός σφάλματος\n"
  
 +#: g10/keylist.c:567
  #, c-format
  msgid "Warning: %lu key skipped due to its large size\n"
  msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
  msgstr[0] ""
  msgstr[1] ""
  
 +#: g10/keylist.c:589
  msgid "Keyring"
- msgstr "����������"
+ msgstr "Κλειδοθήκη"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
- msgstr "��������� �������� ��������:"
+ msgstr "Αποτύπωμα πρωτεύων κλειδιού:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
- msgstr "     ��������� �����������:"
+ msgstr "     Αποτύπωμα υποκλειδιού:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
- msgstr " ��������� �������� ��������:"
+ msgstr " Αποτύπωμα πρωτεύων κλειδιού:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
- msgstr "      ��������� �����������:"
+ msgstr "      Αποτύπωμα υποκλειδιού:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  #, fuzzy
  msgid "      Key fingerprint ="
- msgstr "     ��������� �������� ="
+ msgstr "     Αποτύπωμα κλειδιού ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr ""
  
 +#: g10/keyring.c:1498
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
- msgstr "������� ����������� `%s'\n"
+ msgstr "έλεγχος κλειδοθήκης `%s'\n"
  
 +#: g10/keyring.c:1572
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
- msgstr[0] "%lu ������� ����� �������� (%lu ���������)\n"
- msgstr[1] "%lu ������� ����� �������� (%lu ���������)\n"
+ msgstr[0] "%lu κλειδιά έχουν ελεγχθεί (%lu υπογραφές)\n"
+ msgstr[1] "%lu κλειδιά έχουν ελεγχθεί (%lu υπογραφές)\n"
  
 +#: g10/keyring.c:1588
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
@@@ -5625,581 -4483,464 +5644,581 @@@ msgstr[1] "
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
- msgstr[0] "1 ���� ��������\n"
- msgstr[1] "1 ���� ��������\n"
+ msgstr[0] "1 κακή υπογραφή\n"
+ msgstr[1] "1 κακή υπογραφή\n"
  
 +#: g10/keyring.c:1665
  #, c-format
  msgid "%s: keyring created\n"
- msgstr "%s: ���������� �������������\n"
+ msgstr "%s: κλειδοθήκη δημιουργήθηκε\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  #, fuzzy
  msgid "honor the preferred keyserver URL set on the key"
- msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
+ msgstr "το URL πολιτικής υπογραφής που δόθηκε δεν είναι έγκυρο\n"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  #, fuzzy
  msgid "disabled"
  msgstr "disable"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr ""
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, fuzzy, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
- msgstr "�� ������� �������� ��������\n"
+ msgstr "μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr ""
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
- msgstr[0] "������ �������� %08lX ��� �� %s\n"
- msgstr[1] "������ �������� %08lX ��� �� %s\n"
+ msgstr[0] "αίτηση κλειδιού %08lX από το %s\n"
+ msgstr[1] "αίτηση κλειδιού %08lX από το %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, fuzzy, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
- msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγραφής tempfile (%s) `%s': %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, fuzzy, c-format
  msgid "key \"%s\" not found on keyserver\n"
- msgstr "�� ������ '%s' �� �������: %s\n"
+ msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  #, fuzzy
  msgid "key not found on keyserver\n"
- msgstr "�� ������ '%s' �� �������: %s\n"
+ msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr ""
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, fuzzy, c-format
  msgid "requesting key %s from %s server %s\n"
- msgstr "������ �������� %08lX ��� �� %s\n"
+ msgstr "αίτηση κλειδιού %08lX από το %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, fuzzy, c-format
  msgid "requesting key %s from %s\n"
- msgstr "������ �������� %08lX ��� �� %s\n"
+ msgstr "αίτηση κλειδιού %08lX από το %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  msgid "no keyserver known\n"
- msgstr "�� ������� �������� ��������\n"
+ msgstr "μη έγκυρες επιλογές εξαγωγής\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, fuzzy, c-format
  msgid "skipped \"%s\": %s\n"
- msgstr "������������ `%s': %s\n"
+ msgstr "παραλείφθηκε `%s': %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, fuzzy, c-format
  msgid "sending key %s to %s\n"
  msgstr ""
  "\"\n"
- "����������� �� �� ������ ��� %08lX ���� %s\n"
+ "υπογράφθηκε με το κλειδί σας %08lX στις %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  msgid "requesting key from '%s'\n"
- msgstr "������ �������� %08lX ��� �� %s\n"
+ msgstr "αίτηση κλειδιού %08lX από το %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, fuzzy, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
- msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγραφής tempfile (%s) `%s': %s\n"
  
 +#: g10/mainproc.c:254
  #, c-format
  msgid "weird size for an encrypted session key (%d)\n"
- msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
+ msgstr "παράξενο μέγεθος για ένα κλειδί κρυπτογραφημένης συνεδρίας (%d)\n"
  
 +#: g10/mainproc.c:302
  #, c-format
  msgid "%s encrypted session key\n"
- msgstr "%s ������ ���������������� ��������\n"
+ msgstr "%s κλειδί κρυπτογραφημένης συνεδρία\n"
  
 +#: g10/mainproc.c:312
  #, fuzzy, c-format
  msgid "passphrase generated with unknown digest algorithm %d\n"
- msgstr "��������������� �� ������� ��������� %d\n"
+ msgstr "κρυπτογραφημένο με άγνωστο αλγόριθμο %d\n"
  
 +#: g10/mainproc.c:378
  #, fuzzy, c-format
  msgid "public key is %s\n"
- msgstr "������� ������ ����� %08lX\n"
+ msgstr "δημόσιο κλειδί είναι %08lX\n"
  
 +#: g10/mainproc.c:456
  msgid "public key encrypted data: good DEK\n"
- msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
+ msgstr "κρυπτογραφημένα δεδομένα με δημόσιο κλειδί: καλό DEK\n"
  
 +#: g10/mainproc.c:489
  #, fuzzy, c-format
  msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
- msgstr "��������������� �� %u-bit %s ������, ID %08lX, ������������� %s\n"
+ msgstr "κρυπτογραφημένο με %u-bit %s κλειδί, ID %08lX, δημιουργήθηκε %s\n"
  
 +#: g10/mainproc.c:493 g10/pkclist.c:228
  #, fuzzy, c-format
  msgid "      \"%s\"\n"
- msgstr "                ������ ��� \""
+ msgstr "                γνωστό σαν \""
  
 +#: g10/mainproc.c:497
  #, fuzzy, c-format
  msgid "encrypted with %s key, ID %s\n"
- msgstr "��������������� �� %s key, ID %08lX\n"
+ msgstr "κρυπτογραφημένο με %s key, ID %08lX\n"
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
- msgstr "������������� �� ������� ������ �������: %s\n"
+ msgstr "κρυπτογράφηση με δημόσιο κλειδί απέτυχε: %s\n"
  
 +#: g10/mainproc.c:530
  #, c-format
  msgid "encrypted with %lu passphrases\n"
- msgstr "��������������� �� %lu ������� �������\n"
+ msgstr "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
  
 +#: g10/mainproc.c:532
  msgid "encrypted with 1 passphrase\n"
- msgstr "��������������� �� 1 ����� ������\n"
+ msgstr "κρυπτογραφημένο με 1 φράση κλειδί\n"
  
 +#: g10/mainproc.c:566 g10/mainproc.c:587
  #, c-format
  msgid "assuming %s encrypted data\n"
- msgstr "������� %s ���������������� ���������\n"
+ msgstr "υπόθεση %s κρυπτογραφημένων δεδομένων\n"
  
 +#: g10/mainproc.c:573
  #, c-format
  msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
  msgstr ""
- "��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
- "%s ��������\n"
+ "Κρυπταλγόριθμος IDEA μη διαθέσιμος, αισιόδοξη προσπάθεια χρήσης του\n"
+ "%s αντίθετα\n"
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  msgid "WARNING: message was not integrity protected\n"
- msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν προστατεύτηκε η ακεραιότητα του μηύματος\n"
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
- msgstr "���������������� OK\n"
+ msgstr "αποκρυπτογράφηση OK\n"
  
 +#: g10/mainproc.c:637
  msgid "WARNING: encrypted message has been manipulated!\n"
- msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το κρυπτογραφημένο μήνυμα έχει πειραχθεί!\n"
  
 +#: g10/mainproc.c:653
  #, c-format
  msgid "decryption failed: %s\n"
- msgstr "���������������� �������: %s\n"
+ msgstr "αποκρυπτογράφηση απέτυχε: %s\n"
  
 +#: g10/mainproc.c:676
  #, fuzzy
  #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
  msgid "Note: sender requested \"for-your-eyes-only\"\n"
- msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
+ msgstr "ΣΗΜΕΙΩΣΗ: ο αποστολέας ζήτησε \"για-τα-μάτια-σας-μόνο\"\n"
  
 +#: g10/mainproc.c:678
  #, c-format
  msgid "original file name='%.*s'\n"
- msgstr "������ ����� �������='%.*s'\n"
+ msgstr "αρχικό όνομα αρχείου='%.*s'\n"
  
 +#: g10/mainproc.c:748
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
- msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
+ msgstr "ανεξάρτητη ανάκληση - χρησιμοποιείστε \"gpg --import\" για εφαρμογή\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  #, fuzzy
  msgid "no signature found\n"
- msgstr "���� �������� ��� \""
+ msgstr "Καλή υπογραφή από \""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
- msgstr "���� �������� ��� \""
+ msgstr "ΚΑΚΗ υπογραφή από \""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
- msgstr "������� �������� ��� \""
+ msgstr "Ληγμένη υπογραφή από \""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
- msgstr "���� �������� ��� \""
+ msgstr "Καλή υπογραφή από \""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
- msgstr "��������� ��������� ���������\n"
+ msgstr "καταστολή ανάκλησης υπογραφής\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
- msgstr "�������� ��������� ����� ��� ��������� ���������\n"
+ msgstr "αδυναμία χειρισμού αυτών των πολλαπλών υπογραφών\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, fuzzy, c-format
  msgid "Signature made %s\n"
- msgstr "�������� ����� ���� %s.\n"
+ msgstr "Υπογραφή έληξε στις %s.\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
- msgstr "                ������ ��� \""
+ msgstr "                γνωστό σαν \""
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
- msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
+ msgstr "Υπογραφή έγινε στο %.*s με χρήση του κλειδιού%s ID %08lX\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
- msgstr "                ������ ��� \""
+ msgstr "                γνωστό σαν \""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
- msgstr "������ ��������� ���: "
+ msgstr "Κλειδί διαθέσιμο στο: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
- msgstr "[�������]"
+ msgstr "[αβέβαιο]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, fuzzy, c-format
  msgid "                aka \"%s\""
- msgstr "                ������ ��� \""
+ msgstr "                γνωστό σαν \""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
- msgstr "�������� ����� ���� %s.\n"
+ msgstr "Υπογραφή έληξε στις %s.\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
- msgstr "�������� ����� ���� %s.\n"
+ msgstr "Υπογραφή λήγει στις %s.\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
- msgstr "%s ��������, ���������� ��������� %s\n"
+ msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
- msgstr "�������"
+ msgstr "δυαδικό"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
- msgstr "���������-��������"
+ msgstr "κατάσταση-κειμένου"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
- msgstr "�������"
+ msgstr "άγνωστο"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
- msgstr "�������� ���������� �������� ��������"
+ msgstr "άγνωστος αλγόριθμος δημοσίου κλειδιού"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
- msgstr "�������� ������� ��� ���������: %s\n"
+ msgstr "Αδυναμία ελέγχου της υπογραφής: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
- msgstr "��� ����� ���������� ��������\n"
+ msgstr "δεν είναι αποκομμένη υπογραφή\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
- "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εντοπισμός πολλαπλών υπογραφών. Μόνο η πρώτη θα ελεγχθεί.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
- msgstr "���������� �������� ������ 0x%02x\n"
+ msgstr "ανεξάρτητη υπογραφή κλάσης 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
- msgstr "�������� ������ ���� (PGP 2.x)\n"
+ msgstr "υπογραφή παλιού στυλ (PGP 2.x)\n"
  
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
  #, fuzzy, c-format
  msgid "fstat of '%s' failed in %s: %s\n"
- msgstr "�������� ��������� ��� �������: %s\n"
+ msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
  
 +#: g10/misc.c:170
  #, fuzzy, c-format
  msgid "fstat(%d) failed in %s: %s\n"
- msgstr "trustdb: read ������� (n=%d): %s\n"
+ msgstr "trustdb: read απέτυχε (n=%d): %s\n"
  
 +#: g10/misc.c:279
  #, fuzzy, c-format
  msgid "WARNING: using experimental public key algorithm %s\n"
- msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
+ msgstr "αδυναμία χειρισμού του αλγόριθμου δημοσίου κλειδιού %d\n"
  
 +#: g10/misc.c:286
  #, fuzzy
  msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
  msgstr ""
- "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
- "����������� ��� ���������\n"
+ "ο εξαναγκασμός του αλγόριθμου περίληψης %s (%d) παραβιάζει τις\n"
+ "προεπιλογές του παραλήπτη\n"
  
 +#: g10/misc.c:300
  #, fuzzy, c-format
  msgid "WARNING: using experimental cipher algorithm %s\n"
- msgstr "�� ������������ ���������� ��������������"
+ msgstr "μη υλοποιημένος αλγόριθμος κρυπτογράφησης"
  
 +#: g10/misc.c:319
  #, fuzzy, c-format
  msgid "WARNING: using experimental digest algorithm %s\n"
- msgstr "%s ��������, ���������� ��������� %s\n"
+ msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
  
 +#: g10/misc.c:328
  #, fuzzy, c-format
  msgid "WARNING: digest algorithm %s is deprecated\n"
  msgstr ""
- "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
- "����������� ��� ���������\n"
+ "ο εξαναγκασμός του αλγόριθμου περίληψης %s (%d) παραβιάζει τις\n"
+ "προεπιλογές του παραλήπτη\n"
  
 +#: g10/misc.c:353
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "Note: signatures using the %s algorithm are rejected\n"
- msgstr "%s ��������, ���������� ��������� %s\n"
+ msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
  
 +#: g10/misc.c:375
  #, fuzzy, c-format
  msgid "(reported error: %s)\n"
- msgstr "������ ���������: %s\n"
+ msgstr "σφάλμα ανάγνωσης: %s\n"
  
 +#: g10/misc.c:378
  #, fuzzy, c-format
  msgid "(reported error: %s <%s>)\n"
- msgstr "������ ���������: %s\n"
+ msgstr "σφάλμα ανάγνωσης: %s\n"
  
 +#: g10/misc.c:397
  msgid "(further info: "
  msgstr ""
  
 +#: g10/misc.c:1056
  #, c-format
  msgid "%s:%d: deprecated option \"%s\"\n"
- msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
+ msgstr "%s:%d: μη συνειστώμενη επιλογή \"%s\"\n"
  
 +#: g10/misc.c:1060
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated option\n"
- msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
  
 +#: g10/misc.c:1062
  #, c-format
  msgid "please use \"%s%s\" instead\n"
- msgstr "�������� �������������� �� \"%s%s\" ��������\n"
+ msgstr "παρακαλώ χρησιμοποιήστε το \"%s%s\" καλύτερα\n"
  
 +#: g10/misc.c:1069
  #, fuzzy, c-format
  msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
- msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
  
 +#: g10/misc.c:1079
  #, fuzzy, c-format
  msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
- msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
  
 +#: g10/misc.c:1083
  #, fuzzy, c-format
  msgid ""
  "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
- msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
  
 +#: g10/misc.c:1147
  msgid "Uncompressed"
- msgstr "����������"
+ msgstr "Ασυμπίεστο"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: g10/misc.c:1172
  #, fuzzy
  msgid "uncompressed|none"
- msgstr "����������"
+ msgstr "Ασυμπίεστο"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
- msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
+ msgstr "αυτό το μήνυμα ίσως δεν μπορεί να χρησιμοποιηθεί από %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  msgid "ambiguous option '%s'\n"
- msgstr "�������� �������� ��� `%s'\n"
+ msgstr "ανάγνωση επιλογών από `%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  msgid "unknown option '%s'\n"
- msgstr "�������� ��������������� ���������� `%s'\n"
+ msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  msgid "unknown weak digest '%s'\n"
- msgstr "������� ����� ���������"
+ msgstr "άγνωστη κλάση υπογραφής"
  
 +#: g10/openfile.c:84
  #, fuzzy, c-format
  #| msgid "File `%s' exists. "
  msgid "File '%s' exists. "
- msgstr "�� ������ `%s' ������� ���. "
+ msgstr "Το αρχείο `%s' υπάρχει ήδη. "
  
 +#: g10/openfile.c:88
  #, fuzzy
  msgid "Overwrite? (y/N) "
- msgstr "��������� (y/N); "
+ msgstr "Επικάλυψη (y/N); "
  
 +#: g10/openfile.c:123
  #, c-format
  msgid "%s: unknown suffix\n"
- msgstr "%s: ������� ��������\n"
+ msgstr "%s: άγνωστη κατάληξη\n"
  
 +#: g10/openfile.c:147
  msgid "Enter new filename"
- msgstr "�������������� ��� ��� ����� �������"
+ msgstr "Πληκτρολογήστε ένα νέο όνομα αρχείου"
  
 +#: g10/openfile.c:218
  msgid "writing to stdout\n"
- msgstr "������� ���� stdout\n"
+ msgstr "εγγραφή στην stdout\n"
  
 +#: g10/openfile.c:366
  #, fuzzy, c-format
  #| msgid "assuming signed data in `%s'\n"
  msgid "assuming signed data in '%s'\n"
- msgstr "������� �������������� ��������� ��� `%s'\n"
+ msgstr "υπόθεση υπογεγραμμένων δεδομένων στο `%s'\n"
  
 +#: g10/openfile.c:457
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new configuration file '%s' created\n"
- msgstr "������������� ��� ������ �������� `%s'\n"
+ msgstr "δημιουργήθηκε νέο αρχείο επιλογών `%s'\n"
  
 +#: g10/openfile.c:498
  #, fuzzy, c-format
  #| msgid "WARNING: options in `%s' are not yet active during this run\n"
  msgid "WARNING: options in '%s' are not yet active during this run\n"
  msgstr ""
- "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: οι επιλογες στο `%s' δεν είναι ενεργές σε αυτή την εκτέλεση\n"
  
 +#: g10/parse-packet.c:257
  #, c-format
  msgid "can't handle public key algorithm %d\n"
- msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
+ msgstr "αδυναμία χειρισμού του αλγόριθμου δημοσίου κλειδιού %d\n"
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
- msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: πιθανόν μη ασφαλές κρυπτογραφημένο συμμετρικά κλειδί\n"
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
- msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
+ msgstr "υποπακέτο τύπου %d έχει ορισμένο το κριτικό bit\n"
  
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
- msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
+ msgstr "πρόβλημα με τον agent: agent επιστρέφει 0x%lx\n"
  
 +#: g10/passphrase.c:241
  msgid "Enter passphrase\n"
- msgstr "�������������� �� ����� ������\n"
+ msgstr "Πληκτρολογήστε τη φράση κλειδί\n"
  
 +#: g10/passphrase.c:252
  msgid "cancelled by user\n"
- msgstr "��������� ��� �� ������\n"
+ msgstr "ακυρώθηκε από το χρήστη\n"
  
 +#: g10/passphrase.c:489
  #, fuzzy, c-format
  msgid " (main key ID %s)"
- msgstr " (����� ������, ID %08lX)"
+ msgstr " (κύριο κλειδί, ID %08lX)"
  
 +#: g10/passphrase.c:496
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
- msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+ msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
 +#: g10/passphrase.c:500
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
- msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+ msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
 +#: g10/passphrase.c:505
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
- msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+ msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
 +#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
- msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+ msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
  
 +#: g10/passphrase.c:513
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
- msgstr "������� ������ �� ���������� �� ���������� �������; "
+ msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
  
 +#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
- msgstr "������� ������ �� ���������� �� ���������� �������; "
+ msgstr "Σίγουρα θέλετε να διαγραφούν τα επιλεγμένα κλειδιά; "
  
 +#: g10/passphrase.c:525
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6207,9 -4948,8 +6226,9 @@@
  "%u-bit %s key, ID %s,\n"
  "created %s%s.\n"
  "%s"
- msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
+ msgstr "%u-bit %s κλειδί, ID %08lX, δημιουργία %s"
  
 +#: g10/photoid.c:77
  msgid ""
  "\n"
  "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@@ -6218,70 -4958,56 +6237,70 @@@
  "Keeping the image close to 240x288 is a good size to use.\n"
  msgstr ""
  "\n"
- "�������� ��� ������ ��� �� photo ID.  � ������ ���� ������ �� ����� ������\n"
- "JPEG. ��������� ��� � ������ ������������ ���� ��� ������� ������ ���.  ���\n"
- "�������������� ��� ������ ������ �� ������ ��� ���������� �� ����� ������!\n"
- "������� ������� ��� ��� ������ ����� ���� ����� ��� 240x288.\n"
+ "Διαλέξτε μια εικόνα σαν το photo ID.  Η εικόνα αυτή πρέπει να είναι αρχείο\n"
+ "JPEG. Θυμηθείτε ότι η εικόνα αποθηκεύεται μέσα στο δημόσιο κλειδί σας.  Εάν\n"
+ "χρησιμοποιείτε μια μεγάλη εικόνα το κλειδί σας αντίστοιχα θα γίνει μεγάλο!\n"
+ "Ιδανίκό μέγεθος για μια εικόνα είναι αυτό κοντά στο 240x288.\n"
  
 +#: g10/photoid.c:99
  msgid "Enter JPEG filename for photo ID: "
- msgstr "�������������� ��� ����� ������� ��� �� photo ID: "
+ msgstr "Πληκτρολογήστε ένα όνομα αρχείου για το photo ID: "
  
 +#: g10/photoid.c:120
  #, fuzzy, c-format
  msgid "unable to open JPEG file '%s': %s\n"
- msgstr "�������� ��������� ��� �������: %s\n"
+ msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
  
 +#: g10/photoid.c:131
  #, c-format
  msgid "This JPEG is really large (%d bytes) !\n"
  msgstr ""
  
 +#: g10/photoid.c:133
  #, fuzzy
  msgid "Are you sure you want to use it? (y/N) "
- msgstr "������� ������ ����� �� �� ���������������; (y/N) "
+ msgstr "Σίγουρα θέλετε ακόμα να το χρησιμοποιήσετε; (y/N) "
  
 +#: g10/photoid.c:149
  #, fuzzy, c-format
  msgid "'%s' is not a JPEG file\n"
- msgstr "\"%s\" ��� ����� JPEG ������\n"
+ msgstr "\"%s\" δεν είναι JPEG αρχείο\n"
  
 +#: g10/photoid.c:168
  msgid "Is this photo correct (y/N/q)? "
- msgstr "����� ���� � ���������� ����� (y/N/q); "
+ msgstr "Είναι αυτή η φωτογραφία σωστή (y/N/q); "
  
 +#: g10/photoid.c:380
  msgid "unable to display photo ID!\n"
- msgstr "�������� ����������� ��� photo ID!\n"
+ msgstr "αδυναμία απεικόνισης του photo ID!\n"
  
 +#: g10/pkclist.c:72 g10/revoke.c:757
  msgid "No reason specified"
- msgstr "��� ���� ������� �����"
+ msgstr "Δεν έχει οριστεί αιτία"
  
 +#: g10/pkclist.c:74 g10/revoke.c:759
  msgid "Key is superseded"
- msgstr "�� ������ ���� ����������"
+ msgstr "Το κλειδί έχει παρακαμθεί"
  
 +#: g10/pkclist.c:76 g10/revoke.c:758
  msgid "Key has been compromised"
- msgstr "�� ������ ���� �������"
+ msgstr "Το κλειδί έχει εκτεθεί"
  
 +#: g10/pkclist.c:78 g10/revoke.c:760
  msgid "Key is no longer used"
- msgstr "�� ������ �� ��������������� �����"
+ msgstr "Το κλειδί δε χρησιμοποιείται πλέον"
  
 +#: g10/pkclist.c:80 g10/revoke.c:761
  msgid "User ID is no longer valid"
- msgstr "�� User ID ��� ����� ����� ������"
+ msgstr "Το User ID δεν είναι πλέον έγκυρο"
  
 +#: g10/pkclist.c:84
  msgid "reason for revocation: "
- msgstr "����� ��� ��������:"
+ msgstr "αιτία για ανάκληση:"
  
 +#: g10/pkclist.c:100
  msgid "revocation comment: "
- msgstr "������ ���������:"
+ msgstr "σχόλιο ανάκλησης:"
  
  #. TRANSLATORS: These are the allowed answers in lower and
  #. uppercase.  Below you will find the matching strings which
@@@ -6301,395 -5025,330 +6320,412 @@@ msgstr "iImMqQsS
  #, fuzzy
  msgid "No trust value assigned to:\n"
  msgstr ""
- "��� ������ ���� ������������ ���:\n"
+ "Δεν δόθηκε αξία εμπιστοσύνης στο:\n"
  "%4u%c/%08lX %s \""
  
 +#: g10/pkclist.c:257
  #, fuzzy, c-format
  msgid "  aka \"%s\"\n"
- msgstr "                ������ ��� \""
+ msgstr "                γνωστό σαν \""
  
 +#: g10/pkclist.c:267
  #, fuzzy
  msgid ""
  "How much do you trust that this key actually belongs to the named user?\n"
- msgstr "���� �� ������ ������� ������ ���� ���������\n"
+ msgstr "Αυτό το κλειδί πιθανώς ανήκει στον ιδιοκτήτη\n"
  
 +#: g10/pkclist.c:282
  #, fuzzy, c-format
  msgid "  %d = I don't know or won't say\n"
- msgstr " %d = ��� ����\n"
+ msgstr " %d = Δεν ξέρω\n"
  
 +#: g10/pkclist.c:284
  #, fuzzy, c-format
  msgid "  %d = I do NOT trust\n"
- msgstr " %d =  ��� ��� �����������\n"
+ msgstr " %d =  ΔΕΝ έχω εμπιστοσύνη\n"
  
 +#: g10/pkclist.c:290
  #, fuzzy, c-format
  msgid "  %d = I trust ultimately\n"
- msgstr " %d = ������������ �������\n"
+ msgstr " %d = Εμπιστεύομαι απόλυτα\n"
  
 +#: g10/pkclist.c:296
  #, fuzzy
  msgid "  m = back to the main menu\n"
- msgstr " m = ���� ��� ������ �����\n"
+ msgstr " m = πίσω στο κυρίως μενού\n"
  
 +#: g10/pkclist.c:299
  #, fuzzy
  msgid "  s = skip this key\n"
- msgstr " s = ��������� ����� ��� ��������\n"
+ msgstr " s = παράλειψη αυτού του κλειδιού\n"
  
 +#: g10/pkclist.c:300
  #, fuzzy
  msgid "  q = quit\n"
- msgstr " q = �����������\n"
+ msgstr " q = τερματισμός\n"
  
 +#: g10/pkclist.c:304
  #, c-format
  msgid ""
  "The minimum trust level for this key is: %s\n"
  "\n"
  msgstr ""
  
 +#: g10/pkclist.c:310 g10/revoke.c:786
  msgid "Your decision? "
- msgstr "� ������� ���; "
+ msgstr "Η απόφαση σας; "
  
 +#: g10/pkclist.c:331
  #, fuzzy
  msgid "Do you really want to set this key to ultimate trust? (y/N) "
- msgstr "������� ������ ���� �� ������ �� ������� ��� �������� ������������; "
+ msgstr "Σίγουρα θέλετε αυτό το κλειδί να οριστεί σαν απόλυτης εμπιστοσύνης; "
  
 +#: g10/pkclist.c:345
  msgid "Certificates leading to an ultimately trusted key:\n"
- msgstr "������������� ��� ������� �� ��� ������ �������� ������������:\n"
+ msgstr "Πιστοποιητικά που οδηγούν σε ένα κλειδί απόλυτης εμπιστοσύνης:\n"
  
 +#: g10/pkclist.c:434
  #, fuzzy, c-format
  msgid "%s: There is no assurance this key belongs to the named user\n"
  msgstr ""
- "%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
+ "%08lX: Δεν υπάρχει ένδειξη ότι η υπογραφή αυτή ανήκει στον ιδιοκτήτη.\n"
  
 +#: g10/pkclist.c:439
  #, fuzzy, c-format
  msgid "%s: There is limited assurance this key belongs to the named user\n"
  msgstr ""
- "%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
+ "%08lX: Δεν υπάρχει ένδειξη ότι η υπογραφή αυτή ανήκει στον ιδιοκτήτη.\n"
  
 +#: g10/pkclist.c:445
  #, fuzzy
  msgid "This key probably belongs to the named user\n"
- msgstr "���� �� ������ ������� ������ ���� ���������\n"
+ msgstr "Αυτό το κλειδί πιθανώς ανήκει στον ιδιοκτήτη\n"
  
 +#: g10/pkclist.c:450
  msgid "This key belongs to us\n"
- msgstr "���� �� ������ ������ �� ����\n"
+ msgstr "Αυτό το κλειδί ανήκει σε εμάς\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "ΔΕΝ είναι βέβαιο ότι αυτό το κλειδί ανήκει στο άτομο το οποίο\n"
+ "αναφέρετε το user ID. Εάν *πραγματικά* ξέρετε τι κάνετε, μπορείτε\n"
+ "να απαντήσετε στην επόμενη ερώτηση καταφατικά\n"
+ "\n"
+ 
++#: g10/pkclist.c:489
  #, fuzzy
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
  "you may answer the next question with yes.\n"
  msgstr ""
- "��� ����� ������ ��� ���� �� ������ ������ ��� ����� �� �����\n"
- "��������� �� user ID. ��� *����������* ������ �� ������, ��������\n"
- "�� ���������� ���� ������� ������� ����������\n"
+ "ΔΕΝ είναι βέβαιο ότι αυτό το κλειδί ανήκει στο άτομο το οποίο\n"
+ "αναφέρετε το user ID. Εάν *πραγματικά* ξέρετε τι κάνετε, μπορείτε\n"
+ "να απαντήσετε στην επόμενη ερώτηση καταφατικά\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  #, fuzzy
  msgid "Use this key anyway? (y/N) "
- msgstr "����� ���������� ����� ��� ��������; "
+ msgstr "Χρήση οπωσδήποτε αυτού του κλειδιού; "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
- msgstr "�������������: ����� �������� ����� �����������!\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Χρήση κλειδιού χωρίς εμπιστοσύνη!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
- "�������������: ���� �� ������ ������ �� ��������� (������ �� ������ "
- "���������)\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αυτό το κλειδί μπορεί να ανακληθεί (λείπει το κλειδί "
+ "ανάκλησης)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr ""
- "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί έχει ανακληθεί από τον ορισμένο ανακλητή!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
- msgstr "�������������: ���� �� ������ ���� ��������� ��� ��� ��������� ���!\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί έχει ανακληθεί από τον ιδιοκτήτη του!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  #, fuzzy
  msgid "         This could mean that the signature is forged.\n"
- msgstr "         ���� ������ �� �������� ��� � �������� ����� ������������.\n"
+ msgstr "         Αυτό μπορεί να σημαίνει ότι η υπογραφή είναι πλαστογραφία.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr ""
- "�������������: ���� �� ��������� ���� ��������� ��� ��� ��������� ���!\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το υποκλειδί έχει ανακληθεί από τον ιδιοκτήτη του!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
- msgstr "��������: ���� �� ������ ���� ���������������.\n"
+ msgstr "Σημείωση: Αυτό το κλειδί έχει απενεργοποιηθεί.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
- msgstr "��������: ���� �� ������ ���� �����!\n"
+ msgstr "Σημείωση: Αυτό το κλειδί έχει λήξει!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr ""
- "�������������: ���� �� ������ ��� ���� ������������ �� ������������ "
- "��������!\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί δεν έχει πιστοποιηθεί με εμπιστεύσιμη "
+ "υπογραφή!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
- msgstr "         ��� ������� ������� ��� � �������� ������ ���� ���������.\n"
+ msgstr "         Δεν υπάρχει ένδειξη ότι η υπογραφή ανήκει στον ιδιοκτήτη.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
- msgstr "�������������: ��� �������������� ���� �� ������!\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ΔΕΝ εμπιστευόμαστε αυτό το κλειδί!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
- msgstr "         � �������� ������ ����� ������������.\n"
+ msgstr "         Η υπογραφή μάλλον είναι πλαστογραφία.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
- "�������������: ���� �� ������ ��� ���� ������������ �� ���������\n"
- "������� ������������!\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί δεν έχει πιστοποιηθεί με υπογραφές\n"
+ "αρκετής εμπιστοσύνης!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
- msgstr "         ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
+ msgstr "         Δεν είναι βέβαιο ότι η υπογραφή ανήκει στον ιδιοκτήτη.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
- msgstr "%s: ������������: %s\n"
+ msgstr "%s: παραλείφθηκε: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
- msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
+ msgstr "%s: παραλείφθηκε: το δημόσιο κλειδί έχει απενεργοποιηθεί.\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
- msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
+ msgstr "%s: παραλείφθηκε: δημόσιο κλειδί είναι ήδη παρόν\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
- msgstr "�������� �������� ��� `%s': %s\n"
+ msgstr "αδυναμία σύνδεσης στο `%s': %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
- msgstr "��� �������� ��� user ID. (��������������� �� \"-r\")\n"
+ msgstr "Δεν ορίστηκε ένα user ID. (χρησιμοποιείστε το \"-r\")\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr ""
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
  msgstr ""
  "\n"
- "�������������� �� user ID. ����� �� ��� ����� ������: "
+ "Πληκτρολογήστε το user ID. Τέλος με μια άδεια γραμμή: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
- msgstr "��� ������� ���� �� user ID.\n"
+ msgstr "Δεν υπάρχει αυτό το user ID.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr ""
- "������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
+ "παραλείφθηκε: δημόσιο κλειδί έχει ήδη οριστεί σαν εξ ορισμού παραλήπτης\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
- msgstr "�� ������� ������ ���� ���������������.\n"
+ msgstr "Το δημόσιο κλειδί έχει απενεργοποιηθεί.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
- msgstr "������������: ������� ������ ���� ��� �������\n"
+ msgstr "παραλείφθηκε: δημόσιο κλειδί έχει ήδη οριστεί\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
- msgstr "�������� ��������������� ���������� `%s'\n"
+ msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
- msgstr "������ ������ ���������\n"
+ msgstr "καμμία έγκυρη διεύθυνση\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
- msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
+ msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
- msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
+ msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
  
 +#: g10/plaintext.c:84
  msgid "data not saved; use option \"--output\" to save it\n"
- msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
+ msgstr "δεδομένα δεν αποθηκεύτηκαν. Αποθήκευση με την επιλογή \"--output\"\n"
  
 +#: g10/plaintext.c:598
  msgid "Detached signature.\n"
- msgstr "���������� ��������.\n"
+ msgstr "Αποκομμένη υπογραφή.\n"
  
 +#: g10/plaintext.c:606
  msgid "Please enter name of data file: "
- msgstr "�������� �� ����� ������� ���������: "
+ msgstr "Εισάγετε το όνομα αρχείου δεδομένων: "
  
 +#: g10/plaintext.c:643
  msgid "reading stdin ...\n"
- msgstr "�������� ��� stdin ...\n"
+ msgstr "ανάγνωση της stdin ...\n"
  
 +#: g10/plaintext.c:688
  msgid "no signed data\n"
- msgstr "��� �������� ������������� ��������\n"
+ msgstr "δεν υπάρχουν υπογεγραμμένα δεδομένα\n"
  
 +#: g10/plaintext.c:706
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
- msgstr "�������� ��������� �������������� ��������� `%s'\n"
+ msgstr "αδυναμία πρόσβασης υπογεγραμμένων δεδομένων `%s'\n"
  
 +#: g10/plaintext.c:741
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
- msgstr "�������� ��������� �������������� ��������� `%s'\n"
+ msgstr "αδυναμία πρόσβασης υπογεγραμμένων δεδομένων `%s'\n"
  
 +#: g10/pubkey-enc.c:116
  #, fuzzy, c-format
  msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr "�������� ���������� ������ �������� �������� %08lX ...\n"
+ msgstr "ανώνυμος παραλήπτης· δοκιμή μυστικού κλειδιού %08lX ...\n"
  
 +#: g10/pubkey-enc.c:123
  msgid "okay, we are the anonymous recipient.\n"
- msgstr "�������, ������� � �������� ����������.\n"
+ msgstr "εντάξει, είμαστε ο ανώνυμος παραλήπτης.\n"
  
 +#: g10/pubkey-enc.c:282
  msgid "old encoding of the DEK is not supported\n"
- msgstr "������ ������������ ��� DEK ��� �������������\n"
+ msgstr "παλαιά κωδικοποίηση του DEK δεν υποστηρίζεται\n"
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
- msgstr "� ���������� �������������� %d%s ����� �������� � �����������������\n"
+ msgstr "ο αλγόριθμος κρυπτογράφησης %d%s είναι άγνωστος ή απενεργοποιημένος\n"
  
 +#: g10/pubkey-enc.c:352
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
- msgstr "��������: � ���������� �������������� %d ��� ����� ���� ��������\n"
+ msgstr "ΣΗΜΕΙΩΣΗ: ο αλγόριθμος κρυπτογράφησης %d δεν είναι στις επιλογές\n"
  
 +#: g10/pubkey-enc.c:377
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
- msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
+ msgstr "ΣΗΜΕΙΩΣΗ: το μυστικό κλειδί %08lX έληξε στις %s\n"
  
 +#: g10/pubkey-enc.c:384
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
- msgstr "��������: �� ������ ���� ���������"
+ msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, c-format
  msgid "build_packet failed: %s\n"
- msgstr "build_packet �������: %s\n"
+ msgstr "build_packet απέτυχε: %s\n"
  
 +#: g10/revoke.c:144
  #, fuzzy, c-format
  msgid "key %s has no user IDs\n"
- msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
+ msgstr "κλειδί %08lX: δεν υπάρχει αυτό το user ID\n"
  
 +#: g10/revoke.c:312
  msgid "To be revoked by:\n"
- msgstr "���� �������� ���:\n"
+ msgstr "Προς ανάκληση από:\n"
  
 +#: g10/revoke.c:316
  msgid "(This is a sensitive revocation key)\n"
- msgstr "(���� ����� ��� ��������� ������ ���������)\n"
+ msgstr "(Αυτό είναι ένα ευαίσθητο κλειδί ανάκλησης)\n"
  
 +#: g10/revoke.c:322
  #, fuzzy
  #| msgid "Secret key is available.\n"
  msgid "Secret key is not available.\n"
- msgstr "�� ������� ������ ����� ���������.\n"
+ msgstr "Το μυστικό κλειδί είναι διαθέσιμο.\n"
  
 +#: g10/revoke.c:327
  #, fuzzy
  msgid "Create a designated revocation certificate for this key? (y/N) "
- msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
+ msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτό το κλειδί; "
  
 +#: g10/revoke.c:336 g10/revoke.c:727
  msgid "ASCII armored output forced.\n"
- msgstr "������������ ������ �� ����������� ASCII.\n"
+ msgstr "Εξαναγκασμός εξόδου σε θωρακισμένο ASCII.\n"
  
 +#: g10/revoke.c:352 g10/revoke.c:479
  #, c-format
  msgid "make_keysig_packet failed: %s\n"
- msgstr "make_keysig_packet �������: %s\n"
+ msgstr "make_keysig_packet απέτυχε: %s\n"
  
 +#: g10/revoke.c:415
  msgid "Revocation certificate created.\n"
- msgstr "������������� ��������� �������������.\n"
+ msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
 +#: g10/revoke.c:421
  #, fuzzy, c-format
  msgid "no revocation keys found for \"%s\"\n"
- msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
+ msgstr "δε βρέθηκαν κλειδιά ανάκλησης για το `%s'\n"
  
 +#: g10/revoke.c:551
  #, fuzzy
  msgid "This is a revocation certificate for the OpenPGP key:"
- msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
+ msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτό το κλειδί; "
  
 +#: g10/revoke.c:567
  msgid ""
  "A revocation certificate is a kind of \"kill switch\" to publicly\n"
  "declare that a key shall not anymore be used.  It is not possible\n"
@@@ -6716,12 -5372,11 +6752,12 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
- msgstr "������������� ��������� �������������.\n"
+ msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
 +#: g10/revoke.c:634
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
- msgstr "�� ������� ������ `%s' �� �������: %s\n"
+ msgstr "το μυστικό κλειδί `%s' δε βρέθηκε: %s\n"
  
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
@@@ -6735,14 -5388,12 +6771,14 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
 +#: g10/revoke.c:711
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
- msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
+ msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτό το κλειδί; "
  
 +#: g10/revoke.c:735
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6752,58 -5403,48 +6788,58 @@@
  "your media become unreadable.  But have some caution:  The print system of\n"
  "your machine might store the data and make it available to others!\n"
  msgstr ""
- "�� ������������� ��������� �������������.\n"
+ "Το πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  "\n"
- "�������� ������������ �� �� ��� ���� ��� ������ �� ������� ������ ��� �\n"
- "Mallory ��������� �������� �� ���� �� ������������� ������ �� �����������\n"
- "�� ������ ���. ����� ������ �� �������� ���� �� ������������� ��� �� ��\n"
- "�������� ������, ��� ��� ��������� ��� �� ���� ��� ��������� ���.  ����\n"
- "������� �� ������� ��������� ��� �������� ��� ������ �� ����������� ���\n"
- "�������� ��� �� ��� ����� ��������� �� ������!\n"
+ "Παρακαλώ μετακινείστε το σε ένα μέσο που μπορεί να κρυφτεί εύκολα· εάν η\n"
+ "Mallory αποκτήσει πρόσβαση σε αυτό το πιστοποιητικό μπορεί να αχρηστεύσει\n"
+ "το κλειδί σας. Είναι έξυπνο να τυπώσετε αυτό το πιστοποιητικό και να το\n"
+ "φυλάξετε μακριά, για την περίπτωση που το μέσο δεν διαβάζετε πια.  Αλλά\n"
+ "προσοχή το σύστημα εκτύπωσης στο μηχανημά σας μπορεί να αποθηκεύσει την\n"
+ "εκτύπωση και να την κάνει διαθέσιμη σε άλλους!\n"
  
 +#: g10/revoke.c:769
  msgid "Please select the reason for the revocation:\n"
- msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
+ msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
  
 +#: g10/revoke.c:779
  msgid "Cancel"
- msgstr "�������"
+ msgstr "Ακύρωση"
  
 +#: g10/revoke.c:781
  #, c-format
  msgid "(Probably you want to select %d here)\n"
- msgstr "(������� �� ������ �� ��������� �� %d ���)\n"
+ msgstr "(Πιθανών να θέλετε να επιλέξετε το %d εδώ)\n"
  
 +#: g10/revoke.c:822
  msgid "Enter an optional description; end it with an empty line:\n"
- msgstr "�������������� ��� ����������� ��������޷ ����� �� ��� ����� ������:\n"
+ msgstr "Πληκτρολογήστε μια προαιρετική περιγραφή· τέλος με μια άδεια γραμμή:\n"
  
 +#: g10/revoke.c:850
  #, c-format
  msgid "Reason for revocation: %s\n"
- msgstr "����� ��� ��������: %s\n"
+ msgstr "Αιτία για ανάκληση: %s\n"
  
 +#: g10/revoke.c:852
  msgid "(No description given)\n"
- msgstr "(��� ������ ���������)\n"
+ msgstr "(Δεν δώθηκε περιγραφή)\n"
  
 +#: g10/revoke.c:857
  #, fuzzy
  msgid "Is this okay? (y/N) "
- msgstr "����� ���� �������; "
+ msgstr "Είναι αυτό εντάξει; "
  
 +#: g10/seskey.c:62 sm/encrypt.c:123
  msgid "weak key created - retrying\n"
- msgstr "������������� ������� ������ - ��������� �����������\n"
+ msgstr "δημιουργήθηκε αδύναμο κλειδί - επανάληψη προσπάθειας\n"
  
 +#: g10/seskey.c:66
  #, c-format
  msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
  msgstr ""
- "�������� �������� �������� �������� ��� ���������� ��������������, ������ "
- "��� %d �����!\n"
+ "αδυναμία αποφυγής αδύναμου κλειδιού για συμμετρικό κρυπταλγόριθμο, δοκιμή "
+ "για %d φορές!\n"
  
 +#: g10/seskey.c:306
  #, c-format
  msgid "%s key %s uses an unsafe (%zu bit) hash\n"
  msgstr ""
@@@ -6813,618 -5453,537 +6849,654 @@@
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
- msgstr "�������������: ��������� ��������� ��������� ��� ������\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: σύγκρουση υπογραφής περίληψης στο μήνυμα\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr ""
- "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
- "������������\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογράφων υποκλειδί %08lX δεν έχει κατ' αντιπαράσταση "
+ "πιστοποιηθεί\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, fuzzy, c-format
  msgid "please see %s for more information\n"
- msgstr " i = ���������� ������������ �����������\n"
+ msgstr " i = απεικόνιση περισσότερων πληροφοριών\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
- "�������������: �� ��������� ��������� %08lX ���� ����� ���' ������������� "
- "�����������\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογράφων υποκλειδί %08lX έχει άκυρη κατ' αντιπαράσταση "
+ "πιστοποίηση\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
  msgstr[0] ""
- "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
+ "το δημόσιο κλειδί %08lX είναι %lu δευτερόλεπτο νεότερο από την υπογραφή\n"
  msgstr[1] ""
- "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
+ "το δημόσιο κλειδί %08lX είναι %lu δευτερόλεπτο νεότερο από την υπογραφή\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
  msgstr[0] ""
- "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
+ "το δημόσιο κλειδί %08lX είναι %lu δευτερόλεπτο νεότερο από την υπογραφή\n"
  msgstr[1] ""
- "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
+ "το δημόσιο κλειδί %08lX είναι %lu δευτερόλεπτο νεότερο από την υπογραφή\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu seconds in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
- "����� �������� ��� �����)\n"
+ "το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
+ "απλώς πρόβλημα στο ρολόι)\n"
  msgstr[1] ""
- "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
- "����� �������� ��� �����)\n"
+ "το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
+ "απλώς πρόβλημα στο ρολόι)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu days in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
- "����� �������� ��� �����)\n"
+ "το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
+ "απλώς πρόβλημα στο ρολόι)\n"
  msgstr[1] ""
- "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
- "����� �������� ��� �����)\n"
+ "το κλειδί δημιουργήθηκε %lu δευτερόλεπτο στο μέλλον (χρονοδίνη ή\n"
+ "απλώς πρόβλημα στο ρολόι)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  msgid "Note: signature key %s expired %s\n"
- msgstr "��������: �� ������ ��������� %08lX ����� ���� %s\n"
+ msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί υπογραφής %08lX έληξε στις %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
- msgstr "��������: �� ������ ���� ���������"
+ msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, fuzzy, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
- msgstr "������� ����� ��������� ��� ������ %08lX ���� �������� �������� bit\n"
+ msgstr "υπόθεση κακής υπογραφής από κλειδί %08lX λόγω άγνωστου κρίσιμου bit\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
- msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
+ msgstr "κλειδί %08lX: κανένα υποκλειδί για το πακέτο ανάκλησης υποκλειδιού\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
- msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� �����������\n"
+ msgstr "κλειδί %08lX: δεν υπάρχει υποκλειδί για τη δέσμευση υποκλειδιού\n"
  
 +#: g10/sign.c:88
  #, c-format
  msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
  msgstr ""
- "�������������: �������� ���� %%-�������� ��������� (���� ������).\n"
- "               ����� �� ������������.\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία στην %%-ανάπτυξη σημείωσης (πολυ μεγάλη).\n"
+ "               Χρήση μη ανεπτυγμένου.\n"
  
 +#: g10/sign.c:114
  #, fuzzy, c-format
  msgid ""
  "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
  msgstr ""
- "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
- "               ����� �� ������������.\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία στη %%-ανάπτυξη του url πολιτικής (πολυ μεγάλο).\n"
+ "               Χρήση μη ανεπτυγμένου.\n"
  
 +#: g10/sign.c:137
  #, fuzzy, c-format
  msgid ""
  "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
  "unexpanded.\n"
  msgstr ""
- "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
- "               ����� �� ������������.\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία στη %%-ανάπτυξη του url πολιτικής (πολυ μεγάλο).\n"
+ "               Χρήση μη ανεπτυγμένου.\n"
  
 +#: g10/sign.c:329
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
- msgstr "%s �������� ���: \"%s\"\n"
+ msgstr "%s υπογραφή από: \"%s\"\n"
  
 +#: g10/sign.c:878
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
- "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
- "����������� ��� ���������\n"
+ "ο εξαναγκασμός του αλγόριθμου περίληψης %s (%d) παραβιάζει τις\n"
+ "προεπιλογές του παραλήπτη\n"
  
 +#: g10/sign.c:1009
  msgid "signing:"
- msgstr "��������:"
+ msgstr "υπογραφή:"
  
 +#: g10/sign.c:1286
  #, c-format
  msgid "%s encryption will be used\n"
- msgstr "%s ������������� �� ��������������\n"
+ msgstr "%s κρυπτογράφηση θα χρησιμοποιηθεί\n"
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
  msgstr ""
- "�� ������ ��� ���� ��������� ��� ��������� - ��� ������ �� �������������� �� "
- "������� RNG!\n"
+ "το κλειδί δεν έχει σημειωθεί σαν ανασφαλές - δεν μπορεί να χρησιμοποιηθεί με "
+ "ψεύτικη RNG!\n"
  
 +#: g10/skclist.c:187
  #, fuzzy, c-format
  msgid "skipped \"%s\": duplicated\n"
- msgstr "������������ `%s': ������������\n"
+ msgstr "παραλείφθηκε `%s': αντιγράφτηκε\n"
  
 +#: g10/skclist.c:206
  msgid "skipped: secret key already present\n"
- msgstr "������������: ������� ������ ��� �����\n"
+ msgstr "παραλείφθηκε: μυστικό κλειδί ήδη παρών\n"
  
 +#: g10/skclist.c:225
  #, fuzzy
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr ""
- "������������ `%s': ���� ����� ������������� ��� PGP ������ ElGamal ��� ��� "
- "����� ������� ��� ���������!\n"
+ "παραλείφθηκε `%s': αυτό είναι δημιουργημένο από PGP κλειδί ElGamal και δεν "
+ "είναι ασφαλές για υπογραφές!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
- msgstr "������� trust %lu, ����� %d: write �������: %s\n"
+ msgstr "εγγραφή trust %lu, τύπος %d: write απέτυχε: %s\n"
  
 +#: g10/tdbdump.c:105
  #, c-format
  msgid ""
  "# List of assigned trustvalues, created %s\n"
  "# (Use \"gpg --import-ownertrust\" to restore them)\n"
  msgstr ""
- "# ����� ��� ������������ ����� ������������, ������������� %s\n"
- "# (����� ��� \"gpg --import-ownertrust\" ��� ��������� ����)\n"
+ "# Λίστα των καθορισμένων τιμών εμπιστοσύνης, δημιουργήθηκε %s\n"
+ "# (Χρήση του \"gpg --import-ownertrust\" για επαναφορά τους)\n"
  
 +#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
  #, fuzzy, c-format
  msgid "error in '%s': %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: g10/tdbdump.c:162
  #, fuzzy
  msgid "line too long"
- msgstr "� ������ ����� ���� ������\n"
+ msgstr "η γραμμή είναι πολύ μεγάλη\n"
  
 +#: g10/tdbdump.c:170
  msgid "colon missing"
  msgstr ""
  
 +#: g10/tdbdump.c:176
  #, fuzzy
  msgid "invalid fingerprint"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
 +#: g10/tdbdump.c:181
  #, fuzzy
  msgid "ownertrust value missing"
- msgstr "�������� ��� ����� ������������"
+ msgstr "εισαγωγή των τιμών εμπιστοσύνης"
  
 +#: g10/tdbdump.c:217
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
- msgstr "������ ���� ������ ��� �������� ������������: %s\n"
+ msgstr "σφάλμα στην εύρεση της εγγραφής εμπιστοσύνης: %s\n"
  
 +#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
- msgstr "������ ���������: %s\n"
+ msgstr "σφάλμα ανάγνωσης: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
- msgstr "trustdb: sync �������: %s\n"
+ msgstr "trustdb: sync απέτυχε: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  msgid "can't create lock for '%s'\n"
- msgstr "�������� ����������� ��� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
 +#: g10/tdbio.c:146
  #, fuzzy, c-format
  msgid "can't lock '%s'\n"
- msgstr "�������� ��������� ��� `%s'\n"
+ msgstr "αδυναμία πρόσβασης του `%s'\n"
  
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
  #, c-format
  msgid "trustdb rec %lu: lseek failed: %s\n"
- msgstr "trustdb rec %lu: �������� lseek: %s\n"
+ msgstr "trustdb rec %lu: αποτυχία lseek: %s\n"
  
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
  #, c-format
  msgid "trustdb rec %lu: write failed (n=%d): %s\n"
- msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
+ msgstr "trustdb rec %lu: αποτυχία write (n=%d): %s\n"
  
 +#: g10/tdbio.c:352
  msgid "trustdb transaction too large\n"
- msgstr "���� ������ ��������� trustdb\n"
+ msgstr "πολύ μεγάλη συναλλαγή trustdb\n"
  
 +#: g10/tdbio.c:682
  #, c-format
  msgid "%s: directory does not exist!\n"
- msgstr "%s: � ������� ��� �������!\n"
+ msgstr "%s: ο φάκελος δεν υπάρχει!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
- msgstr "�������� ����������� ��� `%s': %s\n"
+ msgstr "αδυναμία κλεισίματος του `%s': %s\n"
  
 +#: g10/tdbio.c:724
  #, c-format
  msgid "%s: failed to create version record: %s"
- msgstr "%s: �������� ����������� ���� �������� �������: %s"
+ msgstr "%s: αποτυχία δημιουργίας μιας εγγραφής έκδοσης: %s"
  
 +#: g10/tdbio.c:729
  #, c-format
  msgid "%s: invalid trustdb created\n"
- msgstr "%s: ������������� �� ������ trustdb\n"
+ msgstr "%s: δημιουργήθηκε μη έγκυρη trustdb\n"
  
 +#: g10/tdbio.c:732
  #, c-format
  msgid "%s: trustdb created\n"
- msgstr "%s: ������������� � trustdb\n"
+ msgstr "%s: δημιουργήθηκε η trustdb\n"
  
 +#: g10/tdbio.c:788
  #, fuzzy
  #| msgid "NOTE: trustdb not writable\n"
  msgid "Note: trustdb not writable\n"
- msgstr "��������: � trustdb ��� ����� ���������\n"
+ msgstr "ΣΗΜΕΙΩΣΗ: η trustdb δεν είναι εγγράψιμη\n"
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
- msgstr "%s: �� ������ trustdb\n"
+ msgstr "%s: μη έγκυρη trustdb\n"
  
 +#: g10/tdbio.c:834
  #, c-format
  msgid "%s: failed to create hashtable: %s\n"
- msgstr "%s: �������� ����������� hashtable: %s\n"
+ msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
  
 +#: g10/tdbio.c:842
  #, c-format
  msgid "%s: error updating version record: %s\n"
- msgstr "%s: ������ ���� ��������� ��� �������� �������: %s\n"
+ msgstr "%s: σφάλμα στην ενημέρωση της εγγραφής έκδοσης: %s\n"
  
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
  #, c-format
  msgid "%s: error reading version record: %s\n"
- msgstr "%s: ������ ���� �������� ��� �������� �������: %s\n"
+ msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής έκδοσης: %s\n"
  
 +#: g10/tdbio.c:938
  #, c-format
  msgid "%s: error writing version record: %s\n"
- msgstr "%s: ������ ���� ������� ��� �������� �������: %s\n"
+ msgstr "%s: σφάλμα στην εγγραφή της εγγραφής έκδοσης: %s\n"
  
 +#: g10/tdbio.c:1461
  #, c-format
  msgid "trustdb: lseek failed: %s\n"
- msgstr "trustdb: ������� lseek: %s\n"
+ msgstr "trustdb: απέτυχε lseek: %s\n"
  
 +#: g10/tdbio.c:1472
  #, c-format
  msgid "trustdb: read failed (n=%d): %s\n"
- msgstr "trustdb: read ������� (n=%d): %s\n"
+ msgstr "trustdb: read απέτυχε (n=%d): %s\n"
  
 +#: g10/tdbio.c:1497
  #, c-format
  msgid "%s: not a trustdb file\n"
- msgstr "%s: ��� ����� trustdb ������\n"
+ msgstr "%s: δεν είναι trustdb αρχείο\n"
  
 +#: g10/tdbio.c:1522
  #, c-format
  msgid "%s: version record with recnum %lu\n"
- msgstr "%s: ������� ������� �� recnum %lu\n"
+ msgstr "%s: εγγραφή έκδοσης με recnum %lu\n"
  
 +#: g10/tdbio.c:1528
  #, c-format
  msgid "%s: invalid file version %d\n"
- msgstr "%s: �� ������ ������ ������� %d\n"
+ msgstr "%s: μη έγκυρη έκδοση αρχείου %d\n"
  
 +#: g10/tdbio.c:1748
  #, c-format
  msgid "%s: error reading free record: %s\n"
- msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
+ msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
  
 +#: g10/tdbio.c:1757
  #, c-format
  msgid "%s: error writing dir record: %s\n"
- msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
+ msgstr "%s: σφάλμα στην εγγραφή της εγγραφής dir : %s\n"
  
 +#: g10/tdbio.c:1768
  #, c-format
  msgid "%s: failed to zero a record: %s\n"
- msgstr "%s: �������� ���� ��������� ���� ��������: %s\n"
+ msgstr "%s: αποτυχία στον μηδενισμό μιας εγγραφής: %s\n"
  
 +#: g10/tdbio.c:1804
  #, c-format
  msgid "%s: failed to append a record: %s\n"
- msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
+ msgstr "%s: αποτυχία στην προσθήκη μιας εγγραφής: %s\n"
  
 +#: g10/tdbio.c:1865
  #, fuzzy
  msgid "Error: The trustdb is corrupted.\n"
- msgstr "%s: ������������� � trustdb\n"
+ msgstr "%s: δημιουργήθηκε η trustdb\n"
  
 +#: g10/textfilter.c:146
  #, c-format
  msgid "can't handle text lines longer than %d characters\n"
- msgstr "�������� ��������� ������� �������� ����������� ��� %d ����������\n"
+ msgstr "αδυναμία χειρισμού γραμμών κειμένου μεγαλύτερες από %d χαρακτήρες\n"
  
 +#: g10/textfilter.c:241
  #, c-format
  msgid "input line longer than %d characters\n"
- msgstr "������ ������� ���������� ��� %d ����������\n"
+ msgstr "γραμμή εισόδου μεγαλύτερη από %d χαρακτήρες\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
- msgstr "������ ��� �������� ���� �� `%s': %s\n"
+ msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
- "��������������� ����������:\n"
+ "Υποστηριζόμενοι αλγόριθμοι:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
- msgstr "������ ��� �������� ���� �� `%s': %s\n"
+ msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
- msgstr "�������� �������� �������� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
- msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
+ msgstr "%s: σφάλμα στην εγγραφή της εγγραφής dir : %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
- msgstr "������ ��� �������� ���� �� `%s': %s\n"
+ msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
+ msgstr ""
+ 
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "απεικόνιση των κλειδιών και των user ID"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
- msgstr "��������: "
+ msgstr "Πολιτική: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
- msgstr "���������� ��� ������ ��������"
+ msgstr "απεικόνιση της λίστας κλειδιών"
+ 
++#: g10/tofu.c:1715
+ #, fuzzy, c-format
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+ msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
  
- #: g10/tofu.c:1342
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1351
- #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "|����� [������]| ���������� ���������� ��� ���������"
- msgstr[1] "|����� [������]| ���������� ���������� ��� ���������"
- 
- #: g10/tofu.c:1357
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Διαγράφηκαν %d υπογραφές.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|����� [������]| ���������� ���������� ��� ���������"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+ msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+ msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7438,145 -5997,126 +7510,157 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
- msgstr "������ ��� �������� ���� �� `%s': %s\n"
+ msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
+ 
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "αδυναμία εγγραφής δημόσιας κλειδοθήκης `%s': %s\n"
  
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
- msgstr "`%s' ��� ����� ������ ����� keyID\n"
+ msgstr "`%s' δεν είναι έγκυρο μακρύ keyID\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, fuzzy, c-format
  msgid "key %s: accepted as trusted key\n"
- msgstr "������ %08lX: ������� ��� ������ �� �����������\n"
+ msgstr "κλειδί %08lX: αποδοχή σαν κλειδί με εμπιστοσύνη\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, fuzzy, c-format
  msgid "key %s occurs more than once in the trustdb\n"
- msgstr "�� ������ %08lX ������� ���� ��� ��� ���� ���� trustdb\n"
+ msgstr "το κλειδί %08lX υπάρχει πάνω από μια φορά στην trustdb\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, fuzzy, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr ""
- "������ %08lX: ������ ������� ������ ��� �� ������ �� ����������� - "
- "���������\n"
+ "κλειδί %08lX: κανένα δημόσιο κλειδί για το κλειδί με εμπιστοσύνη - "
+ "παράλειψη\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, fuzzy, c-format
  msgid "key %s marked as ultimately trusted\n"
- msgstr "�������� �������� ��� �������� ������������.\n"
+ msgstr "σημείωση κλειδιού σαν απόλυτης εμπιστοσύνης.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
- msgstr "������� trust %lu, req ����� %d: read �������: %s\n"
+ msgstr "εγγραφή trust %lu, req τύπος %d: read απέτυχε: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
- msgstr "� ������� trust %lu ��� ����� ��� ���������� ����� %d\n"
+ msgstr "η εγγραφή trust %lu δεν είναι του ζητούμενου τύπου %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
- msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
+ msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
- msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
+ msgstr "επόμενος έλεγχος της trustdb θα γίνει στις %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
- msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
+ msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
- msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
+ msgstr "δεν υπάρχει ανάγκη για έλεγχο της trustdb\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
- msgstr "�� ������� ������ %08lX ��� �������: %s\n"
+ msgstr "το δημόσιο κλειδί %08lX δεν βρέθηκε: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
- msgstr "�������� ����� ��� --check-trustdb\n"
+ msgstr "παρακαλώ κάντε ένα --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
- msgstr "������� ��� trustdb\n"
+ msgstr "έλεγχος της trustdb\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
- msgstr[0] "%lu ������� ����� ����� ���� ������������\n"
- msgstr[1] "%lu ������� ����� ����� ���� ������������\n"
+ msgstr[0] "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
+ msgstr[1] "%lu κλειδιά έχουν μέχρι τώρα επεξεργαστεί\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
- msgstr[0] "%d ������� �������������� (%d ��������� ����������� �������)\n"
- msgstr[1] "%d ������� �������������� (%d ��������� ����������� �������)\n"
+ msgstr[0] "%d κλειδιά επεξεργάστηκαν (%d μετρήσεις εγγυρότητας πέρασαν)\n"
+ msgstr[1] "%d κλειδιά επεξεργάστηκαν (%d μετρήσεις εγγυρότητας πέρασαν)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
- msgstr "�� �������� ������� ������������ �������\n"
+ msgstr "δε βρέθηκαν απόλυτα εμπιστεύσιμα κλειδιά\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr ""
- "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
+ "δε βρέθηκε το δημόσιο κλειδί του απόλυτα εμπιστεύσιμου κλειδιού %08lX\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
- msgstr "������� trust %lu, ����� %d: write �������: %s\n"
+ msgstr "εγγραφή trust %lu, τύπος %d: write απέτυχε: %s\n"
  
 +#: g10/trust.c:105
  msgid "undefined"
  msgstr ""
  
 +#: g10/trust.c:106
  #, fuzzy
  msgid "never"
- msgstr "����     "
+ msgstr "ποτέ     "
  
 +#: g10/trust.c:107
  msgid "marginal"
  msgstr ""
  
@@@ -7600,31 -6137,25 +7684,31 @@@ msgstr "
  msgid "10 translator see trust.c:uid_trust_string_fixed"
  msgstr ""
  
 +#: g10/trust.c:149
  #, fuzzy
  msgid "[ revoked]"
- msgstr "[����������]"
+ msgstr "[ανακλημένο]"
  
 +#: g10/trust.c:151 g10/trust.c:157
  #, fuzzy
  msgid "[ expired]"
- msgstr "[�������]"
+ msgstr "[ληγμένο]"
  
 +#: g10/trust.c:156
  #, fuzzy
  msgid "[ unknown]"
- msgstr "�������"
+ msgstr "άγνωστο"
  
 +#: g10/trust.c:158
  msgid "[  undef ]"
  msgstr ""
  
 +#: g10/trust.c:159
  #, fuzzy
  msgid "[  never ]"
- msgstr "����     "
+ msgstr "ποτέ     "
  
 +#: g10/trust.c:160
  msgid "[marginal]"
  msgstr ""
  
@@@ -7642,21 -6170,18 +7726,21 @@@ msgid "
  "Please remember that the signature file (.sig or .asc)\n"
  "should be the first file given on the command line.\n"
  msgstr ""
- "�������� ����������� ��� ���������.\n"
- "�������� ��� ������� ��� �� ������ ��������� (.sig or .asc)\n"
- "������ �� ����� �� ����� ������ ��� ������ �������.\n"
+ "αδυναμία επαλήθευσης της υπογραφής.\n"
+ "Παρακαλώ μην ξεχνάτε ότι το αρχείο υπογραφής (.sig or .asc)\n"
+ "πρέπει να είναι το πρώτο αρχείο στη γραμμή εντολών.\n"
  
 +#: g10/verify.c:204
  #, c-format
  msgid "input line %u too long or missing LF\n"
- msgstr "������ ������� %u ����� ���� ������ � ��� ������ �� LF\n"
+ msgstr "γραμμή εισόδου %u είναι πολύ μεγάλη ή της λείπει το LF\n"
  
 +#: g10/verify.c:253
  #, fuzzy, c-format
  msgid "can't open fd %d: %s\n"
- msgstr "�������� ��������� ��� `%s': %s\n"
+ msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
  
 +#: kbx/kbxutil.c:92
  msgid "set debugging flags"
  msgstr ""
  
@@@ -7664,155 -6188,123 +7748,157 @@@
  msgid "enable full debugging"
  msgstr ""
  
 +#: kbx/kbxutil.c:117
  #, fuzzy
  msgid "Usage: kbxutil [options] [files] (-h for help)"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
 +#: kbx/kbxutil.c:120
  #, fuzzy
  msgid ""
  "Syntax: kbxutil [options] [files]\n"
  "List, export, import Keybox data\n"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
- msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
+ msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
- msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
+ msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
- msgstr "�������� ������������� ��� TrustDB: %s\n"
+ msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
- msgstr "�������� ������������ ��� cache �����������: %s\n"
- 
- #: scd/app-openpgp.c:1286
- #, fuzzy, c-format
- msgid "reading public key failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
  
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "remove keys from the public keyring"
+ msgid "response does not contain the EC public key\n"
+ msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
+ 
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1551
+ #, fuzzy, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
- msgstr "keyserver �������� �������: %s\n"
+ msgstr "keyserver αποστολή απέτυχε: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7822,26 -6314,21 +7908,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
- msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
+ msgstr "Παρακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7849,125 -6336,100 +7935,125 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  #, fuzzy
  msgid "error reading application data\n"
- msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  #, fuzzy
  msgid "error reading fingerprint DO\n"
- msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
+ msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  #, fuzzy
  msgid "key already exists\n"
- msgstr "`%s' ��� �����������\n"
+ msgstr "`%s' ήδη συμπιέστηκε\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  #, fuzzy
  msgid "generating new key\n"
- msgstr "���������� ���� ���� ������� ��������"
+ msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
- msgstr "���������� ���� ���� ������� ��������"
+ msgstr "δημιουργία ενός νέου ζεύγους κλειδιών"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
- msgstr "�������� ������������� ��� TrustDB: %s\n"
+ msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
- msgstr "�� �������������� URI"
+ msgstr "μη υποστηριζόμενο URI"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  #, fuzzy
  msgid "generating key failed\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
- msgstr[0] "� ���������� �������� �������: %s\n"
- msgstr[1] "� ���������� �������� �������: %s\n"
+ msgstr[0] "Η δημιουργία κλειδιού απέτυχε: %s\n"
+ msgstr[1] "Η δημιουργία κλειδιού απέτυχε: %s\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
- msgstr "%s ��������, ���������� ��������� %s\n"
+ msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
- msgstr "�� �������� ������ OpenPGP ��������.\n"
+ msgstr "δε βρέθηκαν έγκυρα OpenPGP δεδομένα.\n"
  
 +#: scd/app-dinsig.c:299
  #, fuzzy
  msgid "||Please enter your PIN at the reader's pinpad"
- msgstr "������ ��� ������ ������"
+ msgstr "αλλαγή της φράσης κλειδί"
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
@@@ -7980,35 -6440,28 +8066,35 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
  #, fuzzy
  msgid "|FILE|write a log to FILE"
- msgstr "|������|������� ��� ���������� ��������� ������"
+ msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
 +#: scd/scdaemon.c:134
  msgid "|N|connect to reader at port N"
  msgstr ""
  
 +#: scd/scdaemon.c:136
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
- msgstr "|�����|����� ��� �������� �� ��������������� ���������"
+ msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
  
 +#: scd/scdaemon.c:138
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
- msgstr "|�����|����� ��� �������� �� ��������������� ���������"
+ msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
  
 +#: scd/scdaemon.c:141
  #, fuzzy
  msgid "do not use the internal CCID driver"
- msgstr "�� ����� ����������"
+ msgstr "μη χρήση τερματικού"
  
 +#: scd/scdaemon.c:147
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
@@@ -8016,70 -6468,56 +8102,70 @@@
  msgid "do not use a reader's pinpad"
  msgstr ""
  
 +#: scd/scdaemon.c:155
  #, fuzzy
  msgid "deny the use of admin card commands"
- msgstr "������������� �������\n"
+ msgstr "συγκρουόμενες εντολές\n"
  
 +#: scd/scdaemon.c:158
  msgid "use variable length input for pinpad"
  msgstr ""
  
 +#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
 +#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
 +#: sm/base64.c:327
  #, fuzzy, c-format
  msgid "invalid radix64 character %02x skipped\n"
- msgstr "�� ������� radix64 ���������� %02x ���������\n"
+ msgstr "μη έγκυρος radix64 χαρακτήρας %02x παράβλεψη\n"
  
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
- msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
+ msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδρία\n"
  
 +#: sm/certchain.c:194
  #, c-format
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  #, fuzzy
  msgid "shell"
  msgstr "help"
  
 +#: sm/certchain.c:256 dirmngr/validate.c:107
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
- msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
+ msgstr "δεν υποστηρίζεται η έκδοση πρωτοκόλλου %d του gpg-agent\n"
  
 +#: sm/certchain.c:295 dirmngr/validate.c:205
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8087,224 -6524,174 +8173,224 @@@
  msgid "critical marked policy without configured policies"
  msgstr ""
  
 +#: sm/certchain.c:343
  #, fuzzy, c-format
  msgid "failed to open '%s': %s\n"
- msgstr "�������� ��������� ��� `%s': %s\n"
+ msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
  
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
 +#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
  #, fuzzy
  msgid "certificate policy not allowed"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
- msgstr "�������� ������������� ��� TrustDB: %s\n"
+ msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
- msgstr "��������: �� ������ ���� ���������"
+ msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
- msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+ msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
- msgstr "���� �� ������ ���� �����!"
+ msgstr "Αυτό το κλειδί έχει λήξει!"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
- msgstr "���� �� ������ ���� �����!"
+ msgstr "Αυτό το κλειδί έχει λήξει!"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
- msgstr "���� �� ������ ���� �����!"
+ msgstr "Αυτό το κλειδί έχει λήξει!"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
- msgstr "���� �� ������ ���� �����!"
+ msgstr "Αυτό το κλειδί έχει λήξει!"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
- msgstr "        ���� ���������: %lu\n"
+ msgstr "        νέες υπογραφές: %lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
- msgstr "������������� ��������� �������������.\n"
+ msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
- msgstr "���������� ��� fingerprint"
+ msgstr "απεικόνιση του fingerprint"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
- msgstr "���������� ���� �������������� ���������"
+ msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr ""
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
- msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+ msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
- msgstr "���������� ���� ���������"
+ msgstr "επαλήθευση μιας υπογραφής"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
- msgstr "� ���������� %c%lu ������������\n"
+ msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
- msgstr "������������� ��������� �������������.\n"
+ msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8318,17 -6703,14 +8404,17 @@@ msgstr "
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
 +#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
  #, fuzzy
  msgid "none"
- msgstr "���|���"
+ msgstr "όχι|οχι"
  
 +#: sm/certdump.c:552 sm/certdump.c:617
  #, fuzzy
  msgid "[Error - invalid encoding]"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
 +#: sm/certdump.c:560
  msgid "[Error - out of core]"
  msgstr ""
  
@@@ -8336,12 -6717,10 +8422,12 @@@
  msgid "[Error - No name]"
  msgstr ""
  
 +#: sm/certdump.c:623
  #, fuzzy
  msgid "[Error - invalid DN]"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
 +#: sm/certdump.c:833
  #, fuzzy, c-format
  msgid ""
  "Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -8350,21 -6729,18 +8436,21 @@@
  "S/N %s, ID 0x%08lX,\n"
  "created %s, expires %s.\n"
  msgstr ""
- "���������� ��� ����� ������ ��� �� ������������ �� ������� ������ ��� �� "
- "������:\n"
+ "Χρειάζεστε μια φράση κλειδί για να ξεκλειδώσετε το μυστικό κλειδί για το "
+ "χρήστη:\n"
  "\"%.*s\"\n"
- "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
+ "%u-bit %s κλειδί, ID %08lX, δημιουργία %s%s\n"
  
 +#: sm/certlist.c:122 dirmngr/validate.c:1075
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
 +#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
- msgstr "�������� �������� �������� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
  
 +#: sm/certlist.c:142 dirmngr/validate.c:1095
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
@@@ -8388,12 -6759,10 +8474,12 @@@ msgstr "
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
 +#: sm/certreqgen.c:464
  #, fuzzy, c-format
  msgid "line %d: invalid algorithm\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: sm/certreqgen.c:478
  #, c-format
  msgid "line %d: invalid key length %u (valid are %d to %d)\n"
  msgstr ""
@@@ -8403,27 -6771,22 +8489,27 @@@
  msgid "line %d: no subject name given\n"
  msgstr ""
  
 +#: sm/certreqgen.c:505
  #, fuzzy, c-format
  msgid "line %d: invalid subject name label '%.*s'\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: sm/certreqgen.c:508
  #, fuzzy, c-format
  msgid "line %d: invalid subject name '%s' at pos %d\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: sm/certreqgen.c:525
  #, fuzzy, c-format
  msgid "line %d: not a valid email address\n"
- msgstr "�� ������ ��������� Email\n"
+ msgstr "Μη έγκυρη διεύθυνση Email\n"
  
 +#: sm/certreqgen.c:544
  #, fuzzy, c-format
  msgid "line %d: invalid serial number\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: sm/certreqgen.c:560
  #, c-format
  msgid "line %d: invalid issuer name label '%.*s'\n"
  msgstr ""
@@@ -8433,167 -6795,135 +8519,167 @@@
  msgid "line %d: invalid issuer name '%s' at pos %d\n"
  msgstr ""
  
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
  #, fuzzy, c-format
  msgid "line %d: invalid date given\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: sm/certreqgen.c:599
  #, fuzzy, c-format
  msgid "line %d: error getting signing key by keygrip '%s': %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
 +#: sm/certreqgen.c:618
  #, fuzzy, c-format
  msgid "line %d: invalid hash algorithm given\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: sm/certreqgen.c:633
  #, fuzzy, c-format
  msgid "line %d: invalid authority-key-id\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: sm/certreqgen.c:648
  #, fuzzy, c-format
  msgid "line %d: invalid subject-key-id\n"
- msgstr "������ %08lX: �� ������ �������� �����������\n"
+ msgstr "κλειδί %08lX: μη έγκυρη δέσμευση υποκλειδιού\n"
  
 +#: sm/certreqgen.c:686
  #, fuzzy, c-format
  msgid "line %d: invalid extension syntax\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: sm/certreqgen.c:699
  #, fuzzy, c-format
  msgid "line %d: error reading key '%s' from card: %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
 +#: sm/certreqgen.c:712
  #, fuzzy, c-format
  msgid "line %d: error getting key by keygrip '%s': %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
 +#: sm/certreqgen.c:729
  #, fuzzy, c-format
  msgid "line %d: key generation failed: %s <%s>\n"
- msgstr "� ���������� �������� �������: %s\n"
+ msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
  
 +#: sm/certreqgen.c:1324
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:162
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
- msgstr "   (%d) RSA (��� �������� ����)\n"
+ msgstr "   (%d) RSA (για υπογραφή μόνο)\n"
  
 +#: sm/certreqgen-ui.c:163
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
- msgstr "   (%d) RSA (��� ������������� ����)\n"
+ msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
 +#: sm/certreqgen-ui.c:164
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
- msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
+ msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
  
 +#: sm/certreqgen-ui.c:237
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: sm/certreqgen-ui.c:249
  #, fuzzy
  msgid "Available keys:\n"
- msgstr "������������� ��� ������"
+ msgstr "απενεργοποιεί ένα κλειδί"
  
 +#: sm/certreqgen-ui.c:280
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:281
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
- msgstr "   (%d) RSA (�������� ��� �������������)\n"
+ msgstr "   (%d) RSA (υπογραφή και κρυπτογράφηση)\n"
  
 +#: sm/certreqgen-ui.c:282
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
- msgstr "   (%d) DSA (��� �������� ����)\n"
+ msgstr "   (%d) DSA (για υπογραφή μόνο)\n"
  
 +#: sm/certreqgen-ui.c:283
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
- msgstr "   (%d) RSA (��� ������������� ����)\n"
+ msgstr "   (%d) RSA (για κρυπτογράφηση μόνο)\n"
  
 +#: sm/certreqgen-ui.c:307
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
 +#: sm/certreqgen-ui.c:311
  #, fuzzy
  msgid "No subject name given\n"
- msgstr "(��� ������ ���������)\n"
+ msgstr "(Δεν δώθηκε περιγραφή)\n"
  
 +#: sm/certreqgen-ui.c:315
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
  #. TRANSLATORS: The 22 in the second string is the
  #. length of the first string up to the "%s".  Please
  #. adjust it do the length of your translation.  The
  #. second string is merely passed to atoi so you can
  #. drop everything after the number.
 +#: sm/certreqgen-ui.c:324
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: sm/certreqgen-ui.c:326
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:338
  #, fuzzy
  msgid "Enter email addresses"
- msgstr "��������� Email: "
+ msgstr "Διεύθυνση Email: "
  
 +#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
- "�������������� �� user ID. ����� �� ��� ����� ������: "
+ "Πληκτρολογήστε το user ID. Τέλος με μια άδεια γραμμή: "
  
 +#: sm/certreqgen-ui.c:343
  #, fuzzy
  msgid "Enter DNS names"
- msgstr "�������������� ��� ��� ����� �������"
+ msgstr "Πληκτρολογήστε ένα νέο όνομα αρχείου"
  
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
- msgstr "�������������� ��� ����������� ��������޷ ����� �� ��� ����� ������:\n"
+ msgstr "Πληκτρολογήστε μια προαιρετική περιγραφή· τέλος με μια άδεια γραμμή:\n"
  
 +#: sm/certreqgen-ui.c:348
  msgid "Enter URIs"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:355
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
- msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
+ msgstr "Δημιουργία ενός πιστοποιητικού ανάκλησης για αυτό το κλειδί; "
  
 +#: sm/certreqgen-ui.c:382
  msgid "These parameters are used:\n"
  msgstr ""
  
@@@ -8605,9 -6933,8 +8691,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
- msgstr "������������� ��������� �������������.\n"
+ msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
 +#: sm/certreqgen-ui.c:403
  msgid "This may take a while ...\n"
  msgstr ""
  
@@@ -8631,278 -6953,220 +8717,278 @@@ msgstr "
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
 +#: sm/delete.c:51 sm/delete.c:112
  #, fuzzy, c-format
  msgid "certificate '%s' not found: %s\n"
- msgstr "�� ������ '%s' �� �������: %s\n"
+ msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
- msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
  
 +#: sm/delete.c:143
  #, fuzzy, c-format
  msgid "duplicated certificate '%s' deleted\n"
- msgstr "������������� ��������� �������������.\n"
+ msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
 +#: sm/delete.c:145
  #, fuzzy, c-format
  msgid "certificate '%s' deleted\n"
- msgstr "� ���������� %c%lu ������������\n"
+ msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
 +#: sm/delete.c:175
  #, fuzzy, c-format
  msgid "deleting certificate \"%s\" failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: sm/encrypt.c:328
  #, fuzzy
  msgid "no valid recipients given\n"
- msgstr "(��� ������ ���������)\n"
+ msgstr "(Δεν δώθηκε περιγραφή)\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
- msgstr "���������� ��� ������ �������� ��������"
+ msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
- msgstr "���������� ascii ������������ ������"
+ msgstr "δημιουργία ascii θωρακισμένης εξόδου"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
- msgstr "�� ����� ����������"
+ msgstr "μη χρήση τερματικού"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
- msgstr "|������|������� ��� ���������� ��������� ������"
+ msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
- msgstr "��������� batch: �� �� �������� ���������"
+ msgstr "κατάσταση batch: να μη γίνονται ερωτήσεις"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
- msgstr "�������� ��� ���� ������������ ���������"
+ msgstr "απάντηση ναι στις περισσότερες ερωτήσεις"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
- msgstr "�������� ��� ���� ������������ ���������"
+ msgstr "απάντηση όχι στις περισσότερες ερωτήσεις"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
- msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
+ msgstr "προσθήκη αυτού του κλειδιού στη λίστα των κλειδοθηκών"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
- msgstr "|�����|����� �������� ��� �������������� ������� ������"
+ msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
- msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
+ msgstr "|ΔΙΑΚΟΜΙΣΤΗΣ|χρήση αυτού του διακομιστή κλειδιών για αναζήτηση"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
- msgstr "|�����|����� ���������� �������������� �����"
+ msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου κρυπτογράφησης ΟΝΟΜΑ"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
- msgstr "|�����|����� ���������� ��������� ��������� ����� "
+ msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου περίληψης μηνύματος ΟΝΟΜΑ "
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "�������: gpg [��������] [������]\n"
- "��������, �������, ������������� � ����������������\n"
- "� �������������� ���������� ��������� ��� �� �������� �������\n"
+ "Σύνταξη: gpg [επιλογές] [αρχεία]\n"
+ "υπογραφή, έλεγχος, κρυπτογράφηση ή αποκρυπτογράφηση\n"
+ "η προκαθορισμένη λειτουργία εξαρτάται από τα δεδομένα εισόδου\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
- msgstr "�������� �������� ��� `%s': %s\n"
+ msgstr "αδυναμία σύνδεσης στο `%s': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
- msgstr "�������� ��������������� ���������� `%s'\n"
+ msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
- msgstr "(��� ������ ���������)\n"
+ msgstr "(Δεν δώθηκε περιγραφή)\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
- msgstr " s = ��������� ����� ��� ��������\n"
+ msgstr " s = παράλειψη αυτού του κλειδιού\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, fuzzy
  msgid "could not parse keyserver\n"
- msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
+ msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
- msgstr "������� ���  `%s'\n"
+ msgstr "εγγραφή στο  `%s'\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
- msgstr "�������� ����������� ��� `%s': %s\n"
+ msgstr "αδυναμία κλεισίματος του `%s': %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
 +#: sm/import.c:127
  #, fuzzy, c-format
  msgid "total number processed: %lu\n"
- msgstr "��������� ������� ��� ��������������: %lu\n"
+ msgstr "Συνολικός αριθμός που επεξεργάστηκαν: %lu\n"
  
 +#: sm/import.c:246
  #, fuzzy
  msgid "error storing certificate\n"
- msgstr "���������� ���� �������������� ���������"
+ msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
  
 +#: sm/import.c:254
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: sm/import.c:526 sm/import.c:558
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: sm/import.c:746 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
- msgstr "�������� ������������� ��� TrustDB: %s\n"
+ msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, fuzzy, c-format
  msgid "problem re-searching certificate: %s\n"
- msgstr "rev? �������� ���� ������ ���������: %s\n"
+ msgstr "rev? πρόβλημα στον έλεγχο ανάκλησης: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: sm/keylist.c:657
  msgid "Error - "
  msgstr ""
  
@@@ -8910,17 -7173,14 +8996,17 @@@
  msgid "GPG_TTY has not been set - using maybe bogus default\n"
  msgstr ""
  
 +#: sm/qualified.c:105
  #, fuzzy, c-format
  msgid "invalid formatted fingerprint in '%s', line %d\n"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
 +#: sm/qualified.c:123
  #, fuzzy, c-format
  msgid "invalid country code in '%s', line %d\n"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
 +#: sm/qualified.c:206
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
@@@ -8945,63 -7203,51 +9031,63 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
 +#: sm/sign.c:451
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
- msgstr "��� ������������� � ���������� ���������� %d%s\n"
+ msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
  
 +#: sm/sign.c:465
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
 +#: sm/sign.c:517
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
- msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+ msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
 +#: sm/verify.c:450
  #, fuzzy
  msgid "Signature made "
- msgstr "�������� ����� ���� %s.\n"
+ msgstr "Υπογραφή έληξε στις %s.\n"
  
 +#: sm/verify.c:454
  msgid "[date not given]"
  msgstr ""
  
 +#: sm/verify.c:455
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: sm/verify.c:474
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
 +#: sm/verify.c:595
  #, fuzzy
  msgid "Good signature from"
- msgstr "���� �������� ��� \""
+ msgstr "Καλή υπογραφή από \""
  
 +#: sm/verify.c:596
  #, fuzzy
  msgid "                aka"
- msgstr "                ������ ��� \""
+ msgstr "                γνωστό σαν \""
  
 +#: sm/verify.c:614
  #, fuzzy
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
- "���� �� ����� ��� ����-��������.\n"
+ "Αυτή θα είναι μια ιδιο-υπογραφή.\n"
  
 +#: dirmngr/certcache.c:106
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
- msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+ msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
 +#: dirmngr/certcache.c:117
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
@@@ -9025,29 -7267,24 +9111,29 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
- msgstr "�������� ����������� ��� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
 +#: dirmngr/certcache.c:395
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
- msgstr "� ���������� %c%lu ������������\n"
+ msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
 +#: dirmngr/certcache.c:399
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
- msgstr "������������� ��������� �������������.\n"
+ msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
 +#: dirmngr/certcache.c:401
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
- msgstr "� ���������� %c%lu ������������\n"
+ msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
 +#: dirmngr/certcache.c:405
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
- msgstr "���������� ��� fingerprint"
+ msgstr "απεικόνιση του fingerprint"
  
 +#: dirmngr/certcache.c:408
  msgid "   issuer ="
  msgstr ""
  
@@@ -9055,132 -7291,106 +9141,132 @@@
  msgid "  subject ="
  msgstr ""
  
 +#: dirmngr/certcache.c:413
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/certcache.c:489
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: dirmngr/certcache.c:491
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
- msgstr "������������� ��������� �������������.\n"
+ msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
 +#: dirmngr/certcache.c:508
  #, fuzzy
  msgid "certificate cached\n"
- msgstr "� ���������� %c%lu ������������\n"
+ msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
 +#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/certcache.c:593
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
  #, fuzzy
  msgid "no issuer found in certificate\n"
- msgstr "���������� ���� �������������� ���������"
+ msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
  
 +#: dirmngr/certcache.c:1325
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/crlcache.c:213
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "creating directory '%s'\n"
- msgstr "�������� ����������� ��������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
  
 +#: dirmngr/crlcache.c:217
  #, fuzzy, c-format
  msgid "error creating directory '%s': %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
 +#: dirmngr/crlcache.c:245
  #, fuzzy, c-format
  msgid "ignoring database dir '%s'\n"
- msgstr "������ ��� ������ trailer\n"
+ msgstr "σφάλμα στη γραμμή trailer\n"
  
 +#: dirmngr/crlcache.c:254
  #, fuzzy, c-format
  msgid "error reading directory '%s': %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/crlcache.c:275
  #, fuzzy, c-format
  msgid "removing cache file '%s'\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: dirmngr/crlcache.c:284
  #, fuzzy, c-format
  #| msgid "enarmoring failed: %s\n"
  msgid "not removing file '%s'\n"
- msgstr "�������� �������: %s\n"
+ msgstr "θωράκιση απέτυχε: %s\n"
  
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
  #, fuzzy, c-format
  msgid "failed to open cache dir file '%s': %s\n"
- msgstr "�������� ��������� ��� `%s': %s\n"
+ msgstr "αδυναμία πρόσβασης στο `%s': %s\n"
  
 +#: dirmngr/crlcache.c:421
  #, fuzzy, c-format
  msgid "error creating new cache dir file '%s': %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/crlcache.c:428
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing new cache dir file '%s': %s\n"
- msgstr "�������� �������� �������� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
  
 +#: dirmngr/crlcache.c:435
  #, fuzzy, c-format
  msgid "error closing new cache dir file '%s': %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/crlcache.c:440
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new cache dir file '%s' created\n"
- msgstr "������������� ��� ������ �������� `%s'\n"
+ msgstr "δημιουργήθηκε νέο αρχείο επιλογών `%s'\n"
  
 +#: dirmngr/crlcache.c:445
  #, fuzzy, c-format
  msgid "failed to re-open cache dir file '%s': %s\n"
- msgstr "�������� ����������� ��������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
  
 +#: dirmngr/crlcache.c:473
  #, c-format
  msgid "first record of '%s' is not the version\n"
  msgstr ""
@@@ -9198,45 -7405,37 +9284,45 @@@ msgstr "
  msgid "extra field detected in crl record of '%s' line %u\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:623
  #, fuzzy, c-format
  msgid "invalid line detected in '%s' line %u\n"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
 +#: dirmngr/crlcache.c:632
  #, fuzzy, c-format
  msgid "duplicate entry detected in '%s' line %u\n"
- msgstr "������������� ��������� �������������.\n"
+ msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
 +#: dirmngr/crlcache.c:647
  #, c-format
  msgid "unsupported record type in '%s' line %u skipped\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:673
  #, fuzzy, c-format
  msgid "invalid issuer hash in '%s' line %u\n"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
 +#: dirmngr/crlcache.c:679
  #, fuzzy, c-format
  msgid "no issuer DN in '%s' line %u\n"
- msgstr "������ ���������: %s\n"
+ msgstr "σφάλμα ανάγνωσης: %s\n"
  
 +#: dirmngr/crlcache.c:686
  #, fuzzy, c-format
  msgid "invalid timestamp in '%s' line %u\n"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
 +#: dirmngr/crlcache.c:692
  #, fuzzy, c-format
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid "WARNING: invalid cache file hash in '%s' line %u\n"
  msgstr ""
- "�������������: �� ������ ������� ������� random_seed - ���\n"
- "��������������\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη έγκυρο μέγεθος αρχείου random_seed - δεν\n"
+ "χρησιμοποιείτε\n"
  
 +#: dirmngr/crlcache.c:698
  msgid "detected errors in cache dir file\n"
  msgstr ""
  
@@@ -9244,57 -7442,46 +9330,57 @@@
  msgid "please check the reason and manually delete that file\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
  #, fuzzy, c-format
  msgid "failed to create temporary cache dir file '%s': %s\n"
- msgstr "�������� ����������� ��������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
  
 +#: dirmngr/crlcache.c:937
  #, fuzzy, c-format
  msgid "error closing '%s': %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/crlcache.c:949
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error renaming '%s' to '%s': %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1003
  #, fuzzy, c-format
  msgid "can't hash '%s': %s\n"
- msgstr "�������� ����������� ��� `%s': %s\n"
+ msgstr "αδυναμία κλεισίματος του `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1011
  #, fuzzy, c-format
  msgid "error setting up MD5 hash context: %s\n"
- msgstr "������ ��� �������� ���� �� `%s': %s\n"
+ msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1027
  #, fuzzy, c-format
  msgid "error hashing '%s': %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1055
  #, fuzzy, c-format
  msgid "invalid formatted checksum for '%s'\n"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
 +#: dirmngr/crlcache.c:1108
  msgid "too many open cache files; can't open anymore\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1126
  #, fuzzy, c-format
  msgid "opening cache file '%s'\n"
- msgstr "� �������� �������: %s\n"
+ msgstr "η υπογραφή απέτυχε: %s\n"
  
 +#: dirmngr/crlcache.c:1145
  #, fuzzy, c-format
  msgid "error opening cache file '%s': %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1154
  #, c-format
  msgid "error initializing cache file '%s' for reading: %s\n"
  msgstr ""
@@@ -9307,18 -7492,15 +9393,18 @@@ msgstr "
  msgid "calling unlock_db_file on an unlocked file\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1231
  #, fuzzy, c-format
  msgid "failed to create a new cache object: %s\n"
- msgstr "%s: �������� ����������� hashtable: %s\n"
+ msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
  
 +#: dirmngr/crlcache.c:1286
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "no CRL available for issuer id %s\n"
- msgstr "��� ������� ��������� ������� ��� `%s'"
+ msgstr "Δεν υπάρχει διαθέσιμη βοήθεια για `%s'"
  
 +#: dirmngr/crlcache.c:1293
  #, c-format
  msgid "cached CRL for issuer id %s too old; update required\n"
  msgstr ""
@@@ -9349,12 -7526,10 +9435,12 @@@ msgstr "
  msgid "WARNING: invalid cache record length for S/N "
  msgstr ""
  
 +#: dirmngr/crlcache.c:1357
  #, fuzzy, c-format
  msgid "problem reading cache record for S/N %s: %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1360
  #, c-format
  msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
  msgstr ""
@@@ -9364,18 -7538,15 +9450,18 @@@
  msgid "S/N %s is valid, it is not listed in the CRL\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1379
  #, fuzzy, c-format
  msgid "error getting data from cache file: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
- msgstr "�� ������� ����������  hash `%s'\n"
+ msgstr "μη έγκυρος αλγόριθμος  hash `%s'\n"
  
 +#: dirmngr/crlcache.c:1549
  #, c-format
  msgid "gcry_md_open for algorithm %d failed: %s\n"
  msgstr ""
@@@ -9384,30 -7554,25 +9470,30 @@@
  #, fuzzy
  #| msgid "invalid response from agent\n"
  msgid "got an invalid S-expression from libksba\n"
- msgstr "�� ������ �������� ��� ��� agent\n"
+ msgstr "μη έγκυρη απάντηση από τον agent\n"
  
 +#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
- msgstr "�������� ��������� ��� �������: %s\n"
+ msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
  
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: dirmngr/crlcache.c:1699
  #, fuzzy, c-format
  #| msgid "build_packet failed: %s\n"
  msgid "ksba_crl_parse failed: %s\n"
- msgstr "build_packet �������: %s\n"
+ msgstr "build_packet απέτυχε: %s\n"
  
 +#: dirmngr/crlcache.c:1714
  #, fuzzy, c-format
  msgid "error getting update times of CRL: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/crlcache.c:1721
  #, c-format
  msgid "update times of this CRL: this=%s next=%s\n"
  msgstr ""
@@@ -9416,22 -7580,18 +9502,22 @@@
  msgid "nextUpdate not given; assuming a validity period of one day\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1745
  #, fuzzy, c-format
  msgid "error getting CRL item: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/crlcache.c:1760
  #, fuzzy, c-format
  msgid "error inserting item into temporary cache file: %s\n"
- msgstr "������� ���  `%s'\n"
+ msgstr "εγγραφή στο  `%s'\n"
  
 +#: dirmngr/crlcache.c:1787
  #, fuzzy, c-format
  msgid "no CRL issuer found in CRL: %s\n"
- msgstr "���������� ���� �������������� ���������"
+ msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
  
 +#: dirmngr/crlcache.c:1802
  msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
  msgstr ""
  
@@@ -9439,55 -7598,45 +9525,55 @@@
  #, fuzzy, c-format
  #| msgid "signature verification suppressed\n"
  msgid "CRL signature verification failed: %s\n"
- msgstr "��������� ��������� ���������\n"
+ msgstr "καταστολή ανάκλησης υπογραφής\n"
  
 +#: dirmngr/crlcache.c:1858
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
- msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+ msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
 +#: dirmngr/crlcache.c:2001
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: dirmngr/crlcache.c:2008
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
- msgstr "� ��������� �������: %s\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
  
 +#: dirmngr/crlcache.c:2042
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
- msgstr "�������� ����������� ��������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
  
 +#: dirmngr/crlcache.c:2046
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
- msgstr "�������� ����������� ��������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
  
 +#: dirmngr/crlcache.c:2056
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/crlcache.c:2066
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
- msgstr "� ��������� �������� �������: %s\n"
+ msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
  
 +#: dirmngr/crlcache.c:2076
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
- msgstr "������� ���  `%s'\n"
+ msgstr "εγγραφή στο  `%s'\n"
  
 +#: dirmngr/crlcache.c:2083
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/crlcache.c:2108
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
@@@ -9502,22 -7649,18 +9588,22 @@@ msgstr "
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:2138
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/crlcache.c:2189
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/crlcache.c:2221
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
- msgstr "�������� �������: %s\n"
+ msgstr "θωράκιση απέτυχε: %s\n"
  
 +#: dirmngr/crlcache.c:2235
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9552,44 -7689,36 +9638,44 @@@ msgstr "
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr ""
- "�������������: �� ������ ������� ������� random_seed - ���\n"
- "��������������\n"
+ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη έγκυρο μέγεθος αρχείου random_seed - δεν\n"
+ "χρησιμοποιείτε\n"
  
 +#: dirmngr/crlcache.c:2333
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
- msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
+ msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
  
 +#: dirmngr/crlcache.c:2344
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
- msgstr "rev? �������� ���� ������ ���������: %s\n"
+ msgstr "rev? πρόβλημα στον έλεγχο ανάκλησης: %s\n"
  
 +#: dirmngr/crlcache.c:2375
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/crlcache.c:2378
  msgid "End CRL dump\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:2499
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
- msgstr "� ��������� �������: %s\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
  
 +#: dirmngr/crlcache.c:2510
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
- msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+ msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
 +#: dirmngr/crlcache.c:2570
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: dirmngr/crlfetch.c:74
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
@@@ -9608,40 -7732,32 +9694,40 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
- msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
+ msgstr "%s: σφάλμα στην εγγραφή της εγγραφής dir : %s\n"
  
 +#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
  #, fuzzy
  msgid "too many redirections\n"
- msgstr "���� ������ `%c' �����������\n"
+ msgstr "πάρα πολλές `%c' προεπιλογές\n"
  
 +#: dirmngr/crlfetch.c:274
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
- msgstr "������ ���� �� ���������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά τη δημιουργία του `%s': %s\n"
  
 +#: dirmngr/crlfetch.c:279
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
- msgstr "�� ������ '%s' �� �������: %s\n"
+ msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
 +#: dirmngr/crlfetch.c:386
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
- msgstr "�� ������ '%s' �� �������: %s\n"
+ msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
 +#: dirmngr/dirmngr-client.c:71
  msgid "use OCSP instead of CRLs"
  msgstr ""
  
@@@ -9649,27 -7764,22 +9735,27 @@@
  msgid "check whether a dirmngr is running"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:73
  #, fuzzy
  msgid "add a certificate to the cache"
- msgstr "������������� ��������� �������������.\n"
+ msgstr "Πιστοποιητικό ανάκλησης δημιουργήθηκε.\n"
  
 +#: dirmngr/dirmngr-client.c:74
  #, fuzzy
  msgid "validate a certificate"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: dirmngr/dirmngr-client.c:75
  #, fuzzy
  msgid "lookup a certificate"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: dirmngr/dirmngr-client.c:76
  #, fuzzy
  msgid "lookup only locally stored certificates"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: dirmngr/dirmngr-client.c:77
  msgid "expect an URL for --lookup"
  msgstr ""
  
@@@ -9681,24 -7789,20 +9767,24 @@@ msgstr "
  msgid "special mode for use by Squid"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:80
  #, fuzzy
  msgid "expect certificates in PEM format"
- msgstr "���� �������������"
+ msgstr "κακό πιστοποιητικό"
  
 +#: dirmngr/dirmngr-client.c:82
  #, fuzzy
  #| msgid "Enter the user ID of the designated revoker: "
  msgid "force the use of the default OCSP responder"
- msgstr "�������������� �� user ID ��� ����������� ��������: "
+ msgstr "Πληκτρολογήστε το user ID του διορισμένου ανακλητή: "
  
 +#: dirmngr/dirmngr-client.c:169
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
 +#: dirmngr/dirmngr-client.c:173
  msgid ""
  "Syntax: dirmngr-client [options] [certfile|pattern]\n"
  "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9706,17 -7810,14 +9792,17 @@@
  "not valid and other error codes for general failures\n"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
  #, fuzzy, c-format
  msgid "error reading certificate from stdin: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/dirmngr-client.c:281
  #, fuzzy, c-format
  msgid "error reading certificate from '%s': %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:295
  msgid "certificate too large to make any sense\n"
  msgstr ""
  
@@@ -9724,63 -7824,52 +9810,63 @@@
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to the dirmngr: %s\n"
- msgstr "�������� �������� ��� `%s': %s\n"
+ msgstr "αδυναμία σύνδεσης στο `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:332
  #, fuzzy, c-format
  #| msgid "update failed: %s\n"
  msgid "lookup failed: %s\n"
- msgstr "� ��������� �������: %s\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
  
 +#: dirmngr/dirmngr-client.c:347
  #, fuzzy, c-format
  msgid "loading CRL '%s' failed: %s\n"
- msgstr "�������� �������: %s\n"
+ msgstr "θωράκιση απέτυχε: %s\n"
  
 +#: dirmngr/dirmngr-client.c:375
  msgid "a dirmngr daemon is up and running\n"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:397
  #, fuzzy, c-format
  msgid "validation of certificate failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
  #, fuzzy
  msgid "certificate is valid\n"
- msgstr "� ���������� %c%lu ������������\n"
+ msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
  #, fuzzy
  msgid "certificate has been revoked\n"
- msgstr "��������: �� ������ ���� ���������"
+ msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
  
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
  #, fuzzy, c-format
  msgid "certificate check failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: dirmngr/dirmngr-client.c:428
  #, fuzzy, c-format
  #| msgid "can't stat `%s': %s\n"
  msgid "got status: '%s'\n"
- msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
+ msgstr "αδυναμία λήψης πληροφοριών για το `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:443
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing base64 encoding: %s\n"
- msgstr "�������� �������� �������� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:701
  #, fuzzy, c-format
  msgid "unsupported inquiry '%s'\n"
  msgstr ""
  "\n"
- "��������������� ����������:\n"
+ "Υποστηριζόμενοι αλγόριθμοι:\n"
  
 +#: dirmngr/dirmngr-client.c:803
  msgid "absolute file name expected\n"
  msgstr ""
  
@@@ -9789,112 -7877,88 +9875,116 @@@
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
- msgstr "|������|������� ��� ���������� ��������� ������"
+ msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  msgid "run without asking a user"
- msgstr "����������� ����� ����������; "
+ msgstr "Τερματισμός χωρίς αποθήκευση; "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
- msgstr "|������|������� ��� ���������� ��������� ������"
+ msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
- msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
+ msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9905,93 -7969,74 +9995,93 @@@ msgid "
  "options)\n"
  msgstr ""
  "@\n"
- "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
+ "(δείτε τη σελίδα man για μια πλήρη λίστα εντολών και επιλογών)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
- msgstr "�����: gpg [��������] "
+ msgstr "χρήση: gpg [επιλογές] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
- msgstr "�� %s ��� ����������� �� �� %s!\n"
+ msgstr "το %s δεν επιτρέπεται με το %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
- msgstr "�������� �������: %s\n"
+ msgstr "θωράκιση απέτυχε: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
- msgstr "�������� �������: %s\n"
+ msgstr "θωράκιση απέτυχε: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
- msgstr "� ������ ����� ���� ������\n"
+ msgstr "η γραμμή είναι πολύ μεγάλη\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
- msgstr "������: �� ������ ���������\n"
+ msgstr "σφάλμα: μη έγκυρο αποτύπωμα\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
- msgstr "������ ���������: %s\n"
+ msgstr "σφάλμα ανάγνωσης: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  msgid "shutdown forced\n"
- msgstr "�� �������������"
+ msgstr "μη επεξεργασμένο"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10008,9 -8050,8 +10098,9 @@@ msgstr "
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|connect to host NAME"
- msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
+ msgstr "|ΟΝΟΜΑ|καθορισμός του σετ χαρακτήρων τερματικού σε ΟΝΟΜΑ"
  
 +#: dirmngr/dirmngr_ldap.c:143
  msgid "|N|connect to port N"
  msgstr ""
  
@@@ -10018,9 -8058,8 +10108,9 @@@
  #, fuzzy
  #| msgid "|NAME|use NAME as default recipient"
  msgid "|NAME|use user NAME for authentication"
- msgstr "|�����|����� ��� �������� �� ��������������� ���������"
+ msgstr "|ΟΝΟΜΑ|χρήση του ΟΝΟΜΑτος ως προκαθορισμένου παραλήπτη"
  
 +#: dirmngr/dirmngr_ldap.c:145
  msgid "|PASS|use password PASS for authentication"
  msgstr ""
  
@@@ -10044,9 -8078,8 +10134,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
 +#: dirmngr/dirmngr_ldap.c:212
  msgid ""
  "Syntax: dirmngr_ldap [options] [URL]\n"
  "Internal LDAP helper for Dirmngr\n"
@@@ -10057,31 -8089,24 +10147,31 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "invalid import options\n"
  msgid "invalid port number %d\n"
- msgstr "�� ������� �������� ���������\n"
+ msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
  
 +#: dirmngr/dirmngr_ldap.c:413
  #, c-format
  msgid "scanning result for attribute '%s'\n"
  msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
 +#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
 +#: dirmngr/dirmngr_ldap.c:677
  #, fuzzy, c-format
  msgid "error writing to stdout: %s\n"
- msgstr "�������� �������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:437
  #, c-format
  msgid "          available attribute '%s'\n"
  msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:475
  #, fuzzy, c-format
  msgid "attribute '%s' not found\n"
- msgstr "�� ������ '%s' �� �������: %s\n"
+ msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:482
  #, c-format
  msgid "found attribute '%s'\n"
  msgstr ""
@@@ -10090,51 -8114,42 +10180,51 @@@
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "processing url '%s'\n"
- msgstr "�������� ��� `%s'\n"
+ msgstr "ανάγνωση από `%s'\n"
  
 +#: dirmngr/dirmngr_ldap.c:593
  #, fuzzy, c-format
  #| msgid "          w/o user IDs: %lu\n"
  msgid "          user '%s'\n"
- msgstr "          ����� user ID: %lu\n"
+ msgstr "          χωρίς user ID: %lu\n"
  
 +#: dirmngr/dirmngr_ldap.c:595
  #, fuzzy, c-format
  msgid "          pass '%s'\n"
- msgstr "                ������ ��� \""
+ msgstr "                γνωστό σαν \""
  
 +#: dirmngr/dirmngr_ldap.c:597
  #, fuzzy, c-format
  msgid "          host '%s'\n"
- msgstr "                ������ ��� \""
+ msgstr "                γνωστό σαν \""
  
 +#: dirmngr/dirmngr_ldap.c:598
  #, fuzzy, c-format
  #| msgid "          not imported: %lu\n"
  msgid "          port %d\n"
- msgstr "          ��  ����������: %lu\n"
+ msgstr "          μη  εισαχθέντα: %lu\n"
  
 +#: dirmngr/dirmngr_ldap.c:600
  #, fuzzy, c-format
  msgid "            DN '%s'\n"
- msgstr "                ������ ��� \""
+ msgstr "                γνωστό σαν \""
  
 +#: dirmngr/dirmngr_ldap.c:602
  #, c-format
  msgid "        filter '%s'\n"
  msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
  #, fuzzy, c-format
  msgid "          attr '%s'\n"
- msgstr "                ������ ��� \""
+ msgstr "                γνωστό σαν \""
  
 +#: dirmngr/dirmngr_ldap.c:616
  #, fuzzy, c-format
  msgid "no host name in '%s'\n"
- msgstr "(��� ������ ���������)\n"
+ msgstr "(Δεν δώθηκε περιγραφή)\n"
  
 +#: dirmngr/dirmngr_ldap.c:621
  #, c-format
  msgid "no attribute given for query '%s'\n"
  msgstr ""
@@@ -10143,56 -8157,41 +10233,50 @@@
  #, fuzzy
  #| msgid "WARNING: using insecure memory!\n"
  msgid "WARNING: using first attribute only\n"
- msgstr "�������������: ����� �� �������� ������!\n"
+ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: χρήση μη ασφαλούς μνήμης!\n"
  
 +#: dirmngr/dirmngr_ldap.c:636
  #, fuzzy, c-format
  msgid "LDAP init to '%s:%d' failed: %s\n"
- msgstr "�������� �������: %s\n"
+ msgstr "θωράκιση απέτυχε: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:659
  #, fuzzy, c-format
  msgid "binding to '%s:%d' failed: %s\n"
- msgstr "�������� �������: %s\n"
+ msgstr "θωράκιση απέτυχε: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:686
  #, fuzzy, c-format
  #| msgid "dearmoring failed: %s\n"
  msgid "searching '%s' failed: %s\n"
- msgstr "����������� �������: %s\n"
+ msgstr "αποθωράκιση απέτυχε: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:718
  #, fuzzy, c-format
  msgid "'%s' is not an LDAP URL\n"
- msgstr "\"%s\" ��� ����� JPEG ������\n"
+ msgstr "\"%s\" δεν είναι JPEG αρχείο\n"
  
 +#: dirmngr/dirmngr_ldap.c:724
  #, c-format
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "�������� ����������� ��� ����������� `%s': %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
- msgstr "�������� �������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
  
 +#: dirmngr/ldap-wrapper.c:236
  #, fuzzy, c-format
  msgid "error reading log from ldap wrapper %d: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/ldap-wrapper.c:304
  #, fuzzy, c-format
  msgid "npth_select failed: %s - waiting 1s\n"
- msgstr "� ��������� �������� �������: %s\n"
+ msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:343
  #, c-format
  msgid "ldap wrapper %d ready"
  msgstr ""
@@@ -10207,12 -8204,10 +10291,12 @@@ msgstr "
  msgid "ldap wrapper %d ready: exitcode=%d\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:364
  #, fuzzy, c-format
  msgid "waiting for ldap wrapper %d failed: %s\n"
- msgstr "� ��������� �������: %s\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:376
  #, c-format
  msgid "ldap wrapper %d stalled - killing\n"
  msgstr ""
@@@ -10222,27 -8216,22 +10306,27 @@@
  msgid "error spawning ldap wrapper reaper thread: %s\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
  #, fuzzy, c-format
  msgid "reading from ldap wrapper %d failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: dirmngr/ldap.c:91
  #, c-format
  msgid "invalid char 0x%02x in host name - not added\n"
  msgstr ""
  
 +#: dirmngr/ldap.c:95
  #, fuzzy, c-format
  msgid "adding '%s:%d' to the ldap server list\n"
- msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
+ msgstr "αναζήτηση του \"%s\" από το HKP διακομιστή %s\n"
  
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: dirmngr/ldap.c:627
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
@@@ -10255,83 -8242,67 +10339,83 @@@ msgstr "
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
- msgstr "%s: �� ������ ������ ������� %d\n"
+ msgstr "%s: μη έγκυρη έκδοση αρχείου %d\n"
  
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
- msgstr "�������� ��������� ��� �������: %s\n"
+ msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
  
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
- msgstr "� ��������� �������� �������: %s\n"
+ msgstr "η ενημέρωση μυστικού απέτυχε: %s\n"
  
 +#: dirmngr/misc.c:518
  msgid "bad URL encoding detected\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:80
  #, fuzzy, c-format
  msgid "error reading from responder: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/ocsp.c:98
  #, c-format
  msgid "response from server too large; limit is %d bytes\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:139
  #, fuzzy
  msgid "OCSP request not possible due to Tor mode\n"
- msgstr "�� ������ '%s' �� �������: %s\n"
+ msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
 +#: dirmngr/ocsp.c:145
  msgid "OCSP request not possible due to disabled HTTP\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:152
  #, fuzzy, c-format
  msgid "error setting OCSP target: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/ocsp.c:170
  #, fuzzy, c-format
  msgid "error building OCSP request: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/ocsp.c:181
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
- msgstr "�������� �������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
  
 +#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/ocsp.c:240
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: dirmngr/ocsp.c:265
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
- msgstr "������ ��� �������� ���� �� `%s': %s\n"
+ msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
 +#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:293
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
- msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+ msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
 +#: dirmngr/ocsp.c:328
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
@@@ -10339,46 -8309,37 +10423,46 @@@
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:464
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: dirmngr/ocsp.c:479
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/ocsp.c:514
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
- msgstr "�� ������ '%s' �� �������: %s\n"
+ msgstr "το κλειδί '%s' δε βρέθηκε: %s\n"
  
 +#: dirmngr/ocsp.c:563
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:570
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
- msgstr "���������� ���� �������������� ���������"
+ msgstr "δημιουργία ενός πιστοποιητικού ανάκλησης"
  
 +#: dirmngr/ocsp.c:580
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
- msgstr "�������� ������������� ��� TrustDB: %s\n"
+ msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
 +#: dirmngr/ocsp.c:614
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
- msgstr "%s: �������� ���������: %s\n"
+ msgstr "%s: αδυναμία πρόσβασης: %s\n"
  
 +#: dirmngr/ocsp.c:621
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
@@@ -10386,9 -8346,8 +10470,9 @@@
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
- msgstr "��� ������� �������������� ����������: %s\n"
+ msgstr "δεν υπάρχει προκαθορισμένη κλειδοθήκη: %s\n"
  
 +#: dirmngr/ocsp.c:634
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
@@@ -10397,19 -8355,16 +10481,19 @@@
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
- msgstr "����� ��� ���������������: %s\n"
+ msgstr "χρήση του κρυπταλγόριθμου: %s\n"
  
 +#: dirmngr/ocsp.c:646
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:676
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: dirmngr/ocsp.c:701
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
@@@ -10418,12 -8372,10 +10502,12 @@@
  msgid "good"
  msgstr ""
  
 +#: dirmngr/ocsp.c:708
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
- msgstr "��������: �� ������ ���� ���������"
+ msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
  
 +#: dirmngr/ocsp.c:743
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
@@@ -10435,83 -8385,66 +10519,83 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
- msgstr "� �������� �������: %s\n"
+ msgstr "η υπογραφή απέτυχε: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
- msgstr "� �������� �������: %s\n"
+ msgstr "η υπογραφή απέτυχε: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
- msgstr "������ ��� �������� ���� �� `%s': %s\n"
+ msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
- msgstr "�������� ����������� ��� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: �������� ����������� hashtable: %s\n"
+ msgstr "%s: αδυναμία δημιουργίας hashtable: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
- msgstr "�������� ������������� ��� TrustDB: %s\n"
+ msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
- msgstr "�������� ������������ ��� cache �����������: %s\n"
+ msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
- msgstr "� �������� �������: %s\n"
+ msgstr "η υπογραφή απέτυχε: %s\n"
  
 +#: dirmngr/validate.c:201
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
@@@ -10519,46 -8451,37 +10603,46 @@@
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
- msgstr "������� ��� trustdb\n"
+ msgstr "έλεγχος της trustdb\n"
  
 +#: dirmngr/validate.c:245
  msgid "not checking CRL for"
  msgstr ""
  
 +#: dirmngr/validate.c:250
  #, fuzzy
  msgid "checking CRL for"
- msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+ msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
 +#: dirmngr/validate.c:528
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
- msgstr "���������� ���� ���������"
+ msgstr "επαλήθευση μιας υπογραφής"
  
 +#: dirmngr/validate.c:561
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
- msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
+ msgstr "απέτυχε ο έλεγχος της υπογραφής που δημιουργήθηκε: %s\n"
  
 +#: dirmngr/validate.c:738
  #, fuzzy
  msgid "certificate chain is good\n"
- msgstr "� ���������� %c%lu ������������\n"
+ msgstr "η προεπιλογή %c%lu αντιγράφτηκε\n"
  
 +#: dirmngr/validate.c:968
  msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
+ msgstr "ο DSA απαιτεί τη χρήση ενός 160 bit αλγόριθμου hash\n"
  
 +#: dirmngr/validate.c:1116
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
- msgstr "�����������"
+ msgstr "τερματισμός"
  
 +#: tools/gpg-connect-agent.c:79
  msgid "print data out hex encoded"
  msgstr ""
  
@@@ -10586,21 -8503,17 +10670,21 @@@ msgstr "
  msgid "do not use extended connect mode"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:92
  #, fuzzy
  msgid "|FILE|run commands from FILE on startup"
- msgstr "|������|������� ��� ���������� ��������� ������"
+ msgstr "|ΑΡΧΕΙΟ|φόρτωμα του αρθρώματος επέκτασης ΑΡΧΕΙΟ"
  
 +#: tools/gpg-connect-agent.c:93
  msgid "run /subst on startup"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:205
  #, fuzzy
  msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
 +#: tools/gpg-connect-agent.c:208
  msgid ""
  "Syntax: @GPG at -connect-agent [options]\n"
  "Connect to a running agent and send commands\n"
@@@ -10617,37 -8527,29 +10701,37 @@@ msgstr "
  msgid "option \"%s\" ignored due to \"%s\"\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
  #, fuzzy, c-format
  msgid "receiving line failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: tools/gpg-connect-agent.c:1458
  #, fuzzy
  msgid "line too long - skipped\n"
- msgstr "� ������ ����� ���� ������\n"
+ msgstr "η γραμμή είναι πολύ μεγάλη\n"
  
 +#: tools/gpg-connect-agent.c:1462
  msgid "line shortened due to embedded Nul character\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1837
  #, fuzzy, c-format
  msgid "unknown command '%s'\n"
- msgstr "�������� ��������������� ���������� `%s'\n"
+ msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
  
 +#: tools/gpg-connect-agent.c:1855
  #, fuzzy, c-format
  msgid "sending line failed: %s\n"
- msgstr "� �������� �������: %s\n"
+ msgstr "η υπογραφή απέτυχε: %s\n"
  
 +#: tools/gpg-connect-agent.c:2251
  #, fuzzy, c-format
  msgid "error sending standard options: %s\n"
- msgstr "������ ��� �������� ���� �� `%s': %s\n"
+ msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
 +#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
@@@ -10697,43 -8586,34 +10781,43 @@@ msgstr "
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:579
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
- msgstr "|N|����� ��� ���������� ������ ������ N"
+ msgstr "|N|χρήση της κατάστασης φράσης κλειδί N"
  
 +#: tools/gpgconf-comp.c:583
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
- msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
  
 +#: tools/gpgconf-comp.c:587
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
  msgid "|NAME|use NAME as default secret key"
- msgstr "|�����|����� �������� ��� �������������� ������� ������"
+ msgstr "|ΟΝΟΜΑ|χρήση ΟΝΟΜΑτος σαν προκαθορισμένο μυστικό κλειδί"
  
 +#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
- msgstr "|�����|������������� ��� �����"
+ msgstr "|ΟΝΟΜΑ|κρυπτογράφηση για ΟΝΟΜΑ"
  
 +#: tools/gpgconf-comp.c:704
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
- msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
+ msgstr "αδυναμία επεξεργασίας του URI του διακομιση κλειδιών\n"
  
 +#: tools/gpgconf-comp.c:735
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
@@@ -10745,12 -8623,10 +10829,12 @@@ msgstr "
  msgid "disable all access to the dirmngr"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:790
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
- msgstr "|�����|����� ���������� �������������� ����� ��� ������� �������"
+ msgstr "|ΟΝΟΜΑ|χρήση αλγόριθμου κρυπτογράφησης ΟΝΟΜΑ για φράσεις κλειδιά"
  
 +#: tools/gpgconf-comp.c:820
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
@@@ -10762,182 -8636,149 +10846,190 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "σφάλμα δικτύου"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
- msgstr "���� ����� ������"
+ msgid "Passphrase Entry"
+ msgstr "κακή φράση κλειδί"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
- msgstr "��� ������� �� ������� ������"
+ msgstr "δεν βρέθηκε το δημόσιο κλειδί"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
- msgstr "������� ����������� ��������� \"%s\"\n"
+ msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
- msgstr "������� ����������� ��������� \"%s\"\n"
+ msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
- msgstr "����� �� ������� ������"
+ msgstr "χρήση ως αρχείου εξόδου"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
- msgstr "��� ������� �� ������� ������"
+ msgstr "δεν βρέθηκε το δημόσιο κλειδί"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  #, fuzzy
  msgid "No argument allowed"
- msgstr "������� ��� �������� �������� ��� `%s'\n"
+ msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
  
 +#: tools/symcryptrun.c:154
  #, fuzzy
  msgid ""
  "@\n"
  "Commands:\n"
  " "
  msgstr ""
- "@�������:\n"
+ "@Εντολές:\n"
  " "
  
 +#: tools/symcryptrun.c:156
  #, fuzzy
  msgid "decryption modus"
- msgstr "���������������� OK\n"
+ msgstr "αποκρυπτογράφηση OK\n"
  
 +#: tools/symcryptrun.c:157
  #, fuzzy
  msgid "encryption modus"
- msgstr "���������������� OK\n"
+ msgstr "αποκρυπτογράφηση OK\n"
  
 +#: tools/symcryptrun.c:161
  msgid "tool class (confucius)"
  msgstr ""
  
 +#: tools/symcryptrun.c:162
  #, fuzzy
  msgid "program filename"
- msgstr "--store [����� �������]"
+ msgstr "--store [όνομα αρχείου]"
  
 +#: tools/symcryptrun.c:164
  msgid "secret key file (required)"
  msgstr ""
  
@@@ -10945,59 -8785,48 +11037,59 @@@
  msgid "input file name (default stdin)"
  msgstr ""
  
 +#: tools/symcryptrun.c:209
  #, fuzzy
  msgid "Usage: symcryptrun [options] (-h for help)"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
 +#: tools/symcryptrun.c:212
  msgid ""
  "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
  "[options...] COMMAND [inputfile]\n"
  "Call a simple symmetric encryption tool\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:278
  #, fuzzy, c-format
  msgid "%s on %s aborted with status %i\n"
- msgstr "�� %s ��� ����������� �� �� %s!\n"
+ msgstr "το %s δεν επιτρέπεται με το %s!\n"
  
 +#: tools/symcryptrun.c:285
  #, fuzzy, c-format
  msgid "%s on %s failed with status %i\n"
- msgstr "�������� ��������� ��� �������: %s\n"
+ msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
  
 +#: tools/symcryptrun.c:317
  #, fuzzy, c-format
  msgid "can't create temporary directory '%s': %s\n"
- msgstr "�������� ����������� ��������� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
  
 +#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
  #, fuzzy, c-format
  msgid "could not open %s for writing: %s\n"
- msgstr "�������� ��������� ��� %s: %s\n"
+ msgstr "αδυναμία πρόσβασης του %s: %s\n"
  
 +#: tools/symcryptrun.c:385
  #, fuzzy, c-format
  msgid "error writing to %s: %s\n"
- msgstr "�������� �������� ��� ����������� `%s': %s\n"
+ msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
  
 +#: tools/symcryptrun.c:392
  #, fuzzy, c-format
  msgid "error reading from %s: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
  #, fuzzy, c-format
  msgid "error closing %s: %s\n"
- msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
  
 +#: tools/symcryptrun.c:490
  #, fuzzy
  msgid "no --program option provided\n"
- msgstr "��� ������������ � ������������� �������� ������������\n"
+ msgstr "δεν υποστηρίζετε η απομακρυσμένη εκτέλεση προγράμματος\n"
  
 +#: tools/symcryptrun.c:496
  msgid "only --decrypt and --encrypt are supported\n"
  msgstr ""
  
@@@ -11009,62 -8836,50 +11101,62 @@@ msgstr "
  msgid "cannot allocate args vector\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:531
  #, fuzzy, c-format
  msgid "could not create pipe: %s\n"
- msgstr "�������� ����������� ��� %s: %s\n"
+ msgstr "αδυναμία δημιουργίας του %s: %s\n"
  
 +#: tools/symcryptrun.c:538
  #, fuzzy, c-format
  msgid "could not create pty: %s\n"
- msgstr "�������� ����������� ��� %s: %s\n"
+ msgstr "αδυναμία δημιουργίας του %s: %s\n"
  
 +#: tools/symcryptrun.c:554
  #, c-format
  msgid "could not fork: %s\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:582
  #, fuzzy, c-format
  msgid "execv failed: %s\n"
- msgstr "� ��������� �������: %s\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
  
 +#: tools/symcryptrun.c:611
  #, fuzzy, c-format
  msgid "select failed: %s\n"
- msgstr "�������� block �������� �������: %s\n"
+ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
  
 +#: tools/symcryptrun.c:628
  #, fuzzy, c-format
  msgid "read failed: %s\n"
- msgstr "� ��������� �������: %s\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
  
 +#: tools/symcryptrun.c:680
  #, fuzzy, c-format
  msgid "pty read failed: %s\n"
- msgstr "� ��������� �������: %s\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
  
 +#: tools/symcryptrun.c:732
  #, fuzzy, c-format
  msgid "waitpid failed: %s\n"
- msgstr "� ��������� �������: %s\n"
+ msgstr "η ενημέρωση απέτυχε: %s\n"
  
 +#: tools/symcryptrun.c:746
  #, c-format
  msgid "child aborted with status %i\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:801
  #, fuzzy, c-format
  msgid "cannot allocate infile string: %s\n"
- msgstr "�������� ����������� ��� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
 +#: tools/symcryptrun.c:814
  #, fuzzy, c-format
  msgid "cannot allocate outfile string: %s\n"
- msgstr "�������� ����������� ��� `%s': %s\n"
+ msgstr "αδυναμία δημιουργίας του `%s': %s\n"
  
 +#: tools/symcryptrun.c:987
  #, c-format
  msgid "either %s or %s must be given\n"
  msgstr ""
@@@ -11073,17 -8887,14 +11165,17 @@@
  msgid "no class provided\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:1018
  #, fuzzy, c-format
  msgid "class %s is not supported\n"
- msgstr "��� ������������� � ���������� ���������� %d%s\n"
+ msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
  
 +#: tools/gpg-check-pattern.c:144
  #, fuzzy
  msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
- msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
  
 +#: tools/gpg-check-pattern.c:147
  msgid ""
  "Syntax: gpg-check-pattern [options] patternfile\n"
  "Check a passphrase given on stdin against the patternfile\n"
diff --cc po/en at boldquot.po
index 5d51fa8,0000000..8ba3f78
mode 100644,000000..100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@@ -1,10562 -1,0 +1,10637 @@@
 +# English translations for GNU gnupg package.
 +# Copyright (C) 2016 Free Software Foundation, Inc.
 +# This file is distributed under the same license as the GNU gnupg package.
 +# Automatically generated, 2016.
 +#
 +# All this catalog "translates" are quotation characters.
 +# The msgids must be ASCII and therefore cannot contain real quotation
 +# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
 +# and double quote (0x22). These substitutes look strange; see
 +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
 +#
 +# This catalog translates grave accent (0x60) and apostrophe (0x27) to
 +# left single quotation mark (U+2018) and right single quotation mark (U+2019).
 +# It also translates pairs of apostrophe (0x27) to
 +# left single quotation mark (U+2018) and right single quotation mark (U+2019)
 +# and pairs of quotation mark (0x22) to
 +# left double quotation mark (U+201C) and right double quotation mark (U+201D).
 +#
 +# When output to an UTF-8 terminal, the quotation characters appear perfectly.
 +# When output to an ISO-8859-1 terminal, the single quotation marks are
 +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
 +# grave/acute accent (by libiconv), and the double quotation marks are
 +# transliterated to 0x22.
 +# When output to an ASCII terminal, the single quotation marks are
 +# transliterated to apostrophes, and the double quotation marks are
 +# transliterated to 0x22.
 +#
 +# This catalog furthermore displays the text between the quotation marks in
 +# bold face, assuming the VT100/XTerm escape sequences.
 +#
 +msgid ""
 +msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.15\n"
++"Project-Id-Version: GNU gnupg 2.1.16\n"
 +"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
- "PO-Revision-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"PO-Revision-Date: 2016-11-18 16:54+0100\n"
 +"Last-Translator: Automatically generated\n"
 +"Language-Team: none\n"
 +"Language: en\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 +
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
 +#, c-format
 +msgid "failed to acquire the pinentry lock: %s\n"
 +msgstr "failed to acquire the pinentry lock: %s\n"
 +
 +#. TRANSLATORS: These are labels for buttons etc used in
 +#. Pinentries.  An underscore indicates that the next letter
 +#. should be used as an accelerator.  Double the underscore for
 +#. a literal one.  The actual to be translated text starts after
 +#. the second vertical bar.  Note that gpg-agent has been set to
 +#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
 +msgid "|pinentry-label|_OK"
 +msgstr "|pinentry-label|_OK"
 +
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
 +msgid "|pinentry-label|_Cancel"
 +msgstr "|pinentry-label|_Cancel"
 +
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
 +msgid "|pinentry-label|_Yes"
 +msgstr "|pinentry-label|_Yes"
 +
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
 +msgid "|pinentry-label|_No"
 +msgstr "|pinentry-label|_No"
 +
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
 +msgid "|pinentry-label|PIN:"
 +msgstr "|pinentry-label|PIN:"
 +
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
 +msgid "|pinentry-label|_Save in password manager"
 +msgstr "|pinentry-label|_Save in password manager"
 +
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
 +msgid "Do you really want to make your passphrase visible on the screen?"
 +msgstr "Do you really want to make your passphrase visible on the screen?"
 +
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
 +msgid "|pinentry-tt|Make passphrase visible"
 +msgstr "|pinentry-tt|Make passphrase visible"
 +
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
 +msgid "|pinentry-tt|Hide passphrase"
 +msgstr "|pinentry-tt|Hide passphrase"
 +
 +#. TRANSLATORS: This string is displayed by Pinentry as the label
 +#. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
 +msgid "Quality:"
 +msgstr "Quality:"
 +
 +#. TRANSLATORS: This string is a tooltip, shown by pinentry when
 +#. hovering over the quality bar.  Please use an appropriate
 +#. string to describe what this is about.  The length of the
 +#. 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:758
++#: agent/call-pinentry.c:793
 +msgid "pinentry.qualitybar.tooltip"
 +msgstr "pinentry.qualitybar.tooltip"
 +
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
 +msgid ""
 +"Please enter your PIN, so that the secret key can be unlocked for this "
 +"session"
 +msgstr ""
 +"Please enter your PIN, so that the secret key can be unlocked for this "
 +"session"
 +
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
 +msgid ""
 +"Please enter your passphrase, so that the secret key can be unlocked for "
 +"this session"
 +msgstr ""
 +"Please enter your passphrase, so that the secret key can be unlocked for "
 +"this session"
 +
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +msgid "PIN:"
 +msgstr "PIN:"
 +
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
 +msgid "Passphrase:"
 +msgstr "Passphrase:"
 +
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
 +msgid "does not match - try again"
 +msgstr "does not match - try again"
 +
 +#. TRANSLATORS: The string is appended to an error message in
 +#. the pinentry.  The %s is the actual error message, the
 +#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
 +#, c-format
 +msgid "SETERROR %s (try %d of %d)"
 +msgstr "SETERROR %s (try %d of %d)"
 +
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
 +msgid "Repeat:"
 +msgstr "Repeat:"
 +
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
 +msgid "PIN too long"
 +msgstr "PIN too long"
 +
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
 +msgid "Passphrase too long"
 +msgstr "Passphrase too long"
 +
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
 +msgid "Invalid characters in PIN"
 +msgstr "Invalid characters in PIN"
 +
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
 +msgid "PIN too short"
 +msgstr "PIN too short"
 +
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
 +msgid "Bad PIN"
 +msgstr "Bad PIN"
 +
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
 +msgid "Bad Passphrase"
 +msgstr "Bad Passphrase"
 +
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
 +#, c-format
 +msgid "ssh keys greater than %d bits are not supported\n"
 +msgstr "ssh keys greater than %d bits are not supported\n"
 +
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
 +#, c-format
 +msgid "can't create '%s': %s\n"
 +msgstr "can't create '%s': %s\n"
 +
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
 +#, c-format
 +msgid "can't open '%s': %s\n"
 +msgstr "can't open '%s': %s\n"
 +
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
 +#, c-format
 +msgid "error getting serial number of card: %s\n"
 +msgstr "error getting serial number of card: %s\n"
 +
 +#: agent/command-ssh.c:2419
 +#, c-format
 +msgid "detected card with S/N: %s\n"
 +msgstr "detected card with S/N: %s\n"
 +
 +#: agent/command-ssh.c:2424
 +#, c-format
 +msgid "no authentication key for ssh on card: %s\n"
 +msgstr "no authentication key for ssh on card: %s\n"
 +
 +#: agent/command-ssh.c:2444
 +#, c-format
 +msgid "no suitable card key found: %s\n"
 +msgstr "no suitable card key found: %s\n"
 +
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "shadowing the key failed: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "error writing key: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
 +#, c-format
 +msgid ""
 +"An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 +"allow this?"
 +msgstr ""
 +"An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 +"allow this?"
 +
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
 +msgid "Allow"
 +msgstr "Allow"
 +
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
 +msgid "Deny"
 +msgstr "Deny"
 +
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
 +#, c-format
 +msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 +msgstr "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 +
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
 +msgid "Please re-enter this passphrase"
 +msgstr "Please re-enter this passphrase"
 +
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
 +#, c-format
 +msgid ""
 +"Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 +"%s%%0Awithin gpg-agent's key storage"
 +msgstr ""
 +"Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 +"%s%%0Awithin gpg-agent's key storage"
 +
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
 +#, c-format
 +msgid "failed to create stream from socket: %s\n"
 +msgstr "failed to create stream from socket: %s\n"
 +
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
 +msgid "Please insert the card with serial number"
 +msgstr "Please insert the card with serial number"
 +
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
 +msgid "Please remove the current card and insert the one with serial number"
 +msgstr "Please remove the current card and insert the one with serial number"
 +
 +#: agent/divert-scd.c:204
 +msgid "Admin PIN"
 +msgstr "Admin PIN"
 +
 +#. TRANSLATORS: A PUK is the Personal Unblocking Code
 +#. used to unblock a PIN.
 +#: agent/divert-scd.c:209
 +msgid "PUK"
 +msgstr "PUK"
 +
 +#: agent/divert-scd.c:216
 +msgid "Reset Code"
 +msgstr "Reset Code"
 +
 +#: agent/divert-scd.c:242
 +#, c-format
 +msgid "%s%%0A%%0AUse the reader's pinpad for input."
 +msgstr "%s%%0A%%0AUse the reader's pinpad for input."
 +
 +#: agent/divert-scd.c:291
 +msgid "Repeat this Reset Code"
 +msgstr "Repeat this Reset Code"
 +
 +#: agent/divert-scd.c:293
 +msgid "Repeat this PUK"
 +msgstr "Repeat this PUK"
 +
 +#: agent/divert-scd.c:294
 +msgid "Repeat this PIN"
 +msgstr "Repeat this PIN"
 +
 +#: agent/divert-scd.c:299
 +msgid "Reset Code not correctly repeated; try again"
 +msgstr "Reset Code not correctly repeated; try again"
 +
 +#: agent/divert-scd.c:301
 +msgid "PUK not correctly repeated; try again"
 +msgstr "PUK not correctly repeated; try again"
 +
 +#: agent/divert-scd.c:302
 +msgid "PIN not correctly repeated; try again"
 +msgstr "PIN not correctly repeated; try again"
 +
 +#: agent/divert-scd.c:314
 +#, c-format
 +msgid "Please enter the PIN%s%s%s to unlock the card"
 +msgstr "Please enter the PIN%s%s%s to unlock the card"
 +
 +#: agent/genkey.c:110 sm/certreqgen-ui.c:394
 +#, c-format
 +msgid "error creating temporary file: %s\n"
 +msgstr "error creating temporary file: %s\n"
 +
 +#: agent/genkey.c:117
 +#, c-format
 +msgid "error writing to temporary file: %s\n"
 +msgstr "error writing to temporary file: %s\n"
 +
 +#: agent/genkey.c:158 agent/genkey.c:164
 +msgid "Enter new passphrase"
 +msgstr "Enter new passphrase"
 +
 +#: agent/genkey.c:172
 +msgid "Take this one anyway"
 +msgstr "Take this one anyway"
 +
 +#: agent/genkey.c:202
 +#, c-format
 +msgid ""
 +"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 +msgstr ""
 +"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 +
 +#: agent/genkey.c:204
 +#, c-format
 +msgid ""
 +"You have not entered a passphrase - this is in general a bad idea!%0APlease "
 +"confirm that you do not want to have any protection on your key."
 +msgstr ""
 +"You have not entered a passphrase - this is in general a bad idea!%0APlease "
 +"confirm that you do not want to have any protection on your key."
 +
 +#: agent/genkey.c:216
 +msgid "Yes, protection is not needed"
 +msgstr "Yes, protection is not needed"
 +
 +#: agent/genkey.c:233
 +#, c-format
 +msgid "A passphrase should be at least %u character long."
 +msgid_plural "A passphrase should be at least %u characters long."
 +msgstr[0] "A passphrase should be at least %u character long."
 +msgstr[1] "A passphrase should be at least %u characters long."
 +
 +#: agent/genkey.c:252
 +#, c-format
 +msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 +msgid_plural ""
 +"A passphrase should contain at least %u digits or%%0Aspecial characters."
 +msgstr[0] ""
 +"A passphrase should contain at least %u digit or%%0Aspecial character."
 +msgstr[1] ""
 +"A passphrase should contain at least %u digits or%%0Aspecial characters."
 +
 +#: agent/genkey.c:278
 +#, c-format
 +msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 +msgstr "A passphrase may not be a known term or match%%0Acertain pattern."
 +
 +#: agent/genkey.c:293
 +msgid "Warning: You have entered an insecure passphrase."
 +msgstr "Warning: You have entered an insecure passphrase."
 +
 +#: agent/genkey.c:480
 +#, c-format
 +msgid "Please enter the passphrase to%0Aprotect your new key"
 +msgstr "Please enter the passphrase to%0Aprotect your new key"
 +
 +#: agent/genkey.c:606
 +msgid "Please enter the new passphrase"
 +msgstr "Please enter the new passphrase"
 +
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
 +msgid ""
 +"@Options:\n"
 +" "
 +msgstr ""
 +"@Options:\n"
 +" "
 +
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
 +msgid "run in daemon mode (background)"
 +msgstr "run in daemon mode (background)"
 +
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
 +msgid "run in server mode (foreground)"
 +msgstr "run in server mode (foreground)"
 +
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++msgid "run in supervised mode"
++msgstr "run in supervised mode"
++
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
 +msgid "verbose"
 +msgstr "verbose"
 +
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
 +msgid "be somewhat more quiet"
 +msgstr "be somewhat more quiet"
 +
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
 +msgid "sh-style command output"
 +msgstr "sh-style command output"
 +
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
 +msgid "csh-style command output"
 +msgstr "csh-style command output"
 +
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
 +msgid "|FILE|read options from FILE"
 +msgstr "|FILE|read options from FILE"
 +
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
 +msgid "do not detach from the console"
 +msgstr "do not detach from the console"
 +
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
 +msgid "do not grab keyboard and mouse"
 +msgstr "do not grab keyboard and mouse"
 +
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
 +msgid "use a log file for the server"
 +msgstr "use a log file for the server"
 +
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
 +msgid "|PGM|use PGM as the PIN-Entry program"
 +msgstr "|PGM|use PGM as the PIN-Entry program"
 +
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
 +msgid "|PGM|use PGM as the SCdaemon program"
 +msgstr "|PGM|use PGM as the SCdaemon program"
 +
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
 +msgid "do not use the SCdaemon"
 +msgstr "do not use the SCdaemon"
 +
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
 +msgid "|NAME|accept some commands via NAME"
 +msgstr "|NAME|accept some commands via NAME"
 +
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
 +msgid "ignore requests to change the TTY"
 +msgstr "ignore requests to change the TTY"
 +
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
 +msgid "ignore requests to change the X display"
 +msgstr "ignore requests to change the X display"
 +
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
 +msgid "|N|expire cached PINs after N seconds"
 +msgstr "|N|expire cached PINs after N seconds"
 +
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
 +msgid "do not use the PIN cache when signing"
 +msgstr "do not use the PIN cache when signing"
 +
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
 +msgid "disallow the use of an external password cache"
 +msgstr "disallow the use of an external password cache"
 +
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
 +msgid "disallow clients to mark keys as \"trusted\""
 +msgstr "disallow clients to mark keys as “trusted”"
 +
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
 +msgid "allow presetting passphrase"
 +msgstr "allow presetting passphrase"
 +
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
 +msgid "disallow caller to override the pinentry"
 +msgstr "disallow caller to override the pinentry"
 +
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
 +msgid "allow passphrase to be prompted through Emacs"
 +msgstr "allow passphrase to be prompted through Emacs"
 +
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
 +msgid "enable ssh support"
 +msgstr "enable ssh support"
 +
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
 +msgid "enable putty support"
 +msgstr "enable putty support"
 +
 +#. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
 +msgid "Please report bugs to <@EMAIL@>.\n"
 +msgstr "Please report bugs to <@EMAIL@>.\n"
 +
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
 +msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 +msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 +
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
 +msgid ""
 +"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 +"Secret key management for @GNUPG@\n"
 +msgstr ""
 +"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 +"Secret key management for @GNUPG@\n"
 +
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
 +#, c-format
 +msgid "invalid debug-level '%s' given\n"
 +msgstr "invalid debug-level ‘%s’ given\n"
 +
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
 +#, c-format
 +msgid "Note: no default option file '%s'\n"
 +msgstr "Note: no default option file ‘%s’\n"
 +
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
 +#, c-format
 +msgid "option file '%s': %s\n"
 +msgstr "option file '%s': %s\n"
 +
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
 +#, c-format
 +msgid "reading options from '%s'\n"
 +msgstr "reading options from ‘%s’\n"
 +
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
 +#, c-format
 +msgid "Note: '%s' is not considered an option\n"
 +msgstr "Note: ‘%s’ is not considered an option\n"
 +
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
 +#, c-format
 +msgid "can't create socket: %s\n"
 +msgstr "can't create socket: %s\n"
 +
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
 +#, c-format
 +msgid "socket name '%s' is too long\n"
 +msgstr "socket name ‘%s’ is too long\n"
 +
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
 +msgid "a gpg-agent is already running - not starting a new one\n"
 +msgstr "a gpg-agent is already running - not starting a new one\n"
 +
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
 +msgid "error getting nonce for the socket\n"
 +msgstr "error getting nonce for the socket\n"
 +
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
 +#, c-format
 +msgid "error binding socket to '%s': %s\n"
 +msgstr "error binding socket to '%s': %s\n"
 +
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
 +#, c-format
 +msgid "can't set permissions of '%s': %s\n"
 +msgstr "can't set permissions of '%s': %s\n"
 +
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
 +#, c-format
 +msgid "listen() failed: %s\n"
 +msgstr "listen() failed: %s\n"
 +
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
 +#, c-format
 +msgid "listening on socket '%s'\n"
 +msgstr "listening on socket ‘%s’\n"
 +
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
 +#, c-format
 +msgid "can't create directory '%s': %s\n"
 +msgstr "can't create directory '%s': %s\n"
 +
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
 +#, c-format
 +msgid "directory '%s' created\n"
 +msgstr "directory ‘%s’ created\n"
 +
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
 +#, c-format
 +msgid "stat() failed for '%s': %s\n"
 +msgstr "stat() failed for '%s': %s\n"
 +
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
 +#, c-format
 +msgid "can't use '%s' as home directory\n"
 +msgstr "can't use ‘%s’ as home directory\n"
 +
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
 +#, c-format
 +msgid "error reading nonce on fd %d: %s\n"
 +msgstr "error reading nonce on fd %d: %s\n"
 +
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
 +#, c-format
 +msgid "handler 0x%lx for fd %d started\n"
 +msgstr "handler 0x%lx for fd %d started\n"
 +
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
 +#, c-format
 +msgid "handler 0x%lx for fd %d terminated\n"
 +msgstr "handler 0x%lx for fd %d terminated\n"
 +
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
 +#, c-format
 +msgid "ssh handler 0x%lx for fd %d started\n"
 +msgstr "ssh handler 0x%lx for fd %d started\n"
 +
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
 +#, c-format
 +msgid "ssh handler 0x%lx for fd %d terminated\n"
 +msgstr "ssh handler 0x%lx for fd %d terminated\n"
 +
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
 +#, c-format
 +msgid "npth_pselect failed: %s - waiting 1s\n"
 +msgstr "npth_pselect failed: %s - waiting 1s\n"
 +
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
 +#, c-format
 +msgid "%s %s stopped\n"
 +msgstr "%s %s stopped\n"
 +
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
 +msgid "no gpg-agent running in this session\n"
 +msgstr "no gpg-agent running in this session\n"
 +
 +#: agent/preset-passphrase.c:99
 +msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 +msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 +
 +#: agent/preset-passphrase.c:102
 +msgid ""
 +"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 +"Password cache maintenance\n"
 +msgstr ""
 +"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 +"Password cache maintenance\n"
 +
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
 +msgid ""
 +"@Commands:\n"
 +" "
 +msgstr ""
 +"@Commands:\n"
 +" "
 +
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
 +msgid ""
 +"@\n"
 +"Options:\n"
 +" "
 +msgstr ""
 +"@\n"
 +"Options:\n"
 +" "
 +
 +#: agent/protect-tool.c:154
 +msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 +msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
 +
 +#: agent/protect-tool.c:156
 +msgid ""
 +"Syntax: gpg-protect-tool [options] [args]\n"
 +"Secret key maintenance tool\n"
 +msgstr ""
 +"Syntax: gpg-protect-tool [options] [args]\n"
 +"Secret key maintenance tool\n"
 +
 +#: agent/protect-tool.c:693
 +msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 +msgstr "Please enter the passphrase to unprotect the PKCS#12 object."
 +
 +#: agent/protect-tool.c:698
 +msgid "Please enter the passphrase to protect the new PKCS#12 object."
 +msgstr "Please enter the passphrase to protect the new PKCS#12 object."
 +
 +#: agent/protect-tool.c:704
 +msgid ""
 +"Please enter the passphrase to protect the imported object within the GnuPG "
 +"system."
 +msgstr ""
 +"Please enter the passphrase to protect the imported object within the GnuPG "
 +"system."
 +
 +#: agent/protect-tool.c:709
 +msgid ""
 +"Please enter the passphrase or the PIN\n"
 +"needed to complete this operation."
 +msgstr ""
 +"Please enter the passphrase or the PIN\n"
 +"needed to complete this operation."
 +
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
 +msgid "cancelled\n"
 +msgstr "cancelled\n"
 +
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
 +#, c-format
 +msgid "error while asking for the passphrase: %s\n"
 +msgstr "error while asking for the passphrase: %s\n"
 +
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
 +#, c-format
 +msgid "error opening '%s': %s\n"
 +msgstr "error opening '%s': %s\n"
 +
 +#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
 +#, c-format
 +msgid "file '%s', line %d: %s\n"
 +msgstr "file '%s', line %d: %s\n"
 +
 +#: agent/trustlist.c:192 agent/trustlist.c:200
 +#, c-format
 +msgid "statement \"%s\" ignored in '%s', line %d\n"
 +msgstr "statement “%s” ignored in '%s', line %d\n"
 +
 +#: agent/trustlist.c:206
 +#, c-format
 +msgid "system trustlist '%s' not available\n"
 +msgstr "system trustlist ‘%s’ not available\n"
 +
 +#: agent/trustlist.c:250
 +#, c-format
 +msgid "bad fingerprint in '%s', line %d\n"
 +msgstr "bad fingerprint in '%s', line %d\n"
 +
 +#: agent/trustlist.c:275 agent/trustlist.c:282
 +#, c-format
 +msgid "invalid keyflag in '%s', line %d\n"
 +msgstr "invalid keyflag in '%s', line %d\n"
 +
 +#: agent/trustlist.c:316 common/helpfile.c:136
 +#, c-format
 +msgid "error reading '%s', line %d: %s\n"
 +msgstr "error reading '%s', line %d: %s\n"
 +
 +#: agent/trustlist.c:434 agent/trustlist.c:503
 +msgid "error reading list of trusted root certificates\n"
 +msgstr "error reading list of trusted root certificates\n"
 +
 +#. TRANSLATORS: This prompt is shown by the Pinentry
 +#. and has one special property: A "%%0A" is used by
 +#. Pinentry to insert a line break.  The double
 +#. percent sign is actually needed because it is also
 +#. a printf format string.  If you need to insert a
 +#. plain % sign, you need to encode it as "%%25".  The
 +#. "%s" gets replaced by the name as stored in the
 +#. certificate.
 +#: agent/trustlist.c:664
 +#, c-format
 +msgid ""
 +"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 +"certificates?"
 +msgstr ""
 +"Do you ultimately trust%%0A  “%s”%%0Ato correctly certify user "
 +"certificates?"
 +
 +#: agent/trustlist.c:673 common/audit.c:467
 +msgid "Yes"
 +msgstr "Yes"
 +
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
 +msgid "No"
 +msgstr "No"
 +
 +#. TRANSLATORS: This prompt is shown by the Pinentry and has
 +#. one special property: A "%%0A" is used by Pinentry to
 +#. insert a line break.  The double percent sign is actually
 +#. needed because it is also a printf format string.  If you
 +#. need to insert a plain % sign, you need to encode it as
 +#. "%%25".  The second "%s" gets replaced by a hexdecimal
 +#. fingerprint string whereas the first one receives the name
 +#. as stored in the certificate.
 +#: agent/trustlist.c:707
 +#, c-format
 +msgid ""
 +"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
 +"fingerprint:%%0A  %s"
 +msgstr ""
 +"Please verify that the certificate identified as:%%0A  “%s”%%0Ahas the "
 +"fingerprint:%%0A  %s"
 +
 +#. TRANSLATORS: "Correct" is the label of a button and intended
 +#. to be hit if the fingerprint matches the one of the CA.  The
 +#. other button is "the default "Cancel" of the Pinentry.
 +#: agent/trustlist.c:721
 +msgid "Correct"
 +msgstr "Correct"
 +
 +#: agent/trustlist.c:721
 +msgid "Wrong"
 +msgstr "Wrong"
 +
- #: agent/findkey.c:252
++#: agent/findkey.c:261
 +#, c-format
 +msgid "Note: This passphrase has never been changed.%0APlease change it now."
 +msgstr "Note: This passphrase has never been changed.%0APlease change it now."
 +
- #: agent/findkey.c:268
++#: agent/findkey.c:277
 +#, c-format
 +msgid ""
 +"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 +"it now."
 +msgstr ""
 +"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 +"it now."
 +
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
 +msgid "Change passphrase"
 +msgstr "Change passphrase"
 +
- #: agent/findkey.c:290
++#: agent/findkey.c:299
 +msgid "I'll change it later"
 +msgstr "I'll change it later"
 +
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
 +#, c-format
 +msgid ""
 +"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 +"%%0A?"
 +msgstr ""
 +"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 +"%%0A?"
 +
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
 +msgid "Delete key"
 +msgstr "Delete key"
 +
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
 +msgid ""
 +"Warning: This key is also listed for use with SSH!\n"
 +"Deleting the key might remove your ability to access remote machines."
 +msgstr ""
 +"Warning: This key is also listed for use with SSH!\n"
 +"Deleting the key might remove your ability to access remote machines."
 +
 +#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
 +msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 +msgstr "DSA requires the hash length to be a multiple of 8 bits\n"
 +
 +#: agent/pksign.c:187 sm/certcheck.c:97
 +#, c-format
 +msgid "%s key uses an unsafe (%u bit) hash\n"
 +msgstr "%s key uses an unsafe (%u bit) hash\n"
 +
- #: agent/pksign.c:204
++#: agent/pksign.c:202
 +#, c-format
 +msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 +msgstr "a %zu bit hash is not valid for a %u bit %s key\n"
 +
- #: agent/pksign.c:512
++#: agent/pksign.c:508
 +#, c-format
 +msgid "checking created signature failed: %s\n"
 +msgstr "checking created signature failed: %s\n"
 +
 +#: agent/cvt-openpgp.c:338
 +msgid "secret key parts are not available\n"
 +msgstr "secret key parts are not available\n"
 +
 +#: agent/cvt-openpgp.c:344
 +#, c-format
 +msgid "public key algorithm %d (%s) is not supported\n"
 +msgstr "public key algorithm %d (%s) is not supported\n"
 +
 +#: agent/cvt-openpgp.c:448
 +#, c-format
 +msgid "protection algorithm %d (%s) is not supported\n"
 +msgstr "protection algorithm %d (%s) is not supported\n"
 +
 +#: agent/cvt-openpgp.c:455
 +#, c-format
 +msgid "protection hash algorithm %d (%s) is not supported\n"
 +msgstr "protection hash algorithm %d (%s) is not supported\n"
 +
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
 +#, c-format
 +msgid "error creating a pipe: %s\n"
 +msgstr "error creating a pipe: %s\n"
 +
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
 +#, c-format
 +msgid "error creating a stream for a pipe: %s\n"
 +msgstr "error creating a stream for a pipe: %s\n"
 +
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
 +#, c-format
 +msgid "error forking process: %s\n"
 +msgstr "error forking process: %s\n"
 +
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
 +#, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "waiting for processes to terminate failed: %s\n"
++msgid "waiting for process %d to terminate failed: %s\n"
++msgstr "waiting for process %d to terminate failed: %s\n"
 +
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
 +#, c-format
 +msgid "error running '%s': probably not installed\n"
 +msgstr "error running '%s': probably not installed\n"
 +
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
 +#, c-format
 +msgid "error running '%s': exit status %d\n"
 +msgstr "error running '%s': exit status %d\n"
 +
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
 +#, c-format
 +msgid "error running '%s': terminated\n"
 +msgstr "error running '%s': terminated\n"
 +
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
 +#, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "error getting exit code of process %d: %s\n"
++msgid "waiting for processes to terminate failed: %s\n"
++msgstr "waiting for processes to terminate failed: %s\n"
 +
- #: common/exechelp-w32ce.c:767
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
 +#, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "waiting for process %d to terminate failed: %s\n"
++msgid "error getting exit code of process %d: %s\n"
++msgstr "error getting exit code of process %d: %s\n"
 +
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
 +#, c-format
 +msgid "can't connect to '%s': %s\n"
 +msgstr "can't connect to '%s': %s\n"
 +
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
 +msgid "problem setting the gpg-agent options\n"
 +msgstr "problem setting the gpg-agent options\n"
 +
- #: common/sysutils.c:124
++#: common/sysutils.c:144
 +#, c-format
 +msgid "can't disable core dumps: %s\n"
 +msgstr "can't disable core dumps: %s\n"
 +
- #: common/sysutils.c:219
++#: common/sysutils.c:239
 +#, c-format
 +msgid "Warning: unsafe ownership on %s \"%s\"\n"
 +msgstr "Warning: unsafe ownership on %s “%s”\n"
 +
- #: common/sysutils.c:251
++#: common/sysutils.c:271
 +#, c-format
 +msgid "Warning: unsafe permissions on %s \"%s\"\n"
 +msgstr "Warning: unsafe permissions on %s “%s”\n"
 +
++#: common/sysutils.c:659
++#, c-format
++msgid "waiting for file '%s' to become accessible ...\n"
++msgstr "waiting for file ‘%s’ to become accessible ...\n"
++
++#: common/sysutils.c:685
++#, c-format
++msgid "renaming '%s' to '%s' failed: %s\n"
++msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
++
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
 +msgid "yes"
 +msgstr "yes"
 +
 +#: common/yesno.c:46 common/yesno.c:87
 +msgid "yY"
 +msgstr "yY"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:48 common/yesno.c:84
 +msgid "no"
 +msgstr "no"
 +
 +#: common/yesno.c:49 common/yesno.c:88
 +msgid "nN"
 +msgstr "nN"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:86
 +msgid "quit"
 +msgstr "quit"
 +
 +#: common/yesno.c:89
 +msgid "qQ"
 +msgstr "qQ"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:123
 +msgid "okay|okay"
 +msgstr "okay|okay"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:125
 +msgid "cancel|cancel"
 +msgstr "cancel|cancel"
 +
 +#: common/yesno.c:126
 +msgid "oO"
 +msgstr "oO"
 +
 +#: common/yesno.c:127
 +msgid "cC"
 +msgstr "cC"
 +
 +#: common/miscellaneous.c:86
 +#, c-format
 +msgid "out of core in secure memory while allocating %lu bytes"
 +msgstr "out of core in secure memory while allocating %lu bytes"
 +
 +#: common/miscellaneous.c:89
 +#, c-format
 +msgid "out of core while allocating %lu bytes"
 +msgstr "out of core while allocating %lu bytes"
 +
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
 +#, c-format
 +msgid "error allocating enough memory: %s\n"
 +msgstr "error allocating enough memory: %s\n"
 +
 +#: common/miscellaneous.c:143
 +#, c-format
 +msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 +msgstr "%s:%u: obsolete option “%s” - it has no effect\n"
 +
 +#: common/miscellaneous.c:146
 +#, c-format
 +msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 +msgstr "WARNING: “%s%s” is an obsolete option - it has no effect\n"
 +
 +#: common/miscellaneous.c:554
 +#, c-format
 +msgid "unknown debug flag '%s' ignored\n"
 +msgstr "unknown debug flag ‘%s’ ignored\n"
 +
- #: common/asshelp.c:417
++#: common/asshelp.c:380
 +#, c-format
 +msgid "no running gpg-agent - starting '%s'\n"
 +msgstr "no running gpg-agent - starting ‘%s’\n"
 +
- #: common/asshelp.c:477
++#: common/asshelp.c:440
 +#, c-format
 +msgid "waiting for the agent to come up ... (%ds)\n"
 +msgstr "waiting for the agent to come up ... (%ds)\n"
 +
- #: common/asshelp.c:485
++#: common/asshelp.c:448
 +msgid "connection to agent established\n"
 +msgstr "connection to agent established\n"
 +
- #: common/asshelp.c:525
++#: common/asshelp.c:488
 +msgid "connection to agent is in restricted mode\n"
 +msgstr "connection to agent is in restricted mode\n"
 +
- #: common/asshelp.c:582
++#: common/asshelp.c:545
 +#, c-format
 +msgid "no running Dirmngr - starting '%s'\n"
 +msgstr "no running Dirmngr - starting ‘%s’\n"
 +
- #: common/asshelp.c:630
++#: common/asshelp.c:593
 +#, c-format
 +msgid "waiting for the dirmngr to come up ... (%ds)\n"
 +msgstr "waiting for the dirmngr to come up ... (%ds)\n"
 +
- #: common/asshelp.c:639
++#: common/asshelp.c:602
 +msgid "connection to the dirmngr established\n"
 +msgstr "connection to the dirmngr established\n"
 +
 +#. TRANSLATORS: Copy the prefix between the vertical bars
 +#. verbatim.  It will not be printed.
 +#: common/audit.c:474
 +msgid "|audit-log-result|Good"
 +msgstr "|audit-log-result|Good"
 +
 +#: common/audit.c:477
 +msgid "|audit-log-result|Bad"
 +msgstr "|audit-log-result|Bad"
 +
 +#: common/audit.c:479
 +msgid "|audit-log-result|Not supported"
 +msgstr "|audit-log-result|Not supported"
 +
 +#: common/audit.c:481
 +msgid "|audit-log-result|No certificate"
 +msgstr "|audit-log-result|No certificate"
 +
 +#: common/audit.c:483
 +msgid "|audit-log-result|Not enabled"
 +msgstr "|audit-log-result|Not enabled"
 +
 +#: common/audit.c:485
 +msgid "|audit-log-result|Error"
 +msgstr "|audit-log-result|Error"
 +
 +#: common/audit.c:487
 +msgid "|audit-log-result|Not used"
 +msgstr "|audit-log-result|Not used"
 +
 +#: common/audit.c:489
 +msgid "|audit-log-result|Okay"
 +msgstr "|audit-log-result|Okay"
 +
 +#: common/audit.c:491
 +msgid "|audit-log-result|Skipped"
 +msgstr "|audit-log-result|Skipped"
 +
 +#: common/audit.c:493
 +msgid "|audit-log-result|Some"
 +msgstr "|audit-log-result|Some"
 +
 +#: common/audit.c:726
 +msgid "Certificate chain available"
 +msgstr "Certificate chain available"
 +
 +#: common/audit.c:733
 +msgid "root certificate missing"
 +msgstr "root certificate missing"
 +
 +#: common/audit.c:759
 +msgid "Data encryption succeeded"
 +msgstr "Data encryption succeeded"
 +
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
 +msgid "Data available"
 +msgstr "Data available"
 +
 +#: common/audit.c:767
 +msgid "Session key created"
 +msgstr "Session key created"
 +
 +#: common/audit.c:772 common/audit.c:912 common/audit.c:919
 +#, c-format
 +msgid "algorithm: %s"
 +msgstr "algorithm: %s"
 +
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
 +#, c-format
 +msgid "unsupported algorithm: %s"
 +msgstr "unsupported algorithm: %s"
 +
 +#: common/audit.c:778 common/audit.c:925
 +msgid "seems to be not encrypted"
 +msgstr "seems to be not encrypted"
 +
 +#: common/audit.c:784 common/audit.c:933
 +msgid "Number of recipients"
 +msgstr "Number of recipients"
 +
 +#: common/audit.c:792 common/audit.c:956
 +#, c-format
 +msgid "Recipient %d"
 +msgstr "Recipient %d"
 +
 +#: common/audit.c:825
 +msgid "Data signing succeeded"
 +msgstr "Data signing succeeded"
 +
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
 +#, c-format
 +msgid "data hash algorithm: %s"
 +msgstr "data hash algorithm: %s"
 +
 +#: common/audit.c:862
 +#, c-format
 +msgid "Signer %d"
 +msgstr "Signer %d"
 +
 +#: common/audit.c:866 common/audit.c:1065
 +#, c-format
 +msgid "attr hash algorithm: %s"
 +msgstr "attr hash algorithm: %s"
 +
 +#: common/audit.c:901
 +msgid "Data decryption succeeded"
 +msgstr "Data decryption succeeded"
 +
 +#: common/audit.c:910
 +msgid "Encryption algorithm supported"
 +msgstr "Encryption algorithm supported"
 +
 +#: common/audit.c:993
 +msgid "Data verification succeeded"
 +msgstr "Data verification succeeded"
 +
 +#: common/audit.c:1002
 +msgid "Signature available"
 +msgstr "Signature available"
 +
 +#: common/audit.c:1024
 +msgid "Parsing data succeeded"
 +msgstr "Parsing data succeeded"
 +
 +#: common/audit.c:1036
 +#, c-format
 +msgid "bad data hash algorithm: %s"
 +msgstr "bad data hash algorithm: %s"
 +
 +#: common/audit.c:1051
 +#, c-format
 +msgid "Signature %d"
 +msgstr "Signature %d"
 +
 +#: common/audit.c:1079
 +msgid "Certificate chain valid"
 +msgstr "Certificate chain valid"
 +
 +#: common/audit.c:1090
 +msgid "Root certificate trustworthy"
 +msgstr "Root certificate trustworthy"
 +
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
 +msgid "no CRL found for certificate"
 +msgstr "no CRL found for certificate"
 +
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
 +msgid "the available CRL is too old"
 +msgstr "the available CRL is too old"
 +
 +#: common/audit.c:1119
 +msgid "CRL/OCSP check of certificates"
 +msgstr "CRL/OCSP check of certificates"
 +
 +#: common/audit.c:1139
 +msgid "Included certificates"
 +msgstr "Included certificates"
 +
 +#: common/audit.c:1194
 +msgid "No audit log entries."
 +msgstr "No audit log entries."
 +
 +#: common/audit.c:1243
 +msgid "Unknown operation"
 +msgstr "Unknown operation"
 +
 +#: common/audit.c:1261
 +msgid "Gpg-Agent usable"
 +msgstr "Gpg-Agent usable"
 +
 +#: common/audit.c:1271
 +msgid "Dirmngr usable"
 +msgstr "Dirmngr usable"
 +
 +#: common/audit.c:1307
 +#, c-format
 +msgid "No help available for '%s'."
 +msgstr "No help available for '%s'."
 +
 +#: common/helpfile.c:90
 +msgid "ignoring garbage line"
 +msgstr "ignoring garbage line"
 +
- #: common/gettime.c:893
++#: common/gettime.c:887
 +msgid "[none]"
 +msgstr "[none]"
 +
 +#: common/argparse.c:365
 +msgid "argument not expected"
 +msgstr "argument not expected"
 +
 +#: common/argparse.c:367
 +msgid "read error"
 +msgstr "read error"
 +
 +#: common/argparse.c:369
 +msgid "keyword too long"
 +msgstr "keyword too long"
 +
 +#: common/argparse.c:371
 +msgid "missing argument"
 +msgstr "missing argument"
 +
 +#: common/argparse.c:373
 +msgid "invalid argument"
 +msgstr "invalid argument"
 +
 +#: common/argparse.c:375
 +msgid "invalid command"
 +msgstr "invalid command"
 +
 +#: common/argparse.c:377
 +msgid "invalid alias definition"
 +msgstr "invalid alias definition"
 +
 +#: common/argparse.c:379
 +msgid "out of core"
 +msgstr "out of core"
 +
 +#: common/argparse.c:381
 +msgid "invalid option"
 +msgstr "invalid option"
 +
 +#: common/argparse.c:389
 +#, c-format
 +msgid "missing argument for option \"%.50s\"\n"
 +msgstr "missing argument for option “%.50s”\n"
 +
 +#: common/argparse.c:391
 +#, c-format
 +msgid "invalid argument for option \"%.50s\"\n"
 +msgstr "invalid argument for option “%.50s”\n"
 +
 +#: common/argparse.c:393
 +#, c-format
 +msgid "option \"%.50s\" does not expect an argument\n"
 +msgstr "option “%.50s” does not expect an argument\n"
 +
 +#: common/argparse.c:395
 +#, c-format
 +msgid "invalid command \"%.50s\"\n"
 +msgstr "invalid command “%.50s”\n"
 +
 +#: common/argparse.c:397
 +#, c-format
 +msgid "option \"%.50s\" is ambiguous\n"
 +msgstr "option “%.50s” is ambiguous\n"
 +
 +#: common/argparse.c:399
 +#, c-format
 +msgid "command \"%.50s\" is ambiguous\n"
 +msgstr "command “%.50s” is ambiguous\n"
 +
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
 +msgid "out of core\n"
 +msgstr "out of core\n"
 +
 +#: common/argparse.c:403
 +#, c-format
 +msgid "invalid option \"%.50s\"\n"
 +msgstr "invalid option “%.50s”\n"
 +
 +#: common/utf8conv.c:123
 +#, c-format
 +msgid "conversion from '%s' to '%s' not available\n"
 +msgstr "conversion from ‘%s’ to ‘%s’ not available\n"
 +
 +#: common/utf8conv.c:131
 +#, c-format
 +msgid "iconv_open failed: %s\n"
 +msgstr "iconv_open failed: %s\n"
 +
 +#: common/utf8conv.c:385 common/utf8conv.c:651
 +#, c-format
 +msgid "conversion from '%s' to '%s' failed: %s\n"
 +msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
 +
 +#: common/dotlock.c:707
 +#, c-format
 +msgid "failed to create temporary file '%s': %s\n"
 +msgstr "failed to create temporary file '%s': %s\n"
 +
 +#: common/dotlock.c:771
 +#, c-format
 +msgid "error writing to '%s': %s\n"
 +msgstr "error writing to '%s': %s\n"
 +
 +#: common/dotlock.c:1116
 +#, c-format
 +msgid "removing stale lockfile (created by %d)\n"
 +msgstr "removing stale lockfile (created by %d)\n"
 +
 +#: common/dotlock.c:1152
 +#, c-format
 +msgid "waiting for lock (held by %d%s) %s...\n"
 +msgstr "waiting for lock (held by %d%s) %s...\n"
 +
 +#: common/dotlock.c:1153
 +msgid "(deadlock?) "
 +msgstr "(deadlock?) "
 +
 +#: common/dotlock.c:1192
 +#, c-format
 +msgid "lock '%s' not made: %s\n"
 +msgstr "lock ‘%s’ not made: %s\n"
 +
 +#: common/dotlock.c:1219
 +#, c-format
 +msgid "waiting for lock %s...\n"
 +msgstr "waiting for lock %s...\n"
 +
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
 +#, c-format
 +msgid "%s is too old (need %s, have %s)\n"
 +msgstr "%s is too old (need %s, have %s)\n"
 +
 +#: g10/armor.c:424
 +#, c-format
 +msgid "armor: %s\n"
 +msgstr "armor: %s\n"
 +
 +#: g10/armor.c:463
 +msgid "invalid armor header: "
 +msgstr "invalid armor header: "
 +
 +#: g10/armor.c:474
 +msgid "armor header: "
 +msgstr "armor header: "
 +
 +#: g10/armor.c:487
 +msgid "invalid clearsig header\n"
 +msgstr "invalid clearsig header\n"
 +
 +#: g10/armor.c:500
 +msgid "unknown armor header: "
 +msgstr "unknown armor header: "
 +
 +#: g10/armor.c:553
 +msgid "nested clear text signatures\n"
 +msgstr "nested clear text signatures\n"
 +
 +#: g10/armor.c:688
 +msgid "unexpected armor: "
 +msgstr "unexpected armor: "
 +
 +#: g10/armor.c:701
 +msgid "invalid dash escaped line: "
 +msgstr "invalid dash escaped line: "
 +
 +#: g10/armor.c:873 g10/armor.c:1490
 +#, c-format
 +msgid "invalid radix64 character %02X skipped\n"
 +msgstr "invalid radix64 character %02X skipped\n"
 +
 +#: g10/armor.c:916
 +msgid "premature eof (no CRC)\n"
 +msgstr "premature eof (no CRC)\n"
 +
 +#: g10/armor.c:950
 +msgid "premature eof (in CRC)\n"
 +msgstr "premature eof (in CRC)\n"
 +
 +#: g10/armor.c:958
 +msgid "malformed CRC\n"
 +msgstr "malformed CRC\n"
 +
 +#: g10/armor.c:962 g10/armor.c:1527
 +#, c-format
 +msgid "CRC error; %06lX - %06lX\n"
 +msgstr "CRC error; %06lX - %06lX\n"
 +
 +#: g10/armor.c:982
 +msgid "premature eof (in trailer)\n"
 +msgstr "premature eof (in trailer)\n"
 +
 +#: g10/armor.c:986
 +msgid "error in trailer line\n"
 +msgstr "error in trailer line\n"
 +
 +#: g10/armor.c:1303
 +msgid "no valid OpenPGP data found.\n"
 +msgstr "no valid OpenPGP data found.\n"
 +
 +#: g10/armor.c:1308
 +#, c-format
 +msgid "invalid armor: line longer than %d characters\n"
 +msgstr "invalid armor: line longer than %d characters\n"
 +
 +#: g10/armor.c:1312
 +msgid ""
 +"quoted printable character in armor - probably a buggy MTA has been used\n"
 +msgstr ""
 +"quoted printable character in armor - probably a buggy MTA has been used\n"
 +
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
 +#, c-format
 +msgid "[ not human readable (%zu bytes: %s%s) ]"
 +msgstr "[ not human readable (%zu bytes: %s%s) ]"
 +
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
 +msgid ""
 +"a notation name must have only printable characters or spaces, and end with "
 +"an '='\n"
 +msgstr ""
 +"a notation name must have only printable characters or spaces, and end with "
 +"an ‘=’\n"
 +
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
 +msgid "a user notation name must contain the '@' character\n"
 +msgstr "a user notation name must contain the ‘@’ character\n"
 +
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
 +msgid "a notation name must not contain more than one '@' character\n"
 +msgstr "a notation name must not contain more than one ‘@’ character\n"
 +
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
 +msgid "a notation value must not use any control characters\n"
 +msgstr "a notation value must not use any control characters\n"
 +
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
 +msgid "a notation name may not contain an '=' character\n"
 +msgstr "a notation name may not contain an ‘=’ character\n"
 +
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
 +msgid "a notation name must have only printable characters or spaces\n"
 +msgstr "a notation name must have only printable characters or spaces\n"
 +
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
 +msgid "WARNING: invalid notation data found\n"
 +msgstr "WARNING: invalid notation data found\n"
 +
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
 +#, c-format
 +msgid "failed to proxy %s inquiry to client\n"
 +msgstr "failed to proxy %s inquiry to client\n"
 +
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
 +msgid "Enter passphrase: "
 +msgstr "Enter passphrase: "
 +
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
 +#, c-format
 +msgid "error getting version from '%s': %s\n"
 +msgstr "error getting version from '%s': %s\n"
 +
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
 +#, c-format
 +msgid "server '%s' is older than us (%s < %s)"
 +msgstr "server ‘%s’ is older than us (%s < %s)"
 +
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
 +#, c-format
 +msgid "WARNING: %s\n"
 +msgstr "WARNING: %s\n"
 +
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
 +#, c-format
 +msgid "OpenPGP card not available: %s\n"
 +msgstr "OpenPGP card not available: %s\n"
 +
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
 +#, c-format
 +msgid "OpenPGP card no. %s detected\n"
 +msgstr "OpenPGP card no. %s detected\n"
 +
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
 +msgid "can't do this in batch mode\n"
 +msgstr "can't do this in batch mode\n"
 +
 +#: g10/card-util.c:107
 +msgid "This command is only available for version 2 cards\n"
 +msgstr "This command is only available for version 2 cards\n"
 +
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
 +msgid "Reset Code not or not anymore available\n"
 +msgstr "Reset Code not or not anymore available\n"
 +
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
 +msgid "Your selection? "
 +msgstr "Your selection? "
 +
 +#: g10/card-util.c:279 g10/card-util.c:330
 +msgid "[not set]"
 +msgstr "[not set]"
 +
 +#: g10/card-util.c:533
 +msgid "male"
 +msgstr "male"
 +
 +#: g10/card-util.c:534
 +msgid "female"
 +msgstr "female"
 +
 +#: g10/card-util.c:534
 +msgid "unspecified"
 +msgstr "unspecified"
 +
 +#: g10/card-util.c:561
 +msgid "not forced"
 +msgstr "not forced"
 +
 +#: g10/card-util.c:561
 +msgid "forced"
 +msgstr "forced"
 +
- #: g10/card-util.c:636
++#: g10/card-util.c:647
 +msgid "Error: Only plain ASCII is currently allowed.\n"
 +msgstr "Error: Only plain ASCII is currently allowed.\n"
 +
- #: g10/card-util.c:638
++#: g10/card-util.c:649
 +msgid "Error: The \"<\" character may not be used.\n"
 +msgstr "Error: The “<” character may not be used.\n"
 +
- #: g10/card-util.c:640
++#: g10/card-util.c:651
 +msgid "Error: Double spaces are not allowed.\n"
 +msgstr "Error: Double spaces are not allowed.\n"
 +
- #: g10/card-util.c:657
++#: g10/card-util.c:668
 +msgid "Cardholder's surname: "
 +msgstr "Cardholder's surname: "
 +
- #: g10/card-util.c:659
++#: g10/card-util.c:670
 +msgid "Cardholder's given name: "
 +msgstr "Cardholder's given name: "
 +
- #: g10/card-util.c:677
++#: g10/card-util.c:688
 +#, c-format
 +msgid "Error: Combined name too long (limit is %d characters).\n"
 +msgstr "Error: Combined name too long (limit is %d characters).\n"
 +
- #: g10/card-util.c:698
++#: g10/card-util.c:709
 +msgid "URL to retrieve public key: "
 +msgstr "URL to retrieve public key: "
 +
- #: g10/card-util.c:706
++#: g10/card-util.c:717
 +#, c-format
 +msgid "Error: URL too long (limit is %d characters).\n"
 +msgstr "Error: URL too long (limit is %d characters).\n"
 +
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
 +#, c-format
 +msgid "error reading '%s': %s\n"
 +msgstr "error reading '%s': %s\n"
 +
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
 +#, c-format
 +msgid "error writing '%s': %s\n"
 +msgstr "error writing '%s': %s\n"
 +
- #: g10/card-util.c:861
++#: g10/card-util.c:872
 +msgid "Login data (account name): "
 +msgstr "Login data (account name): "
 +
- #: g10/card-util.c:871
++#: g10/card-util.c:882
 +#, c-format
 +msgid "Error: Login data too long (limit is %d characters).\n"
 +msgstr "Error: Login data too long (limit is %d characters).\n"
 +
- #: g10/card-util.c:907
++#: g10/card-util.c:918
 +msgid "Private DO data: "
 +msgstr "Private DO data: "
 +
- #: g10/card-util.c:917
++#: g10/card-util.c:928
 +#, c-format
 +msgid "Error: Private DO too long (limit is %d characters).\n"
 +msgstr "Error: Private DO too long (limit is %d characters).\n"
 +
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
 +msgid "Language preferences: "
 +msgstr "Language preferences: "
 +
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
 +msgid "Error: invalid length of preference string.\n"
 +msgstr "Error: invalid length of preference string.\n"
 +
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
 +msgid "Error: invalid characters in preference string.\n"
 +msgstr "Error: invalid characters in preference string.\n"
 +
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
 +msgid "Sex ((M)ale, (F)emale or space): "
 +msgstr "Sex ((M)ale, (F)emale or space): "
 +
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
 +msgid "Error: invalid response.\n"
 +msgstr "Error: invalid response.\n"
 +
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
 +msgid "CA fingerprint: "
 +msgstr "CA fingerprint: "
 +
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
 +msgid "Error: invalid formatted fingerprint.\n"
 +msgstr "Error: invalid formatted fingerprint.\n"
 +
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
 +#, c-format
 +msgid "key operation not possible: %s\n"
 +msgstr "key operation not possible: %s\n"
 +
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
 +msgid "not an OpenPGP card"
 +msgstr "not an OpenPGP card"
 +
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
 +#, c-format
 +msgid "error getting current key info: %s\n"
 +msgstr "error getting current key info: %s\n"
 +
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
 +msgid "Replace existing key? (y/N) "
 +msgstr "Replace existing key? (y/N) "
 +
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
 +msgid ""
 +"Note: There is no guarantee that the card supports the requested size.\n"
 +"      If the key generation does not succeed, please check the\n"
 +"      documentation of your card to see what sizes are allowed.\n"
 +msgstr ""
 +"Note: There is no guarantee that the card supports the requested size.\n"
 +"      If the key generation does not succeed, please check the\n"
 +"      documentation of your card to see what sizes are allowed.\n"
 +
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
 +#, c-format
 +msgid "What keysize do you want for the Signature key? (%u) "
 +msgstr "What keysize do you want for the Signature key? (%u) "
 +
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
 +#, c-format
 +msgid "What keysize do you want for the Encryption key? (%u) "
 +msgstr "What keysize do you want for the Encryption key? (%u) "
 +
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
 +#, c-format
 +msgid "What keysize do you want for the Authentication key? (%u) "
 +msgstr "What keysize do you want for the Authentication key? (%u) "
 +
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
 +#, c-format
 +msgid "rounded up to %u bits\n"
 +msgstr "rounded up to %u bits\n"
 +
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
 +#, c-format
 +msgid "%s keysizes must be in the range %u-%u\n"
 +msgstr "%s keysizes must be in the range %u-%u\n"
 +
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
 +#, c-format
 +msgid "The card will now be re-configured to generate a key of %u bits\n"
 +msgstr "The card will now be re-configured to generate a key of %u bits\n"
 +
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
 +#, c-format
 +msgid "error changing size of key %d to %u bits: %s\n"
 +msgstr "error changing size of key %d to %u bits: %s\n"
 +
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
 +msgid "Make off-card backup of encryption key? (Y/n) "
 +msgstr "Make off-card backup of encryption key? (Y/n) "
 +
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
 +msgid "Note: keys are already stored on the card!\n"
 +msgstr "Note: keys are already stored on the card!\n"
 +
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
 +msgid "Replace existing keys? (y/N) "
 +msgstr "Replace existing keys? (y/N) "
 +
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
 +#, c-format
 +msgid ""
 +"Please note that the factory settings of the PINs are\n"
 +"   PIN = '%s'     Admin PIN = '%s'\n"
 +"You should change them using the command --change-pin\n"
 +msgstr ""
 +"Please note that the factory settings of the PINs are\n"
 +"   PIN = ‘%s’     Admin PIN = ‘%s’\n"
 +"You should change them using the command --change-pin\n"
 +
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
 +msgid "Please select the type of key to generate:\n"
 +msgstr "Please select the type of key to generate:\n"
 +
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
 +msgid "   (1) Signature key\n"
 +msgstr "   (1) Signature key\n"
 +
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
 +msgid "   (2) Encryption key\n"
 +msgstr "   (2) Encryption key\n"
 +
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
 +msgid "   (3) Authentication key\n"
 +msgstr "   (3) Authentication key\n"
 +
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
 +msgid "Invalid selection.\n"
 +msgstr "Invalid selection.\n"
 +
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
 +msgid "Please select where to store the key:\n"
 +msgstr "Please select where to store the key:\n"
 +
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
 +#, c-format
 +msgid "KEYTOCARD failed: %s\n"
 +msgstr "KEYTOCARD failed: %s\n"
 +
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
 +msgid "This command is not supported by this card\n"
 +msgstr "This command is not supported by this card\n"
 +
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
 +msgid "Note: This command destroys all keys stored on the card!\n"
 +msgstr "Note: This command destroys all keys stored on the card!\n"
 +
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
 +msgid "Continue? (y/N) "
 +msgstr "Continue? (y/N) "
 +
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
 +msgid "Really do a factory reset? (enter \"yes\") "
 +msgstr "Really do a factory reset? (enter “yes”) "
 +
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
 +msgid "quit this menu"
 +msgstr "quit this menu"
 +
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
 +msgid "show admin commands"
 +msgstr "show admin commands"
 +
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
 +msgid "show this help"
 +msgstr "show this help"
 +
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
 +msgid "list all available data"
 +msgstr "list all available data"
 +
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
 +msgid "change card holder's name"
 +msgstr "change card holder's name"
 +
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
 +msgid "change URL to retrieve key"
 +msgstr "change URL to retrieve key"
 +
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
 +msgid "fetch the key specified in the card URL"
 +msgstr "fetch the key specified in the card URL"
 +
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
 +msgid "change the login name"
 +msgstr "change the login name"
 +
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
 +msgid "change the language preferences"
 +msgstr "change the language preferences"
 +
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
 +msgid "change card holder's sex"
 +msgstr "change card holder's sex"
 +
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
 +msgid "change a CA fingerprint"
 +msgstr "change a CA fingerprint"
 +
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
 +msgid "toggle the signature force PIN flag"
 +msgstr "toggle the signature force PIN flag"
 +
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
 +msgid "generate new keys"
 +msgstr "generate new keys"
 +
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
 +msgid "menu to change or unblock the PIN"
 +msgstr "menu to change or unblock the PIN"
 +
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
 +msgid "verify the PIN and list all data"
 +msgstr "verify the PIN and list all data"
 +
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
 +msgid "unblock the PIN using a Reset Code"
 +msgstr "unblock the PIN using a Reset Code"
 +
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
 +msgid "destroy all keys and data"
 +msgstr "destroy all keys and data"
 +
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
 +msgid "gpg/card> "
 +msgstr "gpg/card> "
 +
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
 +msgid "Admin-only command\n"
 +msgstr "Admin-only command\n"
 +
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
 +msgid "Admin commands are allowed\n"
 +msgstr "Admin commands are allowed\n"
 +
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
 +msgid "Admin commands are not allowed\n"
 +msgstr "Admin commands are not allowed\n"
 +
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
 +msgid "Invalid command  (try \"help\")\n"
 +msgstr "Invalid command  (try “help”)\n"
 +
 +#: g10/decrypt.c:191 g10/encrypt.c:955
 +msgid "--output doesn't work for this command\n"
 +msgstr "--output doesn't work for this command\n"
 +
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
 +#, c-format
 +msgid "can't open '%s'\n"
 +msgstr "can't open ‘%s’\n"
 +
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
 +#, c-format
 +msgid "key \"%s\" not found: %s\n"
 +msgstr "key “%s” not found: %s\n"
 +
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
 +#, c-format
 +msgid "error reading keyblock: %s\n"
 +msgstr "error reading keyblock: %s\n"
 +
 +#: g10/delkey.c:118 g10/getkey.c:579
 +#, c-format
 +msgid "key \"%s\" not found\n"
 +msgstr "key “%s” not found\n"
 +
 +#: g10/delkey.c:129 g10/delkey.c:136
 +msgid "(unless you specify the key by fingerprint)\n"
 +msgstr "(unless you specify the key by fingerprint)\n"
 +
 +#: g10/delkey.c:135
 +msgid "can't do this in batch mode without \"--yes\"\n"
 +msgstr "can't do this in batch mode without “--yes”\n"
 +
 +#: g10/delkey.c:148
 +msgid "Delete this key from the keyring? (y/N) "
 +msgstr "Delete this key from the keyring? (y/N) "
 +
 +#: g10/delkey.c:158
 +msgid "This is a secret key! - really delete? (y/N) "
 +msgstr "This is a secret key! - really delete? (y/N) "
 +
 +#: g10/delkey.c:201
 +#, c-format
 +msgid "deleting secret %s failed: %s\n"
 +msgstr "deleting secret %s failed: %s\n"
 +
 +#: g10/delkey.c:203
 +msgid "key"
 +msgstr "key"
 +
 +#: g10/delkey.c:203
 +msgid "subkey"
 +msgstr "subkey"
 +
 +#: g10/delkey.c:226
 +#, c-format
 +msgid "deleting keyblock failed: %s\n"
 +msgstr "deleting keyblock failed: %s\n"
 +
 +#: g10/delkey.c:239
 +msgid "ownertrust information cleared\n"
 +msgstr "ownertrust information cleared\n"
 +
 +#: g10/delkey.c:275
 +#, c-format
 +msgid "there is a secret key for public key \"%s\"!\n"
 +msgstr "there is a secret key for public key “%s”!\n"
 +
 +#: g10/delkey.c:277
 +msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 +msgstr "use option “--delete-secret-keys” to delete it first.\n"
 +
 +#: g10/encrypt.c:232 g10/sign.c:1292
 +#, c-format
 +msgid "error creating passphrase: %s\n"
 +msgstr "error creating passphrase: %s\n"
 +
 +#: g10/encrypt.c:239
 +msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 +msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
 +
 +#: g10/encrypt.c:253
 +#, c-format
 +msgid "using cipher %s\n"
 +msgstr "using cipher %s\n"
 +
 +#: g10/encrypt.c:263 g10/encrypt.c:624
 +#, c-format
 +msgid "'%s' already compressed\n"
 +msgstr "‘%s’ already compressed\n"
 +
 +#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
 +#, c-format
 +msgid "WARNING: '%s' is an empty file\n"
 +msgstr "WARNING: ‘%s’ is an empty file\n"
 +
 +#: g10/encrypt.c:557
 +#, c-format
 +msgid "reading from '%s'\n"
 +msgstr "reading from ‘%s’\n"
 +
 +#: g10/encrypt.c:605
 +#, c-format
 +msgid ""
 +"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 +msgstr ""
 +"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 +
 +#: g10/encrypt.c:707 g10/sign.c:984
 +#, c-format
 +msgid ""
 +"WARNING: forcing compression algorithm %s (%d) violates recipient "
 +"preferences\n"
 +msgstr ""
 +"WARNING: forcing compression algorithm %s (%d) violates recipient "
 +"preferences\n"
 +
 +#: g10/encrypt.c:817
 +#, c-format
 +msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 +msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 +
 +#: g10/encrypt.c:903
 +#, c-format
 +msgid "%s/%s encrypted for: \"%s\"\n"
 +msgstr "%s/%s encrypted for: “%s”\n"
 +
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
 +#, c-format
 +msgid "you may not use %s while in %s mode\n"
 +msgstr "you may not use %s while in %s mode\n"
 +
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
 +#, c-format
 +msgid "%s encrypted data\n"
 +msgstr "%s encrypted data\n"
 +
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
 +#, c-format
 +msgid "encrypted with unknown algorithm %d\n"
 +msgstr "encrypted with unknown algorithm %d\n"
 +
 +#: g10/decrypt-data.c:164 sm/decrypt.c:127
 +msgid ""
 +"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 +msgstr ""
 +"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 +
 +#: g10/decrypt-data.c:176
 +msgid "problem handling encrypted packet\n"
 +msgstr "problem handling encrypted packet\n"
 +
 +#: g10/exec.c:60
 +msgid "no remote program execution supported\n"
 +msgstr "no remote program execution supported\n"
 +
 +#: g10/exec.c:319
 +msgid ""
 +"external program calls are disabled due to unsafe options file permissions\n"
 +msgstr ""
 +"external program calls are disabled due to unsafe options file permissions\n"
 +
 +#: g10/exec.c:349
 +msgid "this platform requires temporary files when calling external programs\n"
 +msgstr ""
 +"this platform requires temporary files when calling external programs\n"
 +
 +#: g10/exec.c:427
 +#, c-format
 +msgid "unable to execute program '%s': %s\n"
 +msgstr "unable to execute program '%s': %s\n"
 +
 +#: g10/exec.c:430
 +#, c-format
 +msgid "unable to execute shell '%s': %s\n"
 +msgstr "unable to execute shell '%s': %s\n"
 +
 +#: g10/exec.c:521
 +#, c-format
 +msgid "system error while calling external program: %s\n"
 +msgstr "system error while calling external program: %s\n"
 +
 +#: g10/exec.c:532 g10/exec.c:599
 +msgid "unnatural exit of external program\n"
 +msgstr "unnatural exit of external program\n"
 +
 +#: g10/exec.c:547
 +msgid "unable to execute external program\n"
 +msgstr "unable to execute external program\n"
 +
 +#: g10/exec.c:564
 +#, c-format
 +msgid "unable to read external program response: %s\n"
 +msgstr "unable to read external program response: %s\n"
 +
 +#: g10/exec.c:610 g10/exec.c:617
 +#, c-format
 +msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 +msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 +
 +#: g10/exec.c:622
 +#, c-format
 +msgid "WARNING: unable to remove temp directory '%s': %s\n"
 +msgstr "WARNING: unable to remove temp directory '%s': %s\n"
 +
- #: g10/export.c:102
++#: g10/export.c:106
 +msgid "export signatures that are marked as local-only"
 +msgstr "export signatures that are marked as local-only"
 +
- #: g10/export.c:104
++#: g10/export.c:108
 +msgid "export attribute user IDs (generally photo IDs)"
 +msgstr "export attribute user IDs (generally photo IDs)"
 +
- #: g10/export.c:106
++#: g10/export.c:110
 +msgid "export revocation keys marked as \"sensitive\""
 +msgstr "export revocation keys marked as “sensitive”"
 +
- #: g10/export.c:108
++#: g10/export.c:112
 +msgid "remove unusable parts from key during export"
 +msgstr "remove unusable parts from key during export"
 +
- #: g10/export.c:110
++#: g10/export.c:114
 +msgid "remove as much as possible from key during export"
 +msgstr "remove as much as possible from key during export"
 +
- #: g10/export.c:1204
++#: g10/export.c:1218
 +msgid " - skipped"
 +msgstr " - skipped"
 +
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
 +#, c-format
 +msgid "writing to '%s'\n"
 +msgstr "writing to ‘%s’\n"
 +
- #: g10/export.c:1660
++#: g10/export.c:1675
 +#, c-format
 +msgid "key %s: key material on-card - skipped\n"
 +msgstr "key %s: key material on-card - skipped\n"
 +
- #: g10/export.c:1846
++#: g10/export.c:1861
 +msgid "exporting secret keys not allowed\n"
 +msgstr "exporting secret keys not allowed\n"
 +
- #: g10/export.c:1923
++#: g10/export.c:1938
 +#, c-format
 +msgid "key %s: PGP 2.x style key - skipped\n"
 +msgstr "key %s: PGP 2.x style key - skipped\n"
 +
- #: g10/export.c:2004
++#: g10/export.c:2026
 +msgid "WARNING: nothing exported\n"
 +msgstr "WARNING: nothing exported\n"
 +
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
 +#, c-format
 +msgid "error creating '%s': %s\n"
 +msgstr "error creating '%s': %s\n"
 +
 +#: g10/getkey.c:257
 +msgid "[User ID not found]"
 +msgstr "[User ID not found]"
 +
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
 +#, c-format
 +msgid "(check argument of option '%s')\n"
 +msgstr "(check argument of option '%s')\n"
 +
 +#: g10/getkey.c:516
 +#, c-format
 +msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
 +msgstr "Warning: ‘%s’ should be a long key ID or a fingerprint\n"
 +
 +#: g10/getkey.c:546
 +#, c-format
 +msgid "error looking up: %s\n"
 +msgstr "error looking up: %s\n"
 +
 +#: g10/getkey.c:636
 +#, c-format
 +msgid "Warning: %s appears in the keyring %d times\n"
 +msgstr "Warning: %s appears in the keyring %d times\n"
 +
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
 +#, c-format
 +msgid "automatically retrieved '%s' via %s\n"
 +msgstr "automatically retrieved ‘%s’ via %s\n"
 +
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
 +#, c-format
 +msgid "error retrieving '%s' via %s: %s\n"
 +msgstr "error retrieving ‘%s’ via %s: %s\n"
 +
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
 +msgid "No fingerprint"
 +msgstr "No fingerprint"
 +
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
 +#, c-format
 +msgid "secret key \"%s\" not found: %s\n"
 +msgstr "secret key “%s” not found: %s\n"
 +
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
 +#, c-format
 +msgid "Warning: not using '%s' as default key: %s\n"
 +msgstr "Warning: not using ‘%s’ as default key: %s\n"
 +
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
 +#, c-format
 +msgid "using \"%s\" as default secret key for signing\n"
 +msgstr "using “%s” as default secret key for signing\n"
 +
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
 +#, c-format
 +msgid "all values passed to '%s' ignored\n"
 +msgstr "all values passed to ‘%s’ ignored\n"
 +
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
 +#, c-format
 +msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 +msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 +
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
 +#, c-format
 +msgid "using subkey %s instead of primary key %s\n"
 +msgstr "using subkey %s instead of primary key %s\n"
 +
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
 +msgid "make a signature"
 +msgstr "make a signature"
 +
- #: g10/gpg.c:421
++#: g10/gpg.c:425
 +msgid "make a clear text signature"
 +msgstr "make a clear text signature"
 +
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
 +msgid "make a detached signature"
 +msgstr "make a detached signature"
 +
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
 +msgid "encrypt data"
 +msgstr "encrypt data"
 +
- #: g10/gpg.c:425
++#: g10/gpg.c:429
 +msgid "encryption only with symmetric cipher"
 +msgstr "encryption only with symmetric cipher"
 +
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
 +msgid "decrypt data (default)"
 +msgstr "decrypt data (default)"
 +
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
 +msgid "verify a signature"
 +msgstr "verify a signature"
 +
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
 +msgid "list keys"
 +msgstr "list keys"
 +
- #: g10/gpg.c:433
++#: g10/gpg.c:437
 +msgid "list keys and signatures"
 +msgstr "list keys and signatures"
 +
- #: g10/gpg.c:434
++#: g10/gpg.c:438
 +msgid "list and check key signatures"
 +msgstr "list and check key signatures"
 +
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
 +msgid "list keys and fingerprints"
 +msgstr "list keys and fingerprints"
 +
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
 +msgid "list secret keys"
 +msgstr "list secret keys"
 +
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
 +msgid "generate a new key pair"
 +msgstr "generate a new key pair"
 +
- #: g10/gpg.c:440
++#: g10/gpg.c:444
 +msgid "quickly generate a new key pair"
 +msgstr "quickly generate a new key pair"
 +
- #: g10/gpg.c:442
++#: g10/gpg.c:446
 +msgid "quickly add a new user-id"
 +msgstr "quickly add a new user-id"
 +
- #: g10/gpg.c:445
++#: g10/gpg.c:449
 +msgid "quickly revoke a user-id"
 +msgstr "quickly revoke a user-id"
 +
- #: g10/gpg.c:447
++#: g10/gpg.c:451
 +msgid "full featured key pair generation"
 +msgstr "full featured key pair generation"
 +
- #: g10/gpg.c:448
++#: g10/gpg.c:452
 +msgid "generate a revocation certificate"
 +msgstr "generate a revocation certificate"
 +
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
 +msgid "remove keys from the public keyring"
 +msgstr "remove keys from the public keyring"
 +
- #: g10/gpg.c:452
++#: g10/gpg.c:456
 +msgid "remove keys from the secret keyring"
 +msgstr "remove keys from the secret keyring"
 +
- #: g10/gpg.c:454
++#: g10/gpg.c:458
 +msgid "quickly sign a key"
 +msgstr "quickly sign a key"
 +
- #: g10/gpg.c:456
++#: g10/gpg.c:460
 +msgid "quickly sign a key locally"
 +msgstr "quickly sign a key locally"
 +
- #: g10/gpg.c:457
++#: g10/gpg.c:461
 +msgid "sign a key"
 +msgstr "sign a key"
 +
- #: g10/gpg.c:458
++#: g10/gpg.c:462
 +msgid "sign a key locally"
 +msgstr "sign a key locally"
 +
- #: g10/gpg.c:459
++#: g10/gpg.c:463
 +msgid "sign or edit a key"
 +msgstr "sign or edit a key"
 +
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
 +msgid "change a passphrase"
 +msgstr "change a passphrase"
 +
- #: g10/gpg.c:463
++#: g10/gpg.c:467
 +msgid "export keys"
 +msgstr "export keys"
 +
- #: g10/gpg.c:464
++#: g10/gpg.c:468
 +msgid "export keys to a keyserver"
 +msgstr "export keys to a keyserver"
 +
- #: g10/gpg.c:465
++#: g10/gpg.c:469
 +msgid "import keys from a keyserver"
 +msgstr "import keys from a keyserver"
 +
- #: g10/gpg.c:467
++#: g10/gpg.c:471
 +msgid "search for keys on a keyserver"
 +msgstr "search for keys on a keyserver"
 +
- #: g10/gpg.c:469
++#: g10/gpg.c:473
 +msgid "update all keys from a keyserver"
 +msgstr "update all keys from a keyserver"
 +
- #: g10/gpg.c:475
++#: g10/gpg.c:479
 +msgid "import/merge keys"
 +msgstr "import/merge keys"
 +
- #: g10/gpg.c:478
++#: g10/gpg.c:482
 +msgid "print the card status"
 +msgstr "print the card status"
 +
- #: g10/gpg.c:479
++#: g10/gpg.c:483
 +msgid "change data on a card"
 +msgstr "change data on a card"
 +
- #: g10/gpg.c:480
++#: g10/gpg.c:484
 +msgid "change a card's PIN"
 +msgstr "change a card's PIN"
 +
- #: g10/gpg.c:492
++#: g10/gpg.c:496
 +msgid "update the trust database"
 +msgstr "update the trust database"
 +
- #: g10/gpg.c:501
++#: g10/gpg.c:505
 +msgid "print message digests"
 +msgstr "print message digests"
 +
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
 +msgid "run in server mode"
 +msgstr "run in server mode"
 +
- #: g10/gpg.c:506
++#: g10/gpg.c:510
 +msgid "|VALUE|set the TOFU policy for a key"
 +msgstr "|VALUE|set the TOFU policy for a key"
 +
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
 +msgid "create ascii armored output"
 +msgstr "create ascii armored output"
 +
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
 +msgid "|USER-ID|encrypt for USER-ID"
 +msgstr "|USER-ID|encrypt for USER-ID"
 +
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
 +msgid "|USER-ID|use USER-ID to sign or decrypt"
 +msgstr "|USER-ID|use USER-ID to sign or decrypt"
 +
- #: g10/gpg.c:535
++#: g10/gpg.c:539
 +msgid "|N|set compress level to N (0 disables)"
 +msgstr "|N|set compress level to N (0 disables)"
 +
- #: g10/gpg.c:542
++#: g10/gpg.c:546
 +msgid "use canonical text mode"
 +msgstr "use canonical text mode"
 +
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
 +msgid "|FILE|write output to FILE"
 +msgstr "|FILE|write output to FILE"
 +
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
 +msgid "do not make any changes"
 +msgstr "do not make any changes"
 +
- #: g10/gpg.c:575
++#: g10/gpg.c:579
 +msgid "prompt before overwriting"
 +msgstr "prompt before overwriting"
 +
- #: g10/gpg.c:623
++#: g10/gpg.c:628
 +msgid "use strict OpenPGP behavior"
 +msgstr "use strict OpenPGP behavior"
 +
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
 +msgid ""
 +"@\n"
 +"(See the man page for a complete listing of all commands and options)\n"
 +msgstr ""
 +"@\n"
 +"(See the man page for a complete listing of all commands and options)\n"
 +
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
 +msgid ""
 +"@\n"
 +"Examples:\n"
 +"\n"
 +" -se -r Bob [file]          sign and encrypt for user Bob\n"
 +" --clearsign [file]         make a clear text signature\n"
 +" --detach-sign [file]       make a detached signature\n"
 +" --list-keys [names]        show keys\n"
 +" --fingerprint [names]      show fingerprints\n"
 +msgstr ""
 +"@\n"
 +"Examples:\n"
 +"\n"
 +" -se -r Bob [file]          sign and encrypt for user Bob\n"
 +" --clearsign [file]         make a clear text signature\n"
 +" --detach-sign [file]       make a detached signature\n"
 +" --list-keys [names]        show keys\n"
 +" --fingerprint [names]      show fingerprints\n"
 +
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
 +msgid "Usage: @GPG@ [options] [files] (-h for help)"
 +msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 +
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
 +msgid ""
 +"Syntax: @GPG@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt\n"
 +"Default operation depends on the input data\n"
 +msgstr ""
 +"Syntax: @GPG@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt\n"
 +"Default operation depends on the input data\n"
 +
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
 +msgid ""
 +"\n"
 +"Supported algorithms:\n"
 +msgstr ""
 +"\n"
 +"Supported algorithms:\n"
 +
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
 +msgid "Pubkey: "
 +msgstr "Pubkey: "
 +
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
 +msgid "Cipher: "
 +msgstr "Cipher: "
 +
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
 +msgid "Hash: "
 +msgstr "Hash: "
 +
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
 +msgid "Compression: "
 +msgstr "Compression: "
 +
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
 +#, c-format
 +msgid "usage: %s [options] %s\n"
 +msgstr "usage: %s [options] %s\n"
 +
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
 +msgid "conflicting commands\n"
 +msgstr "conflicting commands\n"
 +
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
 +#, c-format
 +msgid "no = sign found in group definition '%s'\n"
 +msgstr "no = sign found in group definition ‘%s’\n"
 +
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
 +#, c-format
 +msgid "WARNING: unsafe ownership on homedir '%s'\n"
 +msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 +
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
 +#, c-format
 +msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 +msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 +
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
 +#, c-format
 +msgid "WARNING: unsafe ownership on extension '%s'\n"
 +msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 +
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
 +#, c-format
 +msgid "WARNING: unsafe permissions on homedir '%s'\n"
 +msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 +
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
 +#, c-format
 +msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 +msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 +
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
 +#, c-format
 +msgid "WARNING: unsafe permissions on extension '%s'\n"
 +msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 +
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
 +#, c-format
 +msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 +msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘%s’\n"
 +
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
 +#, c-format
 +msgid ""
 +"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 +msgstr ""
 +"WARNING: unsafe enclosing directory ownership on configuration file ‘"
 +"%s’\n"
 +
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
 +#, c-format
 +msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 +msgstr ""
 +"WARNING: unsafe enclosing directory ownership on extension ‘%s’\n"
 +
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
 +#, c-format
 +msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 +msgstr ""
 +"WARNING: unsafe enclosing directory permissions on homedir ‘%s’\n"
 +
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
 +#, c-format
 +msgid ""
 +"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 +msgstr ""
 +"WARNING: unsafe enclosing directory permissions on configuration file ‘"
 +"%s’\n"
 +
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
 +#, c-format
 +msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 +msgstr ""
 +"WARNING: unsafe enclosing directory permissions on extension ‘%s’\n"
 +
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
 +#, c-format
 +msgid "unknown configuration item '%s'\n"
 +msgstr "unknown configuration item ‘%s’\n"
 +
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
 +msgid "display photo IDs during key listings"
 +msgstr "display photo IDs during key listings"
 +
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
 +msgid "show key usage information during key listings"
 +msgstr "show key usage information during key listings"
 +
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
 +msgid "show policy URLs during signature listings"
 +msgstr "show policy URLs during signature listings"
 +
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
 +msgid "show all notations during signature listings"
 +msgstr "show all notations during signature listings"
 +
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
 +msgid "show IETF standard notations during signature listings"
 +msgstr "show IETF standard notations during signature listings"
 +
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
 +msgid "show user-supplied notations during signature listings"
 +msgstr "show user-supplied notations during signature listings"
 +
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
 +msgid "show preferred keyserver URLs during signature listings"
 +msgstr "show preferred keyserver URLs during signature listings"
 +
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
 +msgid "show user ID validity during key listings"
 +msgstr "show user ID validity during key listings"
 +
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
 +msgid "show revoked and expired user IDs in key listings"
 +msgstr "show revoked and expired user IDs in key listings"
 +
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
 +msgid "show revoked and expired subkeys in key listings"
 +msgstr "show revoked and expired subkeys in key listings"
 +
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
 +msgid "show the keyring name in key listings"
 +msgstr "show the keyring name in key listings"
 +
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
 +msgid "show expiration dates during signature listings"
 +msgstr "show expiration dates during signature listings"
 +
- #: g10/gpg.c:2011
- msgid "available TOFU policies:\n"
- msgstr "available TOFU policies:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
++#, c-format
++msgid "valid values for option '%s':\n"
++msgstr "valid values for option '%s':\n"
 +
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
 +#, c-format
 +msgid "unknown TOFU policy '%s'\n"
 +msgstr "unknown TOFU policy ‘%s’\n"
 +
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
 +msgid "(use \"help\" to list choices)\n"
 +msgstr "(use “help” to list choices)\n"
 +
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
++#, c-format
++msgid "invalid value for option '%s'\n"
++msgstr "invalid value for option ‘%s’\n"
++
++#: g10/gpg.c:2203
 +#, c-format
 +msgid "Note: old default options file '%s' ignored\n"
 +msgstr "Note: old default options file ‘%s’ ignored\n"
 +
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
 +#, c-format
 +msgid "Note: %s is not for normal use!\n"
 +msgstr "Note: %s is not for normal use!\n"
 +
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
 +#, c-format
 +msgid "'%s' is not a valid signature expiration\n"
 +msgstr "‘%s’ is not a valid signature expiration\n"
 +
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
 +#, c-format
 +msgid "\"%s\" is not a proper mail address\n"
 +msgstr "“%s” is not a proper mail address\n"
 +
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
 +#, c-format
 +msgid "invalid pinentry mode '%s'\n"
 +msgstr "invalid pinentry mode ‘%s’\n"
 +
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
 +#, c-format
 +msgid "'%s' is not a valid character set\n"
 +msgstr "‘%s’ is not a valid character set\n"
 +
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
 +msgid "could not parse keyserver URL\n"
 +msgstr "could not parse keyserver URL\n"
 +
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
 +#, c-format
 +msgid "%s:%d: invalid keyserver options\n"
 +msgstr "%s:%d: invalid keyserver options\n"
 +
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
 +msgid "invalid keyserver options\n"
 +msgstr "invalid keyserver options\n"
 +
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
 +#, c-format
 +msgid "%s:%d: invalid import options\n"
 +msgstr "%s:%d: invalid import options\n"
 +
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
 +msgid "invalid import options\n"
 +msgstr "invalid import options\n"
 +
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
 +#, c-format
 +msgid "invalid filter option: %s\n"
 +msgstr "invalid filter option: %s\n"
 +
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
 +#, c-format
 +msgid "%s:%d: invalid export options\n"
 +msgstr "%s:%d: invalid export options\n"
 +
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
 +msgid "invalid export options\n"
 +msgstr "invalid export options\n"
 +
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
 +#, c-format
 +msgid "%s:%d: invalid list options\n"
 +msgstr "%s:%d: invalid list options\n"
 +
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
 +msgid "invalid list options\n"
 +msgstr "invalid list options\n"
 +
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
 +msgid "display photo IDs during signature verification"
 +msgstr "display photo IDs during signature verification"
 +
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
 +msgid "show policy URLs during signature verification"
 +msgstr "show policy URLs during signature verification"
 +
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
 +msgid "show all notations during signature verification"
 +msgstr "show all notations during signature verification"
 +
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
 +msgid "show IETF standard notations during signature verification"
 +msgstr "show IETF standard notations during signature verification"
 +
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
 +msgid "show user-supplied notations during signature verification"
 +msgstr "show user-supplied notations during signature verification"
 +
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
 +msgid "show preferred keyserver URLs during signature verification"
 +msgstr "show preferred keyserver URLs during signature verification"
 +
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
 +msgid "show user ID validity during signature verification"
 +msgstr "show user ID validity during signature verification"
 +
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
 +msgid "show revoked and expired user IDs in signature verification"
 +msgstr "show revoked and expired user IDs in signature verification"
 +
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
 +msgid "show only the primary user ID in signature verification"
 +msgstr "show only the primary user ID in signature verification"
 +
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
 +msgid "validate signatures with PKA data"
 +msgstr "validate signatures with PKA data"
 +
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
 +msgid "elevate the trust of signatures with valid PKA data"
 +msgstr "elevate the trust of signatures with valid PKA data"
 +
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
 +#, c-format
 +msgid "%s:%d: invalid verify options\n"
 +msgstr "%s:%d: invalid verify options\n"
 +
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
 +msgid "invalid verify options\n"
 +msgstr "invalid verify options\n"
 +
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
 +#, c-format
 +msgid "unable to set exec-path to %s\n"
 +msgstr "unable to set exec-path to %s\n"
 +
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
 +#, c-format
 +msgid "%s:%d: invalid auto-key-locate list\n"
 +msgstr "%s:%d: invalid auto-key-locate list\n"
 +
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
 +msgid "invalid auto-key-locate list\n"
 +msgstr "invalid auto-key-locate list\n"
 +
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
 +msgid "WARNING: program may create a core file!\n"
 +msgstr "WARNING: program may create a core file!\n"
 +
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
 +#, c-format
 +msgid "WARNING: %s overrides %s\n"
 +msgstr "WARNING: %s overrides %s\n"
 +
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
 +#, c-format
 +msgid "%s not allowed with %s!\n"
 +msgstr "%s not allowed with %s!\n"
 +
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
 +#, c-format
 +msgid "%s makes no sense with %s!\n"
 +msgstr "%s makes no sense with %s!\n"
 +
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
 +msgid "WARNING: running with faked system time: "
 +msgstr "WARNING: running with faked system time: "
 +
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
 +#, c-format
 +msgid "will not run with insecure memory due to %s\n"
 +msgstr "will not run with insecure memory due to %s\n"
 +
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
 +msgid "selected cipher algorithm is invalid\n"
 +msgstr "selected cipher algorithm is invalid\n"
 +
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
 +msgid "selected digest algorithm is invalid\n"
 +msgstr "selected digest algorithm is invalid\n"
 +
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
 +msgid "selected compression algorithm is invalid\n"
 +msgstr "selected compression algorithm is invalid\n"
 +
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
 +msgid "selected certification digest algorithm is invalid\n"
 +msgstr "selected certification digest algorithm is invalid\n"
 +
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
 +msgid "completes-needed must be greater than 0\n"
 +msgstr "completes-needed must be greater than 0\n"
 +
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
 +msgid "marginals-needed must be greater than 1\n"
 +msgstr "marginals-needed must be greater than 1\n"
 +
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
 +msgid "max-cert-depth must be in the range from 1 to 255\n"
 +msgstr "max-cert-depth must be in the range from 1 to 255\n"
 +
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
 +msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 +msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 +
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
 +msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 +msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 +
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
 +msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 +msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 +
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
 +msgid "invalid S2K mode; must be 0, 1 or 3\n"
 +msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 +
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
 +msgid "invalid default preferences\n"
 +msgstr "invalid default preferences\n"
 +
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
 +msgid "invalid personal cipher preferences\n"
 +msgstr "invalid personal cipher preferences\n"
 +
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
 +msgid "invalid personal digest preferences\n"
 +msgstr "invalid personal digest preferences\n"
 +
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
 +msgid "invalid personal compress preferences\n"
 +msgstr "invalid personal compress preferences\n"
 +
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
 +#, c-format
 +msgid "%s does not yet work with %s\n"
 +msgstr "%s does not yet work with %s\n"
 +
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
 +#, c-format
 +msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 +msgstr "you may not use cipher algorithm ‘%s’ while in %s mode\n"
 +
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
 +#, c-format
 +msgid "you may not use digest algorithm '%s' while in %s mode\n"
 +msgstr "you may not use digest algorithm ‘%s’ while in %s mode\n"
 +
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
 +#, c-format
 +msgid "you may not use compression algorithm '%s' while in %s mode\n"
 +msgstr "you may not use compression algorithm ‘%s’ while in %s mode\n"
 +
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
 +#, c-format
 +msgid "failed to initialize the TrustDB: %s\n"
 +msgstr "failed to initialize the TrustDB: %s\n"
 +
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
 +msgid "WARNING: recipients (-r) given without using public key encryption\n"
 +msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 +
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
 +msgid "--store [filename]"
 +msgstr "--store [filename]"
 +
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
 +msgid "--symmetric [filename]"
 +msgstr "--symmetric [filename]"
 +
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
 +#, c-format
 +msgid "symmetric encryption of '%s' failed: %s\n"
 +msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 +
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
 +msgid "--encrypt [filename]"
 +msgstr "--encrypt [filename]"
 +
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
 +msgid "--symmetric --encrypt [filename]"
 +msgstr "--symmetric --encrypt [filename]"
 +
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
 +msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 +msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 +
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
 +#, c-format
 +msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 +msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
 +
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
 +msgid "--sign [filename]"
 +msgstr "--sign [filename]"
 +
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
 +msgid "--sign --encrypt [filename]"
 +msgstr "--sign --encrypt [filename]"
 +
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
 +msgid "--symmetric --sign --encrypt [filename]"
 +msgstr "--symmetric --sign --encrypt [filename]"
 +
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
 +msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 +msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 +
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
 +#, c-format
 +msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 +msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 +
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
 +msgid "--sign --symmetric [filename]"
 +msgstr "--sign --symmetric [filename]"
 +
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
 +msgid "--clearsign [filename]"
 +msgstr "--clearsign [filename]"
 +
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
 +msgid "--decrypt [filename]"
 +msgstr "--decrypt [filename]"
 +
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
 +msgid "--sign-key user-id"
 +msgstr "--sign-key user-id"
 +
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
 +msgid "--lsign-key user-id"
 +msgstr "--lsign-key user-id"
 +
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
 +msgid "--edit-key user-id [commands]"
 +msgstr "--edit-key user-id [commands]"
 +
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
 +msgid "--passwd <user-id>"
 +msgstr "--passwd <user-id>"
 +
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
 +#, c-format
 +msgid "keyserver send failed: %s\n"
 +msgstr "keyserver send failed: %s\n"
 +
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
 +#, c-format
 +msgid "keyserver receive failed: %s\n"
 +msgstr "keyserver receive failed: %s\n"
 +
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
 +#, c-format
 +msgid "key export failed: %s\n"
 +msgstr "key export failed: %s\n"
 +
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
 +#, c-format
 +msgid "export as ssh key failed: %s\n"
 +msgstr "export as ssh key failed: %s\n"
 +
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
 +#, c-format
 +msgid "keyserver search failed: %s\n"
 +msgstr "keyserver search failed: %s\n"
 +
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
 +#, c-format
 +msgid "keyserver refresh failed: %s\n"
 +msgstr "keyserver refresh failed: %s\n"
 +
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
 +#, c-format
 +msgid "dearmoring failed: %s\n"
 +msgstr "dearmoring failed: %s\n"
 +
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
 +#, c-format
 +msgid "enarmoring failed: %s\n"
 +msgstr "enarmoring failed: %s\n"
 +
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
 +#, c-format
 +msgid "invalid hash algorithm '%s'\n"
 +msgstr "invalid hash algorithm ‘%s’\n"
 +
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
 +#, c-format
 +msgid "error parsing key specification '%s': %s\n"
 +msgstr "error parsing key specification '%s': %s\n"
 +
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
 +#, c-format
 +msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 +msgstr ""
 +"‘%s’ does not appear to be a valid key ID, fingerprint or keygrip\n"
 +
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
 +msgid "[filename]"
 +msgstr "[filename]"
 +
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
 +msgid "Go ahead and type your message ...\n"
 +msgstr "Go ahead and type your message ...\n"
 +
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
 +msgid "the given certification policy URL is invalid\n"
 +msgstr "the given certification policy URL is invalid\n"
 +
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
 +msgid "the given signature policy URL is invalid\n"
 +msgstr "the given signature policy URL is invalid\n"
 +
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
 +msgid "the given preferred keyserver URL is invalid\n"
 +msgstr "the given preferred keyserver URL is invalid\n"
 +
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
 +msgid "|FILE|take the keys from the keyring FILE"
 +msgstr "|FILE|take the keys from the keyring FILE"
 +
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
 +msgid "make timestamp conflicts only a warning"
 +msgstr "make timestamp conflicts only a warning"
 +
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
 +msgid "|FD|write status info to this FD"
 +msgstr "|FD|write status info to this FD"
 +
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
 +msgid "|ALGO|reject signatures made with ALGO"
 +msgstr "|ALGO|reject signatures made with ALGO"
 +
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
 +msgid "Usage: gpgv [options] [files] (-h for help)"
 +msgstr "Usage: gpgv [options] [files] (-h for help)"
 +
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
 +msgid ""
 +"Syntax: gpgv [options] [files]\n"
 +"Check signatures against known trusted keys\n"
 +msgstr ""
 +"Syntax: gpgv [options] [files]\n"
 +"Check signatures against known trusted keys\n"
 +
 +#: g10/helptext.c:72
 +msgid "No help available"
 +msgstr "No help available"
 +
 +#: g10/helptext.c:82
 +#, c-format
 +msgid "No help available for '%s'"
 +msgstr "No help available for ‘%s’"
 +
- #: g10/import.c:138
++#: g10/import.c:151
 +msgid "import signatures that are marked as local-only"
 +msgstr "import signatures that are marked as local-only"
 +
- #: g10/import.c:141
++#: g10/import.c:154
 +msgid "repair damage from the pks keyserver during import"
 +msgstr "repair damage from the pks keyserver during import"
 +
- #: g10/import.c:144
++#: g10/import.c:157
 +msgid "do not clear the ownertrust values during import"
 +msgstr "do not clear the ownertrust values during import"
 +
- #: g10/import.c:147
++#: g10/import.c:160
 +msgid "do not update the trustdb after import"
 +msgstr "do not update the trustdb after import"
 +
- #: g10/import.c:150
++#: g10/import.c:163
 +msgid "show key during import"
 +msgstr "show key during import"
 +
- #: g10/import.c:153
++#: g10/import.c:166
 +msgid "only accept updates to existing keys"
 +msgstr "only accept updates to existing keys"
 +
- #: g10/import.c:156
++#: g10/import.c:169
 +msgid "remove unusable parts from key after import"
 +msgstr "remove unusable parts from key after import"
 +
- #: g10/import.c:159
++#: g10/import.c:172
 +msgid "remove as much as possible from key after import"
 +msgstr "remove as much as possible from key after import"
 +
- #: g10/import.c:162
++#: g10/import.c:175
 +msgid "run import filters and export key immediately"
 +msgstr "run import filters and export key immediately"
 +
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
 +#, c-format
 +msgid "skipping block of type %d\n"
 +msgstr "skipping block of type %d\n"
 +
- #: g10/import.c:542
++#: g10/import.c:585
 +#, c-format
 +msgid "%lu keys processed so far\n"
 +msgstr "%lu keys processed so far\n"
 +
- #: g10/import.c:612
++#: g10/import.c:655
 +#, c-format
 +msgid "Total number processed: %lu\n"
 +msgstr "Total number processed: %lu\n"
 +
- #: g10/import.c:615
++#: g10/import.c:658
 +#, c-format
 +msgid "    skipped PGP-2 keys: %lu\n"
 +msgstr "    skipped PGP-2 keys: %lu\n"
 +
- #: g10/import.c:617
++#: g10/import.c:660
 +#, c-format
 +msgid "      skipped new keys: %lu\n"
 +msgstr "      skipped new keys: %lu\n"
 +
- #: g10/import.c:620
++#: g10/import.c:663
 +#, c-format
 +msgid "          w/o user IDs: %lu\n"
 +msgstr "          w/o user IDs: %lu\n"
 +
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
 +#, c-format
 +msgid "              imported: %lu"
 +msgstr "              imported: %lu"
 +
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
 +#, c-format
 +msgid "             unchanged: %lu\n"
 +msgstr "             unchanged: %lu\n"
 +
- #: g10/import.c:629
++#: g10/import.c:672
 +#, c-format
 +msgid "          new user IDs: %lu\n"
 +msgstr "          new user IDs: %lu\n"
 +
- #: g10/import.c:631
++#: g10/import.c:674
 +#, c-format
 +msgid "           new subkeys: %lu\n"
 +msgstr "           new subkeys: %lu\n"
 +
- #: g10/import.c:633
++#: g10/import.c:676
 +#, c-format
 +msgid "        new signatures: %lu\n"
 +msgstr "        new signatures: %lu\n"
 +
- #: g10/import.c:635
++#: g10/import.c:678
 +#, c-format
 +msgid "   new key revocations: %lu\n"
 +msgstr "   new key revocations: %lu\n"
 +
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
 +#, c-format
 +msgid "      secret keys read: %lu\n"
 +msgstr "      secret keys read: %lu\n"
 +
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
 +#, c-format
 +msgid "  secret keys imported: %lu\n"
 +msgstr "  secret keys imported: %lu\n"
 +
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
 +#, c-format
 +msgid " secret keys unchanged: %lu\n"
 +msgstr " secret keys unchanged: %lu\n"
 +
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
 +#, c-format
 +msgid "          not imported: %lu\n"
 +msgstr "          not imported: %lu\n"
 +
- #: g10/import.c:645
++#: g10/import.c:688
 +#, c-format
 +msgid "    signatures cleaned: %lu\n"
 +msgstr "    signatures cleaned: %lu\n"
 +
- #: g10/import.c:647
++#: g10/import.c:690
 +#, c-format
 +msgid "      user IDs cleaned: %lu\n"
 +msgstr "      user IDs cleaned: %lu\n"
 +
- #: g10/import.c:991
++#: g10/import.c:1034
 +#, c-format
 +msgid ""
 +"WARNING: key %s contains preferences for unavailable\n"
 +"algorithms on these user IDs:\n"
 +msgstr ""
 +"WARNING: key %s contains preferences for unavailable\n"
 +"algorithms on these user IDs:\n"
 +
- #: g10/import.c:1033
++#: g10/import.c:1076
 +#, c-format
 +msgid "         \"%s\": preference for cipher algorithm %s\n"
 +msgstr "         “%s”: preference for cipher algorithm %s\n"
 +
- #: g10/import.c:1048
++#: g10/import.c:1091
 +#, c-format
 +msgid "         \"%s\": preference for digest algorithm %s\n"
 +msgstr "         “%s”: preference for digest algorithm %s\n"
 +
- #: g10/import.c:1060
++#: g10/import.c:1103
 +#, c-format
 +msgid "         \"%s\": preference for compression algorithm %s\n"
 +msgstr "         “%s”: preference for compression algorithm %s\n"
 +
- #: g10/import.c:1073
++#: g10/import.c:1116
 +msgid "it is strongly suggested that you update your preferences and\n"
 +msgstr "it is strongly suggested that you update your preferences and\n"
 +
- #: g10/import.c:1075
++#: g10/import.c:1118
 +msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 +msgstr ""
 +"re-distribute this key to avoid potential algorithm mismatch problems\n"
 +
- #: g10/import.c:1100
++#: g10/import.c:1143
 +#, c-format
 +msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 +msgstr "you can update your preferences with: gpg --edit-key %s updpref save\n"
 +
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
 +#, c-format
 +msgid "key %s: no user ID\n"
 +msgstr "key %s: no user ID\n"
 +
- #: g10/import.c:1312
++#: g10/import.c:1385
 +#, c-format
 +msgid "key %s: %s\n"
 +msgstr "key %s: %s\n"
 +
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
 +msgid "rejected by import screener"
 +msgstr "rejected by import screener"
 +
- #: g10/import.c:1343
++#: g10/import.c:1416
 +#, c-format
 +msgid "key %s: PKS subkey corruption repaired\n"
 +msgstr "key %s: PKS subkey corruption repaired\n"
 +
- #: g10/import.c:1361
++#: g10/import.c:1434
 +#, c-format
 +msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 +msgstr "key %s: accepted non self-signed user ID “%s”\n"
 +
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
 +#, c-format
 +msgid "key %s: no valid user IDs\n"
 +msgstr "key %s: no valid user IDs\n"
 +
- #: g10/import.c:1373
++#: g10/import.c:1446
 +msgid "this may be caused by a missing self-signature\n"
 +msgstr "this may be caused by a missing self-signature\n"
 +
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
 +#, c-format
 +msgid "key %s: public key not found: %s\n"
 +msgstr "key %s: public key not found: %s\n"
 +
- #: g10/import.c:1437
++#: g10/import.c:1522
 +#, c-format
 +msgid "key %s: new key - skipped\n"
 +msgstr "key %s: new key - skipped\n"
 +
- #: g10/import.c:1452
++#: g10/import.c:1537
 +#, c-format
 +msgid "no writable keyring found: %s\n"
 +msgstr "no writable keyring found: %s\n"
 +
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
 +#, c-format
 +msgid "error writing keyring '%s': %s\n"
 +msgstr "error writing keyring '%s': %s\n"
 +
- #: g10/import.c:1481
++#: g10/import.c:1566
 +#, c-format
 +msgid "key %s: public key \"%s\" imported\n"
 +msgstr "key %s: public key “%s” imported\n"
 +
- #: g10/import.c:1505
++#: g10/import.c:1590
 +#, c-format
 +msgid "key %s: doesn't match our copy\n"
 +msgstr "key %s: doesn't match our copy\n"
 +
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
 +#, c-format
 +msgid "key %s: can't locate original keyblock: %s\n"
 +msgstr "key %s: can't locate original keyblock: %s\n"
 +
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
 +#, c-format
 +msgid "key %s: can't read original keyblock: %s\n"
 +msgstr "key %s: can't read original keyblock: %s\n"
 +
- #: g10/import.c:1572
++#: g10/import.c:1657
 +#, c-format
 +msgid "key %s: \"%s\" 1 new user ID\n"
 +msgstr "key %s: “%s” 1 new user ID\n"
 +
- #: g10/import.c:1575
++#: g10/import.c:1660
 +#, c-format
 +msgid "key %s: \"%s\" %d new user IDs\n"
 +msgstr "key %s: “%s” %d new user IDs\n"
 +
- #: g10/import.c:1578
++#: g10/import.c:1663
 +#, c-format
 +msgid "key %s: \"%s\" 1 new signature\n"
 +msgstr "key %s: “%s” 1 new signature\n"
 +
- #: g10/import.c:1581
++#: g10/import.c:1666
 +#, c-format
 +msgid "key %s: \"%s\" %d new signatures\n"
 +msgstr "key %s: “%s” %d new signatures\n"
 +
- #: g10/import.c:1584
++#: g10/import.c:1669
 +#, c-format
 +msgid "key %s: \"%s\" 1 new subkey\n"
 +msgstr "key %s: “%s” 1 new subkey\n"
 +
- #: g10/import.c:1587
++#: g10/import.c:1672
 +#, c-format
 +msgid "key %s: \"%s\" %d new subkeys\n"
 +msgstr "key %s: “%s” %d new subkeys\n"
 +
- #: g10/import.c:1590
++#: g10/import.c:1675
 +#, c-format
 +msgid "key %s: \"%s\" %d signature cleaned\n"
 +msgstr "key %s: “%s” %d signature cleaned\n"
 +
- #: g10/import.c:1593
++#: g10/import.c:1678
 +#, c-format
 +msgid "key %s: \"%s\" %d signatures cleaned\n"
 +msgstr "key %s: “%s” %d signatures cleaned\n"
 +
- #: g10/import.c:1596
++#: g10/import.c:1681
 +#, c-format
 +msgid "key %s: \"%s\" %d user ID cleaned\n"
 +msgstr "key %s: “%s” %d user ID cleaned\n"
 +
- #: g10/import.c:1599
++#: g10/import.c:1684
 +#, c-format
 +msgid "key %s: \"%s\" %d user IDs cleaned\n"
 +msgstr "key %s: “%s” %d user IDs cleaned\n"
 +
- #: g10/import.c:1622
++#: g10/import.c:1707
 +#, c-format
 +msgid "key %s: \"%s\" not changed\n"
 +msgstr "key %s: “%s” not changed\n"
 +
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
 +#, c-format
 +msgid "key %s: secret key imported\n"
 +msgstr "key %s: secret key imported\n"
 +
- #: g10/import.c:1942
++#: g10/import.c:2027
 +#, c-format
 +msgid "key %s: secret key already exists\n"
 +msgstr "key %s: secret key already exists\n"
 +
- #: g10/import.c:1950
++#: g10/import.c:2035
 +#, c-format
 +msgid "key %s: error sending to agent: %s\n"
 +msgstr "key %s: error sending to agent: %s\n"
 +
- #: g10/import.c:2055
++#: g10/import.c:2140
 +#, c-format
 +msgid "secret key %s: %s\n"
 +msgstr "secret key %s: %s\n"
 +
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
 +msgid "importing secret keys not allowed\n"
 +msgstr "importing secret keys not allowed\n"
 +
- #: g10/import.c:2099
++#: g10/import.c:2184
 +#, c-format
 +msgid "key %s: secret key with invalid cipher %d - skipped\n"
 +msgstr "key %s: secret key with invalid cipher %d - skipped\n"
 +
 +#. TRANSLATORS: For smartcard, each private key on
 +#. host has a reference (stub) to a smartcard and
 +#. actual private key data is stored on the card.  A
 +#. single smartcard can have up to three private key
 +#. data.  Importing private key stub is always
 +#. skipped in 2.1, and it returns
 +#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
 +#. suggested to run 'gpg --card-status', then,
 +#. references to a card will be automatically
 +#. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
 +#, c-format
 +msgid "To migrate '%s', with each smartcard, run: %s\n"
 +msgstr "To migrate '%s', with each smartcard, run: %s\n"
 +
- #: g10/import.c:2226
++#: g10/import.c:2311
 +#, c-format
 +msgid "key %s: no public key - can't apply revocation certificate\n"
 +msgstr "key %s: no public key - can't apply revocation certificate\n"
 +
- #: g10/import.c:2275
++#: g10/import.c:2360
 +#, c-format
 +msgid "key %s: invalid revocation certificate: %s - rejected\n"
 +msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 +
- #: g10/import.c:2308
++#: g10/import.c:2393
 +#, c-format
 +msgid "key %s: \"%s\" revocation certificate imported\n"
 +msgstr "key %s: “%s” revocation certificate imported\n"
 +
- #: g10/import.c:2384
++#: g10/import.c:2469
 +#, c-format
 +msgid "key %s: no user ID for signature\n"
 +msgstr "key %s: no user ID for signature\n"
 +
- #: g10/import.c:2401
++#: g10/import.c:2486
 +#, c-format
 +msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 +msgstr "key %s: unsupported public key algorithm on user ID “%s”\n"
 +
- #: g10/import.c:2403
++#: g10/import.c:2488
 +#, c-format
 +msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 +msgstr "key %s: invalid self-signature on user ID “%s”\n"
 +
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
 +#, c-format
 +msgid "key %s: unsupported public key algorithm\n"
 +msgstr "key %s: unsupported public key algorithm\n"
 +
- #: g10/import.c:2421
++#: g10/import.c:2506
 +#, c-format
 +msgid "key %s: invalid direct key signature\n"
 +msgstr "key %s: invalid direct key signature\n"
 +
- #: g10/import.c:2435
++#: g10/import.c:2520
 +#, c-format
 +msgid "key %s: no subkey for key binding\n"
 +msgstr "key %s: no subkey for key binding\n"
 +
- #: g10/import.c:2448
++#: g10/import.c:2533
 +#, c-format
 +msgid "key %s: invalid subkey binding\n"
 +msgstr "key %s: invalid subkey binding\n"
 +
- #: g10/import.c:2464
++#: g10/import.c:2549
 +#, c-format
 +msgid "key %s: removed multiple subkey binding\n"
 +msgstr "key %s: removed multiple subkey binding\n"
 +
- #: g10/import.c:2486
++#: g10/import.c:2571
 +#, c-format
 +msgid "key %s: no subkey for key revocation\n"
 +msgstr "key %s: no subkey for key revocation\n"
 +
- #: g10/import.c:2499
++#: g10/import.c:2584
 +#, c-format
 +msgid "key %s: invalid subkey revocation\n"
 +msgstr "key %s: invalid subkey revocation\n"
 +
- #: g10/import.c:2514
++#: g10/import.c:2599
 +#, c-format
 +msgid "key %s: removed multiple subkey revocation\n"
 +msgstr "key %s: removed multiple subkey revocation\n"
 +
- #: g10/import.c:2556
++#: g10/import.c:2641
 +#, c-format
 +msgid "key %s: skipped user ID \"%s\"\n"
 +msgstr "key %s: skipped user ID “%s”\n"
 +
- #: g10/import.c:2580
++#: g10/import.c:2665
 +#, c-format
 +msgid "key %s: skipped subkey\n"
 +msgstr "key %s: skipped subkey\n"
 +
- #: g10/import.c:2609
++#: g10/import.c:2694
 +#, c-format
 +msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 +msgstr "key %s: non exportable signature (class 0x%02X) - skipped\n"
 +
- #: g10/import.c:2620
++#: g10/import.c:2705
 +#, c-format
 +msgid "key %s: revocation certificate at wrong place - skipped\n"
 +msgstr "key %s: revocation certificate at wrong place - skipped\n"
 +
- #: g10/import.c:2638
++#: g10/import.c:2723
 +#, c-format
 +msgid "key %s: invalid revocation certificate: %s - skipped\n"
 +msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 +
- #: g10/import.c:2652
++#: g10/import.c:2737
 +#, c-format
 +msgid "key %s: subkey signature in wrong place - skipped\n"
 +msgstr "key %s: subkey signature in wrong place - skipped\n"
 +
- #: g10/import.c:2660
++#: g10/import.c:2745
 +#, c-format
 +msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 +msgstr "key %s: unexpected signature class (0x%02X) - skipped\n"
 +
- #: g10/import.c:2789
++#: g10/import.c:2887
 +#, c-format
 +msgid "key %s: duplicated user ID detected - merged\n"
 +msgstr "key %s: duplicated user ID detected - merged\n"
 +
- #: g10/import.c:2853
++#: g10/import.c:2951
 +#, c-format
 +msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 +msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
 +
- #: g10/import.c:2869
++#: g10/import.c:2967
 +#, c-format
 +msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 +msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
 +
- #: g10/import.c:2933
++#: g10/import.c:3031
 +#, c-format
 +msgid "key %s: \"%s\" revocation certificate added\n"
 +msgstr "key %s: “%s” revocation certificate added\n"
 +
- #: g10/import.c:2971
++#: g10/import.c:3069
 +#, c-format
 +msgid "key %s: direct key signature added\n"
 +msgstr "key %s: direct key signature added\n"
 +
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
 +#, c-format
 +msgid "error creating keybox '%s': %s\n"
 +msgstr "error creating keybox '%s': %s\n"
 +
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
 +#, c-format
 +msgid "error creating keyring '%s': %s\n"
 +msgstr "error creating keyring '%s': %s\n"
 +
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
 +#, c-format
 +msgid "keybox '%s' created\n"
 +msgstr "keybox ‘%s’ created\n"
 +
- #: g10/keydb.c:443
++#: g10/keydb.c:445
 +#, c-format
 +msgid "keyring '%s' created\n"
 +msgstr "keyring ‘%s’ created\n"
 +
- #: g10/keydb.c:822
++#: g10/keydb.c:823
 +#, c-format
 +msgid "keyblock resource '%s': %s\n"
 +msgstr "keyblock resource '%s': %s\n"
 +
- #: g10/keydb.c:907
++#: g10/keydb.c:911
 +#, c-format
 +msgid "error opening key DB: %s\n"
 +msgstr "error opening key DB: %s\n"
 +
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
 +#, c-format
 +msgid "failed to rebuild keyring cache: %s\n"
 +msgstr "failed to rebuild keyring cache: %s\n"
 +
 +#: g10/keyedit.c:264
 +msgid "[revocation]"
 +msgstr "[revocation]"
 +
 +#: g10/keyedit.c:264
 +msgid "[self-signature]"
 +msgstr "[self-signature]"
 +
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
++#, c-format
++msgid "error allocating memory: %s\n"
++msgstr "error allocating memory: %s\n"
++
++#: g10/keyedit.c:629
 +#, c-format
 +msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 +msgstr ""
 +"can't check signature with unsupported public-key algorithm (%d): %s.\n"
 +
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
 +#, c-format
 +msgid ""
 +"can't check signature with unsupported message-digest algorithm %d: %s.\n"
 +msgstr ""
 +"can't check signature with unsupported message-digest algorithm %d: %s.\n"
 +
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
 +msgid " (reordered signatures follow)"
 +msgstr " (reordered signatures follow)"
 +
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
 +#, c-format
 +msgid "key %s:\n"
 +msgstr "key %s:\n"
 +
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
 +#, c-format
 +msgid "%d duplicate signature removed\n"
 +msgid_plural "%d duplicate signatures removed\n"
 +msgstr[0] "%d duplicate signature removed\n"
 +msgstr[1] "%d duplicate signatures removed\n"
 +
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
 +#, c-format
 +msgid "%d signature not checked due to a missing key\n"
 +msgid_plural "%d signatures not checked due to missing keys\n"
 +msgstr[0] "%d signature not checked due to a missing key\n"
 +msgstr[1] "%d signatures not checked due to missing keys\n"
 +
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
 +#, c-format
 +msgid "%d bad signature\n"
 +msgid_plural "%d bad signatures\n"
 +msgstr[0] "%d bad signature\n"
 +msgstr[1] "%d bad signatures\n"
 +
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
 +#, c-format
 +msgid "%d signature reordered\n"
 +msgid_plural "%d signatures reordered\n"
 +msgstr[0] "%d signature reordered\n"
 +msgstr[1] "%d signatures reordered\n"
 +
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
 +#, c-format
 +msgid ""
 +"Warning: errors found and only checked self-signatures, run '%s' to check "
 +"all signatures.\n"
 +msgstr ""
 +"Warning: errors found and only checked self-signatures, run ‘%s’ to "
 +"check all signatures.\n"
 +
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
 +msgid ""
 +"Please decide how far you trust this user to correctly verify other users' "
 +"keys\n"
 +"(by looking at passports, checking fingerprints from different sources, "
 +"etc.)\n"
 +msgstr ""
 +"Please decide how far you trust this user to correctly verify other users' "
 +"keys\n"
 +"(by looking at passports, checking fingerprints from different sources, "
 +"etc.)\n"
 +
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
 +#, c-format
 +msgid "  %d = I trust marginally\n"
 +msgstr "  %d = I trust marginally\n"
 +
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
 +#, c-format
 +msgid "  %d = I trust fully\n"
 +msgstr "  %d = I trust fully\n"
 +
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
 +msgid ""
 +"Please enter the depth of this trust signature.\n"
 +"A depth greater than 1 allows the key you are signing to make\n"
 +"trust signatures on your behalf.\n"
 +msgstr ""
 +"Please enter the depth of this trust signature.\n"
 +"A depth greater than 1 allows the key you are signing to make\n"
 +"trust signatures on your behalf.\n"
 +
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
 +msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 +msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
 +
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
 +#, c-format
 +msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 +msgstr "Skipping user ID “%s”, which is not a text ID.\n"
 +
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
 +#, c-format
 +msgid "User ID \"%s\" is revoked."
 +msgstr "User ID “%s” is revoked."
 +
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
 +msgid "Are you sure you still want to sign it? (y/N) "
 +msgstr "Are you sure you still want to sign it? (y/N) "
 +
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
 +msgid "  Unable to sign.\n"
 +msgstr "  Unable to sign.\n"
 +
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
 +#, c-format
 +msgid "User ID \"%s\" is expired."
 +msgstr "User ID “%s” is expired."
 +
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
 +#, c-format
 +msgid "User ID \"%s\" is not self-signed."
 +msgstr "User ID “%s” is not self-signed."
 +
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
 +#, c-format
 +msgid "User ID \"%s\" is signable.  "
 +msgstr "User ID “%s” is signable.  "
 +
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
 +msgid "Sign it? (y/N) "
 +msgstr "Sign it? (y/N) "
 +
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
 +#, c-format
 +msgid ""
 +"The self-signature on \"%s\"\n"
 +"is a PGP 2.x-style signature.\n"
 +msgstr ""
 +"The self-signature on “%s”\n"
 +"is a PGP 2.x-style signature.\n"
 +
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
 +msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 +msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 +
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
 +#, c-format
 +msgid ""
 +"Your current signature on \"%s\"\n"
 +"has expired.\n"
 +msgstr ""
 +"Your current signature on “%s”\n"
 +"has expired.\n"
 +
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
 +msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 +msgstr ""
 +"Do you want to issue a new signature to replace the expired one? (y/N) "
 +
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
 +#, c-format
 +msgid ""
 +"Your current signature on \"%s\"\n"
 +"is a local signature.\n"
 +msgstr ""
 +"Your current signature on “%s”\n"
 +"is a local signature.\n"
 +
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
 +msgid "Do you want to promote it to a full exportable signature? (y/N) "
 +msgstr "Do you want to promote it to a full exportable signature? (y/N) "
 +
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
 +#, c-format
 +msgid "\"%s\" was already locally signed by key %s\n"
 +msgstr "“%s” was already locally signed by key %s\n"
 +
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
 +#, c-format
 +msgid "\"%s\" was already signed by key %s\n"
 +msgstr "“%s” was already signed by key %s\n"
 +
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
 +msgid "Do you want to sign it again anyway? (y/N) "
 +msgstr "Do you want to sign it again anyway? (y/N) "
 +
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
 +#, c-format
 +msgid "Nothing to sign with key %s\n"
 +msgstr "Nothing to sign with key %s\n"
 +
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
 +msgid "This key has expired!"
 +msgstr "This key has expired!"
 +
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
 +#, c-format
 +msgid "This key is due to expire on %s.\n"
 +msgstr "This key is due to expire on %s.\n"
 +
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
 +msgid "Do you want your signature to expire at the same time? (Y/n) "
 +msgstr "Do you want your signature to expire at the same time? (Y/n) "
 +
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
 +msgid ""
 +"How carefully have you verified the key you are about to sign actually "
 +"belongs\n"
 +"to the person named above?  If you don't know what to answer, enter \"0\".\n"
 +msgstr ""
 +"How carefully have you verified the key you are about to sign actually "
 +"belongs\n"
 +"to the person named above?  If you don't know what to answer, enter "
 +"“0”.\n"
 +
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
 +#, c-format
 +msgid "   (0) I will not answer.%s\n"
 +msgstr "   (0) I will not answer.%s\n"
 +
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
 +#, c-format
 +msgid "   (1) I have not checked at all.%s\n"
 +msgstr "   (1) I have not checked at all.%s\n"
 +
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
 +#, c-format
 +msgid "   (2) I have done casual checking.%s\n"
 +msgstr "   (2) I have done casual checking.%s\n"
 +
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
 +#, c-format
 +msgid "   (3) I have done very careful checking.%s\n"
 +msgstr "   (3) I have done very careful checking.%s\n"
 +
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
 +msgid "Your selection? (enter '?' for more information): "
 +msgstr "Your selection? (enter ‘?’ for more information): "
 +
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
 +#, c-format
 +msgid ""
 +"Are you sure that you want to sign this key with your\n"
 +"key \"%s\" (%s)\n"
 +msgstr ""
 +"Are you sure that you want to sign this key with your\n"
 +"key “%s” (%s)\n"
 +
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
 +msgid "This will be a self-signature.\n"
 +msgstr "This will be a self-signature.\n"
 +
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
 +msgid "WARNING: the signature will not be marked as non-exportable.\n"
 +msgstr "WARNING: the signature will not be marked as non-exportable.\n"
 +
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
 +msgid "WARNING: the signature will not be marked as non-revocable.\n"
 +msgstr "WARNING: the signature will not be marked as non-revocable.\n"
 +
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
 +msgid "The signature will be marked as non-exportable.\n"
 +msgstr "The signature will be marked as non-exportable.\n"
 +
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
 +msgid "The signature will be marked as non-revocable.\n"
 +msgstr "The signature will be marked as non-revocable.\n"
 +
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
 +msgid "I have not checked this key at all.\n"
 +msgstr "I have not checked this key at all.\n"
 +
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
 +msgid "I have checked this key casually.\n"
 +msgstr "I have checked this key casually.\n"
 +
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
 +msgid "I have checked this key very carefully.\n"
 +msgstr "I have checked this key very carefully.\n"
 +
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
 +msgid "Really sign? (y/N) "
 +msgstr "Really sign? (y/N) "
 +
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
 +#, c-format
 +msgid "signing failed: %s\n"
 +msgstr "signing failed: %s\n"
 +
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
 +msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 +msgstr "Key has only stub or on-card key items - no passphrase to change.\n"
 +
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
 +#, c-format
 +msgid "key %s: error changing passphrase: %s\n"
 +msgstr "key %s: error changing passphrase: %s\n"
 +
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
 +msgid "save and quit"
 +msgstr "save and quit"
 +
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
 +msgid "show key fingerprint"
 +msgstr "show key fingerprint"
 +
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
 +msgid "show the keygrip"
 +msgstr "show the keygrip"
 +
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
 +msgid "list key and user IDs"
 +msgstr "list key and user IDs"
 +
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
 +msgid "select user ID N"
 +msgstr "select user ID N"
 +
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
 +msgid "select subkey N"
 +msgstr "select subkey N"
 +
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
 +msgid "check signatures"
 +msgstr "check signatures"
 +
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
 +msgid "sign selected user IDs [* see below for related commands]"
 +msgstr "sign selected user IDs [* see below for related commands]"
 +
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
 +msgid "sign selected user IDs locally"
 +msgstr "sign selected user IDs locally"
 +
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
 +msgid "sign selected user IDs with a trust signature"
 +msgstr "sign selected user IDs with a trust signature"
 +
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
 +msgid "sign selected user IDs with a non-revocable signature"
 +msgstr "sign selected user IDs with a non-revocable signature"
 +
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
 +msgid "add a user ID"
 +msgstr "add a user ID"
 +
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
 +msgid "add a photo ID"
 +msgstr "add a photo ID"
 +
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
 +msgid "delete selected user IDs"
 +msgstr "delete selected user IDs"
 +
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
 +msgid "add a subkey"
 +msgstr "add a subkey"
 +
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
 +msgid "add a key to a smartcard"
 +msgstr "add a key to a smartcard"
 +
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
 +msgid "move a key to a smartcard"
 +msgstr "move a key to a smartcard"
 +
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
 +msgid "move a backup key to a smartcard"
 +msgstr "move a backup key to a smartcard"
 +
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
 +msgid "delete selected subkeys"
 +msgstr "delete selected subkeys"
 +
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
 +msgid "add a revocation key"
 +msgstr "add a revocation key"
 +
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
 +msgid "delete signatures from the selected user IDs"
 +msgstr "delete signatures from the selected user IDs"
 +
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
 +msgid "change the expiration date for the key or selected subkeys"
 +msgstr "change the expiration date for the key or selected subkeys"
 +
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
 +msgid "flag the selected user ID as primary"
 +msgstr "flag the selected user ID as primary"
 +
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
 +msgid "list preferences (expert)"
 +msgstr "list preferences (expert)"
 +
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
 +msgid "list preferences (verbose)"
 +msgstr "list preferences (verbose)"
 +
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
 +msgid "set preference list for the selected user IDs"
 +msgstr "set preference list for the selected user IDs"
 +
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
 +msgid "set the preferred keyserver URL for the selected user IDs"
 +msgstr "set the preferred keyserver URL for the selected user IDs"
 +
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
 +msgid "set a notation for the selected user IDs"
 +msgstr "set a notation for the selected user IDs"
 +
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
 +msgid "change the passphrase"
 +msgstr "change the passphrase"
 +
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
 +msgid "change the ownertrust"
 +msgstr "change the ownertrust"
 +
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
 +msgid "revoke signatures on the selected user IDs"
 +msgstr "revoke signatures on the selected user IDs"
 +
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
 +msgid "revoke selected user IDs"
 +msgstr "revoke selected user IDs"
 +
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
 +msgid "revoke key or selected subkeys"
 +msgstr "revoke key or selected subkeys"
 +
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
 +msgid "enable key"
 +msgstr "enable key"
 +
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
 +msgid "disable key"
 +msgstr "disable key"
 +
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
 +msgid "show selected photo IDs"
 +msgstr "show selected photo IDs"
 +
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
 +msgid "compact unusable user IDs and remove unusable signatures from key"
 +msgstr "compact unusable user IDs and remove unusable signatures from key"
 +
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
 +msgid "compact unusable user IDs and remove all signatures from key"
 +msgstr "compact unusable user IDs and remove all signatures from key"
 +
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
 +msgid "Secret key is available.\n"
 +msgstr "Secret key is available.\n"
 +
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
 +msgid "Need the secret key to do this.\n"
 +msgstr "Need the secret key to do this.\n"
 +
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
 +msgid ""
 +"* The 'sign' command may be prefixed with an 'l' for local signatures "
 +"(lsign),\n"
 +"  a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
 +"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 +msgstr ""
 +"* The ‘sign’ command may be prefixed with an ‘l’ for local "
 +"signatures (lsign),\n"
 +"  a ‘t’ for trust signatures (tsign), an ‘nr’ for non-revocable "
 +"signatures\n"
 +"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 +
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
 +msgid "Key is revoked."
 +msgstr "Key is revoked."
 +
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
 +msgid "Really sign all user IDs? (y/N) "
 +msgstr "Really sign all user IDs? (y/N) "
 +
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
 +msgid "Really sign all text user IDs? (y/N) "
 +msgstr "Really sign all text user IDs? (y/N) "
 +
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
 +msgid "Hint: Select the user IDs to sign\n"
 +msgstr "Hint: Select the user IDs to sign\n"
 +
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
 +#, c-format
 +msgid "Unknown signature type '%s'\n"
 +msgstr "Unknown signature type ‘%s’\n"
 +
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
 +#, c-format
 +msgid "This command is not allowed while in %s mode.\n"
 +msgstr "This command is not allowed while in %s mode.\n"
 +
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
 +msgid "You must select at least one user ID.\n"
 +msgstr "You must select at least one user ID.\n"
 +
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
 +#, c-format
 +msgid "(Use the '%s' command.)\n"
 +msgstr "(Use the ‘%s’ command.)\n"
 +
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
 +msgid "You can't delete the last user ID!\n"
 +msgstr "You can't delete the last user ID!\n"
 +
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
 +msgid "Really remove all selected user IDs? (y/N) "
 +msgstr "Really remove all selected user IDs? (y/N) "
 +
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
 +msgid "Really remove this user ID? (y/N) "
 +msgstr "Really remove this user ID? (y/N) "
 +
 +#. TRANSLATORS: Please take care: This is about
 +#. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
 +msgid "Really move the primary key? (y/N) "
 +msgstr "Really move the primary key? (y/N) "
 +
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
 +msgid "You must select exactly one key.\n"
 +msgstr "You must select exactly one key.\n"
 +
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
 +msgid "Command expects a filename argument\n"
 +msgstr "Command expects a filename argument\n"
 +
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
 +#, c-format
 +msgid "Can't open '%s': %s\n"
 +msgstr "Can't open '%s': %s\n"
 +
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
 +#, c-format
 +msgid "Error reading backup key from '%s': %s\n"
 +msgstr "Error reading backup key from '%s': %s\n"
 +
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
 +msgid "You must select at least one key.\n"
 +msgstr "You must select at least one key.\n"
 +
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
 +msgid "Do you really want to delete the selected keys? (y/N) "
 +msgstr "Do you really want to delete the selected keys? (y/N) "
 +
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
 +msgid "Do you really want to delete this key? (y/N) "
 +msgstr "Do you really want to delete this key? (y/N) "
 +
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
 +msgid "Really revoke all selected user IDs? (y/N) "
 +msgstr "Really revoke all selected user IDs? (y/N) "
 +
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
 +msgid "Really revoke this user ID? (y/N) "
 +msgstr "Really revoke this user ID? (y/N) "
 +
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
 +msgid "Do you really want to revoke the entire key? (y/N) "
 +msgstr "Do you really want to revoke the entire key? (y/N) "
 +
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
 +msgid "Do you really want to revoke the selected subkeys? (y/N) "
 +msgstr "Do you really want to revoke the selected subkeys? (y/N) "
 +
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
 +msgid "Do you really want to revoke this subkey? (y/N) "
 +msgstr "Do you really want to revoke this subkey? (y/N) "
 +
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
 +msgid "Owner trust may not be set while using a user provided trust database\n"
 +msgstr ""
 +"Owner trust may not be set while using a user provided trust database\n"
 +
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
 +msgid "Set preference list to:\n"
 +msgstr "Set preference list to:\n"
 +
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
 +msgid "Really update the preferences for the selected user IDs? (y/N) "
 +msgstr "Really update the preferences for the selected user IDs? (y/N) "
 +
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
 +msgid "Really update the preferences? (y/N) "
 +msgstr "Really update the preferences? (y/N) "
 +
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
 +msgid "Save changes? (y/N) "
 +msgstr "Save changes? (y/N) "
 +
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
 +msgid "Quit without saving? (y/N) "
 +msgstr "Quit without saving? (y/N) "
 +
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
 +#, c-format
 +msgid "update failed: %s\n"
 +msgstr "update failed: %s\n"
 +
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
 +msgid "Key not changed so no update needed.\n"
 +msgstr "Key not changed so no update needed.\n"
 +
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
 +#, c-format
 +msgid "User ID revocation failed: %s\n"
 +msgstr "User ID revocation failed: %s\n"
 +
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
 +#, c-format
 +msgid "\"%s\" is not a fingerprint\n"
 +msgstr "“%s” is not a fingerprint\n"
 +
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
 +#, c-format
 +msgid "\"%s\" is not the primary fingerprint\n"
 +msgstr "“%s” is not the primary fingerprint\n"
 +
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
 +#, c-format
 +msgid "Invalid user ID '%s': %s\n"
 +msgstr "Invalid user ID '%s': %s\n"
 +
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
 +msgid "No matching user IDs."
 +msgstr "No matching user IDs."
 +
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
 +msgid "Nothing to sign.\n"
 +msgstr "Nothing to sign.\n"
 +
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
 +msgid "Digest: "
 +msgstr "Digest: "
 +
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
 +msgid "Features: "
 +msgstr "Features: "
 +
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
 +msgid "Keyserver no-modify"
 +msgstr "Keyserver no-modify"
 +
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
 +msgid "Preferred keyserver: "
 +msgstr "Preferred keyserver: "
 +
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
 +msgid "Notations: "
 +msgstr "Notations: "
 +
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
 +msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 +msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 +
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
 +#, c-format
 +msgid "The following key was revoked on %s by %s key %s\n"
 +msgstr "The following key was revoked on %s by %s key %s\n"
 +
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
 +#, c-format
 +msgid "This key may be revoked by %s key %s"
 +msgstr "This key may be revoked by %s key %s"
 +
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
 +msgid "(sensitive)"
 +msgstr "(sensitive)"
 +
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
 +#, c-format
 +msgid "created: %s"
 +msgstr "created: %s"
 +
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
 +#, c-format
 +msgid "revoked: %s"
 +msgstr "revoked: %s"
 +
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
 +#, c-format
 +msgid "expired: %s"
 +msgstr "expired: %s"
 +
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
 +#, c-format
 +msgid "expires: %s"
 +msgstr "expires: %s"
 +
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
 +#, c-format
 +msgid "usage: %s"
 +msgstr "usage: %s"
 +
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
 +msgid "card-no: "
 +msgstr "card-no: "
 +
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
 +#, c-format
 +msgid "trust: %s"
 +msgstr "trust: %s"
 +
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
 +#, c-format
 +msgid "validity: %s"
 +msgstr "validity: %s"
 +
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
 +msgid "This key has been disabled"
 +msgstr "This key has been disabled"
 +
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
 +msgid ""
 +"Please note that the shown key validity is not necessarily correct\n"
 +"unless you restart the program.\n"
 +msgstr ""
 +"Please note that the shown key validity is not necessarily correct\n"
 +"unless you restart the program.\n"
 +
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
 +msgid "revoked"
 +msgstr "revoked"
 +
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
 +msgid "expired"
 +msgstr "expired"
 +
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
 +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 ""
 +"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:4227
++#: g10/keyedit.c:4240
 +msgid "WARNING: Your encryption subkey expires soon.\n"
 +msgstr "WARNING: Your encryption subkey expires soon.\n"
 +
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
 +msgid "You may want to change its expiration date too.\n"
 +msgstr "You may want to change its expiration date too.\n"
 +
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
 +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 ""
 +"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 +"versions\n"
 +"         of PGP to reject this key.\n"
 +
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
 +msgid "Are you sure you still want to add it? (y/N) "
 +msgstr "Are you sure you still want to add it? (y/N) "
 +
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
 +msgid "You may not add a photo ID to a PGP2-style key.\n"
 +msgstr "You may not add a photo ID to a PGP2-style key.\n"
 +
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
 +msgid "Such a user ID already exists on this key!\n"
 +msgstr "Such a user ID already exists on this key!\n"
 +
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
 +msgid "Delete this good signature? (y/N/q)"
 +msgstr "Delete this good signature? (y/N/q)"
 +
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
 +msgid "Delete this invalid signature? (y/N/q)"
 +msgstr "Delete this invalid signature? (y/N/q)"
 +
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
 +msgid "Delete this unknown signature? (y/N/q)"
 +msgstr "Delete this unknown signature? (y/N/q)"
 +
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
 +msgid "Really delete this self-signature? (y/N)"
 +msgstr "Really delete this self-signature? (y/N)"
 +
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
 +#, c-format
 +msgid "Deleted %d signature.\n"
 +msgid_plural "Deleted %d signatures.\n"
 +msgstr[0] "Deleted %d signature.\n"
 +msgstr[1] "Deleted %d signatures.\n"
 +
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
 +msgid "Nothing deleted.\n"
 +msgstr "Nothing deleted.\n"
 +
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
 +msgid "invalid"
 +msgstr "invalid"
 +
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
 +#, c-format
 +msgid "User ID \"%s\" compacted: %s\n"
 +msgstr "User ID “%s” compacted: %s\n"
 +
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
 +#, c-format
 +msgid "User ID \"%s\": %d signature removed\n"
 +msgid_plural "User ID \"%s\": %d signatures removed\n"
 +msgstr[0] "User ID “%s”: %d signature removed\n"
 +msgstr[1] "User ID “%s”: %d signatures removed\n"
 +
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
 +#, c-format
 +msgid "User ID \"%s\": already minimized\n"
 +msgstr "User ID “%s”: already minimized\n"
 +
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
 +#, c-format
 +msgid "User ID \"%s\": already clean\n"
 +msgstr "User ID “%s”: already clean\n"
 +
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
 +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 ""
 +"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"
 +
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
 +msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 +msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 +
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
 +msgid "Enter the user ID of the designated revoker: "
 +msgstr "Enter the user ID of the designated revoker: "
 +
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
 +msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 +msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 +
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
 +msgid "you cannot appoint a key as its own designated revoker\n"
 +msgstr "you cannot appoint a key as its own designated revoker\n"
 +
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
 +msgid "this key has already been designated as a revoker\n"
 +msgstr "this key has already been designated as a revoker\n"
 +
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
 +msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 +msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 +
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
 +msgid ""
 +"Are you sure you want to appoint this key as a designated revoker? (y/N) "
 +msgstr ""
 +"Are you sure you want to appoint this key as a designated revoker? (y/N) "
 +
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
 +msgid ""
 +"Are you sure you want to change the expiration time for multiple subkeys? (y/"
 +"N) "
 +msgstr ""
 +"Are you sure you want to change the expiration time for multiple subkeys? (y/"
 +"N) "
 +
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
 +msgid "Changing expiration time for a subkey.\n"
 +msgstr "Changing expiration time for a subkey.\n"
 +
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
 +msgid "Changing expiration time for the primary key.\n"
 +msgstr "Changing expiration time for the primary key.\n"
 +
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
 +msgid "You can't change the expiration date of a v3 key\n"
 +msgstr "You can't change the expiration date of a v3 key\n"
 +
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
 +#, c-format
 +msgid "signing subkey %s is already cross-certified\n"
 +msgstr "signing subkey %s is already cross-certified\n"
 +
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
 +#, c-format
 +msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 +msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
 +
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
 +msgid "Please select exactly one user ID.\n"
 +msgstr "Please select exactly one user ID.\n"
 +
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
 +#, c-format
 +msgid "skipping v3 self-signature on user ID \"%s\"\n"
 +msgstr "skipping v3 self-signature on user ID “%s”\n"
 +
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
 +msgid "Enter your preferred keyserver URL: "
 +msgstr "Enter your preferred keyserver URL: "
 +
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
 +msgid "Are you sure you want to replace it? (y/N) "
 +msgstr "Are you sure you want to replace it? (y/N) "
 +
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
 +msgid "Are you sure you want to delete it? (y/N) "
 +msgstr "Are you sure you want to delete it? (y/N) "
 +
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
 +msgid "Enter the notation: "
 +msgstr "Enter the notation: "
 +
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
 +msgid "Proceed? (y/N) "
 +msgstr "Proceed? (y/N) "
 +
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
 +#, c-format
 +msgid "No user ID with index %d\n"
 +msgstr "No user ID with index %d\n"
 +
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
 +#, c-format
 +msgid "No user ID with hash %s\n"
 +msgstr "No user ID with hash %s\n"
 +
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
 +#, c-format
 +msgid "No subkey with key ID '%s'.\n"
 +msgstr "No subkey with key ID '%s'.\n"
 +
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
 +#, c-format
 +msgid "No subkey with index %d\n"
 +msgstr "No subkey with index %d\n"
 +
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
 +#, c-format
 +msgid "user ID: \"%s\"\n"
 +msgstr "user ID: “%s”\n"
 +
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
 +#, c-format
 +msgid "signed by your key %s on %s%s%s\n"
 +msgstr "signed by your key %s on %s%s%s\n"
 +
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
 +msgid " (non-exportable)"
 +msgstr " (non-exportable)"
 +
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
 +#, c-format
 +msgid "This signature expired on %s.\n"
 +msgstr "This signature expired on %s.\n"
 +
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
 +msgid "Are you sure you still want to revoke it? (y/N) "
 +msgstr "Are you sure you still want to revoke it? (y/N) "
 +
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
 +msgid "Create a revocation certificate for this signature? (y/N) "
 +msgstr "Create a revocation certificate for this signature? (y/N) "
 +
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
 +msgid "Not signed by you.\n"
 +msgstr "Not signed by you.\n"
 +
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
 +#, c-format
 +msgid "You have signed these user IDs on key %s:\n"
 +msgstr "You have signed these user IDs on key %s:\n"
 +
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
 +msgid " (non-revocable)"
 +msgstr " (non-revocable)"
 +
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
 +#, c-format
 +msgid "revoked by your key %s on %s\n"
 +msgstr "revoked by your key %s on %s\n"
 +
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
 +msgid "You are about to revoke these signatures:\n"
 +msgstr "You are about to revoke these signatures:\n"
 +
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
 +msgid "Really create the revocation certificates? (y/N) "
 +msgstr "Really create the revocation certificates? (y/N) "
 +
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
 +msgid "no secret key\n"
 +msgstr "no secret key\n"
 +
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
 +#, c-format
 +msgid "tried to revoke a non-user ID: %s\n"
 +msgstr "tried to revoke a non-user ID: %s\n"
 +
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
 +#, c-format
 +msgid "user ID \"%s\" is already revoked\n"
 +msgstr "user ID “%s” is already revoked\n"
 +
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
 +#, c-format
 +msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 +msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
 +
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
 +#, c-format
 +msgid "Key %s is already revoked.\n"
 +msgstr "Key %s is already revoked.\n"
 +
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
 +#, c-format
 +msgid "Subkey %s is already revoked.\n"
 +msgstr "Subkey %s is already revoked.\n"
 +
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
 +#, c-format
 +msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 +msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 +
- #: g10/keygen.c:295
++#: g10/keygen.c:305
 +#, c-format
 +msgid "preference '%s' duplicated\n"
 +msgstr "preference ‘%s’ duplicated\n"
 +
- #: g10/keygen.c:302
++#: g10/keygen.c:312
 +msgid "too many cipher preferences\n"
 +msgstr "too many cipher preferences\n"
 +
- #: g10/keygen.c:304
++#: g10/keygen.c:314
 +msgid "too many digest preferences\n"
 +msgstr "too many digest preferences\n"
 +
- #: g10/keygen.c:306
++#: g10/keygen.c:316
 +msgid "too many compression preferences\n"
 +msgstr "too many compression preferences\n"
 +
- #: g10/keygen.c:447
++#: g10/keygen.c:457
 +#, c-format
 +msgid "invalid item '%s' in preference string\n"
 +msgstr "invalid item ‘%s’ in preference string\n"
 +
- #: g10/keygen.c:926
++#: g10/keygen.c:936
 +msgid "writing direct signature\n"
 +msgstr "writing direct signature\n"
 +
- #: g10/keygen.c:972
++#: g10/keygen.c:982
 +msgid "writing self signature\n"
 +msgstr "writing self signature\n"
 +
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
 +msgid "writing key binding signature\n"
 +msgstr "writing key binding signature\n"
 +
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
 +#, c-format
 +msgid "keysize invalid; using %u bits\n"
 +msgstr "keysize invalid; using %u bits\n"
 +
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
 +#, c-format
 +msgid "keysize rounded up to %u bits\n"
 +msgstr "keysize rounded up to %u bits\n"
 +
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
 +msgid ""
 +"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 +msgstr ""
 +"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 +
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
 +msgid "Sign"
 +msgstr "Sign"
 +
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
 +msgid "Certify"
 +msgstr "Certify"
 +
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
 +msgid "Encrypt"
 +msgstr "Encrypt"
 +
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
 +msgid "Authenticate"
 +msgstr "Authenticate"
 +
 +#. TRANSLATORS: Please use only plain ASCII characters for the
 +#. translation.  If this is not possible use single digits.  The
 +#. string needs to 8 bytes long. Here is a description of the
 +#. functions:
 +#.
 +#. s = Toggle signing capability
 +#. e = Toggle encryption capability
 +#. a = Toggle authentication capability
 +#. q = Finish
 +#.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
 +msgid "SsEeAaQq"
 +msgstr "SsEeAaQq"
 +
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
 +#, c-format
 +msgid "Possible actions for a %s key: "
 +msgstr "Possible actions for a %s key: "
 +
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
 +msgid "Current allowed actions: "
 +msgstr "Current allowed actions: "
 +
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
 +#, c-format
 +msgid "   (%c) Toggle the sign capability\n"
 +msgstr "   (%c) Toggle the sign capability\n"
 +
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
 +#, c-format
 +msgid "   (%c) Toggle the encrypt capability\n"
 +msgstr "   (%c) Toggle the encrypt capability\n"
 +
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
 +#, c-format
 +msgid "   (%c) Toggle the authenticate capability\n"
 +msgstr "   (%c) Toggle the authenticate capability\n"
 +
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
 +#, c-format
 +msgid "   (%c) Finished\n"
 +msgstr "   (%c) Finished\n"
 +
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
 +msgid "Please select what kind of key you want:\n"
 +msgstr "Please select what kind of key you want:\n"
 +
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
 +#, c-format
 +msgid "   (%d) RSA and RSA (default)\n"
 +msgstr "   (%d) RSA and RSA (default)\n"
 +
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
 +#, c-format
 +msgid "   (%d) DSA and Elgamal\n"
 +msgstr "   (%d) DSA and Elgamal\n"
 +
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
 +#, c-format
 +msgid "   (%d) DSA (sign only)\n"
 +msgstr "   (%d) DSA (sign only)\n"
 +
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
 +#, c-format
 +msgid "   (%d) RSA (sign only)\n"
 +msgstr "   (%d) RSA (sign only)\n"
 +
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
 +#, c-format
 +msgid "   (%d) Elgamal (encrypt only)\n"
 +msgstr "   (%d) Elgamal (encrypt only)\n"
 +
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
 +#, c-format
 +msgid "   (%d) RSA (encrypt only)\n"
 +msgstr "   (%d) RSA (encrypt only)\n"
 +
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
 +#, c-format
 +msgid "   (%d) DSA (set your own capabilities)\n"
 +msgstr "   (%d) DSA (set your own capabilities)\n"
 +
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
 +#, c-format
 +msgid "   (%d) RSA (set your own capabilities)\n"
 +msgstr "   (%d) RSA (set your own capabilities)\n"
 +
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
 +#, c-format
 +msgid "   (%d) ECC and ECC\n"
 +msgstr "   (%d) ECC and ECC\n"
 +
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
 +#, c-format
 +msgid "  (%d) ECC (sign only)\n"
 +msgstr "  (%d) ECC (sign only)\n"
 +
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
 +#, c-format
 +msgid "  (%d) ECC (set your own capabilities)\n"
 +msgstr "  (%d) ECC (set your own capabilities)\n"
 +
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
 +#, c-format
 +msgid "  (%d) ECC (encrypt only)\n"
 +msgstr "  (%d) ECC (encrypt only)\n"
 +
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
 +#, c-format
 +msgid "  (%d) Existing key\n"
 +msgstr "  (%d) Existing key\n"
 +
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
 +msgid "Enter the keygrip: "
 +msgstr "Enter the keygrip: "
 +
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
 +msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 +msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 +
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
 +msgid "No key with this keygrip\n"
 +msgstr "No key with this keygrip\n"
 +
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
 +#, c-format
 +msgid "rounded to %u bits\n"
 +msgstr "rounded to %u bits\n"
 +
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
 +#, c-format
 +msgid "%s keys may be between %u and %u bits long.\n"
 +msgstr "%s keys may be between %u and %u bits long.\n"
 +
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
 +#, c-format
 +msgid "What keysize do you want for the subkey? (%u) "
 +msgstr "What keysize do you want for the subkey? (%u) "
 +
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
 +#, c-format
 +msgid "What keysize do you want? (%u) "
 +msgstr "What keysize do you want? (%u) "
 +
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
 +#, c-format
 +msgid "Requested keysize is %u bits\n"
 +msgstr "Requested keysize is %u bits\n"
 +
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
 +msgid "Please select which elliptic curve you want:\n"
 +msgstr "Please select which elliptic curve you want:\n"
 +
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
 +msgid ""
 +"Please specify how long the key should be valid.\n"
 +"         0 = key does not expire\n"
 +"      <n>  = key expires in n days\n"
 +"      <n>w = key expires in n weeks\n"
 +"      <n>m = key expires in n months\n"
 +"      <n>y = key expires in n years\n"
 +msgstr ""
 +"Please specify how long the key should be valid.\n"
 +"         0 = key does not expire\n"
 +"      <n>  = key expires in n days\n"
 +"      <n>w = key expires in n weeks\n"
 +"      <n>m = key expires in n months\n"
 +"      <n>y = key expires in n years\n"
 +
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
 +msgid ""
 +"Please specify how long the signature should be valid.\n"
 +"         0 = signature does not expire\n"
 +"      <n>  = signature expires in n days\n"
 +"      <n>w = signature expires in n weeks\n"
 +"      <n>m = signature expires in n months\n"
 +"      <n>y = signature expires in n years\n"
 +msgstr ""
 +"Please specify how long the signature should be valid.\n"
 +"         0 = signature does not expire\n"
 +"      <n>  = signature expires in n days\n"
 +"      <n>w = signature expires in n weeks\n"
 +"      <n>m = signature expires in n months\n"
 +"      <n>y = signature expires in n years\n"
 +
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
 +msgid "Key is valid for? (0) "
 +msgstr "Key is valid for? (0) "
 +
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
 +#, c-format
 +msgid "Signature is valid for? (%s) "
 +msgstr "Signature is valid for? (%s) "
 +
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
 +msgid "invalid value\n"
 +msgstr "invalid value\n"
 +
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
 +msgid "Key does not expire at all\n"
 +msgstr "Key does not expire at all\n"
 +
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
 +msgid "Signature does not expire at all\n"
 +msgstr "Signature does not expire at all\n"
 +
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
 +#, c-format
 +msgid "Key expires at %s\n"
 +msgstr "Key expires at %s\n"
 +
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
 +#, c-format
 +msgid "Signature expires at %s\n"
 +msgstr "Signature expires at %s\n"
 +
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
 +msgid ""
 +"Your system can't display dates beyond 2038.\n"
 +"However, it will be correctly handled up to 2106.\n"
 +msgstr ""
 +"Your system can't display dates beyond 2038.\n"
 +"However, it will be correctly handled up to 2106.\n"
 +
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
 +msgid "Is this correct? (y/N) "
 +msgstr "Is this correct? (y/N) "
 +
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
 +msgid ""
 +"\n"
 +"GnuPG needs to construct a user ID to identify your key.\n"
 +"\n"
 +msgstr ""
 +"\n"
 +"GnuPG needs to construct a user ID to identify your key.\n"
 +"\n"
 +
 +#. TRANSLATORS: This string is in general not anymore used
 +#. but you should keep your existing translation.  In case
 +#. the new string is not translated this old string will
 +#. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
 +msgid ""
 +"\n"
 +"You need a user ID to identify your key; the software constructs the user "
 +"ID\n"
 +"from the Real Name, Comment and Email Address in this form:\n"
 +"    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
 +"\n"
 +msgstr ""
 +"\n"
 +"You need a user ID to identify your key; the software constructs the user "
 +"ID\n"
 +"from the Real Name, Comment and Email Address in this form:\n"
 +"    “Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>”\n"
 +"\n"
 +
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
 +msgid "Real name: "
 +msgstr "Real name: "
 +
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
 +msgid "Invalid character in name\n"
 +msgstr "Invalid character in name\n"
 +
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
 +#, c-format
 +msgid "The characters '%s' and '%s' may not appear in name\n"
 +msgstr "The characters ‘%s’ and ‘%s’ may not appear in name\n"
 +
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
 +msgid "Name may not start with a digit\n"
 +msgstr "Name may not start with a digit\n"
 +
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
 +msgid "Name must be at least 5 characters long\n"
 +msgstr "Name must be at least 5 characters long\n"
 +
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
 +msgid "Email address: "
 +msgstr "Email address: "
 +
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
 +msgid "Not a valid email address\n"
 +msgstr "Not a valid email address\n"
 +
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
 +msgid "Comment: "
 +msgstr "Comment: "
 +
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
 +msgid "Invalid character in comment\n"
 +msgstr "Invalid character in comment\n"
 +
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
 +#, c-format
 +msgid "You are using the '%s' character set.\n"
 +msgstr "You are using the ‘%s’ character set.\n"
 +
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
 +#, c-format
 +msgid ""
 +"You selected this USER-ID:\n"
 +"    \"%s\"\n"
 +"\n"
 +msgstr ""
 +"You selected this USER-ID:\n"
 +"    “%s”\n"
 +"\n"
 +
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
 +msgid "Please don't put the email address into the real name or the comment\n"
 +msgstr "Please don't put the email address into the real name or the comment\n"
 +
 +#. TRANSLATORS: These are the allowed answers in
 +#. lower and uppercase.  Below you will find the matching
 +#. string which should be translated accordingly and the
 +#. letter changed to match the one in the answer string.
 +#.
 +#. n = Change name
 +#. c = Change comment
 +#. e = Change email
 +#. o = Okay (ready, continue)
 +#. q = Quit
 +#.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
 +msgid "NnCcEeOoQq"
 +msgstr "NnCcEeOoQq"
 +
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
 +msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 +msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 +
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
 +msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 +msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 +
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
 +msgid "Change (N)ame, (E)mail, or (Q)uit? "
 +msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 +
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
 +msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 +msgstr "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 +
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
 +msgid "Please correct the error first\n"
 +msgstr "Please correct the error first\n"
 +
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
 +msgid ""
 +"We need to generate a lot of random bytes. It is a good idea to perform\n"
 +"some other action (type on the keyboard, move the mouse, utilize the\n"
 +"disks) during the prime generation; this gives the random number\n"
 +"generator a better chance to gain enough entropy.\n"
 +msgstr ""
 +"We need to generate a lot of random bytes. It is a good idea to perform\n"
 +"some other action (type on the keyboard, move the mouse, utilize the\n"
 +"disks) during the prime generation; this gives the random number\n"
 +"generator a better chance to gain enough entropy.\n"
 +
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
 +#, c-format
 +msgid "Key generation failed: %s\n"
 +msgstr "Key generation failed: %s\n"
 +
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
 +#, c-format
 +msgid ""
 +"About to create a key for:\n"
 +"    \"%s\"\n"
 +"\n"
 +msgstr ""
 +"About to create a key for:\n"
 +"    “%s”\n"
 +"\n"
 +
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
 +msgid "Continue? (Y/n) "
 +msgstr "Continue? (Y/n) "
 +
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
 +#, c-format
 +msgid "A key for \"%s\" already exists\n"
 +msgstr "A key for “%s” already exists\n"
 +
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
 +msgid "Create anyway? (y/N) "
 +msgstr "Create anyway? (y/N) "
 +
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
 +msgid "creating anyway\n"
 +msgstr "creating anyway\n"
 +
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
 +#, c-format
 +msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 +msgstr "Note: Use “%s %s” for a full featured key generation dialog.\n"
 +
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
 +msgid "Key generation canceled.\n"
 +msgstr "Key generation canceled.\n"
 +
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
 +#, c-format
 +msgid "can't create backup file '%s': %s\n"
 +msgstr "can't create backup file '%s': %s\n"
 +
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
 +#, c-format
 +msgid "Note: backup of card key saved to '%s'\n"
 +msgstr "Note: backup of card key saved to ‘%s’\n"
 +
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
 +#, c-format
 +msgid "writing public key to '%s'\n"
 +msgstr "writing public key to ‘%s’\n"
 +
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
 +#, c-format
 +msgid "no writable public keyring found: %s\n"
 +msgstr "no writable public keyring found: %s\n"
 +
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
 +#, c-format
 +msgid "error writing public keyring '%s': %s\n"
 +msgstr "error writing public keyring '%s': %s\n"
 +
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
 +msgid "public and secret key created and signed.\n"
 +msgstr "public and secret key created and signed.\n"
 +
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
 +msgid ""
 +"Note that this key cannot be used for encryption.  You may want to use\n"
 +"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 +msgstr ""
 +"Note that this key cannot be used for encryption.  You may want to use\n"
 +"the command “--edit-key” to generate a subkey for this purpose.\n"
 +
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
 +#, c-format
 +msgid ""
 +"key has been created %lu second in future (time warp or clock problem)\n"
 +msgstr ""
 +"key has been created %lu second in future (time warp or clock problem)\n"
 +
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
 +#, c-format
 +msgid ""
 +"key has been created %lu seconds in future (time warp or clock problem)\n"
 +msgstr ""
 +"key has been created %lu seconds in future (time warp or clock problem)\n"
 +
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
 +msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 +msgstr "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 +
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
 +msgid "Secret parts of primary key are not available.\n"
 +msgstr "Secret parts of primary key are not available.\n"
 +
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
 +msgid "Secret parts of primary key are stored on-card.\n"
 +msgstr "Secret parts of primary key are stored on-card.\n"
 +
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
 +msgid "Really create? (y/N) "
 +msgstr "Really create? (y/N) "
 +
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
 +msgid "never     "
 +msgstr "never     "
 +
 +#: g10/keylist.c:331
 +msgid "Critical signature policy: "
 +msgstr "Critical signature policy: "
 +
 +#: g10/keylist.c:333
 +msgid "Signature policy: "
 +msgstr "Signature policy: "
 +
 +#: g10/keylist.c:375
 +msgid "Critical preferred keyserver: "
 +msgstr "Critical preferred keyserver: "
 +
 +#: g10/keylist.c:428
 +msgid "Critical signature notation: "
 +msgstr "Critical signature notation: "
 +
 +#: g10/keylist.c:430
 +msgid "Signature notation: "
 +msgstr "Signature notation: "
 +
 +#: g10/keylist.c:472
 +#, c-format
 +msgid "%d good signature\n"
 +msgid_plural "%d good signatures\n"
 +msgstr[0] "%d good signature\n"
 +msgstr[1] "%d good signatures\n"
 +
 +#: g10/keylist.c:485
 +#, c-format
 +msgid "%d signature not checked due to an error\n"
 +msgid_plural "%d signatures not checked due to errors\n"
 +msgstr[0] "%d signature not checked due to an error\n"
 +msgstr[1] "%d signatures not checked due to errors\n"
 +
 +#: g10/keylist.c:567
 +#, c-format
 +msgid "Warning: %lu key skipped due to its large size\n"
 +msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
 +msgstr[0] "Warning: %lu key skipped due to its large size\n"
 +msgstr[1] "Warning: %lu keys skipped due to their large sizes\n"
 +
 +#: g10/keylist.c:589
 +msgid "Keyring"
 +msgstr "Keyring"
 +
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
 +msgid "Primary key fingerprint:"
 +msgstr "Primary key fingerprint:"
 +
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
 +msgid "     Subkey fingerprint:"
 +msgstr "     Subkey fingerprint:"
 +
 +#. TRANSLATORS: this should fit into 24 bytes so that the
 +#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
 +msgid " Primary key fingerprint:"
 +msgstr " Primary key fingerprint:"
 +
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
 +msgid "      Subkey fingerprint:"
 +msgstr "      Subkey fingerprint:"
 +
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
 +msgid "      Key fingerprint ="
 +msgstr "      Key fingerprint ="
 +
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
 +msgid "      Card serial no. ="
 +msgstr "      Card serial no. ="
 +
 +#: g10/keyring.c:1498
 +#, c-format
 +msgid "caching keyring '%s'\n"
 +msgstr "caching keyring ‘%s’\n"
 +
 +#: g10/keyring.c:1572
 +#, c-format
 +msgid "%lu keys cached so far (%lu signature)\n"
 +msgid_plural "%lu keys cached so far (%lu signatures)\n"
 +msgstr[0] "%lu keys cached so far (%lu signature)\n"
 +msgstr[1] "%lu keys cached so far (%lu signatures)\n"
 +
 +#: g10/keyring.c:1588
 +#, c-format
 +msgid "%lu key cached"
 +msgid_plural "%lu keys cached"
 +msgstr[0] "%lu key cached"
 +msgstr[1] "%lu keys cached"
 +
 +#: g10/keyring.c:1590
 +#, c-format
 +msgid " (%lu signature)\n"
 +msgid_plural " (%lu signatures)\n"
 +msgstr[0] " (%lu signature)\n"
 +msgstr[1] " (%lu signatures)\n"
 +
 +#: g10/keyring.c:1665
 +#, c-format
 +msgid "%s: keyring created\n"
 +msgstr "%s: keyring created\n"
 +
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
 +msgid "override proxy options set for dirmngr"
 +msgstr "override proxy options set for dirmngr"
 +
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
 +msgid "include revoked keys in search results"
 +msgstr "include revoked keys in search results"
 +
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
 +msgid "include subkeys when searching by key ID"
 +msgstr "include subkeys when searching by key ID"
 +
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
 +msgid "override timeout options set for dirmngr"
 +msgstr "override timeout options set for dirmngr"
 +
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
 +msgid "automatically retrieve keys when verifying signatures"
 +msgstr "automatically retrieve keys when verifying signatures"
 +
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
 +msgid "honor the preferred keyserver URL set on the key"
 +msgstr "honor the preferred keyserver URL set on the key"
 +
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
 +msgid "honor the PKA record set on a key when retrieving keys"
 +msgstr "honor the PKA record set on a key when retrieving keys"
 +
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
 +msgid "disabled"
 +msgstr "disabled"
 +
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
 +msgid "Enter number(s), N)ext, or Q)uit > "
 +msgstr "Enter number(s), N)ext, or Q)uit > "
 +
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
 +#, c-format
 +msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 +msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 +
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
 +#, c-format
 +msgid "\"%s\" not a key ID: skipping\n"
 +msgstr "“%s” not a key ID: skipping\n"
 +
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
 +#, c-format
 +msgid "refreshing %d key from %s\n"
 +msgid_plural "refreshing %d keys from %s\n"
 +msgstr[0] "refreshing %d key from %s\n"
 +msgstr[1] "refreshing %d keys from %s\n"
 +
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
 +#, c-format
 +msgid "WARNING: unable to refresh key %s via %s: %s\n"
 +msgstr "WARNING: unable to refresh key %s via %s: %s\n"
 +
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
 +#, c-format
 +msgid "key \"%s\" not found on keyserver\n"
 +msgstr "key “%s” not found on keyserver\n"
 +
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
 +msgid "key not found on keyserver\n"
 +msgstr "key not found on keyserver\n"
 +
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
 +msgid "no keyserver known (use option --keyserver)\n"
 +msgstr "no keyserver known (use option --keyserver)\n"
 +
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
 +#, c-format
 +msgid "requesting key %s from %s server %s\n"
 +msgstr "requesting key %s from %s server %s\n"
 +
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
 +#, c-format
 +msgid "requesting key %s from %s\n"
 +msgstr "requesting key %s from %s\n"
 +
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
 +msgid "no keyserver known\n"
 +msgstr "no keyserver known\n"
 +
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
 +#, c-format
 +msgid "skipped \"%s\": %s\n"
 +msgstr "skipped “%s”: %s\n"
 +
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
 +#, c-format
 +msgid "sending key %s to %s\n"
 +msgstr "sending key %s to %s\n"
 +
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
 +#, c-format
 +msgid "requesting key from '%s'\n"
 +msgstr "requesting key from ‘%s’\n"
 +
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
 +#, c-format
 +msgid "WARNING: unable to fetch URI %s: %s\n"
 +msgstr "WARNING: unable to fetch URI %s: %s\n"
 +
 +#: g10/mainproc.c:254
 +#, c-format
 +msgid "weird size for an encrypted session key (%d)\n"
 +msgstr "weird size for an encrypted session key (%d)\n"
 +
 +#: g10/mainproc.c:302
 +#, c-format
 +msgid "%s encrypted session key\n"
 +msgstr "%s encrypted session key\n"
 +
 +#: g10/mainproc.c:312
 +#, c-format
 +msgid "passphrase generated with unknown digest algorithm %d\n"
 +msgstr "passphrase generated with unknown digest algorithm %d\n"
 +
 +#: g10/mainproc.c:378
 +#, c-format
 +msgid "public key is %s\n"
 +msgstr "public key is %s\n"
 +
 +#: g10/mainproc.c:456
 +msgid "public key encrypted data: good DEK\n"
 +msgstr "public key encrypted data: good DEK\n"
 +
 +#: g10/mainproc.c:489
 +#, c-format
 +msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 +msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
 +
 +#: g10/mainproc.c:493 g10/pkclist.c:228
 +#, c-format
 +msgid "      \"%s\"\n"
 +msgstr "      “%s”\n"
 +
 +#: g10/mainproc.c:497
 +#, c-format
 +msgid "encrypted with %s key, ID %s\n"
 +msgstr "encrypted with %s key, ID %s\n"
 +
 +#: g10/mainproc.c:514
 +#, c-format
 +msgid "public key decryption failed: %s\n"
 +msgstr "public key decryption failed: %s\n"
 +
 +#: g10/mainproc.c:530
 +#, c-format
 +msgid "encrypted with %lu passphrases\n"
 +msgstr "encrypted with %lu passphrases\n"
 +
 +#: g10/mainproc.c:532
 +msgid "encrypted with 1 passphrase\n"
 +msgstr "encrypted with 1 passphrase\n"
 +
 +#: g10/mainproc.c:566 g10/mainproc.c:587
 +#, c-format
 +msgid "assuming %s encrypted data\n"
 +msgstr "assuming %s encrypted data\n"
 +
 +#: g10/mainproc.c:573
 +#, c-format
 +msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 +msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 +
 +#: g10/mainproc.c:618 g10/mainproc.c:632
 +msgid "WARNING: message was not integrity protected\n"
 +msgstr "WARNING: message was not integrity protected\n"
 +
 +#: g10/mainproc.c:628
 +msgid "decryption okay\n"
 +msgstr "decryption okay\n"
 +
 +#: g10/mainproc.c:637
 +msgid "WARNING: encrypted message has been manipulated!\n"
 +msgstr "WARNING: encrypted message has been manipulated!\n"
 +
 +#: g10/mainproc.c:653
 +#, c-format
 +msgid "decryption failed: %s\n"
 +msgstr "decryption failed: %s\n"
 +
 +#: g10/mainproc.c:676
 +msgid "Note: sender requested \"for-your-eyes-only\"\n"
 +msgstr "Note: sender requested “for-your-eyes-only”\n"
 +
 +#: g10/mainproc.c:678
 +#, c-format
 +msgid "original file name='%.*s'\n"
 +msgstr "original file name='%.*s'\n"
 +
 +#: g10/mainproc.c:748
 +msgid "WARNING: multiple plaintexts seen\n"
 +msgstr "WARNING: multiple plaintexts seen\n"
 +
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
 +msgid "standalone revocation - use \"gpg --import\" to apply\n"
 +msgstr "standalone revocation - use “gpg --import” to apply\n"
 +
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
 +msgid "no signature found\n"
 +msgstr "no signature found\n"
 +
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
 +#, c-format
 +msgid "BAD signature from \"%s\""
 +msgstr "BAD signature from “%s”"
 +
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
 +#, c-format
 +msgid "Expired signature from \"%s\""
 +msgstr "Expired signature from “%s”"
 +
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
 +#, c-format
 +msgid "Good signature from \"%s\""
 +msgstr "Good signature from “%s”"
 +
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
 +msgid "signature verification suppressed\n"
 +msgstr "signature verification suppressed\n"
 +
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
 +msgid "can't handle this ambiguous signature data\n"
 +msgstr "can't handle this ambiguous signature data\n"
 +
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
 +#, c-format
 +msgid "Signature made %s\n"
 +msgstr "Signature made %s\n"
 +
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
 +#, c-format
 +msgid "               using %s key %s\n"
 +msgstr "               using %s key %s\n"
 +
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
 +#, c-format
 +msgid "Signature made %s using %s key ID %s\n"
 +msgstr "Signature made %s using %s key ID %s\n"
 +
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
 +#, c-format
 +msgid "               issuer \"%s\"\n"
 +msgstr "               issuer “%s”\n"
 +
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
 +msgid "Key available at: "
 +msgstr "Key available at: "
 +
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
 +msgid "[uncertain]"
 +msgstr "[uncertain]"
 +
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
 +#, c-format
 +msgid "                aka \"%s\""
 +msgstr "                aka “%s”"
 +
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
 +#, c-format
 +msgid "Signature expired %s\n"
 +msgstr "Signature expired %s\n"
 +
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
 +#, c-format
 +msgid "Signature expires %s\n"
 +msgstr "Signature expires %s\n"
 +
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
 +#, c-format
 +msgid "%s signature, digest algorithm %s%s%s\n"
 +msgstr "%s signature, digest algorithm %s%s%s\n"
 +
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
 +msgid "binary"
 +msgstr "binary"
 +
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
 +msgid "textmode"
 +msgstr "textmode"
 +
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
 +msgid "unknown"
 +msgstr "unknown"
 +
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
 +msgid ", key algorithm "
 +msgstr ", key algorithm "
 +
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
 +#, c-format
 +msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 +msgstr "WARNING: not a detached signature; file ‘%s’ was NOT verified!\n"
 +
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
 +#, c-format
 +msgid "Can't check signature: %s\n"
 +msgstr "Can't check signature: %s\n"
 +
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
 +msgid "not a detached signature\n"
 +msgstr "not a detached signature\n"
 +
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
 +msgid ""
 +"WARNING: multiple signatures detected.  Only the first will be checked.\n"
 +msgstr ""
 +"WARNING: multiple signatures detected.  Only the first will be checked.\n"
 +
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
 +#, c-format
 +msgid "standalone signature of class 0x%02x\n"
 +msgstr "standalone signature of class 0x%02x\n"
 +
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
 +msgid "old style (PGP 2.x) signature\n"
 +msgstr "old style (PGP 2.x) signature\n"
 +
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
 +#, c-format
 +msgid "fstat of '%s' failed in %s: %s\n"
 +msgstr "fstat of ‘%s’ failed in %s: %s\n"
 +
 +#: g10/misc.c:170
 +#, c-format
 +msgid "fstat(%d) failed in %s: %s\n"
 +msgstr "fstat(%d) failed in %s: %s\n"
 +
 +#: g10/misc.c:279
 +#, c-format
 +msgid "WARNING: using experimental public key algorithm %s\n"
 +msgstr "WARNING: using experimental public key algorithm %s\n"
 +
 +#: g10/misc.c:286
 +msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 +msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 +
 +#: g10/misc.c:300
 +#, c-format
 +msgid "WARNING: using experimental cipher algorithm %s\n"
 +msgstr "WARNING: using experimental cipher algorithm %s\n"
 +
 +#: g10/misc.c:319
 +#, c-format
 +msgid "WARNING: using experimental digest algorithm %s\n"
 +msgstr "WARNING: using experimental digest algorithm %s\n"
 +
 +#: g10/misc.c:328
 +#, c-format
 +msgid "WARNING: digest algorithm %s is deprecated\n"
 +msgstr "WARNING: digest algorithm %s is deprecated\n"
 +
 +#: g10/misc.c:353
 +#, c-format
 +msgid "Note: signatures using the %s algorithm are rejected\n"
 +msgstr "Note: signatures using the %s algorithm are rejected\n"
 +
 +#: g10/misc.c:375
 +#, c-format
 +msgid "(reported error: %s)\n"
 +msgstr "(reported error: %s)\n"
 +
 +#: g10/misc.c:378
 +#, c-format
 +msgid "(reported error: %s <%s>)\n"
 +msgstr "(reported error: %s <%s>)\n"
 +
 +#: g10/misc.c:397
 +msgid "(further info: "
 +msgstr "(further info: "
 +
 +#: g10/misc.c:1056
 +#, c-format
 +msgid "%s:%d: deprecated option \"%s\"\n"
 +msgstr "%s:%d: deprecated option “%s”\n"
 +
 +#: g10/misc.c:1060
 +#, c-format
 +msgid "WARNING: \"%s\" is a deprecated option\n"
 +msgstr "WARNING: “%s” is a deprecated option\n"
 +
 +#: g10/misc.c:1062
 +#, c-format
 +msgid "please use \"%s%s\" instead\n"
 +msgstr "please use “%s%s” instead\n"
 +
 +#: g10/misc.c:1069
 +#, c-format
 +msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 +msgstr "WARNING: “%s” is a deprecated command - do not use it\n"
 +
 +#: g10/misc.c:1079
 +#, c-format
 +msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 +msgstr ""
 +"%s:%u: “%s” is obsolete in this file - it only has effect in %s\n"
 +
 +#: g10/misc.c:1083
 +#, c-format
 +msgid ""
 +"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 +msgstr ""
 +"WARNING: “%s%s” is an obsolete option - it has no effect except on %s\n"
 +
 +#: g10/misc.c:1147
 +msgid "Uncompressed"
 +msgstr "Uncompressed"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: g10/misc.c:1172
 +msgid "uncompressed|none"
 +msgstr "uncompressed|none"
 +
- #: g10/misc.c:1292
++#: g10/misc.c:1297
 +#, c-format
 +msgid "this message may not be usable by %s\n"
 +msgstr "this message may not be usable by %s\n"
 +
- #: g10/misc.c:1467
++#: g10/misc.c:1472
 +#, c-format
 +msgid "ambiguous option '%s'\n"
 +msgstr "ambiguous option ‘%s’\n"
 +
- #: g10/misc.c:1492
++#: g10/misc.c:1497
 +#, c-format
 +msgid "unknown option '%s'\n"
 +msgstr "unknown option ‘%s’\n"
 +
- #: g10/misc.c:1730
++#: g10/misc.c:1735
 +msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 +msgstr ""
 +"ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 +
- #: g10/misc.c:1752
++#: g10/misc.c:1757
 +#, c-format
 +msgid "unknown weak digest '%s'\n"
 +msgstr "unknown weak digest ‘%s’\n"
 +
 +#: g10/openfile.c:84
 +#, c-format
 +msgid "File '%s' exists. "
 +msgstr "File ‘%s’ exists. "
 +
 +#: g10/openfile.c:88
 +msgid "Overwrite? (y/N) "
 +msgstr "Overwrite? (y/N) "
 +
 +#: g10/openfile.c:123
 +#, c-format
 +msgid "%s: unknown suffix\n"
 +msgstr "%s: unknown suffix\n"
 +
 +#: g10/openfile.c:147
 +msgid "Enter new filename"
 +msgstr "Enter new filename"
 +
 +#: g10/openfile.c:218
 +msgid "writing to stdout\n"
 +msgstr "writing to stdout\n"
 +
 +#: g10/openfile.c:366
 +#, c-format
 +msgid "assuming signed data in '%s'\n"
 +msgstr "assuming signed data in ‘%s’\n"
 +
 +#: g10/openfile.c:457
 +#, c-format
 +msgid "new configuration file '%s' created\n"
 +msgstr "new configuration file ‘%s’ created\n"
 +
 +#: g10/openfile.c:498
 +#, c-format
 +msgid "WARNING: options in '%s' are not yet active during this run\n"
 +msgstr "WARNING: options in ‘%s’ are not yet active during this run\n"
 +
 +#: g10/parse-packet.c:257
 +#, c-format
 +msgid "can't handle public key algorithm %d\n"
 +msgstr "can't handle public key algorithm %d\n"
 +
 +#: g10/parse-packet.c:1113
 +msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 +msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
 +
 +#: g10/parse-packet.c:1649
 +#, c-format
 +msgid "subpacket of type %d has critical bit set\n"
 +msgstr "subpacket of type %d has critical bit set\n"
 +
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
 +#, c-format
 +msgid "problem with the agent: %s\n"
 +msgstr "problem with the agent: %s\n"
 +
 +#: g10/passphrase.c:241
 +msgid "Enter passphrase\n"
 +msgstr "Enter passphrase\n"
 +
 +#: g10/passphrase.c:252
 +msgid "cancelled by user\n"
 +msgstr "cancelled by user\n"
 +
 +#: g10/passphrase.c:489
 +#, c-format
 +msgid " (main key ID %s)"
 +msgstr " (main key ID %s)"
 +
 +#: g10/passphrase.c:496
 +msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 +msgstr "Please enter the passphrase to unlock the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:500
 +msgid "Please enter the passphrase to import the OpenPGP secret key:"
 +msgstr "Please enter the passphrase to import the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:505
 +msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 +msgstr "Please enter the passphrase to export the OpenPGP secret subkey:"
 +
 +#: g10/passphrase.c:508
 +msgid "Please enter the passphrase to export the OpenPGP secret key:"
 +msgstr "Please enter the passphrase to export the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:513
 +msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 +msgstr ""
 +"Do you really want to permanently delete the OpenPGP secret subkey key:"
 +
 +#: g10/passphrase.c:516
 +msgid "Do you really want to permanently delete the OpenPGP secret key:"
 +msgstr "Do you really want to permanently delete the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:525
 +#, c-format
 +msgid ""
 +"%s\n"
 +"\"%.*s\"\n"
 +"%u-bit %s key, ID %s,\n"
 +"created %s%s.\n"
 +"%s"
 +msgstr ""
 +"%s\n"
 +"“%.*s”\n"
 +"%u-bit %s key, ID %s,\n"
 +"created %s%s.\n"
 +"%s"
 +
 +#: g10/photoid.c:77
 +msgid ""
 +"\n"
 +"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
 +"Remember that the image is stored within your public key.  If you use a\n"
 +"very large picture, your key will become very large as well!\n"
 +"Keeping the image close to 240x288 is a good size to use.\n"
 +msgstr ""
 +"\n"
 +"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
 +"Remember that the image is stored within your public key.  If you use a\n"
 +"very large picture, your key will become very large as well!\n"
 +"Keeping the image close to 240x288 is a good size to use.\n"
 +
 +#: g10/photoid.c:99
 +msgid "Enter JPEG filename for photo ID: "
 +msgstr "Enter JPEG filename for photo ID: "
 +
 +#: g10/photoid.c:120
 +#, c-format
 +msgid "unable to open JPEG file '%s': %s\n"
 +msgstr "unable to open JPEG file '%s': %s\n"
 +
 +#: g10/photoid.c:131
 +#, c-format
 +msgid "This JPEG is really large (%d bytes) !\n"
 +msgstr "This JPEG is really large (%d bytes) !\n"
 +
 +#: g10/photoid.c:133
 +msgid "Are you sure you want to use it? (y/N) "
 +msgstr "Are you sure you want to use it? (y/N) "
 +
 +#: g10/photoid.c:149
 +#, c-format
 +msgid "'%s' is not a JPEG file\n"
 +msgstr "‘%s’ is not a JPEG file\n"
 +
 +#: g10/photoid.c:168
 +msgid "Is this photo correct (y/N/q)? "
 +msgstr "Is this photo correct (y/N/q)? "
 +
 +#: g10/photoid.c:380
 +msgid "unable to display photo ID!\n"
 +msgstr "unable to display photo ID!\n"
 +
 +#: g10/pkclist.c:72 g10/revoke.c:757
 +msgid "No reason specified"
 +msgstr "No reason specified"
 +
 +#: g10/pkclist.c:74 g10/revoke.c:759
 +msgid "Key is superseded"
 +msgstr "Key is superseded"
 +
 +#: g10/pkclist.c:76 g10/revoke.c:758
 +msgid "Key has been compromised"
 +msgstr "Key has been compromised"
 +
 +#: g10/pkclist.c:78 g10/revoke.c:760
 +msgid "Key is no longer used"
 +msgstr "Key is no longer used"
 +
 +#: g10/pkclist.c:80 g10/revoke.c:761
 +msgid "User ID is no longer valid"
 +msgstr "User ID is no longer valid"
 +
 +#: g10/pkclist.c:84
 +msgid "reason for revocation: "
 +msgstr "reason for revocation: "
 +
 +#: g10/pkclist.c:100
 +msgid "revocation comment: "
 +msgstr "revocation comment: "
 +
 +#. TRANSLATORS: These are the allowed answers in lower and
 +#. uppercase.  Below you will find the matching strings which
 +#. should be translated accordingly and the letter changed to
 +#. match the one in the answer string.
 +#.
 +#. i = please show me more information
 +#. m = back to the main menu
 +#. s = skip this key
 +#. q = quit
 +#.
 +#: g10/pkclist.c:216
 +msgid "iImMqQsS"
 +msgstr "iImMqQsS"
 +
 +#: g10/pkclist.c:224
 +msgid "No trust value assigned to:\n"
 +msgstr "No trust value assigned to:\n"
 +
 +#: g10/pkclist.c:257
 +#, c-format
 +msgid "  aka \"%s\"\n"
 +msgstr "  aka “%s”\n"
 +
 +#: g10/pkclist.c:267
 +msgid ""
 +"How much do you trust that this key actually belongs to the named user?\n"
 +msgstr ""
 +"How much do you trust that this key actually belongs to the named user?\n"
 +
 +#: g10/pkclist.c:282
 +#, c-format
 +msgid "  %d = I don't know or won't say\n"
 +msgstr "  %d = I don't know or won't say\n"
 +
 +#: g10/pkclist.c:284
 +#, c-format
 +msgid "  %d = I do NOT trust\n"
 +msgstr "  %d = I do NOT trust\n"
 +
 +#: g10/pkclist.c:290
 +#, c-format
 +msgid "  %d = I trust ultimately\n"
 +msgstr "  %d = I trust ultimately\n"
 +
 +#: g10/pkclist.c:296
 +msgid "  m = back to the main menu\n"
 +msgstr "  m = back to the main menu\n"
 +
 +#: g10/pkclist.c:299
 +msgid "  s = skip this key\n"
 +msgstr "  s = skip this key\n"
 +
 +#: g10/pkclist.c:300
 +msgid "  q = quit\n"
 +msgstr "  q = quit\n"
 +
 +#: g10/pkclist.c:304
 +#, c-format
 +msgid ""
 +"The minimum trust level for this key is: %s\n"
 +"\n"
 +msgstr ""
 +"The minimum trust level for this key is: %s\n"
 +"\n"
 +
 +#: g10/pkclist.c:310 g10/revoke.c:786
 +msgid "Your decision? "
 +msgstr "Your decision? "
 +
 +#: g10/pkclist.c:331
 +msgid "Do you really want to set this key to ultimate trust? (y/N) "
 +msgstr "Do you really want to set this key to ultimate trust? (y/N) "
 +
 +#: g10/pkclist.c:345
 +msgid "Certificates leading to an ultimately trusted key:\n"
 +msgstr "Certificates leading to an ultimately trusted key:\n"
 +
 +#: g10/pkclist.c:434
 +#, c-format
 +msgid "%s: There is no assurance this key belongs to the named user\n"
 +msgstr "%s: There is no assurance this key belongs to the named user\n"
 +
 +#: g10/pkclist.c:439
 +#, c-format
 +msgid "%s: There is limited assurance this key belongs to the named user\n"
 +msgstr "%s: There is limited assurance this key belongs to the named user\n"
 +
 +#: g10/pkclist.c:445
 +msgid "This key probably belongs to the named user\n"
 +msgstr "This key probably belongs to the named user\n"
 +
 +#: g10/pkclist.c:450
 +msgid "This key belongs to us\n"
 +msgstr "This key belongs to us\n"
 +
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
++#, c-format
++msgid "%s: This key is bad!  It has been marked as untrusted!\n"
++msgstr "%s: This key is bad!  It has been marked as untrusted!\n"
++
++#: g10/pkclist.c:484
++msgid ""
++"This key has is bad!  It has been marked as untrusted!  If you\n"
++"*really* know what you are doing, you may answer the next\n"
++"question with yes.\n"
++msgstr ""
++"This key has is bad!  It has been marked as untrusted!  If you\n"
++"*really* know what you are doing, you may answer the next\n"
++"question with yes.\n"
++
++#: g10/pkclist.c:489
 +msgid ""
 +"It is NOT certain that the key belongs to the person named\n"
 +"in the user ID.  If you *really* know what you are doing,\n"
 +"you may answer the next question with yes.\n"
 +msgstr ""
 +"It is NOT certain that the key belongs to the person named\n"
 +"in the user ID.  If you *really* know what you are doing,\n"
 +"you may answer the next question with yes.\n"
 +
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
 +msgid "Use this key anyway? (y/N) "
 +msgstr "Use this key anyway? (y/N) "
 +
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
 +msgid "WARNING: Using untrusted key!\n"
 +msgstr "WARNING: Using untrusted key!\n"
 +
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
 +msgid "WARNING: this key might be revoked (revocation key not present)\n"
 +msgstr "WARNING: this key might be revoked (revocation key not present)\n"
 +
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
 +msgid "WARNING: This key has been revoked by its designated revoker!\n"
 +msgstr "WARNING: This key has been revoked by its designated revoker!\n"
 +
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
 +msgid "WARNING: This key has been revoked by its owner!\n"
 +msgstr "WARNING: This key has been revoked by its owner!\n"
 +
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
 +msgid "         This could mean that the signature is forged.\n"
 +msgstr "         This could mean that the signature is forged.\n"
 +
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
 +msgid "WARNING: This subkey has been revoked by its owner!\n"
 +msgstr "WARNING: This subkey has been revoked by its owner!\n"
 +
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
 +msgid "Note: This key has been disabled.\n"
 +msgstr "Note: This key has been disabled.\n"
 +
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
 +#, c-format
 +msgid "Note: Verified signer's address is '%s'\n"
 +msgstr "Note: Verified signer's address is ‘%s’\n"
 +
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
 +#, c-format
 +msgid "Note: Signer's address '%s' does not match DNS entry\n"
 +msgstr "Note: Signer's address ‘%s’ does not match DNS entry\n"
 +
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
 +msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 +msgstr "trustlevel adjusted to FULL due to valid PKA info\n"
 +
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
 +msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 +msgstr "trustlevel adjusted to NEVER due to bad PKA info\n"
 +
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
 +msgid "Note: This key has expired!\n"
 +msgstr "Note: This key has expired!\n"
 +
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
 +msgid "WARNING: This key is not certified with a trusted signature!\n"
 +msgstr "WARNING: This key is not certified with a trusted signature!\n"
 +
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
 +msgid ""
 +"         There is no indication that the signature belongs to the owner.\n"
 +msgstr ""
 +"         There is no indication that the signature belongs to the owner.\n"
 +
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
 +msgid "WARNING: We do NOT trust this key!\n"
 +msgstr "WARNING: We do NOT trust this key!\n"
 +
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
 +msgid "         The signature is probably a FORGERY.\n"
 +msgstr "         The signature is probably a FORGERY.\n"
 +
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
 +msgid ""
 +"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 +msgstr ""
 +"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 +
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
 +msgid "         It is not certain that the signature belongs to the owner.\n"
 +msgstr "         It is not certain that the signature belongs to the owner.\n"
 +
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
 +#, c-format
 +msgid "%s: skipped: %s\n"
 +msgstr "%s: skipped: %s\n"
 +
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
 +#, c-format
 +msgid "%s: skipped: public key is disabled\n"
 +msgstr "%s: skipped: public key is disabled\n"
 +
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
 +#, c-format
 +msgid "%s: skipped: public key already present\n"
 +msgstr "%s: skipped: public key already present\n"
 +
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
 +#, c-format
 +msgid "can't encrypt to '%s'\n"
 +msgstr "can't encrypt to ‘%s’\n"
 +
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
 +#, c-format
 +msgid "option '%s' given, but no valid default keys given\n"
 +msgstr "option ‘%s’ given, but no valid default keys given\n"
 +
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
 +#, c-format
 +msgid "option '%s' given, but option '%s' not given\n"
 +msgstr "option ‘%s’ given, but option ‘%s’ not given\n"
 +
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
 +msgid "You did not specify a user ID. (you may use \"-r\")\n"
 +msgstr "You did not specify a user ID. (you may use “-r”)\n"
 +
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
 +msgid "Current recipients:\n"
 +msgstr "Current recipients:\n"
 +
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
 +msgid ""
 +"\n"
 +"Enter the user ID.  End with an empty line: "
 +msgstr ""
 +"\n"
 +"Enter the user ID.  End with an empty line: "
 +
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
 +msgid "No such user ID.\n"
 +msgstr "No such user ID.\n"
 +
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
 +msgid "skipped: public key already set as default recipient\n"
 +msgstr "skipped: public key already set as default recipient\n"
 +
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
 +msgid "Public key is disabled.\n"
 +msgstr "Public key is disabled.\n"
 +
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
 +msgid "skipped: public key already set\n"
 +msgstr "skipped: public key already set\n"
 +
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
 +#, c-format
 +msgid "unknown default recipient \"%s\"\n"
 +msgstr "unknown default recipient “%s”\n"
 +
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
 +msgid "no valid addressees\n"
 +msgstr "no valid addressees\n"
 +
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
 +#, c-format
 +msgid "Note: key %s has no %s feature\n"
 +msgstr "Note: key %s has no %s feature\n"
 +
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
 +#, c-format
 +msgid "Note: key %s has no preference for %s\n"
 +msgstr "Note: key %s has no preference for %s\n"
 +
 +#: g10/plaintext.c:84
 +msgid "data not saved; use option \"--output\" to save it\n"
 +msgstr "data not saved; use option “--output” to save it\n"
 +
 +#: g10/plaintext.c:598
 +msgid "Detached signature.\n"
 +msgstr "Detached signature.\n"
 +
 +#: g10/plaintext.c:606
 +msgid "Please enter name of data file: "
 +msgstr "Please enter name of data file: "
 +
 +#: g10/plaintext.c:643
 +msgid "reading stdin ...\n"
 +msgstr "reading stdin ...\n"
 +
 +#: g10/plaintext.c:688
 +msgid "no signed data\n"
 +msgstr "no signed data\n"
 +
 +#: g10/plaintext.c:706
 +#, c-format
 +msgid "can't open signed data '%s'\n"
 +msgstr "can't open signed data ‘%s’\n"
 +
 +#: g10/plaintext.c:741
 +#, c-format
 +msgid "can't open signed data fd=%d: %s\n"
 +msgstr "can't open signed data fd=%d: %s\n"
 +
 +#: g10/pubkey-enc.c:116
 +#, c-format
 +msgid "anonymous recipient; trying secret key %s ...\n"
 +msgstr "anonymous recipient; trying secret key %s ...\n"
 +
 +#: g10/pubkey-enc.c:123
 +msgid "okay, we are the anonymous recipient.\n"
 +msgstr "okay, we are the anonymous recipient.\n"
 +
 +#: g10/pubkey-enc.c:282
 +msgid "old encoding of the DEK is not supported\n"
 +msgstr "old encoding of the DEK is not supported\n"
 +
 +#: g10/pubkey-enc.c:310
 +#, c-format
 +msgid "cipher algorithm %d%s is unknown or disabled\n"
 +msgstr "cipher algorithm %d%s is unknown or disabled\n"
 +
 +#: g10/pubkey-enc.c:352
 +#, c-format
 +msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 +msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
 +
 +#: g10/pubkey-enc.c:377
 +#, c-format
 +msgid "Note: secret key %s expired at %s\n"
 +msgstr "Note: secret key %s expired at %s\n"
 +
 +#: g10/pubkey-enc.c:384
 +msgid "Note: key has been revoked"
 +msgstr "Note: key has been revoked"
 +
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
 +#, c-format
 +msgid "build_packet failed: %s\n"
 +msgstr "build_packet failed: %s\n"
 +
 +#: g10/revoke.c:144
 +#, c-format
 +msgid "key %s has no user IDs\n"
 +msgstr "key %s has no user IDs\n"
 +
 +#: g10/revoke.c:312
 +msgid "To be revoked by:\n"
 +msgstr "To be revoked by:\n"
 +
 +#: g10/revoke.c:316
 +msgid "(This is a sensitive revocation key)\n"
 +msgstr "(This is a sensitive revocation key)\n"
 +
 +#: g10/revoke.c:322
 +msgid "Secret key is not available.\n"
 +msgstr "Secret key is not available.\n"
 +
 +#: g10/revoke.c:327
 +msgid "Create a designated revocation certificate for this key? (y/N) "
 +msgstr "Create a designated revocation certificate for this key? (y/N) "
 +
 +#: g10/revoke.c:336 g10/revoke.c:727
 +msgid "ASCII armored output forced.\n"
 +msgstr "ASCII armored output forced.\n"
 +
 +#: g10/revoke.c:352 g10/revoke.c:479
 +#, c-format
 +msgid "make_keysig_packet failed: %s\n"
 +msgstr "make_keysig_packet failed: %s\n"
 +
 +#: g10/revoke.c:415
 +msgid "Revocation certificate created.\n"
 +msgstr "Revocation certificate created.\n"
 +
 +#: g10/revoke.c:421
 +#, c-format
 +msgid "no revocation keys found for \"%s\"\n"
 +msgstr "no revocation keys found for “%s”\n"
 +
 +#: g10/revoke.c:551
 +msgid "This is a revocation certificate for the OpenPGP key:"
 +msgstr "This is a revocation certificate for the OpenPGP key:"
 +
 +#: g10/revoke.c:567
 +msgid ""
 +"A revocation certificate is a kind of \"kill switch\" to publicly\n"
 +"declare that a key shall not anymore be used.  It is not possible\n"
 +"to retract such a revocation certificate once it has been published."
 +msgstr ""
 +"A revocation certificate is a kind of “kill switch” to publicly\n"
 +"declare that a key shall not anymore be used.  It is not possible\n"
 +"to retract such a revocation certificate once it has been published."
 +
 +#: g10/revoke.c:570
 +msgid ""
 +"Use it to revoke this key in case of a compromise or loss of\n"
 +"the secret key.  However, if the secret key is still accessible,\n"
 +"it is better to generate a new revocation certificate and give\n"
 +"a reason for the revocation.  For details see the description of\n"
 +"of the gpg command \"--gen-revoke\" in the GnuPG manual."
 +msgstr ""
 +"Use it to revoke this key in case of a compromise or loss of\n"
 +"the secret key.  However, if the secret key is still accessible,\n"
 +"it is better to generate a new revocation certificate and give\n"
 +"a reason for the revocation.  For details see the description of\n"
 +"of the gpg command “--gen-revoke” in the GnuPG manual."
 +
 +#: g10/revoke.c:575
 +msgid ""
 +"To avoid an accidental use of this file, a colon has been inserted\n"
 +"before the 5 dashes below.  Remove this colon with a text editor\n"
 +"before importing and publishing this revocation certificate."
 +msgstr ""
 +"To avoid an accidental use of this file, a colon has been inserted\n"
 +"before the 5 dashes below.  Remove this colon with a text editor\n"
 +"before importing and publishing this revocation certificate."
 +
 +#: g10/revoke.c:590
 +#, c-format
 +msgid "revocation certificate stored as '%s.rev'\n"
 +msgstr "revocation certificate stored as ‘%s.rev’\n"
 +
 +#: g10/revoke.c:634
 +#, c-format
 +msgid "secret key \"%s\" not found\n"
 +msgstr "secret key “%s” not found\n"
 +
 +#. TRANSLATORS: The %s prints a key specification which
 +#. for example has been given at the command line.  Several lines
 +#. lines with secret key infos are printed after this message.
 +#: g10/revoke.c:661
 +#, c-format
 +msgid "'%s' matches multiple secret keys:\n"
 +msgstr "‘%s’ matches multiple secret keys:\n"
 +
 +#: g10/revoke.c:688
 +#, c-format
 +msgid "error searching the keyring: %s\n"
 +msgstr "error searching the keyring: %s\n"
 +
 +#: g10/revoke.c:711
 +msgid "Create a revocation certificate for this key? (y/N) "
 +msgstr "Create a revocation certificate for this key? (y/N) "
 +
 +#: g10/revoke.c:735
 +msgid ""
 +"Revocation certificate created.\n"
 +"\n"
 +"Please move it to a medium which you can hide away; if Mallory gets\n"
 +"access to this certificate he can use it to make your key unusable.\n"
 +"It is smart to print this certificate and store it away, just in case\n"
 +"your media become unreadable.  But have some caution:  The print system of\n"
 +"your machine might store the data and make it available to others!\n"
 +msgstr ""
 +"Revocation certificate created.\n"
 +"\n"
 +"Please move it to a medium which you can hide away; if Mallory gets\n"
 +"access to this certificate he can use it to make your key unusable.\n"
 +"It is smart to print this certificate and store it away, just in case\n"
 +"your media become unreadable.  But have some caution:  The print system of\n"
 +"your machine might store the data and make it available to others!\n"
 +
 +#: g10/revoke.c:769
 +msgid "Please select the reason for the revocation:\n"
 +msgstr "Please select the reason for the revocation:\n"
 +
 +#: g10/revoke.c:779
 +msgid "Cancel"
 +msgstr "Cancel"
 +
 +#: g10/revoke.c:781
 +#, c-format
 +msgid "(Probably you want to select %d here)\n"
 +msgstr "(Probably you want to select %d here)\n"
 +
 +#: g10/revoke.c:822
 +msgid "Enter an optional description; end it with an empty line:\n"
 +msgstr "Enter an optional description; end it with an empty line:\n"
 +
 +#: g10/revoke.c:850
 +#, c-format
 +msgid "Reason for revocation: %s\n"
 +msgstr "Reason for revocation: %s\n"
 +
 +#: g10/revoke.c:852
 +msgid "(No description given)\n"
 +msgstr "(No description given)\n"
 +
 +#: g10/revoke.c:857
 +msgid "Is this okay? (y/N) "
 +msgstr "Is this okay? (y/N) "
 +
 +#: g10/seskey.c:62 sm/encrypt.c:123
 +msgid "weak key created - retrying\n"
 +msgstr "weak key created - retrying\n"
 +
 +#: g10/seskey.c:66
 +#, c-format
 +msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 +msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 +
 +#: g10/seskey.c:306
 +#, c-format
 +msgid "%s key %s uses an unsafe (%zu bit) hash\n"
 +msgstr "%s key %s uses an unsafe (%zu bit) hash\n"
 +
 +#: g10/seskey.c:324
 +#, c-format
 +msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 +msgstr "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 +
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
 +msgid "WARNING: signature digest conflict in message\n"
 +msgstr "WARNING: signature digest conflict in message\n"
 +
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
 +#, c-format
 +msgid "WARNING: signing subkey %s is not cross-certified\n"
 +msgstr "WARNING: signing subkey %s is not cross-certified\n"
 +
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
 +#, c-format
 +msgid "please see %s for more information\n"
 +msgstr "please see %s for more information\n"
 +
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
 +#, c-format
 +msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 +msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
 +
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
 +#, c-format
 +msgid "public key %s is %lu second newer than the signature\n"
 +msgid_plural "public key %s is %lu seconds newer than the signature\n"
 +msgstr[0] "public key %s is %lu second newer than the signature\n"
 +msgstr[1] "public key %s is %lu seconds newer than the signature\n"
 +
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
 +#, c-format
 +msgid "public key %s is %lu day newer than the signature\n"
 +msgid_plural "public key %s is %lu days newer than the signature\n"
 +msgstr[0] "public key %s is %lu day newer than the signature\n"
 +msgstr[1] "public key %s is %lu days newer than the signature\n"
 +
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
 +#, c-format
 +msgid ""
 +"key %s was created %lu second in the future (time warp or clock problem)\n"
 +msgid_plural ""
 +"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 +msgstr[0] ""
 +"key %s was created %lu second in the future (time warp or clock problem)\n"
 +msgstr[1] ""
 +"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 +
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
 +#, c-format
 +msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 +msgid_plural ""
 +"key %s was created %lu days in the future (time warp or clock problem)\n"
 +msgstr[0] ""
 +"key %s was created %lu day in the future (time warp or clock problem)\n"
 +msgstr[1] ""
 +"key %s was created %lu days in the future (time warp or clock problem)\n"
 +
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
 +#, c-format
 +msgid "Note: signature key %s expired %s\n"
 +msgstr "Note: signature key %s expired %s\n"
 +
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
 +#, c-format
 +msgid "Note: signature key %s has been revoked\n"
 +msgstr "Note: signature key %s has been revoked\n"
 +
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
 +#, c-format
 +msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 +msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
 +
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
 +#, c-format
 +msgid "key %s: no subkey for subkey revocation signature\n"
 +msgstr "key %s: no subkey for subkey revocation signature\n"
 +
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
 +#, c-format
 +msgid "key %s: no subkey for subkey binding signature\n"
 +msgstr "key %s: no subkey for subkey binding signature\n"
 +
 +#: g10/sign.c:88
 +#, c-format
 +msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 +msgstr ""
 +"WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 +
 +#: g10/sign.c:114
 +#, c-format
 +msgid ""
 +"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 +msgstr ""
 +"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 +
 +#: g10/sign.c:137
 +#, c-format
 +msgid ""
 +"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 +"unexpanded.\n"
 +msgstr ""
 +"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 +"unexpanded.\n"
 +
 +#: g10/sign.c:329
 +#, c-format
 +msgid "%s/%s signature from: \"%s\"\n"
 +msgstr "%s/%s signature from: “%s”\n"
 +
 +#: g10/sign.c:878
 +#, c-format
 +msgid ""
 +"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 +msgstr ""
 +"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 +
 +#: g10/sign.c:1009
 +msgid "signing:"
 +msgstr "signing:"
 +
 +#: g10/sign.c:1286
 +#, c-format
 +msgid "%s encryption will be used\n"
 +msgstr "%s encryption will be used\n"
 +
 +#: g10/skclist.c:155 g10/skclist.c:236
 +msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 +msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
 +
 +#: g10/skclist.c:187
 +#, c-format
 +msgid "skipped \"%s\": duplicated\n"
 +msgstr "skipped “%s”: duplicated\n"
 +
 +#: g10/skclist.c:206
 +msgid "skipped: secret key already present\n"
 +msgstr "skipped: secret key already present\n"
 +
 +#: g10/skclist.c:225
 +msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 +msgstr ""
 +"this is a PGP generated Elgamal key which is not secure for signatures!"
 +
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
 +#, c-format
 +msgid "trust record %lu, type %d: write failed: %s\n"
 +msgstr "trust record %lu, type %d: write failed: %s\n"
 +
 +#: g10/tdbdump.c:105
 +#, c-format
 +msgid ""
 +"# List of assigned trustvalues, created %s\n"
 +"# (Use \"gpg --import-ownertrust\" to restore them)\n"
 +msgstr ""
 +"# List of assigned trustvalues, created %s\n"
 +"# (Use “gpg --import-ownertrust” to restore them)\n"
 +
 +#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
 +#, c-format
 +msgid "error in '%s': %s\n"
 +msgstr "error in '%s': %s\n"
 +
 +#: g10/tdbdump.c:162
 +msgid "line too long"
 +msgstr "line too long"
 +
 +#: g10/tdbdump.c:170
 +msgid "colon missing"
 +msgstr "colon missing"
 +
 +#: g10/tdbdump.c:176
 +msgid "invalid fingerprint"
 +msgstr "invalid fingerprint"
 +
 +#: g10/tdbdump.c:181
 +msgid "ownertrust value missing"
 +msgstr "ownertrust value missing"
 +
 +#: g10/tdbdump.c:217
 +#, c-format
 +msgid "error finding trust record in '%s': %s\n"
 +msgstr "error finding trust record in '%s': %s\n"
 +
 +#: g10/tdbdump.c:221
 +#, c-format
 +msgid "read error in '%s': %s\n"
 +msgstr "read error in '%s': %s\n"
 +
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
 +#, c-format
 +msgid "trustdb: sync failed: %s\n"
 +msgstr "trustdb: sync failed: %s\n"
 +
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
 +#, c-format
 +msgid "can't create lock for '%s'\n"
 +msgstr "can't create lock for ‘%s’\n"
 +
 +#: g10/tdbio.c:146
 +#, c-format
 +msgid "can't lock '%s'\n"
 +msgstr "can't lock ‘%s’\n"
 +
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
 +#, c-format
 +msgid "trustdb rec %lu: lseek failed: %s\n"
 +msgstr "trustdb rec %lu: lseek failed: %s\n"
 +
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
 +#, c-format
 +msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 +msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 +
 +#: g10/tdbio.c:352
 +msgid "trustdb transaction too large\n"
 +msgstr "trustdb transaction too large\n"
 +
 +#: g10/tdbio.c:682
 +#, c-format
 +msgid "%s: directory does not exist!\n"
 +msgstr "%s: directory does not exist!\n"
 +
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
 +#, c-format
 +msgid "can't access '%s': %s\n"
 +msgstr "can't access '%s': %s\n"
 +
 +#: g10/tdbio.c:724
 +#, c-format
 +msgid "%s: failed to create version record: %s"
 +msgstr "%s: failed to create version record: %s"
 +
 +#: g10/tdbio.c:729
 +#, c-format
 +msgid "%s: invalid trustdb created\n"
 +msgstr "%s: invalid trustdb created\n"
 +
 +#: g10/tdbio.c:732
 +#, c-format
 +msgid "%s: trustdb created\n"
 +msgstr "%s: trustdb created\n"
 +
 +#: g10/tdbio.c:788
 +msgid "Note: trustdb not writable\n"
 +msgstr "Note: trustdb not writable\n"
 +
 +#: g10/tdbio.c:797
 +#, c-format
 +msgid "%s: invalid trustdb\n"
 +msgstr "%s: invalid trustdb\n"
 +
 +#: g10/tdbio.c:834
 +#, c-format
 +msgid "%s: failed to create hashtable: %s\n"
 +msgstr "%s: failed to create hashtable: %s\n"
 +
 +#: g10/tdbio.c:842
 +#, c-format
 +msgid "%s: error updating version record: %s\n"
 +msgstr "%s: error updating version record: %s\n"
 +
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
 +#, c-format
 +msgid "%s: error reading version record: %s\n"
 +msgstr "%s: error reading version record: %s\n"
 +
 +#: g10/tdbio.c:938
 +#, c-format
 +msgid "%s: error writing version record: %s\n"
 +msgstr "%s: error writing version record: %s\n"
 +
 +#: g10/tdbio.c:1461
 +#, c-format
 +msgid "trustdb: lseek failed: %s\n"
 +msgstr "trustdb: lseek failed: %s\n"
 +
 +#: g10/tdbio.c:1472
 +#, c-format
 +msgid "trustdb: read failed (n=%d): %s\n"
 +msgstr "trustdb: read failed (n=%d): %s\n"
 +
 +#: g10/tdbio.c:1497
 +#, c-format
 +msgid "%s: not a trustdb file\n"
 +msgstr "%s: not a trustdb file\n"
 +
 +#: g10/tdbio.c:1522
 +#, c-format
 +msgid "%s: version record with recnum %lu\n"
 +msgstr "%s: version record with recnum %lu\n"
 +
 +#: g10/tdbio.c:1528
 +#, c-format
 +msgid "%s: invalid file version %d\n"
 +msgstr "%s: invalid file version %d\n"
 +
 +#: g10/tdbio.c:1748
 +#, c-format
 +msgid "%s: error reading free record: %s\n"
 +msgstr "%s: error reading free record: %s\n"
 +
 +#: g10/tdbio.c:1757
 +#, c-format
 +msgid "%s: error writing dir record: %s\n"
 +msgstr "%s: error writing dir record: %s\n"
 +
 +#: g10/tdbio.c:1768
 +#, c-format
 +msgid "%s: failed to zero a record: %s\n"
 +msgstr "%s: failed to zero a record: %s\n"
 +
 +#: g10/tdbio.c:1804
 +#, c-format
 +msgid "%s: failed to append a record: %s\n"
 +msgstr "%s: failed to append a record: %s\n"
 +
 +#: g10/tdbio.c:1865
 +msgid "Error: The trustdb is corrupted.\n"
 +msgstr "Error: The trustdb is corrupted.\n"
 +
 +#: g10/textfilter.c:146
 +#, c-format
 +msgid "can't handle text lines longer than %d characters\n"
 +msgstr "can't handle text lines longer than %d characters\n"
 +
 +#: g10/textfilter.c:241
 +#, c-format
 +msgid "input line longer than %d characters\n"
 +msgstr "input line longer than %d characters\n"
 +
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
 +#, c-format
 +msgid "error beginning transaction on TOFU database: %s\n"
 +msgstr "error beginning transaction on TOFU database: %s\n"
 +
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
 +#, c-format
 +msgid "error committing transaction on TOFU database: %s\n"
 +msgstr "error committing transaction on TOFU database: %s\n"
 +
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
 +#, c-format
 +msgid "error rolling back transaction on TOFU database: %s\n"
 +msgstr "error rolling back transaction on TOFU database: %s\n"
 +
- #: g10/tofu.c:435
++#: g10/tofu.c:501
 +#, c-format
 +msgid "unsupported TOFU database version: %s\n"
 +msgstr "unsupported TOFU database version: %s\n"
 +
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
 +#, c-format
 +msgid "error reading TOFU database: %s\n"
 +msgstr "error reading TOFU database: %s\n"
 +
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
 +#, c-format
 +msgid "error determining TOFU database's version: %s\n"
 +msgstr "error determining TOFU database's version: %s\n"
 +
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
 +#, c-format
 +msgid "error initializing TOFU database: %s\n"
 +msgstr "error initializing TOFU database: %s\n"
 +
- #: g10/tofu.c:658
++#: g10/tofu.c:765
 +#, c-format
 +msgid "error opening TOFU database '%s': %s\n"
 +msgstr "error opening TOFU database '%s': %s\n"
 +
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
 +#, c-format
 +msgid "error updating TOFU database: %s\n"
 +msgstr "error updating TOFU database: %s\n"
 +
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
 +#, c-format
- msgid "The binding %s is NOT known."
- msgstr "The binding %s is NOT known."
++msgid ""
++"This is the first time the email address \"%s\" is being used with key %s."
++msgstr ""
++"This is the first time the email address “%s” is being used with key "
++"%s."
 +
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
 +#, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
++msgid "The email address \"%s\" is associated with %d keys!"
++msgstr "The email address “%s” is associated with %d keys!"
++
++#: g10/tofu.c:1251
++msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 +msgstr ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
++"  Since this binding's policy was 'auto', it has been changed to 'ask'."
 +
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
 +#, c-format
 +msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
++"Please indicate whether this email address should be associated with key %s "
++"or whether you think someone is impersonating \"%s\"."
 +msgstr ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
++"Please indicate whether this email address should be associated with key %s "
++"or whether you think someone is impersonating “%s”."
 +
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
 +#, c-format
 +msgid "error gathering other user IDs: %s\n"
 +msgstr "error gathering other user IDs: %s\n"
 +
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr "Known user IDs associated with this key:\n"
++#: g10/tofu.c:1523
++msgid "This key's user IDs:\n"
++msgstr "This key's user IDs:\n"
 +
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
 +#, c-format
 +msgid "policy: %s"
 +msgstr "policy: %s"
 +
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
 +#, c-format
 +msgid "error gathering signature stats: %s\n"
 +msgstr "error gathering signature stats: %s\n"
 +
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
 +#, c-format
 +msgid "The email address \"%s\" is associated with %d key:\n"
 +msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 +msgstr[0] "The email address “%s” is associated with %d key:\n"
 +msgstr[1] "The email address “%s” is associated with %d keys:\n"
 +
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
 +#, c-format
 +msgid "Statistics for keys with the email address \"%s\":\n"
 +msgstr "Statistics for keys with the email address “%s”:\n"
 +
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
++msgid ", "
++msgstr ", "
++
++#: g10/tofu.c:1693
 +msgid "this key"
 +msgstr "this key"
 +
- #: g10/tofu.c:1342
++#: g10/tofu.c:1715
 +#, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] "%ld message signed in the future."
- msgstr[1] "%ld messages signed in the future."
++msgid "Verified %d message"
++msgid_plural "Verified %d messages"
++msgstr[0] "Verified %d message"
++msgstr[1] "Verified %d messages"
 +
- #: g10/tofu.c:1351
++#: g10/tofu.c:1719
 +#, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "%ld message signed"
- msgstr[1] "%ld messages signed"
++msgid "Encrypted %d message"
++msgid_plural "Encrypted %d messages"
++msgstr[0] "Encrypted %d message"
++msgstr[1] "Encrypted %d messages"
 +
- #: g10/tofu.c:1357
++#: g10/tofu.c:1734
 +#, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
- msgstr[0] " over the past %ld day."
- msgstr[1] " over the past %ld days."
++msgid " over the past day."
++msgid_plural " over the past %d days."
++msgstr[0] " over the past day."
++msgstr[1] " over the past %d days."
 +
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
 +#, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
- msgstr[0] " over the past %ld week."
- msgstr[1] " over the past %ld weeks."
++msgid " over the past month."
++msgid_plural " over the past %d months."
++msgstr[0] " over the past month."
++msgstr[1] " over the past %d months."
 +
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
 +#, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
- msgstr[0] " over the past %ld month."
- msgstr[1] " over the past %ld months."
++msgid " over the past year."
++msgid_plural " over the past %d years."
++msgstr[0] " over the past year."
++msgstr[1] " over the past %d years."
++
++#: g10/tofu.c:1752
++msgid " in the past."
++msgstr " in the past."
 +
 +#. TRANSLATORS: Please translate the text found in the source
 +#. * file below.  We don't directly internationalize that text so
 +#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
 +msgid "TOFU detected a binding conflict"
 +msgstr "TOFU detected a binding conflict"
 +
 +#. TRANSLATORS: Two letters (normally the lower and upper case
 +#. * version of the hotkey) for each of the five choices.  If
 +#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
 +msgid "gGaAuUrRbB"
 +msgstr "gGaAuUrRbB"
 +
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
 +msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 +msgstr "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 +
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
++msgid "Defaulting to unknown."
++msgstr "Defaulting to unknown."
++
++#: g10/tofu.c:1938 g10/tofu.c:2074
++msgid "TOFU db corruption detected.\n"
++msgstr "TOFU db corruption detected.\n"
++
++#: g10/tofu.c:1994
++#, c-format
++msgid "resetting keydb: %s\n"
++msgstr "resetting keydb: %s\n"
++
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
 +#, c-format
 +msgid "error setting TOFU binding's trust level to %s\n"
 +msgstr "error setting TOFU binding's trust level to %s\n"
 +
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
 +#, c-format
 +msgid "error changing TOFU policy: %s\n"
 +msgstr "error changing TOFU policy: %s\n"
 +
 +#. TRANSLATORS: The tilde ('~') is used here to indicate a
 +#. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
 +#, c-format
 +msgid "%d~year"
 +msgid_plural "%d~years"
 +msgstr[0] "%d~year"
 +msgstr[1] "%d~years"
 +
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
 +#, c-format
 +msgid "%d~month"
 +msgid_plural "%d~months"
 +msgstr[0] "%d~month"
 +msgstr[1] "%d~months"
 +
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
 +#, c-format
 +msgid "%d~day"
 +msgid_plural "%d~days"
 +msgstr[0] "%d~day"
 +msgstr[1] "%d~days"
 +
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
 +#, c-format
 +msgid "%d~hour"
 +msgid_plural "%d~hours"
 +msgstr[0] "%d~hour"
 +msgstr[1] "%d~hours"
 +
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
 +#, c-format
 +msgid "%d~minute"
 +msgid_plural "%d~minutes"
 +msgstr[0] "%d~minute"
 +msgstr[1] "%d~minutes"
 +
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
 +#, c-format
 +msgid "%d~second"
 +msgid_plural "%d~seconds"
 +msgstr[0] "%d~second"
 +msgstr[1] "%d~seconds"
 +
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
 +#, c-format
- msgid "Have never verified a message signed by key %s!\n"
- msgstr "Have never verified a message signed by key %s!\n"
++msgid "%s: "
++msgstr "%s: "
 +
- #: g10/tofu.c:1976
++#: g10/tofu.c:2806
 +#, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
- "Failed to collect signature statistics for “%s”\n"
- "(key %s)\n"
++msgid "Verified %ld signatures"
++msgstr "Verified %ld signatures"
 +
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
 +#, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "Verified %ld messages signed by “%s”."
++msgid "Verified %ld signature in the past %s"
++msgid_plural "Verified %ld signatures in the past %s"
++msgstr[0] "Verified %ld signature in the past %s"
++msgstr[1] "Verified %ld signatures in the past %s"
 +
- #: g10/tofu.c:2007
++#: g10/tofu.c:2826
 +#, c-format
- msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- "Verified %ld message signed by “%s”\n"
- "in the past %s."
- msgstr[1] ""
- "Verified %ld messages signed by “%s”\n"
- "in the past %s."
++msgid ", and encrypted %ld messages"
++msgstr ", and encrypted %ld messages"
 +
- #: g10/tofu.c:2018
++#: g10/tofu.c:2835
 +#, c-format
- msgid "The most recent message was verified %s ago."
- msgstr "The most recent message was verified %s ago."
++msgid ", and encrypted %ld message in the past %s"
++msgid_plural ", and encrypted %ld messages in the past %s"
++msgstr[0] ", and encrypted %ld message in the past %s"
++msgstr[1] ", and encrypted %ld messages in the past %s"
++
++#: g10/tofu.c:2880
++msgid ""
++"Warning: we have yet to see a message signed using this key and user id!\n"
++msgstr ""
++"Warning: we have yet to see a message signed using this key and user id!\n"
++
++#: g10/tofu.c:2883
++msgid ""
++"Warning: we've only seen one message signed using this key and user id!\n"
++msgstr ""
++"Warning: we've only seen one message signed using this key and user id!\n"
 +
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
- msgstr "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
++msgid "Warning: you have yet to encrypt a message to this key!\n"
++msgstr "Warning: you have yet to encrypt a message to this key!\n"
 +
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
- msgstr "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
++msgid "Warning: you have only encrypted one message to this key!\n"
++msgstr "Warning: you have only encrypted one message to this key!\n"
 +
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
 +#, c-format
 +msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
++"Warning: if you think you've seen more signatures by this key and user id, "
 +"then this key might be a forgery!  Carefully examine the email address for "
 +"small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +msgid_plural ""
- "Warning: if you think you've seen more than %ld messages signed by this key, "
- "then this key might be a forgery!  Carefully examine the email address for "
- "small variations.  If the key is suspect, then use\n"
++"Warning: if you think you've seen more signatures by this key and these user "
++"ids, then this key might be a forgery!  Carefully examine the email "
++"addresses for small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +msgstr[0] ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
++"Warning: if you think you've seen more signatures by this key and user id, "
 +"then this key might be a forgery!  Carefully examine the email address for "
 +"small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +msgstr[1] ""
- "Warning: if you think you've seen more than %ld messages signed by this key, "
- "then this key might be a forgery!  Carefully examine the email address for "
- "small variations.  If the key is suspect, then use\n"
++"Warning: if you think you've seen more signatures by this key and these user "
++"ids, then this key might be a forgery!  Carefully examine the email "
++"addresses for small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
 +#, c-format
 +msgid "error opening TOFU database: %s\n"
 +msgstr "error opening TOFU database: %s\n"
 +
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
++#, c-format
++msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
++msgstr "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
++
++#: g10/tofu.c:3515
++#, c-format
++msgid "error setting policy for key %s, user id \"%s\": %s"
++msgstr "error setting policy for key %s, user id “%s”: %s"
++
++#: g10/trustdb.c:216
 +#, c-format
 +msgid "'%s' is not a valid long keyID\n"
 +msgstr "‘%s’ is not a valid long keyID\n"
 +
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
 +#, c-format
 +msgid "key %s: accepted as trusted key\n"
 +msgstr "key %s: accepted as trusted key\n"
 +
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
 +#, c-format
 +msgid "key %s occurs more than once in the trustdb\n"
 +msgstr "key %s occurs more than once in the trustdb\n"
 +
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
 +#, c-format
 +msgid "key %s: no public key for trusted key - skipped\n"
 +msgstr "key %s: no public key for trusted key - skipped\n"
 +
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
 +#, c-format
 +msgid "key %s marked as ultimately trusted\n"
 +msgstr "key %s marked as ultimately trusted\n"
 +
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
 +#, c-format
 +msgid "trust record %lu, req type %d: read failed: %s\n"
 +msgstr "trust record %lu, req type %d: read failed: %s\n"
 +
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
 +#, c-format
 +msgid "trust record %lu is not of requested type %d\n"
 +msgstr "trust record %lu is not of requested type %d\n"
 +
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
 +msgid "You may try to re-create the trustdb using the commands:\n"
 +msgstr "You may try to re-create the trustdb using the commands:\n"
 +
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
 +msgid "If that does not work, please consult the manual\n"
 +msgstr "If that does not work, please consult the manual\n"
 +
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
 +#, c-format
 +msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 +msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
 +
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
 +#, c-format
 +msgid "using %s trust model\n"
 +msgstr "using %s trust model\n"
 +
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
 +msgid "no need for a trustdb check\n"
 +msgstr "no need for a trustdb check\n"
 +
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
 +#, c-format
 +msgid "next trustdb check due at %s\n"
 +msgstr "next trustdb check due at %s\n"
 +
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
 +#, c-format
 +msgid "no need for a trustdb check with '%s' trust model\n"
 +msgstr "no need for a trustdb check with ‘%s’ trust model\n"
 +
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
 +#, c-format
 +msgid "no need for a trustdb update with '%s' trust model\n"
 +msgstr "no need for a trustdb update with ‘%s’ trust model\n"
 +
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
 +#, c-format
 +msgid "public key %s not found: %s\n"
 +msgstr "public key %s not found: %s\n"
 +
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
 +msgid "please do a --check-trustdb\n"
 +msgstr "please do a --check-trustdb\n"
 +
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
 +msgid "checking the trustdb\n"
 +msgstr "checking the trustdb\n"
 +
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
 +#, c-format
 +msgid "%d key processed"
 +msgid_plural "%d keys processed"
 +msgstr[0] "%d key processed"
 +msgstr[1] "%d keys processed"
 +
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
 +#, c-format
 +msgid " (%d validity count cleared)\n"
 +msgid_plural " (%d validity counts cleared)\n"
 +msgstr[0] " (%d validity count cleared)\n"
 +msgstr[1] " (%d validity counts cleared)\n"
 +
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
 +msgid "no ultimately trusted keys found\n"
 +msgstr "no ultimately trusted keys found\n"
 +
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
 +#, c-format
 +msgid "public key of ultimately trusted key %s not found\n"
 +msgstr "public key of ultimately trusted key %s not found\n"
 +
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
 +#, c-format
 +msgid ""
 +"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 +msgstr ""
 +"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 +
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
 +#, c-format
 +msgid "unable to update trustdb version record: write failed: %s\n"
 +msgstr "unable to update trustdb version record: write failed: %s\n"
 +
 +#: g10/trust.c:105
 +msgid "undefined"
 +msgstr "undefined"
 +
 +#: g10/trust.c:106
 +msgid "never"
 +msgstr "never"
 +
 +#: g10/trust.c:107
 +msgid "marginal"
 +msgstr "marginal"
 +
 +#: g10/trust.c:108
 +msgid "full"
 +msgstr "full"
 +
 +#: g10/trust.c:109
 +msgid "ultimate"
 +msgstr "ultimate"
 +
 +#. TRANSLATORS: these strings are similar to those in
 +#. trust_value_to_string(), but are a fixed length.  This is needed to
 +#. make attractive information listings where columns line up
 +#. properly.  The value "10" should be the length of the strings you
 +#. choose to translate to.  This is the length in printable columns.
 +#. It gets passed to atoi() so everything after the number is
 +#. essentially a comment and need not be translated.  Either key and
 +#. uid are both NULL, or neither are NULL.
 +#: g10/trust.c:146
 +msgid "10 translator see trust.c:uid_trust_string_fixed"
 +msgstr "10 translator see trust.c:uid_trust_string_fixed"
 +
 +#: g10/trust.c:149
 +msgid "[ revoked]"
 +msgstr "[ revoked]"
 +
 +#: g10/trust.c:151 g10/trust.c:157
 +msgid "[ expired]"
 +msgstr "[ expired]"
 +
 +#: g10/trust.c:156
 +msgid "[ unknown]"
 +msgstr "[ unknown]"
 +
 +#: g10/trust.c:158
 +msgid "[  undef ]"
 +msgstr "[  undef ]"
 +
 +#: g10/trust.c:159
 +msgid "[  never ]"
 +msgstr "[  never ]"
 +
 +#: g10/trust.c:160
 +msgid "[marginal]"
 +msgstr "[marginal]"
 +
 +#: g10/trust.c:161
 +msgid "[  full  ]"
 +msgstr "[  full  ]"
 +
 +#: g10/trust.c:162
 +msgid "[ultimate]"
 +msgstr "[ultimate]"
 +
 +#: g10/verify.c:117
 +msgid ""
 +"the signature could not be verified.\n"
 +"Please remember that the signature file (.sig or .asc)\n"
 +"should be the first file given on the command line.\n"
 +msgstr ""
 +"the signature could not be verified.\n"
 +"Please remember that the signature file (.sig or .asc)\n"
 +"should be the first file given on the command line.\n"
 +
 +#: g10/verify.c:204
 +#, c-format
 +msgid "input line %u too long or missing LF\n"
 +msgstr "input line %u too long or missing LF\n"
 +
 +#: g10/verify.c:253
 +#, c-format
 +msgid "can't open fd %d: %s\n"
 +msgstr "can't open fd %d: %s\n"
 +
 +#: kbx/kbxutil.c:92
 +msgid "set debugging flags"
 +msgstr "set debugging flags"
 +
 +#: kbx/kbxutil.c:93
 +msgid "enable full debugging"
 +msgstr "enable full debugging"
 +
 +#: kbx/kbxutil.c:117
 +msgid "Usage: kbxutil [options] [files] (-h for help)"
 +msgstr "Usage: kbxutil [options] [files] (-h for help)"
 +
 +#: kbx/kbxutil.c:120
 +msgid ""
 +"Syntax: kbxutil [options] [files]\n"
 +"List, export, import Keybox data\n"
 +msgstr ""
 +"Syntax: kbxutil [options] [files]\n"
 +"List, export, import Keybox data\n"
 +
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
 +#, c-format
 +msgid "RSA modulus missing or not of size %d bits\n"
 +msgstr "RSA modulus missing or not of size %d bits\n"
 +
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
 +#, c-format
 +msgid "RSA public exponent missing or larger than %d bits\n"
 +msgstr "RSA public exponent missing or larger than %d bits\n"
 +
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
 +#, c-format
 +msgid "PIN callback returned error: %s\n"
 +msgstr "PIN callback returned error: %s\n"
 +
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
 +msgid "the NullPIN has not yet been changed\n"
 +msgstr "the NullPIN has not yet been changed\n"
 +
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
 +msgid "|N|Please enter a new PIN for the standard keys."
 +msgstr "|N|Please enter a new PIN for the standard keys."
 +
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
 +msgid "||Please enter the PIN for the standard keys."
 +msgstr "||Please enter the PIN for the standard keys."
 +
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
 +msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 +msgstr ""
 +"|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 +
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
 +msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 +msgstr "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 +
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
 +msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 +msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
 +
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
 +msgid "||Please enter the PIN for the key to create qualified signatures."
 +msgstr "||Please enter the PIN for the key to create qualified signatures."
 +
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
 +msgid ""
 +"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +msgstr ""
 +"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
 +msgid ""
 +"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +msgstr ""
 +"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
 +#, c-format
 +msgid "error getting new PIN: %s\n"
 +msgstr "error getting new PIN: %s\n"
 +
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
 +#, c-format
 +msgid "failed to store the fingerprint: %s\n"
 +msgstr "failed to store the fingerprint: %s\n"
 +
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
 +#, c-format
 +msgid "failed to store the creation date: %s\n"
 +msgstr "failed to store the creation date: %s\n"
 +
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "reading public key failed: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "response does not contain the public key data\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
 +msgid "response does not contain the RSA modulus\n"
 +msgstr "response does not contain the RSA modulus\n"
 +
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
 +msgid "response does not contain the RSA public exponent\n"
 +msgstr "response does not contain the RSA public exponent\n"
 +
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
- msgstr "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
++msgid "response does not contain the EC public key\n"
++msgstr "response does not contain the EC public key\n"
++
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++msgid "response does not contain the public key data\n"
++msgstr "response does not contain the public key data\n"
++
++#: scd/app-openpgp.c:1551
++#, c-format
++msgid "reading public key failed: %s\n"
++msgstr "reading public key failed: %s\n"
 +
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1903
 +#, c-format
 +msgid "using default PIN as %s\n"
 +msgstr "using default PIN as %s\n"
 +
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
 +#, c-format
 +msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 +msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
 +
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
 +#, c-format
 +msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 +msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
 +
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
 +msgid "||Please enter the PIN"
 +msgstr "||Please enter the PIN"
 +
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
 +#, c-format
 +msgid "PIN for CHV%d is too short; minimum length is %d\n"
 +msgstr "PIN for CHV%d is too short; minimum length is %d\n"
 +
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
 +#, c-format
 +msgid "verify CHV%d failed: %s\n"
 +msgstr "verify CHV%d failed: %s\n"
 +
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
 +msgid "error retrieving CHV status from card\n"
 +msgstr "error retrieving CHV status from card\n"
 +
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
 +msgid "card is permanently locked!\n"
 +msgstr "card is permanently locked!\n"
 +
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
 +#, c-format
 +msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 +msgid_plural ""
 +"%d Admin PIN attempts remaining before card is permanently locked\n"
 +msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
 +msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
 +
 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 +#. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
 +#, c-format
 +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 +msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 +
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
 +msgid "|A|Please enter the Admin PIN"
 +msgstr "|A|Please enter the Admin PIN"
 +
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
 +msgid "access to admin commands is not configured\n"
 +msgstr "access to admin commands is not configured\n"
 +
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
 +msgid "||Please enter the Reset Code for the card"
 +msgstr "||Please enter the Reset Code for the card"
 +
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
 +#, c-format
 +msgid "Reset Code is too short; minimum length is %d\n"
 +msgstr "Reset Code is too short; minimum length is %d\n"
 +
 +#. TRANSLATORS: Do not translate the "|*|" prefixes but
 +#. keep it at the start of the string.  We need this elsewhere
 +#. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
 +msgid "|RN|New Reset Code"
 +msgstr "|RN|New Reset Code"
 +
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
 +msgid "|AN|New Admin PIN"
 +msgstr "|AN|New Admin PIN"
 +
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
 +msgid "|N|New PIN"
 +msgstr "|N|New PIN"
 +
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
 +msgid "||Please enter the Admin PIN and New Admin PIN"
 +msgstr "||Please enter the Admin PIN and New Admin PIN"
 +
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
 +msgid "||Please enter the PIN and New PIN"
 +msgstr "||Please enter the PIN and New PIN"
 +
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
 +msgid "error reading application data\n"
 +msgstr "error reading application data\n"
 +
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
 +msgid "error reading fingerprint DO\n"
 +msgstr "error reading fingerprint DO\n"
 +
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
 +msgid "key already exists\n"
 +msgstr "key already exists\n"
 +
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
 +msgid "existing key will be replaced\n"
 +msgstr "existing key will be replaced\n"
 +
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
 +msgid "generating new key\n"
 +msgstr "generating new key\n"
 +
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
 +msgid "writing new key\n"
 +msgstr "writing new key\n"
 +
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
 +msgid "creation timestamp missing\n"
 +msgstr "creation timestamp missing\n"
 +
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
 +#, c-format
 +msgid "RSA prime %s missing or not of size %d bits\n"
 +msgstr "RSA prime %s missing or not of size %d bits\n"
 +
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
 +#, c-format
 +msgid "failed to store the key: %s\n"
 +msgstr "failed to store the key: %s\n"
 +
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
 +msgid "unsupported curve\n"
 +msgstr "unsupported curve\n"
 +
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
 +msgid "please wait while key is being generated ...\n"
 +msgstr "please wait while key is being generated ...\n"
 +
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
 +msgid "generating key failed\n"
 +msgstr "generating key failed\n"
 +
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
 +#, c-format
 +msgid "key generation completed (%d second)\n"
 +msgid_plural "key generation completed (%d seconds)\n"
 +msgstr[0] "key generation completed (%d second)\n"
 +msgstr[1] "key generation completed (%d seconds)\n"
 +
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
 +msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 +msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 +
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
 +msgid "fingerprint on card does not match requested one\n"
 +msgstr "fingerprint on card does not match requested one\n"
 +
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
 +#, c-format
 +msgid "card does not support digest algorithm %s\n"
 +msgstr "card does not support digest algorithm %s\n"
 +
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
 +#, c-format
 +msgid "signatures created so far: %lu\n"
 +msgstr "signatures created so far: %lu\n"
 +
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
 +msgid ""
 +"verification of Admin PIN is currently prohibited through this command\n"
 +msgstr ""
 +"verification of Admin PIN is currently prohibited through this command\n"
 +
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
 +#, c-format
 +msgid "can't access %s - invalid OpenPGP card?\n"
 +msgstr "can't access %s - invalid OpenPGP card?\n"
 +
 +#: scd/app-dinsig.c:299
 +msgid "||Please enter your PIN at the reader's pinpad"
 +msgstr "||Please enter your PIN at the reader's pinpad"
 +
 +#. TRANSLATORS: Do not translate the "|*|" prefixes but
 +#. keep it at the start of the string.  We need this elsewhere
 +#. to get some infos on the string.
 +#: scd/app-dinsig.c:529
 +msgid "|N|Initial New PIN"
 +msgstr "|N|Initial New PIN"
 +
 +#: scd/scdaemon.c:114
 +msgid "run in multi server mode (foreground)"
 +msgstr "run in multi server mode (foreground)"
 +
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
 +msgid "|LEVEL|set the debugging level to LEVEL"
 +msgstr "|LEVEL|set the debugging level to LEVEL"
 +
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
 +msgid "|FILE|write a log to FILE"
 +msgstr "|FILE|write a log to FILE"
 +
 +#: scd/scdaemon.c:134
 +msgid "|N|connect to reader at port N"
 +msgstr "|N|connect to reader at port N"
 +
 +#: scd/scdaemon.c:136
 +msgid "|NAME|use NAME as ct-API driver"
 +msgstr "|NAME|use NAME as ct-API driver"
 +
 +#: scd/scdaemon.c:138
 +msgid "|NAME|use NAME as PC/SC driver"
 +msgstr "|NAME|use NAME as PC/SC driver"
 +
 +#: scd/scdaemon.c:141
 +msgid "do not use the internal CCID driver"
 +msgstr "do not use the internal CCID driver"
 +
 +#: scd/scdaemon.c:147
 +msgid "|N|disconnect the card after N seconds of inactivity"
 +msgstr "|N|disconnect the card after N seconds of inactivity"
 +
 +#: scd/scdaemon.c:150
 +msgid "do not use a reader's pinpad"
 +msgstr "do not use a reader's pinpad"
 +
 +#: scd/scdaemon.c:155
 +msgid "deny the use of admin card commands"
 +msgstr "deny the use of admin card commands"
 +
 +#: scd/scdaemon.c:158
 +msgid "use variable length input for pinpad"
 +msgstr "use variable length input for pinpad"
 +
 +#: scd/scdaemon.c:287
 +msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 +msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
 +
 +#: scd/scdaemon.c:289
 +msgid ""
 +"Syntax: scdaemon [options] [command [args]]\n"
 +"Smartcard daemon for @GNUPG@\n"
 +msgstr ""
 +"Syntax: scdaemon [options] [command [args]]\n"
 +"Smartcard daemon for @GNUPG@\n"
 +
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
 +msgid "please use the option '--daemon' to run the program in the background\n"
 +msgstr ""
 +"please use the option ‘--daemon’ to run the program in the background\n"
 +
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
 +#, c-format
 +msgid "handler for fd %d started\n"
 +msgstr "handler for fd %d started\n"
 +
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
 +#, c-format
 +msgid "handler for fd %d terminated\n"
 +msgstr "handler for fd %d terminated\n"
 +
 +#: sm/base64.c:327
 +#, c-format
 +msgid "invalid radix64 character %02x skipped\n"
 +msgstr "invalid radix64 character %02x skipped\n"
 +
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
 +msgid "no dirmngr running in this session\n"
 +msgstr "no dirmngr running in this session\n"
 +
 +#: sm/certchain.c:194
 +#, c-format
 +msgid "validation model requested by certificate: %s"
 +msgstr "validation model requested by certificate: %s"
 +
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
 +msgid "chain"
 +msgstr "chain"
 +
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
 +msgid "shell"
 +msgstr "shell"
 +
 +#: sm/certchain.c:256 dirmngr/validate.c:107
 +#, c-format
 +msgid "critical certificate extension %s is not supported"
 +msgstr "critical certificate extension %s is not supported"
 +
 +#: sm/certchain.c:295 dirmngr/validate.c:205
 +msgid "issuer certificate is not marked as a CA"
 +msgstr "issuer certificate is not marked as a CA"
 +
 +#: sm/certchain.c:333
 +msgid "critical marked policy without configured policies"
 +msgstr "critical marked policy without configured policies"
 +
 +#: sm/certchain.c:343
 +#, c-format
 +msgid "failed to open '%s': %s\n"
 +msgstr "failed to open '%s': %s\n"
 +
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
 +msgid "Note: non-critical certificate policy not allowed"
 +msgstr "Note: non-critical certificate policy not allowed"
 +
 +#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
 +msgid "certificate policy not allowed"
 +msgstr "certificate policy not allowed"
 +
- #: sm/certchain.c:527
++#: sm/certchain.c:538
 +msgid "looking up issuer at external location\n"
 +msgstr "looking up issuer at external location\n"
 +
- #: sm/certchain.c:546
++#: sm/certchain.c:558
 +#, c-format
 +msgid "number of issuers matching: %d\n"
 +msgstr "number of issuers matching: %d\n"
 +
- #: sm/certchain.c:590
++#: sm/certchain.c:606
 +msgid "looking up issuer from the Dirmngr cache\n"
 +msgstr "looking up issuer from the Dirmngr cache\n"
 +
- #: sm/certchain.c:614
++#: sm/certchain.c:631
 +#, c-format
 +msgid "number of matching certificates: %d\n"
 +msgstr "number of matching certificates: %d\n"
 +
- #: sm/certchain.c:616
++#: sm/certchain.c:634
 +#, c-format
 +msgid "dirmngr cache-only key lookup failed: %s\n"
 +msgstr "dirmngr cache-only key lookup failed: %s\n"
 +
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
 +msgid "failed to allocate keyDB handle\n"
 +msgstr "failed to allocate keyDB handle\n"
 +
- #: sm/certchain.c:981
++#: sm/certchain.c:999
 +msgid "certificate has been revoked"
 +msgstr "certificate has been revoked"
 +
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
 +msgid "the status of the certificate is unknown"
 +msgstr "the status of the certificate is unknown"
 +
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
 +msgid "please make sure that the \"dirmngr\" is properly installed\n"
 +msgstr "please make sure that the “dirmngr” is properly installed\n"
 +
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
 +#, c-format
 +msgid "checking the CRL failed: %s"
 +msgstr "checking the CRL failed: %s"
 +
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
 +#, c-format
 +msgid "certificate with invalid validity: %s"
 +msgstr "certificate with invalid validity: %s"
 +
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
 +msgid "certificate not yet valid"
 +msgstr "certificate not yet valid"
 +
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
 +msgid "root certificate not yet valid"
 +msgstr "root certificate not yet valid"
 +
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
 +msgid "intermediate certificate not yet valid"
 +msgstr "intermediate certificate not yet valid"
 +
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
 +msgid "certificate has expired"
 +msgstr "certificate has expired"
 +
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
 +msgid "root certificate has expired"
 +msgstr "root certificate has expired"
 +
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
 +msgid "intermediate certificate has expired"
 +msgstr "intermediate certificate has expired"
 +
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
 +#, c-format
 +msgid "required certificate attributes missing: %s%s%s"
 +msgstr "required certificate attributes missing: %s%s%s"
 +
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
 +msgid "certificate with invalid validity"
 +msgstr "certificate with invalid validity"
 +
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
 +msgid "signature not created during lifetime of certificate"
 +msgstr "signature not created during lifetime of certificate"
 +
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
 +msgid "certificate not created during lifetime of issuer"
 +msgstr "certificate not created during lifetime of issuer"
 +
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
 +msgid "intermediate certificate not created during lifetime of issuer"
 +msgstr "intermediate certificate not created during lifetime of issuer"
 +
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
 +msgid "  (  signature created at "
 +msgstr "  (  signature created at "
 +
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
 +msgid "  (certificate created at "
 +msgstr "  (certificate created at "
 +
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
 +msgid "  (certificate valid from "
 +msgstr "  (certificate valid from "
 +
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
 +msgid "  (     issuer valid from "
 +msgstr "  (     issuer valid from "
 +
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
 +#, c-format
 +msgid "fingerprint=%s\n"
 +msgstr "fingerprint=%s\n"
 +
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
 +msgid "root certificate has now been marked as trusted\n"
 +msgstr "root certificate has now been marked as trusted\n"
 +
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
 +msgid "interactive marking as trusted not enabled in gpg-agent\n"
 +msgstr "interactive marking as trusted not enabled in gpg-agent\n"
 +
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
 +msgid "interactive marking as trusted disabled for this session\n"
 +msgstr "interactive marking as trusted disabled for this session\n"
 +
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
 +msgid "WARNING: creation time of signature not known - assuming current time"
 +msgstr "WARNING: creation time of signature not known - assuming current time"
 +
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
 +msgid "no issuer found in certificate"
 +msgstr "no issuer found in certificate"
 +
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
 +msgid "self-signed certificate has a BAD signature"
 +msgstr "self-signed certificate has a BAD signature"
 +
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
 +msgid "root certificate is not marked trusted"
 +msgstr "root certificate is not marked trusted"
 +
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
 +#, c-format
 +msgid "checking the trust list failed: %s\n"
 +msgstr "checking the trust list failed: %s\n"
 +
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
 +msgid "certificate chain too long\n"
 +msgstr "certificate chain too long\n"
 +
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
 +msgid "issuer certificate not found"
 +msgstr "issuer certificate not found"
 +
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
 +msgid "certificate has a BAD signature"
 +msgstr "certificate has a BAD signature"
 +
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
 +msgid "found another possible matching CA certificate - trying again"
 +msgstr "found another possible matching CA certificate - trying again"
 +
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
 +#, c-format
 +msgid "certificate chain longer than allowed by CA (%d)"
 +msgstr "certificate chain longer than allowed by CA (%d)"
 +
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
 +msgid "certificate is good\n"
 +msgstr "certificate is good\n"
 +
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
 +msgid "intermediate certificate is good\n"
 +msgstr "intermediate certificate is good\n"
 +
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
 +msgid "root certificate is good\n"
 +msgstr "root certificate is good\n"
 +
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
 +msgid "switching to chain model"
 +msgstr "switching to chain model"
 +
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
 +#, c-format
 +msgid "validation model used: %s"
 +msgstr "validation model used: %s"
 +
 +#: sm/certcheck.c:107
 +#, c-format
 +msgid "a %u bit hash is not valid for a %u bit %s key\n"
 +msgstr "a %u bit hash is not valid for a %u bit %s key\n"
 +
 +#: sm/certcheck.c:244 sm/verify.c:202
 +msgid "(this is the MD2 algorithm)\n"
 +msgstr "(this is the MD2 algorithm)\n"
 +
 +#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
 +msgid "none"
 +msgstr "none"
 +
 +#: sm/certdump.c:552 sm/certdump.c:617
 +msgid "[Error - invalid encoding]"
 +msgstr "[Error - invalid encoding]"
 +
 +#: sm/certdump.c:560
 +msgid "[Error - out of core]"
 +msgstr "[Error - out of core]"
 +
 +#: sm/certdump.c:596
 +msgid "[Error - No name]"
 +msgstr "[Error - No name]"
 +
 +#: sm/certdump.c:623
 +msgid "[Error - invalid DN]"
 +msgstr "[Error - invalid DN]"
 +
 +#: sm/certdump.c:833
 +#, c-format
 +msgid ""
 +"Please enter the passphrase to unlock the secret key for the X.509 "
 +"certificate:\n"
 +"\"%s\"\n"
 +"S/N %s, ID 0x%08lX,\n"
 +"created %s, expires %s.\n"
 +msgstr ""
 +"Please enter the passphrase to unlock the secret key for the X.509 "
 +"certificate:\n"
 +"“%s”\n"
 +"S/N %s, ID 0x%08lX,\n"
 +"created %s, expires %s.\n"
 +
 +#: sm/certlist.c:122 dirmngr/validate.c:1075
 +msgid "no key usage specified - assuming all usages\n"
 +msgstr "no key usage specified - assuming all usages\n"
 +
 +#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
 +#, c-format
 +msgid "error getting key usage information: %s\n"
 +msgstr "error getting key usage information: %s\n"
 +
 +#: sm/certlist.c:142 dirmngr/validate.c:1095
 +msgid "certificate should not have been used for certification\n"
 +msgstr "certificate should not have been used for certification\n"
 +
 +#: sm/certlist.c:154 dirmngr/validate.c:1107
 +msgid "certificate should not have been used for OCSP response signing\n"
 +msgstr "certificate should not have been used for OCSP response signing\n"
 +
 +#: sm/certlist.c:165 dirmngr/validate.c:1127
 +msgid "certificate should not have been used for encryption\n"
 +msgstr "certificate should not have been used for encryption\n"
 +
 +#: sm/certlist.c:166 dirmngr/validate.c:1129
 +msgid "certificate should not have been used for signing\n"
 +msgstr "certificate should not have been used for signing\n"
 +
 +#: sm/certlist.c:167 dirmngr/validate.c:1130
 +msgid "certificate is not usable for encryption\n"
 +msgstr "certificate is not usable for encryption\n"
 +
 +#: sm/certlist.c:168 dirmngr/validate.c:1131
 +msgid "certificate is not usable for signing\n"
 +msgstr "certificate is not usable for signing\n"
 +
 +#: sm/certreqgen.c:464
 +#, c-format
 +msgid "line %d: invalid algorithm\n"
 +msgstr "line %d: invalid algorithm\n"
 +
 +#: sm/certreqgen.c:478
 +#, c-format
 +msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 +msgstr "line %d: invalid key length %u (valid are %d to %d)\n"
 +
 +#: sm/certreqgen.c:496
 +#, c-format
 +msgid "line %d: no subject name given\n"
 +msgstr "line %d: no subject name given\n"
 +
 +#: sm/certreqgen.c:505
 +#, c-format
 +msgid "line %d: invalid subject name label '%.*s'\n"
 +msgstr "line %d: invalid subject name label ‘%.*s’\n"
 +
 +#: sm/certreqgen.c:508
 +#, c-format
 +msgid "line %d: invalid subject name '%s' at pos %d\n"
 +msgstr "line %d: invalid subject name ‘%s’ at pos %d\n"
 +
 +#: sm/certreqgen.c:525
 +#, c-format
 +msgid "line %d: not a valid email address\n"
 +msgstr "line %d: not a valid email address\n"
 +
 +#: sm/certreqgen.c:544
 +#, c-format
 +msgid "line %d: invalid serial number\n"
 +msgstr "line %d: invalid serial number\n"
 +
 +#: sm/certreqgen.c:560
 +#, c-format
 +msgid "line %d: invalid issuer name label '%.*s'\n"
 +msgstr "line %d: invalid issuer name label ‘%.*s’\n"
 +
 +#: sm/certreqgen.c:563
 +#, c-format
 +msgid "line %d: invalid issuer name '%s' at pos %d\n"
 +msgstr "line %d: invalid issuer name ‘%s’ at pos %d\n"
 +
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
 +#, c-format
 +msgid "line %d: invalid date given\n"
 +msgstr "line %d: invalid date given\n"
 +
 +#: sm/certreqgen.c:599
 +#, c-format
 +msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 +msgstr "line %d: error getting signing key by keygrip '%s': %s\n"
 +
 +#: sm/certreqgen.c:618
 +#, c-format
 +msgid "line %d: invalid hash algorithm given\n"
 +msgstr "line %d: invalid hash algorithm given\n"
 +
 +#: sm/certreqgen.c:633
 +#, c-format
 +msgid "line %d: invalid authority-key-id\n"
 +msgstr "line %d: invalid authority-key-id\n"
 +
 +#: sm/certreqgen.c:648
 +#, c-format
 +msgid "line %d: invalid subject-key-id\n"
 +msgstr "line %d: invalid subject-key-id\n"
 +
 +#: sm/certreqgen.c:686
 +#, c-format
 +msgid "line %d: invalid extension syntax\n"
 +msgstr "line %d: invalid extension syntax\n"
 +
 +#: sm/certreqgen.c:699
 +#, c-format
 +msgid "line %d: error reading key '%s' from card: %s\n"
 +msgstr "line %d: error reading key ‘%s’ from card: %s\n"
 +
 +#: sm/certreqgen.c:712
 +#, c-format
 +msgid "line %d: error getting key by keygrip '%s': %s\n"
 +msgstr "line %d: error getting key by keygrip '%s': %s\n"
 +
 +#: sm/certreqgen.c:729
 +#, c-format
 +msgid "line %d: key generation failed: %s <%s>\n"
 +msgstr "line %d: key generation failed: %s <%s>\n"
 +
 +#: sm/certreqgen.c:1324
 +msgid ""
 +"To complete this certificate request please enter the passphrase for the key "
 +"you just created once more.\n"
 +msgstr ""
 +"To complete this certificate request please enter the passphrase for the key "
 +"you just created once more.\n"
 +
 +#: sm/certreqgen-ui.c:162
 +#, c-format
 +msgid "   (%d) RSA\n"
 +msgstr "   (%d) RSA\n"
 +
 +#: sm/certreqgen-ui.c:163
 +#, c-format
 +msgid "   (%d) Existing key\n"
 +msgstr "   (%d) Existing key\n"
 +
 +#: sm/certreqgen-ui.c:164
 +#, c-format
 +msgid "   (%d) Existing key from card\n"
 +msgstr "   (%d) Existing key from card\n"
 +
 +#: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
 +#, c-format
 +msgid "error reading the card: %s\n"
 +msgstr "error reading the card: %s\n"
 +
 +#: sm/certreqgen-ui.c:237
 +#, c-format
 +msgid "Serial number of the card: %s\n"
 +msgstr "Serial number of the card: %s\n"
 +
 +#: sm/certreqgen-ui.c:249
 +msgid "Available keys:\n"
 +msgstr "Available keys:\n"
 +
 +#: sm/certreqgen-ui.c:280
 +#, c-format
 +msgid "Possible actions for a %s key:\n"
 +msgstr "Possible actions for a %s key:\n"
 +
 +#: sm/certreqgen-ui.c:281
 +#, c-format
 +msgid "   (%d) sign, encrypt\n"
 +msgstr "   (%d) sign, encrypt\n"
 +
 +#: sm/certreqgen-ui.c:282
 +#, c-format
 +msgid "   (%d) sign\n"
 +msgstr "   (%d) sign\n"
 +
 +#: sm/certreqgen-ui.c:283
 +#, c-format
 +msgid "   (%d) encrypt\n"
 +msgstr "   (%d) encrypt\n"
 +
 +#: sm/certreqgen-ui.c:307
 +msgid "Enter the X.509 subject name: "
 +msgstr "Enter the X.509 subject name: "
 +
 +#: sm/certreqgen-ui.c:311
 +msgid "No subject name given\n"
 +msgstr "No subject name given\n"
 +
 +#: sm/certreqgen-ui.c:315
 +#, c-format
 +msgid "Invalid subject name label '%.*s'\n"
 +msgstr "Invalid subject name label ‘%.*s’\n"
 +
 +#. TRANSLATORS: The 22 in the second string is the
 +#. length of the first string up to the "%s".  Please
 +#. adjust it do the length of your translation.  The
 +#. second string is merely passed to atoi so you can
 +#. drop everything after the number.
 +#: sm/certreqgen-ui.c:324
 +#, c-format
 +msgid "Invalid subject name '%s'\n"
 +msgstr "Invalid subject name ‘%s’\n"
 +
 +#: sm/certreqgen-ui.c:326
 +msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 +msgstr "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 +
 +#: sm/certreqgen-ui.c:338
 +msgid "Enter email addresses"
 +msgstr "Enter email addresses"
 +
 +#: sm/certreqgen-ui.c:339
 +msgid " (end with an empty line):\n"
 +msgstr " (end with an empty line):\n"
 +
 +#: sm/certreqgen-ui.c:343
 +msgid "Enter DNS names"
 +msgstr "Enter DNS names"
 +
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
 +msgid " (optional; end with an empty line):\n"
 +msgstr " (optional; end with an empty line):\n"
 +
 +#: sm/certreqgen-ui.c:348
 +msgid "Enter URIs"
 +msgstr "Enter URIs"
 +
 +#: sm/certreqgen-ui.c:355
 +msgid "Create self-signed certificate? (y/N) "
 +msgstr "Create self-signed certificate? (y/N) "
 +
 +#: sm/certreqgen-ui.c:382
 +msgid "These parameters are used:\n"
 +msgstr "These parameters are used:\n"
 +
 +#: sm/certreqgen-ui.c:400
 +msgid "Now creating self-signed certificate.  "
 +msgstr "Now creating self-signed certificate.  "
 +
 +#: sm/certreqgen-ui.c:402
 +msgid "Now creating certificate request.  "
 +msgstr "Now creating certificate request.  "
 +
 +#: sm/certreqgen-ui.c:403
 +msgid "This may take a while ...\n"
 +msgstr "This may take a while ...\n"
 +
 +#: sm/certreqgen-ui.c:414
 +msgid "Ready.\n"
 +msgstr "Ready.\n"
 +
 +#: sm/certreqgen-ui.c:417
 +msgid "Ready.  You should now send this request to your CA.\n"
 +msgstr "Ready.  You should now send this request to your CA.\n"
 +
 +#: sm/certreqgen-ui.c:423
 +msgid "resource problem: out of core\n"
 +msgstr "resource problem: out of core\n"
 +
 +#: sm/decrypt.c:330
 +msgid "(this is the RC2 algorithm)\n"
 +msgstr "(this is the RC2 algorithm)\n"
 +
 +#: sm/decrypt.c:332
 +msgid "(this does not seem to be an encrypted message)\n"
 +msgstr "(this does not seem to be an encrypted message)\n"
 +
 +#: sm/delete.c:51 sm/delete.c:112
 +#, c-format
 +msgid "certificate '%s' not found: %s\n"
 +msgstr "certificate ‘%s’ not found: %s\n"
 +
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
 +#, c-format
 +msgid "error locking keybox: %s\n"
 +msgstr "error locking keybox: %s\n"
 +
 +#: sm/delete.c:143
 +#, c-format
 +msgid "duplicated certificate '%s' deleted\n"
 +msgstr "duplicated certificate ‘%s’ deleted\n"
 +
 +#: sm/delete.c:145
 +#, c-format
 +msgid "certificate '%s' deleted\n"
 +msgstr "certificate ‘%s’ deleted\n"
 +
 +#: sm/delete.c:175
 +#, c-format
 +msgid "deleting certificate \"%s\" failed: %s\n"
 +msgstr "deleting certificate “%s” failed: %s\n"
 +
 +#: sm/encrypt.c:328
 +msgid "no valid recipients given\n"
 +msgstr "no valid recipients given\n"
 +
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
 +msgid "list external keys"
 +msgstr "list external keys"
 +
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
 +msgid "list certificate chain"
 +msgstr "list certificate chain"
 +
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
 +msgid "import certificates"
 +msgstr "import certificates"
 +
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
 +msgid "export certificates"
 +msgstr "export certificates"
 +
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
 +msgid "register a smartcard"
 +msgstr "register a smartcard"
 +
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
 +msgid "pass a command to the dirmngr"
 +msgstr "pass a command to the dirmngr"
 +
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
 +msgid "invoke gpg-protect-tool"
 +msgstr "invoke gpg-protect-tool"
 +
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
 +msgid "create base-64 encoded output"
 +msgstr "create base-64 encoded output"
 +
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
 +msgid "assume input is in PEM format"
 +msgstr "assume input is in PEM format"
 +
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
 +msgid "assume input is in base-64 format"
 +msgstr "assume input is in base-64 format"
 +
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
 +msgid "assume input is in binary format"
 +msgstr "assume input is in binary format"
 +
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
 +msgid "never consult a CRL"
 +msgstr "never consult a CRL"
 +
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
 +msgid "check validity using OCSP"
 +msgstr "check validity using OCSP"
 +
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
 +msgid "|N|number of certificates to include"
 +msgstr "|N|number of certificates to include"
 +
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
 +msgid "|FILE|take policy information from FILE"
 +msgstr "|FILE|take policy information from FILE"
 +
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
 +msgid "do not check certificate policies"
 +msgstr "do not check certificate policies"
 +
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
 +msgid "fetch missing issuer certificates"
 +msgstr "fetch missing issuer certificates"
 +
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
 +msgid "don't use the terminal at all"
 +msgstr "don't use the terminal at all"
 +
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
 +msgid "|FILE|write a server mode log to FILE"
 +msgstr "|FILE|write a server mode log to FILE"
 +
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
 +msgid "|FILE|write an audit log to FILE"
 +msgstr "|FILE|write an audit log to FILE"
 +
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
 +msgid "batch mode: never ask"
 +msgstr "batch mode: never ask"
 +
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
 +msgid "assume yes on most questions"
 +msgstr "assume yes on most questions"
 +
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
 +msgid "assume no on most questions"
 +msgstr "assume no on most questions"
 +
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
 +msgid "|FILE|add keyring to the list of keyrings"
 +msgstr "|FILE|add keyring to the list of keyrings"
 +
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
 +msgid "|USER-ID|use USER-ID as default secret key"
 +msgstr "|USER-ID|use USER-ID as default secret key"
 +
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
 +msgid "|SPEC|use this keyserver to lookup keys"
 +msgstr "|SPEC|use this keyserver to lookup keys"
 +
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
 +msgid "|NAME|use cipher algorithm NAME"
 +msgstr "|NAME|use cipher algorithm NAME"
 +
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
 +msgid "|NAME|use message digest algorithm NAME"
 +msgstr "|NAME|use message digest algorithm NAME"
 +
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
 +msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 +msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 +
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
 +msgid ""
 +"Syntax: @GPGSM@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 +"Default operation depends on the input data\n"
 +msgstr ""
 +"Syntax: @GPGSM@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 +"Default operation depends on the input data\n"
 +
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
 +#, c-format
 +msgid "Note: won't be able to encrypt to '%s': %s\n"
 +msgstr "Note: won't be able to encrypt to '%s': %s\n"
 +
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
 +#, c-format
 +msgid "unknown validation model '%s'\n"
 +msgstr "unknown validation model ‘%s’\n"
 +
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
 +#, c-format
 +msgid "%s:%u: no hostname given\n"
 +msgstr "%s:%u: no hostname given\n"
 +
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
 +#, c-format
 +msgid "%s:%u: password given without user\n"
 +msgstr "%s:%u: password given without user\n"
 +
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
 +#, c-format
 +msgid "%s:%u: skipping this line\n"
 +msgstr "%s:%u: skipping this line\n"
 +
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
 +msgid "could not parse keyserver\n"
 +msgstr "could not parse keyserver\n"
 +
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
 +#, c-format
 +msgid "importing common certificates '%s'\n"
 +msgstr "importing common certificates ‘%s’\n"
 +
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
 +#, c-format
 +msgid "can't sign using '%s': %s\n"
 +msgstr "can't sign using '%s': %s\n"
 +
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
 +msgid "invalid command (there is no implicit command)\n"
 +msgstr "invalid command (there is no implicit command)\n"
 +
 +#: sm/import.c:127
 +#, c-format
 +msgid "total number processed: %lu\n"
 +msgstr "total number processed: %lu\n"
 +
 +#: sm/import.c:246
 +msgid "error storing certificate\n"
 +msgstr "error storing certificate\n"
 +
 +#: sm/import.c:254
 +msgid "basic certificate checks failed - not imported\n"
 +msgstr "basic certificate checks failed - not imported\n"
 +
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
 +#, c-format
 +msgid "error getting stored flags: %s\n"
 +msgstr "error getting stored flags: %s\n"
 +
 +#: sm/import.c:526 sm/import.c:558
 +#, c-format
 +msgid "error importing certificate: %s\n"
 +msgstr "error importing certificate: %s\n"
 +
 +#: sm/import.c:746 tools/gpg-connect-agent.c:1433
 +#, c-format
 +msgid "error reading input: %s\n"
 +msgstr "error reading input: %s\n"
 +
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
 +msgid "failed to get the fingerprint\n"
 +msgstr "failed to get the fingerprint\n"
 +
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
 +#, c-format
 +msgid "problem looking for existing certificate: %s\n"
 +msgstr "problem looking for existing certificate: %s\n"
 +
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
 +#, c-format
 +msgid "error finding writable keyDB: %s\n"
 +msgstr "error finding writable keyDB: %s\n"
 +
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
 +#, c-format
 +msgid "error storing certificate: %s\n"
 +msgstr "error storing certificate: %s\n"
 +
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
 +#, c-format
 +msgid "problem re-searching certificate: %s\n"
 +msgstr "problem re-searching certificate: %s\n"
 +
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
 +#, c-format
 +msgid "error storing flags: %s\n"
 +msgstr "error storing flags: %s\n"
 +
 +#: sm/keylist.c:657
 +msgid "Error - "
 +msgstr "Error - "
 +
 +#: sm/misc.c:58
 +msgid "GPG_TTY has not been set - using maybe bogus default\n"
 +msgstr "GPG_TTY has not been set - using maybe bogus default\n"
 +
 +#: sm/qualified.c:105
 +#, c-format
 +msgid "invalid formatted fingerprint in '%s', line %d\n"
 +msgstr "invalid formatted fingerprint in '%s', line %d\n"
 +
 +#: sm/qualified.c:123
 +#, c-format
 +msgid "invalid country code in '%s', line %d\n"
 +msgstr "invalid country code in '%s', line %d\n"
 +
 +#: sm/qualified.c:206
 +#, c-format
 +msgid ""
 +"You are about to create a signature using your certificate:\n"
 +"\"%s\"\n"
 +"This will create a qualified signature by law equated to a handwritten "
 +"signature.\n"
 +"\n"
 +"%s%sAre you really sure that you want to do this?"
 +msgstr ""
 +"You are about to create a signature using your certificate:\n"
 +"“%s”\n"
 +"This will create a qualified signature by law equated to a handwritten "
 +"signature.\n"
 +"\n"
 +"%s%sAre you really sure that you want to do this?"
 +
 +#: sm/qualified.c:215 sm/verify.c:617
 +msgid ""
 +"Note, that this software is not officially approved to create or verify such "
 +"signatures.\n"
 +msgstr ""
 +"Note, that this software is not officially approved to create or verify such "
 +"signatures.\n"
 +
 +#: sm/qualified.c:282
 +#, c-format
 +msgid ""
 +"You are about to create a signature using your certificate:\n"
 +"\"%s\"\n"
 +"Note, that this certificate will NOT create a qualified signature!"
 +msgstr ""
 +"You are about to create a signature using your certificate:\n"
 +"“%s”\n"
 +"Note, that this certificate will NOT create a qualified signature!"
 +
 +#: sm/sign.c:451
 +#, c-format
 +msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 +msgstr "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 +
 +#: sm/sign.c:465
 +#, c-format
 +msgid "hash algorithm used for signer %d: %s (%s)\n"
 +msgstr "hash algorithm used for signer %d: %s (%s)\n"
 +
 +#: sm/sign.c:517
 +#, c-format
 +msgid "checking for qualified certificate failed: %s\n"
 +msgstr "checking for qualified certificate failed: %s\n"
 +
 +#: sm/verify.c:450
 +msgid "Signature made "
 +msgstr "Signature made "
 +
 +#: sm/verify.c:454
 +msgid "[date not given]"
 +msgstr "[date not given]"
 +
 +#: sm/verify.c:455
 +#, c-format
 +msgid " using certificate ID 0x%08lX\n"
 +msgstr " using certificate ID 0x%08lX\n"
 +
 +#: sm/verify.c:474
 +msgid ""
 +"invalid signature: message digest attribute does not match computed one\n"
 +msgstr ""
 +"invalid signature: message digest attribute does not match computed one\n"
 +
 +#: sm/verify.c:595
 +msgid "Good signature from"
 +msgstr "Good signature from"
 +
 +#: sm/verify.c:596
 +msgid "                aka"
 +msgstr "                aka"
 +
 +#: sm/verify.c:614
 +msgid "This is a qualified signature\n"
 +msgstr "This is a qualified signature\n"
 +
 +#: dirmngr/certcache.c:106
 +#, c-format
 +msgid "can't initialize certificate cache lock: %s\n"
 +msgstr "can't initialize certificate cache lock: %s\n"
 +
 +#: dirmngr/certcache.c:117
 +#, c-format
 +msgid "can't acquire read lock on the certificate cache: %s\n"
 +msgstr "can't acquire read lock on the certificate cache: %s\n"
 +
 +#: dirmngr/certcache.c:128
 +#, c-format
 +msgid "can't acquire write lock on the certificate cache: %s\n"
 +msgstr "can't acquire write lock on the certificate cache: %s\n"
 +
 +#: dirmngr/certcache.c:139
 +#, c-format
 +msgid "can't release lock on the certificate cache: %s\n"
 +msgstr "can't release lock on the certificate cache: %s\n"
 +
 +#: dirmngr/certcache.c:267
 +#, c-format
 +msgid "dropping %u certificates from the cache\n"
 +msgstr "dropping %u certificates from the cache\n"
 +
 +#: dirmngr/certcache.c:387
 +#, c-format
 +msgid "can't parse certificate '%s': %s\n"
 +msgstr "can't parse certificate '%s': %s\n"
 +
 +#: dirmngr/certcache.c:395
 +#, c-format
 +msgid "certificate '%s' already cached\n"
 +msgstr "certificate ‘%s’ already cached\n"
 +
 +#: dirmngr/certcache.c:399
 +#, c-format
 +msgid "trusted certificate '%s' loaded\n"
 +msgstr "trusted certificate ‘%s’ loaded\n"
 +
 +#: dirmngr/certcache.c:401
 +#, c-format
 +msgid "certificate '%s' loaded\n"
 +msgstr "certificate ‘%s’ loaded\n"
 +
 +#: dirmngr/certcache.c:405
 +#, c-format
 +msgid "  SHA1 fingerprint = %s\n"
 +msgstr "  SHA1 fingerprint = %s\n"
 +
 +#: dirmngr/certcache.c:408
 +msgid "   issuer ="
 +msgstr "   issuer ="
 +
 +#: dirmngr/certcache.c:409
 +msgid "  subject ="
 +msgstr "  subject ="
 +
 +#: dirmngr/certcache.c:413
 +#, c-format
 +msgid "error loading certificate '%s': %s\n"
 +msgstr "error loading certificate '%s': %s\n"
 +
 +#: dirmngr/certcache.c:489
 +#, c-format
 +msgid "permanently loaded certificates: %u\n"
 +msgstr "permanently loaded certificates: %u\n"
 +
 +#: dirmngr/certcache.c:491
 +#, c-format
 +msgid "    runtime cached certificates: %u\n"
 +msgstr "    runtime cached certificates: %u\n"
 +
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
 +msgid "certificate already cached\n"
 +msgstr "certificate already cached\n"
 +
 +#: dirmngr/certcache.c:508
 +msgid "certificate cached\n"
 +msgstr "certificate cached\n"
 +
 +#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
 +#: dirmngr/dirmngr-client.c:389
 +#, c-format
 +msgid "error caching certificate: %s\n"
 +msgstr "error caching certificate: %s\n"
 +
 +#: dirmngr/certcache.c:593
 +#, c-format
 +msgid "invalid SHA1 fingerprint string '%s'\n"
 +msgstr "invalid SHA1 fingerprint string ‘%s’\n"
 +
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
 +#, c-format
 +msgid "error fetching certificate by S/N: %s\n"
 +msgstr "error fetching certificate by S/N: %s\n"
 +
 +#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
 +#, c-format
 +msgid "error fetching certificate by subject: %s\n"
 +msgstr "error fetching certificate by subject: %s\n"
 +
 +#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
 +msgid "no issuer found in certificate\n"
 +msgstr "no issuer found in certificate\n"
 +
 +#: dirmngr/certcache.c:1325
 +#, c-format
 +msgid "error getting authorityKeyIdentifier: %s\n"
 +msgstr "error getting authorityKeyIdentifier: %s\n"
 +
 +#: dirmngr/crlcache.c:213
 +#, c-format
 +msgid "creating directory '%s'\n"
 +msgstr "creating directory ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:217
 +#, c-format
 +msgid "error creating directory '%s': %s\n"
 +msgstr "error creating directory '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:245
 +#, c-format
 +msgid "ignoring database dir '%s'\n"
 +msgstr "ignoring database dir ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:254
 +#, c-format
 +msgid "error reading directory '%s': %s\n"
 +msgstr "error reading directory '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:275
 +#, c-format
 +msgid "removing cache file '%s'\n"
 +msgstr "removing cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:284
 +#, c-format
 +msgid "not removing file '%s'\n"
 +msgstr "not removing file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
 +#, c-format
 +msgid "error closing cache file: %s\n"
 +msgstr "error closing cache file: %s\n"
 +
 +#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
 +#, c-format
 +msgid "failed to open cache dir file '%s': %s\n"
 +msgstr "failed to open cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:421
 +#, c-format
 +msgid "error creating new cache dir file '%s': %s\n"
 +msgstr "error creating new cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:428
 +#, c-format
 +msgid "error writing new cache dir file '%s': %s\n"
 +msgstr "error writing new cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:435
 +#, c-format
 +msgid "error closing new cache dir file '%s': %s\n"
 +msgstr "error closing new cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:440
 +#, c-format
 +msgid "new cache dir file '%s' created\n"
 +msgstr "new cache dir file ‘%s’ created\n"
 +
 +#: dirmngr/crlcache.c:445
 +#, c-format
 +msgid "failed to re-open cache dir file '%s': %s\n"
 +msgstr "failed to re-open cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:473
 +#, c-format
 +msgid "first record of '%s' is not the version\n"
 +msgstr "first record of ‘%s’ is not the version\n"
 +
 +#: dirmngr/crlcache.c:488
 +msgid "old version of cache directory - cleaning up\n"
 +msgstr "old version of cache directory - cleaning up\n"
 +
 +#: dirmngr/crlcache.c:504
 +msgid "old version of cache directory - giving up\n"
 +msgstr "old version of cache directory - giving up\n"
 +
 +#: dirmngr/crlcache.c:615
 +#, c-format
 +msgid "extra field detected in crl record of '%s' line %u\n"
 +msgstr "extra field detected in crl record of ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:623
 +#, c-format
 +msgid "invalid line detected in '%s' line %u\n"
 +msgstr "invalid line detected in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:632
 +#, c-format
 +msgid "duplicate entry detected in '%s' line %u\n"
 +msgstr "duplicate entry detected in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:647
 +#, c-format
 +msgid "unsupported record type in '%s' line %u skipped\n"
 +msgstr "unsupported record type in ‘%s’ line %u skipped\n"
 +
 +#: dirmngr/crlcache.c:673
 +#, c-format
 +msgid "invalid issuer hash in '%s' line %u\n"
 +msgstr "invalid issuer hash in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:679
 +#, c-format
 +msgid "no issuer DN in '%s' line %u\n"
 +msgstr "no issuer DN in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:686
 +#, c-format
 +msgid "invalid timestamp in '%s' line %u\n"
 +msgstr "invalid timestamp in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:692
 +#, c-format
 +msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 +msgstr "WARNING: invalid cache file hash in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:698
 +msgid "detected errors in cache dir file\n"
 +msgstr "detected errors in cache dir file\n"
 +
 +#: dirmngr/crlcache.c:699
 +msgid "please check the reason and manually delete that file\n"
 +msgstr "please check the reason and manually delete that file\n"
 +
 +#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
 +#, c-format
 +msgid "failed to create temporary cache dir file '%s': %s\n"
 +msgstr "failed to create temporary cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:937
 +#, c-format
 +msgid "error closing '%s': %s\n"
 +msgstr "error closing '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:949
 +#, c-format
 +msgid "error renaming '%s' to '%s': %s\n"
 +msgstr "error renaming ‘%s’ to '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1003
 +#, c-format
 +msgid "can't hash '%s': %s\n"
 +msgstr "can't hash '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1011
 +#, c-format
 +msgid "error setting up MD5 hash context: %s\n"
 +msgstr "error setting up MD5 hash context: %s\n"
 +
 +#: dirmngr/crlcache.c:1027
 +#, c-format
 +msgid "error hashing '%s': %s\n"
 +msgstr "error hashing '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1055
 +#, c-format
 +msgid "invalid formatted checksum for '%s'\n"
 +msgstr "invalid formatted checksum for ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:1108
 +msgid "too many open cache files; can't open anymore\n"
 +msgstr "too many open cache files; can't open anymore\n"
 +
 +#: dirmngr/crlcache.c:1126
 +#, c-format
 +msgid "opening cache file '%s'\n"
 +msgstr "opening cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:1145
 +#, c-format
 +msgid "error opening cache file '%s': %s\n"
 +msgstr "error opening cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1154
 +#, c-format
 +msgid "error initializing cache file '%s' for reading: %s\n"
 +msgstr "error initializing cache file ‘%s’ for reading: %s\n"
 +
 +#: dirmngr/crlcache.c:1175
 +msgid "calling unlock_db_file on a closed file\n"
 +msgstr "calling unlock_db_file on a closed file\n"
 +
 +#: dirmngr/crlcache.c:1177
 +msgid "calling unlock_db_file on an unlocked file\n"
 +msgstr "calling unlock_db_file on an unlocked file\n"
 +
 +#: dirmngr/crlcache.c:1231
 +#, c-format
 +msgid "failed to create a new cache object: %s\n"
 +msgstr "failed to create a new cache object: %s\n"
 +
 +#: dirmngr/crlcache.c:1286
 +#, c-format
 +msgid "no CRL available for issuer id %s\n"
 +msgstr "no CRL available for issuer id %s\n"
 +
 +#: dirmngr/crlcache.c:1293
 +#, c-format
 +msgid "cached CRL for issuer id %s too old; update required\n"
 +msgstr "cached CRL for issuer id %s too old; update required\n"
 +
 +#: dirmngr/crlcache.c:1307
 +#, c-format
 +msgid ""
 +"force-crl-refresh active and %d minutes passed for issuer id %s; update "
 +"required\n"
 +msgstr ""
 +"force-crl-refresh active and %d minutes passed for issuer id %s; update "
 +"required\n"
 +
 +#: dirmngr/crlcache.c:1315
 +#, c-format
 +msgid "force-crl-refresh active for issuer id %s; update required\n"
 +msgstr "force-crl-refresh active for issuer id %s; update required\n"
 +
 +#: dirmngr/crlcache.c:1324
 +#, c-format
 +msgid "available CRL for issuer ID %s can't be used\n"
 +msgstr "available CRL for issuer ID %s can't be used\n"
 +
 +#: dirmngr/crlcache.c:1335
 +#, c-format
 +msgid "cached CRL for issuer id %s tampered; we need to update\n"
 +msgstr "cached CRL for issuer id %s tampered; we need to update\n"
 +
 +#: dirmngr/crlcache.c:1347
 +msgid "WARNING: invalid cache record length for S/N "
 +msgstr "WARNING: invalid cache record length for S/N "
 +
 +#: dirmngr/crlcache.c:1357
 +#, c-format
 +msgid "problem reading cache record for S/N %s: %s\n"
 +msgstr "problem reading cache record for S/N %s: %s\n"
 +
 +#: dirmngr/crlcache.c:1360
 +#, c-format
 +msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 +msgstr "S/N %s is not valid; reason=%02X  date=%.15s\n"
 +
 +#: dirmngr/crlcache.c:1371
 +#, c-format
 +msgid "S/N %s is valid, it is not listed in the CRL\n"
 +msgstr "S/N %s is valid, it is not listed in the CRL\n"
 +
 +#: dirmngr/crlcache.c:1379
 +#, c-format
 +msgid "error getting data from cache file: %s\n"
 +msgstr "error getting data from cache file: %s\n"
 +
 +#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
 +#, c-format
 +msgid "unknown hash algorithm '%s'\n"
 +msgstr "unknown hash algorithm ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:1549
 +#, c-format
 +msgid "gcry_md_open for algorithm %d failed: %s\n"
 +msgstr "gcry_md_open for algorithm %d failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1586 dirmngr/crlcache.c:1605
 +msgid "got an invalid S-expression from libksba\n"
 +msgstr "got an invalid S-expression from libksba\n"
 +
 +#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
 +#, c-format
 +msgid "converting S-expression failed: %s\n"
 +msgstr "converting S-expression failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
 +#, c-format
 +msgid "creating S-expression failed: %s\n"
 +msgstr "creating S-expression failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1699
 +#, c-format
 +msgid "ksba_crl_parse failed: %s\n"
 +msgstr "ksba_crl_parse failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1714
 +#, c-format
 +msgid "error getting update times of CRL: %s\n"
 +msgstr "error getting update times of CRL: %s\n"
 +
 +#: dirmngr/crlcache.c:1721
 +#, c-format
 +msgid "update times of this CRL: this=%s next=%s\n"
 +msgstr "update times of this CRL: this=%s next=%s\n"
 +
 +#: dirmngr/crlcache.c:1725
 +msgid "nextUpdate not given; assuming a validity period of one day\n"
 +msgstr "nextUpdate not given; assuming a validity period of one day\n"
 +
 +#: dirmngr/crlcache.c:1745
 +#, c-format
 +msgid "error getting CRL item: %s\n"
 +msgstr "error getting CRL item: %s\n"
 +
 +#: dirmngr/crlcache.c:1760
 +#, c-format
 +msgid "error inserting item into temporary cache file: %s\n"
 +msgstr "error inserting item into temporary cache file: %s\n"
 +
 +#: dirmngr/crlcache.c:1787
 +#, c-format
 +msgid "no CRL issuer found in CRL: %s\n"
 +msgstr "no CRL issuer found in CRL: %s\n"
 +
 +#: dirmngr/crlcache.c:1802
 +msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 +msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
 +
 +#: dirmngr/crlcache.c:1847
 +#, c-format
 +msgid "CRL signature verification failed: %s\n"
 +msgstr "CRL signature verification failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1858
 +#, c-format
 +msgid "error checking validity of CRL issuer certificate: %s\n"
 +msgstr "error checking validity of CRL issuer certificate: %s\n"
 +
 +#: dirmngr/crlcache.c:2001
 +#, c-format
 +msgid "ksba_crl_new failed: %s\n"
 +msgstr "ksba_crl_new failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2008
 +#, c-format
 +msgid "ksba_crl_set_reader failed: %s\n"
 +msgstr "ksba_crl_set_reader failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2042
 +#, c-format
 +msgid "removed stale temporary cache file '%s'\n"
 +msgstr "removed stale temporary cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:2046
 +#, c-format
 +msgid "problem removing stale temporary cache file '%s': %s\n"
 +msgstr "problem removing stale temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2056
 +#, c-format
 +msgid "error creating temporary cache file '%s': %s\n"
 +msgstr "error creating temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2066
 +#, c-format
 +msgid "crl_parse_insert failed: %s\n"
 +msgstr "crl_parse_insert failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2076
 +#, c-format
 +msgid "error finishing temporary cache file '%s': %s\n"
 +msgstr "error finishing temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2083
 +#, c-format
 +msgid "error closing temporary cache file '%s': %s\n"
 +msgstr "error closing temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2108
 +#, c-format
 +msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 +msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 +
 +#: dirmngr/crlcache.c:2112
 +#, c-format
 +msgid "new CRL still too old; it expired on %s\n"
 +msgstr "new CRL still too old; it expired on %s\n"
 +
 +#: dirmngr/crlcache.c:2128
 +#, c-format
 +msgid "unknown critical CRL extension %s\n"
 +msgstr "unknown critical CRL extension %s\n"
 +
 +#: dirmngr/crlcache.c:2138
 +#, c-format
 +msgid "error reading CRL extensions: %s\n"
 +msgstr "error reading CRL extensions: %s\n"
 +
 +#: dirmngr/crlcache.c:2189
 +#, c-format
 +msgid "creating cache file '%s'\n"
 +msgstr "creating cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:2221
 +#, c-format
 +msgid "problem renaming '%s' to '%s': %s\n"
 +msgstr "problem renaming ‘%s’ to '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2235
 +msgid ""
 +"updating the DIR file failed - cache entry will get lost with the next "
 +"program start\n"
 +msgstr ""
 +"updating the DIR file failed - cache entry will get lost with the next "
 +"program start\n"
 +
 +#: dirmngr/crlcache.c:2272
 +#, c-format
 +msgid "Begin CRL dump (retrieved via %s)\n"
 +msgstr "Begin CRL dump (retrieved via %s)\n"
 +
 +#: dirmngr/crlcache.c:2295
 +msgid ""
 +" ERROR: The CRL will not be used because it was still too old after an "
 +"update!\n"
 +msgstr ""
 +" ERROR: The CRL will not be used because it was still too old after an "
 +"update!\n"
 +
 +#: dirmngr/crlcache.c:2298
 +msgid ""
 +" ERROR: The CRL will not be used due to an unknown critical extension!\n"
 +msgstr ""
 +" ERROR: The CRL will not be used due to an unknown critical extension!\n"
 +
 +#: dirmngr/crlcache.c:2301
 +msgid " ERROR: The CRL will not be used\n"
 +msgstr " ERROR: The CRL will not be used\n"
 +
 +#: dirmngr/crlcache.c:2308
 +msgid " ERROR: This cached CRL may have been tampered with!\n"
 +msgstr " ERROR: This cached CRL may have been tampered with!\n"
 +
 +#: dirmngr/crlcache.c:2326
 +msgid " WARNING: invalid cache record length\n"
 +msgstr " WARNING: invalid cache record length\n"
 +
 +#: dirmngr/crlcache.c:2333
 +#, c-format
 +msgid "problem reading cache record: %s\n"
 +msgstr "problem reading cache record: %s\n"
 +
 +#: dirmngr/crlcache.c:2344
 +#, c-format
 +msgid "problem reading cache key: %s\n"
 +msgstr "problem reading cache key: %s\n"
 +
 +#: dirmngr/crlcache.c:2375
 +#, c-format
 +msgid "error reading cache entry from db: %s\n"
 +msgstr "error reading cache entry from db: %s\n"
 +
 +#: dirmngr/crlcache.c:2378
 +msgid "End CRL dump\n"
 +msgstr "End CRL dump\n"
 +
 +#: dirmngr/crlcache.c:2499
 +#, c-format
 +msgid "crl_fetch via DP failed: %s\n"
 +msgstr "crl_fetch via DP failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2510
 +#, c-format
 +msgid "crl_cache_insert via DP failed: %s\n"
 +msgstr "crl_cache_insert via DP failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2570
 +#, c-format
 +msgid "crl_cache_insert via issuer failed: %s\n"
 +msgstr "crl_cache_insert via issuer failed: %s\n"
 +
 +#: dirmngr/crlfetch.c:74
 +msgid "reader to file mapping table full - waiting\n"
 +msgstr "reader to file mapping table full - waiting\n"
 +
 +#: dirmngr/crlfetch.c:182
 +msgid "using \"http\" instead of \"https\"\n"
 +msgstr "using “http” instead of “https”\n"
 +
 +#: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
 +#: dirmngr/crlfetch.c:359
 +#, c-format
 +msgid "CRL access not possible due to disabled %s\n"
 +msgstr "CRL access not possible due to disabled %s\n"
 +
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
 +#: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
 +#, c-format
 +msgid "error initializing reader object: %s\n"
 +msgstr "error initializing reader object: %s\n"
 +
 +#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
 +#, c-format
 +msgid "URL '%s' redirected to '%s' (%u)\n"
 +msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
 +
 +#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
 +msgid "too many redirections\n"
 +msgstr "too many redirections\n"
 +
 +#: dirmngr/crlfetch.c:274
 +#, c-format
 +msgid "error retrieving '%s': %s\n"
 +msgstr "error retrieving '%s': %s\n"
 +
 +#: dirmngr/crlfetch.c:279
 +#, c-format
 +msgid "error retrieving '%s': http status %u\n"
 +msgstr "error retrieving '%s': http status %u\n"
 +
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
 +msgid "CRL access not possible due to Tor mode\n"
 +msgstr "CRL access not possible due to Tor mode\n"
 +
 +#: dirmngr/crlfetch.c:386
 +#, c-format
 +msgid "certificate search not possible due to disabled %s\n"
 +msgstr "certificate search not possible due to disabled %s\n"
 +
 +#: dirmngr/dirmngr-client.c:71
 +msgid "use OCSP instead of CRLs"
 +msgstr "use OCSP instead of CRLs"
 +
 +#: dirmngr/dirmngr-client.c:72
 +msgid "check whether a dirmngr is running"
 +msgstr "check whether a dirmngr is running"
 +
 +#: dirmngr/dirmngr-client.c:73
 +msgid "add a certificate to the cache"
 +msgstr "add a certificate to the cache"
 +
 +#: dirmngr/dirmngr-client.c:74
 +msgid "validate a certificate"
 +msgstr "validate a certificate"
 +
 +#: dirmngr/dirmngr-client.c:75
 +msgid "lookup a certificate"
 +msgstr "lookup a certificate"
 +
 +#: dirmngr/dirmngr-client.c:76
 +msgid "lookup only locally stored certificates"
 +msgstr "lookup only locally stored certificates"
 +
 +#: dirmngr/dirmngr-client.c:77
 +msgid "expect an URL for --lookup"
 +msgstr "expect an URL for --lookup"
 +
 +#: dirmngr/dirmngr-client.c:78
 +msgid "load a CRL into the dirmngr"
 +msgstr "load a CRL into the dirmngr"
 +
 +#: dirmngr/dirmngr-client.c:79
 +msgid "special mode for use by Squid"
 +msgstr "special mode for use by Squid"
 +
 +#: dirmngr/dirmngr-client.c:80
 +msgid "expect certificates in PEM format"
 +msgstr "expect certificates in PEM format"
 +
 +#: dirmngr/dirmngr-client.c:82
 +msgid "force the use of the default OCSP responder"
 +msgstr "force the use of the default OCSP responder"
 +
 +#: dirmngr/dirmngr-client.c:169
 +msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 +msgstr "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 +
 +#: dirmngr/dirmngr-client.c:173
 +msgid ""
 +"Syntax: dirmngr-client [options] [certfile|pattern]\n"
 +"Test an X.509 certificate against a CRL or do an OCSP check\n"
 +"The process returns 0 if the certificate is valid, 1 if it is\n"
 +"not valid and other error codes for general failures\n"
 +msgstr ""
 +"Syntax: dirmngr-client [options] [certfile|pattern]\n"
 +"Test an X.509 certificate against a CRL or do an OCSP check\n"
 +"The process returns 0 if the certificate is valid, 1 if it is\n"
 +"not valid and other error codes for general failures\n"
 +
 +#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
 +#, c-format
 +msgid "error reading certificate from stdin: %s\n"
 +msgstr "error reading certificate from stdin: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:281
 +#, c-format
 +msgid "error reading certificate from '%s': %s\n"
 +msgstr "error reading certificate from '%s': %s\n"
 +
 +#: dirmngr/dirmngr-client.c:295
 +msgid "certificate too large to make any sense\n"
 +msgstr "certificate too large to make any sense\n"
 +
 +#: dirmngr/dirmngr-client.c:310
 +#, c-format
 +msgid "can't connect to the dirmngr: %s\n"
 +msgstr "can't connect to the dirmngr: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:332
 +#, c-format
 +msgid "lookup failed: %s\n"
 +msgstr "lookup failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:347
 +#, c-format
 +msgid "loading CRL '%s' failed: %s\n"
 +msgstr "loading CRL ‘%s’ failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:375
 +msgid "a dirmngr daemon is up and running\n"
 +msgstr "a dirmngr daemon is up and running\n"
 +
 +#: dirmngr/dirmngr-client.c:397
 +#, c-format
 +msgid "validation of certificate failed: %s\n"
 +msgstr "validation of certificate failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
 +msgid "certificate is valid\n"
 +msgstr "certificate is valid\n"
 +
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
 +msgid "certificate has been revoked\n"
 +msgstr "certificate has been revoked\n"
 +
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
 +#, c-format
 +msgid "certificate check failed: %s\n"
 +msgstr "certificate check failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:428
 +#, c-format
 +msgid "got status: '%s'\n"
 +msgstr "got status: ‘%s’\n"
 +
 +#: dirmngr/dirmngr-client.c:443
 +#, c-format
 +msgid "error writing base64 encoding: %s\n"
 +msgstr "error writing base64 encoding: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:701
 +#, c-format
 +msgid "unsupported inquiry '%s'\n"
 +msgstr "unsupported inquiry ‘%s’\n"
 +
 +#: dirmngr/dirmngr-client.c:803
 +msgid "absolute file name expected\n"
 +msgstr "absolute file name expected\n"
 +
 +#: dirmngr/dirmngr-client.c:848
 +#, c-format
 +msgid "looking up '%s'\n"
 +msgstr "looking up ‘%s’\n"
 +
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
 +msgid "list the contents of the CRL cache"
 +msgstr "list the contents of the CRL cache"
 +
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
 +msgid "|FILE|load CRL from FILE into cache"
 +msgstr "|FILE|load CRL from FILE into cache"
 +
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
 +msgid "|URL|fetch a CRL from URL"
 +msgstr "|URL|fetch a CRL from URL"
 +
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
 +msgid "shutdown the dirmngr"
 +msgstr "shutdown the dirmngr"
 +
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
 +msgid "flush the cache"
 +msgstr "flush the cache"
 +
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
 +msgid "|FILE|write server mode logs to FILE"
 +msgstr "|FILE|write server mode logs to FILE"
 +
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
 +msgid "run without asking a user"
 +msgstr "run without asking a user"
 +
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
 +msgid "force loading of outdated CRLs"
 +msgstr "force loading of outdated CRLs"
 +
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
 +msgid "allow sending OCSP requests"
 +msgstr "allow sending OCSP requests"
 +
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
++msgid "allow online software version check"
++msgstr "allow online software version check"
++
++#: dirmngr/dirmngr.c:182
 +msgid "inhibit the use of HTTP"
 +msgstr "inhibit the use of HTTP"
 +
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
 +msgid "inhibit the use of LDAP"
 +msgstr "inhibit the use of LDAP"
 +
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
 +msgid "ignore HTTP CRL distribution points"
 +msgstr "ignore HTTP CRL distribution points"
 +
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
 +msgid "ignore LDAP CRL distribution points"
 +msgstr "ignore LDAP CRL distribution points"
 +
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
 +msgid "ignore certificate contained OCSP service URLs"
 +msgstr "ignore certificate contained OCSP service URLs"
 +
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
 +msgid "|URL|redirect all HTTP requests to URL"
 +msgstr "|URL|redirect all HTTP requests to URL"
 +
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
 +msgid "|HOST|use HOST for LDAP queries"
 +msgstr "|HOST|use HOST for LDAP queries"
 +
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
 +msgid "do not use fallback hosts with --ldap-proxy"
 +msgstr "do not use fallback hosts with --ldap-proxy"
 +
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
 +msgid "|FILE|read LDAP server list from FILE"
 +msgstr "|FILE|read LDAP server list from FILE"
 +
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
 +msgid "add new servers discovered in CRL distribution points to serverlist"
 +msgstr "add new servers discovered in CRL distribution points to serverlist"
 +
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
 +msgid "|N|set LDAP timeout to N seconds"
 +msgstr "|N|set LDAP timeout to N seconds"
 +
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
 +msgid "|URL|use OCSP responder at URL"
 +msgstr "|URL|use OCSP responder at URL"
 +
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
 +msgid "|FPR|OCSP response signed by FPR"
 +msgstr "|FPR|OCSP response signed by FPR"
 +
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
 +msgid "|N|do not return more than N items in one query"
 +msgstr "|N|do not return more than N items in one query"
 +
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
 +msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 +msgstr "|FILE|use the CA certificates in FILE for HKP over TLS"
 +
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
 +msgid "route all network traffic via Tor"
 +msgstr "route all network traffic via Tor"
 +
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
 +msgid ""
 +"@\n"
 +"(See the \"info\" manual for a complete listing of all commands and "
 +"options)\n"
 +msgstr ""
 +"@\n"
 +"(See the “info” manual for a complete listing of all commands and "
 +"options)\n"
 +
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
 +msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 +msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 +
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
 +msgid ""
 +"Syntax: @DIRMNGR@ [options] [command [args]]\n"
 +"Keyserver, CRL, and OCSP access for @GNUPG@\n"
 +msgstr ""
 +"Syntax: @DIRMNGR@ [options] [command [args]]\n"
 +"Keyserver, CRL, and OCSP access for @GNUPG@\n"
 +
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
 +#, c-format
 +msgid "valid debug levels are: %s\n"
 +msgstr "valid debug levels are: %s\n"
 +
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
 +#, c-format
 +msgid "usage: %s [options] "
 +msgstr "usage: %s [options] "
 +
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
 +msgid "colons are not allowed in the socket name\n"
 +msgstr "colons are not allowed in the socket name\n"
 +
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
 +#, c-format
 +msgid "fetching CRL from '%s' failed: %s\n"
 +msgstr "fetching CRL from ‘%s’ failed: %s\n"
 +
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
 +#, c-format
 +msgid "processing CRL from '%s' failed: %s\n"
 +msgstr "processing CRL from ‘%s’ failed: %s\n"
 +
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
 +#, c-format
 +msgid "%s:%u: line too long - skipped\n"
 +msgstr "%s:%u: line too long - skipped\n"
 +
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
 +#, c-format
 +msgid "%s:%u: invalid fingerprint detected\n"
 +msgstr "%s:%u: invalid fingerprint detected\n"
 +
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
 +#, c-format
 +msgid "%s:%u: read error: %s\n"
 +msgstr "%s:%u: read error: %s\n"
 +
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
 +#, c-format
 +msgid "%s:%u: garbage at end of line ignored\n"
 +msgstr "%s:%u: garbage at end of line ignored\n"
 +
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
 +msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 +msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
 +
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
 +msgid "SIGUSR2 received - no action defined\n"
 +msgstr "SIGUSR2 received - no action defined\n"
 +
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
 +msgid "SIGTERM received - shutting down ...\n"
 +msgstr "SIGTERM received - shutting down ...\n"
 +
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
 +#, c-format
 +msgid "SIGTERM received - still %d active connections\n"
 +msgstr "SIGTERM received - still %d active connections\n"
 +
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
 +msgid "shutdown forced\n"
 +msgstr "shutdown forced\n"
 +
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
 +msgid "SIGINT received - immediate shutdown\n"
 +msgstr "SIGINT received - immediate shutdown\n"
 +
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
 +#, c-format
 +msgid "signal %d received - no action defined\n"
 +msgstr "signal %d received - no action defined\n"
 +
 +#: dirmngr/dirmngr_ldap.c:138
 +msgid "return all values in a record oriented format"
 +msgstr "return all values in a record oriented format"
 +
 +#: dirmngr/dirmngr_ldap.c:141
 +msgid "|NAME|ignore host part and connect through NAME"
 +msgstr "|NAME|ignore host part and connect through NAME"
 +
 +#: dirmngr/dirmngr_ldap.c:142
 +msgid "|NAME|connect to host NAME"
 +msgstr "|NAME|connect to host NAME"
 +
 +#: dirmngr/dirmngr_ldap.c:143
 +msgid "|N|connect to port N"
 +msgstr "|N|connect to port N"
 +
 +#: dirmngr/dirmngr_ldap.c:144
 +msgid "|NAME|use user NAME for authentication"
 +msgstr "|NAME|use user NAME for authentication"
 +
 +#: dirmngr/dirmngr_ldap.c:145
 +msgid "|PASS|use password PASS for authentication"
 +msgstr "|PASS|use password PASS for authentication"
 +
 +#: dirmngr/dirmngr_ldap.c:147
 +msgid "take password from $DIRMNGR_LDAP_PASS"
 +msgstr "take password from $DIRMNGR_LDAP_PASS"
 +
 +#: dirmngr/dirmngr_ldap.c:148
 +msgid "|STRING|query DN STRING"
 +msgstr "|STRING|query DN STRING"
 +
 +#: dirmngr/dirmngr_ldap.c:149
 +msgid "|STRING|use STRING as filter expression"
 +msgstr "|STRING|use STRING as filter expression"
 +
 +#: dirmngr/dirmngr_ldap.c:150
 +msgid "|STRING|return the attribute STRING"
 +msgstr "|STRING|return the attribute STRING"
 +
 +#: dirmngr/dirmngr_ldap.c:209
 +msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 +msgstr "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 +
 +#: dirmngr/dirmngr_ldap.c:212
 +msgid ""
 +"Syntax: dirmngr_ldap [options] [URL]\n"
 +"Internal LDAP helper for Dirmngr\n"
 +"Interface and options may change without notice\n"
 +msgstr ""
 +"Syntax: dirmngr_ldap [options] [URL]\n"
 +"Internal LDAP helper for Dirmngr\n"
 +"Interface and options may change without notice\n"
 +
 +#: dirmngr/dirmngr_ldap.c:337
 +#, c-format
 +msgid "invalid port number %d\n"
 +msgstr "invalid port number %d\n"
 +
 +#: dirmngr/dirmngr_ldap.c:413
 +#, c-format
 +msgid "scanning result for attribute '%s'\n"
 +msgstr "scanning result for attribute ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
 +#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
 +#: dirmngr/dirmngr_ldap.c:677
 +#, c-format
 +msgid "error writing to stdout: %s\n"
 +msgstr "error writing to stdout: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:437
 +#, c-format
 +msgid "          available attribute '%s'\n"
 +msgstr "          available attribute ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:475
 +#, c-format
 +msgid "attribute '%s' not found\n"
 +msgstr "attribute ‘%s’ not found\n"
 +
 +#: dirmngr/dirmngr_ldap.c:482
 +#, c-format
 +msgid "found attribute '%s'\n"
 +msgstr "found attribute ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:591
 +#, c-format
 +msgid "processing url '%s'\n"
 +msgstr "processing url ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:593
 +#, c-format
 +msgid "          user '%s'\n"
 +msgstr "          user ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:595
 +#, c-format
 +msgid "          pass '%s'\n"
 +msgstr "          pass ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:597
 +#, c-format
 +msgid "          host '%s'\n"
 +msgstr "          host ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:598
 +#, c-format
 +msgid "          port %d\n"
 +msgstr "          port %d\n"
 +
 +#: dirmngr/dirmngr_ldap.c:600
 +#, c-format
 +msgid "            DN '%s'\n"
 +msgstr "            DN ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:602
 +#, c-format
 +msgid "        filter '%s'\n"
 +msgstr "        filter ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
 +#, c-format
 +msgid "          attr '%s'\n"
 +msgstr "          attr ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:616
 +#, c-format
 +msgid "no host name in '%s'\n"
 +msgstr "no host name in ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:621
 +#, c-format
 +msgid "no attribute given for query '%s'\n"
 +msgstr "no attribute given for query ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:627
 +msgid "WARNING: using first attribute only\n"
 +msgstr "WARNING: using first attribute only\n"
 +
 +#: dirmngr/dirmngr_ldap.c:636
 +#, c-format
 +msgid "LDAP init to '%s:%d' failed: %s\n"
 +msgstr "LDAP init to ‘%s:%d’ failed: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:659
 +#, c-format
 +msgid "binding to '%s:%d' failed: %s\n"
 +msgstr "binding to ‘%s:%d’ failed: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:686
 +#, c-format
 +msgid "searching '%s' failed: %s\n"
 +msgstr "searching ‘%s’ failed: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:718
 +#, c-format
 +msgid "'%s' is not an LDAP URL\n"
 +msgstr "‘%s’ is not an LDAP URL\n"
 +
 +#: dirmngr/dirmngr_ldap.c:724
 +#, c-format
 +msgid "'%s' is an invalid LDAP URL\n"
 +msgstr "‘%s’ is an invalid LDAP URL\n"
 +
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, c-format
- msgid "error allocating memory: %s\n"
- msgstr "error allocating memory: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
 +#, c-format
 +msgid "error printing log line: %s\n"
 +msgstr "error printing log line: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:236
 +#, c-format
 +msgid "error reading log from ldap wrapper %d: %s\n"
 +msgstr "error reading log from ldap wrapper %d: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:304
 +#, c-format
 +msgid "npth_select failed: %s - waiting 1s\n"
 +msgstr "npth_select failed: %s - waiting 1s\n"
 +
 +#: dirmngr/ldap-wrapper.c:343
 +#, c-format
 +msgid "ldap wrapper %d ready"
 +msgstr "ldap wrapper %d ready"
 +
 +#: dirmngr/ldap-wrapper.c:352
 +#, c-format
 +msgid "ldap wrapper %d ready: timeout\n"
 +msgstr "ldap wrapper %d ready: timeout\n"
 +
 +#: dirmngr/ldap-wrapper.c:355
 +#, c-format
 +msgid "ldap wrapper %d ready: exitcode=%d\n"
 +msgstr "ldap wrapper %d ready: exitcode=%d\n"
 +
 +#: dirmngr/ldap-wrapper.c:364
 +#, c-format
 +msgid "waiting for ldap wrapper %d failed: %s\n"
 +msgstr "waiting for ldap wrapper %d failed: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:376
 +#, c-format
 +msgid "ldap wrapper %d stalled - killing\n"
 +msgstr "ldap wrapper %d stalled - killing\n"
 +
 +#: dirmngr/ldap-wrapper.c:444
 +#, c-format
 +msgid "error spawning ldap wrapper reaper thread: %s\n"
 +msgstr "error spawning ldap wrapper reaper thread: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
 +#, c-format
 +msgid "reading from ldap wrapper %d failed: %s\n"
 +msgstr "reading from ldap wrapper %d failed: %s\n"
 +
 +#: dirmngr/ldap.c:91
 +#, c-format
 +msgid "invalid char 0x%02x in host name - not added\n"
 +msgstr "invalid char 0x%02x in host name - not added\n"
 +
 +#: dirmngr/ldap.c:95
 +#, c-format
 +msgid "adding '%s:%d' to the ldap server list\n"
 +msgstr "adding ‘%s:%d’ to the ldap server list\n"
 +
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
 +#, c-format
 +msgid "malloc failed: %s\n"
 +msgstr "malloc failed: %s\n"
 +
 +#: dirmngr/ldap.c:627
 +#, c-format
 +msgid "start_cert_fetch: invalid pattern '%s'\n"
 +msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
 +
 +#: dirmngr/ldap.c:840
 +msgid "ldap_search hit the size limit of the server\n"
 +msgstr "ldap_search hit the size limit of the server\n"
 +
 +#: dirmngr/misc.c:170
 +msgid "invalid canonical S-expression found\n"
 +msgstr "invalid canonical S-expression found\n"
 +
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
 +#, c-format
 +msgid "gcry_md_open failed: %s\n"
 +msgstr "gcry_md_open failed: %s\n"
 +
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
 +#, c-format
 +msgid "oops: ksba_cert_hash failed: %s\n"
 +msgstr "oops: ksba_cert_hash failed: %s\n"
 +
 +#: dirmngr/misc.c:518
 +msgid "bad URL encoding detected\n"
 +msgstr "bad URL encoding detected\n"
 +
 +#: dirmngr/ocsp.c:80
 +#, c-format
 +msgid "error reading from responder: %s\n"
 +msgstr "error reading from responder: %s\n"
 +
 +#: dirmngr/ocsp.c:98
 +#, c-format
 +msgid "response from server too large; limit is %d bytes\n"
 +msgstr "response from server too large; limit is %d bytes\n"
 +
 +#: dirmngr/ocsp.c:139
 +msgid "OCSP request not possible due to Tor mode\n"
 +msgstr "OCSP request not possible due to Tor mode\n"
 +
 +#: dirmngr/ocsp.c:145
 +msgid "OCSP request not possible due to disabled HTTP\n"
 +msgstr "OCSP request not possible due to disabled HTTP\n"
 +
 +#: dirmngr/ocsp.c:152
 +#, c-format
 +msgid "error setting OCSP target: %s\n"
 +msgstr "error setting OCSP target: %s\n"
 +
 +#: dirmngr/ocsp.c:170
 +#, c-format
 +msgid "error building OCSP request: %s\n"
 +msgstr "error building OCSP request: %s\n"
 +
 +#: dirmngr/ocsp.c:181
 +#, c-format
 +msgid "error connecting to '%s': %s\n"
 +msgstr "error connecting to '%s': %s\n"
 +
 +#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
 +#, c-format
 +msgid "error reading HTTP response for '%s': %s\n"
 +msgstr "error reading HTTP response for '%s': %s\n"
 +
 +#: dirmngr/ocsp.c:240
 +#, c-format
 +msgid "error accessing '%s': http status %u\n"
 +msgstr "error accessing '%s': http status %u\n"
 +
 +#: dirmngr/ocsp.c:265
 +#, c-format
 +msgid "error parsing OCSP response for '%s': %s\n"
 +msgstr "error parsing OCSP response for '%s': %s\n"
 +
 +#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
 +#, c-format
 +msgid "OCSP responder at '%s' status: %s\n"
 +msgstr "OCSP responder at ‘%s’ status: %s\n"
 +
 +#: dirmngr/ocsp.c:293
 +#, c-format
 +msgid "hashing the OCSP response for '%s' failed: %s\n"
 +msgstr "hashing the OCSP response for ‘%s’ failed: %s\n"
 +
 +#: dirmngr/ocsp.c:328
 +msgid "not signed by a default OCSP signer's certificate"
 +msgstr "not signed by a default OCSP signer's certificate"
 +
 +#: dirmngr/ocsp.c:413
 +msgid "only SHA-1 is supported for OCSP responses\n"
 +msgstr "only SHA-1 is supported for OCSP responses\n"
 +
 +#: dirmngr/ocsp.c:464
 +#, c-format
 +msgid "allocating list item failed: %s\n"
 +msgstr "allocating list item failed: %s\n"
 +
 +#: dirmngr/ocsp.c:479
 +#, c-format
 +msgid "error getting responder ID: %s\n"
 +msgstr "error getting responder ID: %s\n"
 +
 +#: dirmngr/ocsp.c:514
 +msgid "no suitable certificate found to verify the OCSP response\n"
 +msgstr "no suitable certificate found to verify the OCSP response\n"
 +
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
 +#, c-format
 +msgid "issuer certificate not found: %s\n"
 +msgstr "issuer certificate not found: %s\n"
 +
 +#: dirmngr/ocsp.c:563
 +msgid "caller did not return the target certificate\n"
 +msgstr "caller did not return the target certificate\n"
 +
 +#: dirmngr/ocsp.c:570
 +msgid "caller did not return the issuing certificate\n"
 +msgstr "caller did not return the issuing certificate\n"
 +
 +#: dirmngr/ocsp.c:580
 +#, c-format
 +msgid "failed to allocate OCSP context: %s\n"
 +msgstr "failed to allocate OCSP context: %s\n"
 +
 +#: dirmngr/ocsp.c:614
 +#, c-format
 +msgid "can't get authorityInfoAccess: %s\n"
 +msgstr "can't get authorityInfoAccess: %s\n"
 +
 +#: dirmngr/ocsp.c:621
 +msgid "no default OCSP responder defined\n"
 +msgstr "no default OCSP responder defined\n"
 +
 +#: dirmngr/ocsp.c:627
 +msgid "no default OCSP signer defined\n"
 +msgstr "no default OCSP signer defined\n"
 +
 +#: dirmngr/ocsp.c:634
 +#, c-format
 +msgid "using default OCSP responder '%s'\n"
 +msgstr "using default OCSP responder ‘%s’\n"
 +
 +#: dirmngr/ocsp.c:639
 +#, c-format
 +msgid "using OCSP responder '%s'\n"
 +msgstr "using OCSP responder ‘%s’\n"
 +
 +#: dirmngr/ocsp.c:646
 +#, c-format
 +msgid "failed to establish a hashing context for OCSP: %s\n"
 +msgstr "failed to establish a hashing context for OCSP: %s\n"
 +
 +#: dirmngr/ocsp.c:676
 +#, c-format
 +msgid "error getting OCSP status for target certificate: %s\n"
 +msgstr "error getting OCSP status for target certificate: %s\n"
 +
 +#: dirmngr/ocsp.c:701
 +#, c-format
 +msgid "certificate status is: %s  (this=%s  next=%s)\n"
 +msgstr "certificate status is: %s  (this=%s  next=%s)\n"
 +
 +#: dirmngr/ocsp.c:702
 +msgid "good"
 +msgstr "good"
 +
 +#: dirmngr/ocsp.c:708
 +#, c-format
 +msgid "certificate has been revoked at: %s due to: %s\n"
 +msgstr "certificate has been revoked at: %s due to: %s\n"
 +
 +#: dirmngr/ocsp.c:743
 +msgid "OCSP responder returned a status in the future\n"
 +msgstr "OCSP responder returned a status in the future\n"
 +
 +#: dirmngr/ocsp.c:755
 +msgid "OCSP responder returned a non-current status\n"
 +msgstr "OCSP responder returned a non-current status\n"
 +
 +#: dirmngr/ocsp.c:770
 +msgid "OCSP responder returned an too old status\n"
 +msgstr "OCSP responder returned an too old status\n"
 +
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
 +#, c-format
 +msgid "assuan_inquire(%s) failed: %s\n"
 +msgstr "assuan_inquire(%s) failed: %s\n"
 +
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
 +msgid "ldapserver missing"
 +msgstr "ldapserver missing"
 +
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
 +msgid "serialno missing in cert ID"
 +msgstr "serialno missing in cert ID"
 +
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
 +#, c-format
 +msgid "assuan_inquire failed: %s\n"
 +msgstr "assuan_inquire failed: %s\n"
 +
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
 +#, c-format
 +msgid "fetch_cert_by_url failed: %s\n"
 +msgstr "fetch_cert_by_url failed: %s\n"
 +
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
 +#, c-format
 +msgid "error sending data: %s\n"
 +msgstr "error sending data: %s\n"
 +
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
 +#, c-format
 +msgid "start_cert_fetch failed: %s\n"
 +msgstr "start_cert_fetch failed: %s\n"
 +
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
 +#, c-format
 +msgid "fetch_next_cert failed: %s\n"
 +msgstr "fetch_next_cert failed: %s\n"
 +
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
 +#, c-format
 +msgid "max_replies %d exceeded\n"
 +msgstr "max_replies %d exceeded\n"
 +
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
 +#, c-format
 +msgid "can't allocate control structure: %s\n"
 +msgstr "can't allocate control structure: %s\n"
 +
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
 +#, c-format
 +msgid "failed to allocate assuan context: %s\n"
 +msgstr "failed to allocate assuan context: %s\n"
 +
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
 +#, c-format
 +msgid "failed to initialize the server: %s\n"
 +msgstr "failed to initialize the server: %s\n"
 +
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
 +#, c-format
 +msgid "failed to the register commands with Assuan: %s\n"
 +msgstr "failed to the register commands with Assuan: %s\n"
 +
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
 +#, c-format
 +msgid "Assuan accept problem: %s\n"
 +msgstr "Assuan accept problem: %s\n"
 +
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
 +#, c-format
 +msgid "Assuan processing failed: %s\n"
 +msgstr "Assuan processing failed: %s\n"
 +
 +#: dirmngr/validate.c:201
 +msgid "accepting root CA not marked as a CA"
 +msgstr "accepting root CA not marked as a CA"
 +
 +#: dirmngr/validate.c:227
 +msgid "CRL checking too deeply nested\n"
 +msgstr "CRL checking too deeply nested\n"
 +
 +#: dirmngr/validate.c:245
 +msgid "not checking CRL for"
 +msgstr "not checking CRL for"
 +
 +#: dirmngr/validate.c:250
 +msgid "checking CRL for"
 +msgstr "checking CRL for"
 +
 +#: dirmngr/validate.c:528
 +msgid "selfsigned certificate has a BAD signature"
 +msgstr "selfsigned certificate has a BAD signature"
 +
 +#: dirmngr/validate.c:561
 +#, c-format
 +msgid "checking trustworthiness of root certificate failed: %s\n"
 +msgstr "checking trustworthiness of root certificate failed: %s\n"
 +
 +#: dirmngr/validate.c:738
 +msgid "certificate chain is good\n"
 +msgstr "certificate chain is good\n"
 +
 +#: dirmngr/validate.c:968
 +msgid "DSA requires the use of a 160 bit hash algorithm\n"
 +msgstr "DSA requires the use of a 160 bit hash algorithm\n"
 +
 +#: dirmngr/validate.c:1116
 +msgid "certificate should not have been used for CRL signing\n"
 +msgstr "certificate should not have been used for CRL signing\n"
 +
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
 +msgid "quiet"
 +msgstr "quiet"
 +
 +#: tools/gpg-connect-agent.c:79
 +msgid "print data out hex encoded"
 +msgstr "print data out hex encoded"
 +
 +#: tools/gpg-connect-agent.c:80
 +msgid "decode received data lines"
 +msgstr "decode received data lines"
 +
 +#: tools/gpg-connect-agent.c:81
 +msgid "connect to the dirmngr"
 +msgstr "connect to the dirmngr"
 +
 +#: tools/gpg-connect-agent.c:84
 +msgid "|NAME|connect to Assuan socket NAME"
 +msgstr "|NAME|connect to Assuan socket NAME"
 +
 +#: tools/gpg-connect-agent.c:86
 +msgid "|ADDR|connect to Assuan server at ADDR"
 +msgstr "|ADDR|connect to Assuan server at ADDR"
 +
 +#: tools/gpg-connect-agent.c:88
 +msgid "run the Assuan server given on the command line"
 +msgstr "run the Assuan server given on the command line"
 +
 +#: tools/gpg-connect-agent.c:90
 +msgid "do not use extended connect mode"
 +msgstr "do not use extended connect mode"
 +
 +#: tools/gpg-connect-agent.c:92
 +msgid "|FILE|run commands from FILE on startup"
 +msgstr "|FILE|run commands from FILE on startup"
 +
 +#: tools/gpg-connect-agent.c:93
 +msgid "run /subst on startup"
 +msgstr "run /subst on startup"
 +
 +#: tools/gpg-connect-agent.c:205
 +msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
 +msgstr "Usage: @GPG at -connect-agent [options] (-h for help)"
 +
 +#: tools/gpg-connect-agent.c:208
 +msgid ""
 +"Syntax: @GPG at -connect-agent [options]\n"
 +"Connect to a running agent and send commands\n"
 +msgstr ""
 +"Syntax: @GPG at -connect-agent [options]\n"
 +"Connect to a running agent and send commands\n"
 +
 +#: tools/gpg-connect-agent.c:1247
 +#, c-format
 +msgid "option \"%s\" requires a program and optional arguments\n"
 +msgstr "option “%s” requires a program and optional arguments\n"
 +
 +#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
 +#: tools/gpg-connect-agent.c:1270
 +#, c-format
 +msgid "option \"%s\" ignored due to \"%s\"\n"
 +msgstr "option “%s” ignored due to “%s”\n"
 +
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
 +#, c-format
 +msgid "receiving line failed: %s\n"
 +msgstr "receiving line failed: %s\n"
 +
 +#: tools/gpg-connect-agent.c:1458
 +msgid "line too long - skipped\n"
 +msgstr "line too long - skipped\n"
 +
 +#: tools/gpg-connect-agent.c:1462
 +msgid "line shortened due to embedded Nul character\n"
 +msgstr "line shortened due to embedded Nul character\n"
 +
 +#: tools/gpg-connect-agent.c:1837
 +#, c-format
 +msgid "unknown command '%s'\n"
 +msgstr "unknown command ‘%s’\n"
 +
 +#: tools/gpg-connect-agent.c:1855
 +#, c-format
 +msgid "sending line failed: %s\n"
 +msgstr "sending line failed: %s\n"
 +
 +#: tools/gpg-connect-agent.c:2251
 +#, c-format
 +msgid "error sending standard options: %s\n"
 +msgstr "error sending standard options: %s\n"
 +
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
 +#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
 +msgid "Options controlling the diagnostic output"
 +msgstr "Options controlling the diagnostic output"
 +
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
 +#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
 +msgid "Options controlling the configuration"
 +msgstr "Options controlling the configuration"
 +
 +#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
 +#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
 +msgid "Options useful for debugging"
 +msgstr "Options useful for debugging"
 +
 +#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
 +msgid "Options controlling the security"
 +msgstr "Options controlling the security"
 +
 +#: tools/gpgconf-comp.c:528
 +msgid "|N|expire SSH keys after N seconds"
 +msgstr "|N|expire SSH keys after N seconds"
 +
 +#: tools/gpgconf-comp.c:532
 +msgid "|N|set maximum PIN cache lifetime to N seconds"
 +msgstr "|N|set maximum PIN cache lifetime to N seconds"
 +
 +#: tools/gpgconf-comp.c:536
 +msgid "|N|set maximum SSH key lifetime to N seconds"
 +msgstr "|N|set maximum SSH key lifetime to N seconds"
 +
 +#: tools/gpgconf-comp.c:560
 +msgid "Options enforcing a passphrase policy"
 +msgstr "Options enforcing a passphrase policy"
 +
 +#: tools/gpgconf-comp.c:563
 +msgid "do not allow bypassing the passphrase policy"
 +msgstr "do not allow bypassing the passphrase policy"
 +
 +#: tools/gpgconf-comp.c:567
 +msgid "|N|set minimal required length for new passphrases to N"
 +msgstr "|N|set minimal required length for new passphrases to N"
 +
 +#: tools/gpgconf-comp.c:571
 +msgid "|N|require at least N non-alpha characters for a new passphrase"
 +msgstr "|N|require at least N non-alpha characters for a new passphrase"
 +
 +#: tools/gpgconf-comp.c:575
 +msgid "|FILE|check new passphrases against pattern in FILE"
 +msgstr "|FILE|check new passphrases against pattern in FILE"
 +
 +#: tools/gpgconf-comp.c:579
 +msgid "|N|expire the passphrase after N days"
 +msgstr "|N|expire the passphrase after N days"
 +
 +#: tools/gpgconf-comp.c:583
 +msgid "do not allow the reuse of old passphrases"
 +msgstr "do not allow the reuse of old passphrases"
 +
 +#: tools/gpgconf-comp.c:587
 +msgid "|N|set the Pinentry timeout to N seconds"
 +msgstr "|N|set the Pinentry timeout to N seconds"
 +
 +#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
 +msgid "|NAME|use NAME as default secret key"
 +msgstr "|NAME|use NAME as default secret key"
 +
 +#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
 +msgid "|NAME|encrypt to user ID NAME as well"
 +msgstr "|NAME|encrypt to user ID NAME as well"
 +
 +#: tools/gpgconf-comp.c:704
 +msgid "|SPEC|set up email aliases"
 +msgstr "|SPEC|set up email aliases"
 +
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
 +msgid "Configuration for Keyservers"
 +msgstr "Configuration for Keyservers"
 +
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
 +msgid "|URL|use keyserver at URL"
 +msgstr "|URL|use keyserver at URL"
 +
 +#: tools/gpgconf-comp.c:735
 +msgid "allow PKA lookups (DNS requests)"
 +msgstr "allow PKA lookups (DNS requests)"
 +
 +#: tools/gpgconf-comp.c:738
 +msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 +msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 +
 +#: tools/gpgconf-comp.c:787
 +msgid "disable all access to the dirmngr"
 +msgstr "disable all access to the dirmngr"
 +
 +#: tools/gpgconf-comp.c:790
 +msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 +msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 +
 +#: tools/gpgconf-comp.c:820
 +msgid "do not check CRLs for root certificates"
 +msgstr "do not check CRLs for root certificates"
 +
 +#: tools/gpgconf-comp.c:869
 +msgid "Options controlling the format of the output"
 +msgstr "Options controlling the format of the output"
 +
 +#: tools/gpgconf-comp.c:905
 +msgid "Options controlling the interactivity and enforcement"
 +msgstr "Options controlling the interactivity and enforcement"
 +
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
 +msgid "Options controlling the use of Tor"
 +msgstr "Options controlling the use of Tor"
 +
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
 +msgid "Configuration for HTTP servers"
 +msgstr "Configuration for HTTP servers"
 +
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
 +msgid "use system's HTTP proxy setting"
 +msgstr "use system's HTTP proxy setting"
 +
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
 +msgid "Configuration of LDAP servers to use"
 +msgstr "Configuration of LDAP servers to use"
 +
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
 +msgid "LDAP server list"
 +msgstr "LDAP server list"
 +
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
 +msgid "Configuration for OCSP"
 +msgstr "Configuration for OCSP"
 +
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
- msgstr "GPG for OpenPGP"
- 
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
- msgstr "GPG Agent"
- 
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
- msgstr "Smartcard Daemon"
- 
 +#: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
- msgstr "GPG for S/MIME"
++msgid "OpenPGP"
++msgstr "OpenPGP"
 +
 +#: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr "Key Acquirer"
++msgid "Private Keys"
++msgstr "Private Keys"
 +
 +#: tools/gpgconf-comp.c:1068
- msgid "PIN and Passphrase Entry"
- msgstr "PIN and Passphrase Entry"
++msgid "Smartcards"
++msgstr "Smartcards"
++
++#: tools/gpgconf-comp.c:1069
++msgid "S/MIME"
++msgstr "S/MIME"
++
++#: tools/gpgconf-comp.c:1070
++msgid "Network"
++msgstr "Network"
++
++#: tools/gpgconf-comp.c:1071
++msgid "Passphrase Entry"
++msgstr "Passphrase Entry"
 +
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
 +msgid "Component not suitable for launching"
 +msgstr "Component not suitable for launching"
 +
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
 +#, c-format
 +msgid "External verification of component %s failed"
 +msgstr "External verification of component %s failed"
 +
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
 +msgid "Note that group specifications are ignored\n"
 +msgstr "Note that group specifications are ignored\n"
 +
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
 +msgid "list all components"
 +msgstr "list all components"
 +
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
 +msgid "check all programs"
 +msgstr "check all programs"
 +
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
 +msgid "|COMPONENT|list options"
 +msgstr "|COMPONENT|list options"
 +
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
 +msgid "|COMPONENT|change options"
 +msgstr "|COMPONENT|change options"
 +
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
 +msgid "|COMPONENT|check options"
 +msgstr "|COMPONENT|check options"
 +
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
 +msgid "apply global default values"
 +msgstr "apply global default values"
 +
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
 +msgid "get the configuration directories for @GPGCONF@"
 +msgstr "get the configuration directories for @GPGCONF@"
 +
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
 +msgid "list global configuration file"
 +msgstr "list global configuration file"
 +
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
 +msgid "check global configuration file"
 +msgstr "check global configuration file"
 +
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
++msgid "query the software version database"
++msgstr "query the software version database"
++
++#: tools/gpgconf.c:86
 +msgid "reload all or a given component"
 +msgstr "reload all or a given component"
 +
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
 +msgid "launch a given component"
 +msgstr "launch a given component"
 +
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
 +msgid "kill a given component"
 +msgstr "kill a given component"
 +
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
 +msgid "use as output file"
 +msgstr "use as output file"
 +
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
 +msgid "activate changes at runtime, if possible"
 +msgstr "activate changes at runtime, if possible"
 +
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
 +msgid "Usage: @GPGCONF@ [options] (-h for help)"
 +msgstr "Usage: @GPGCONF@ [options] (-h for help)"
 +
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
 +msgid ""
 +"Syntax: @GPGCONF@ [options]\n"
 +"Manage configuration options for tools of the @GNUPG@ system\n"
 +msgstr ""
 +"Syntax: @GPGCONF@ [options]\n"
 +"Manage configuration options for tools of the @GNUPG@ system\n"
 +
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
 +msgid "Need one component argument"
 +msgstr "Need one component argument"
 +
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
 +msgid "Component not found"
 +msgstr "Component not found"
 +
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
 +msgid "No argument allowed"
 +msgstr "No argument allowed"
 +
 +#: tools/symcryptrun.c:154
 +msgid ""
 +"@\n"
 +"Commands:\n"
 +" "
 +msgstr ""
 +"@\n"
 +"Commands:\n"
 +" "
 +
 +#: tools/symcryptrun.c:156
 +msgid "decryption modus"
 +msgstr "decryption modus"
 +
 +#: tools/symcryptrun.c:157
 +msgid "encryption modus"
 +msgstr "encryption modus"
 +
 +#: tools/symcryptrun.c:161
 +msgid "tool class (confucius)"
 +msgstr "tool class (confucius)"
 +
 +#: tools/symcryptrun.c:162
 +msgid "program filename"
 +msgstr "program filename"
 +
 +#: tools/symcryptrun.c:164
 +msgid "secret key file (required)"
 +msgstr "secret key file (required)"
 +
 +#: tools/symcryptrun.c:165
 +msgid "input file name (default stdin)"
 +msgstr "input file name (default stdin)"
 +
 +#: tools/symcryptrun.c:209
 +msgid "Usage: symcryptrun [options] (-h for help)"
 +msgstr "Usage: symcryptrun [options] (-h for help)"
 +
 +#: tools/symcryptrun.c:212
 +msgid ""
 +"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 +"[options...] COMMAND [inputfile]\n"
 +"Call a simple symmetric encryption tool\n"
 +msgstr ""
 +"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 +"[options...] COMMAND [inputfile]\n"
 +"Call a simple symmetric encryption tool\n"
 +
 +#: tools/symcryptrun.c:278
 +#, c-format
 +msgid "%s on %s aborted with status %i\n"
 +msgstr "%s on %s aborted with status %i\n"
 +
 +#: tools/symcryptrun.c:285
 +#, c-format
 +msgid "%s on %s failed with status %i\n"
 +msgstr "%s on %s failed with status %i\n"
 +
 +#: tools/symcryptrun.c:317
 +#, c-format
 +msgid "can't create temporary directory '%s': %s\n"
 +msgstr "can't create temporary directory '%s': %s\n"
 +
 +#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
 +#, c-format
 +msgid "could not open %s for writing: %s\n"
 +msgstr "could not open %s for writing: %s\n"
 +
 +#: tools/symcryptrun.c:385
 +#, c-format
 +msgid "error writing to %s: %s\n"
 +msgstr "error writing to %s: %s\n"
 +
 +#: tools/symcryptrun.c:392
 +#, c-format
 +msgid "error reading from %s: %s\n"
 +msgstr "error reading from %s: %s\n"
 +
 +#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
 +#, c-format
 +msgid "error closing %s: %s\n"
 +msgstr "error closing %s: %s\n"
 +
 +#: tools/symcryptrun.c:490
 +msgid "no --program option provided\n"
 +msgstr "no --program option provided\n"
 +
 +#: tools/symcryptrun.c:496
 +msgid "only --decrypt and --encrypt are supported\n"
 +msgstr "only --decrypt and --encrypt are supported\n"
 +
 +#: tools/symcryptrun.c:502
 +msgid "no --keyfile option provided\n"
 +msgstr "no --keyfile option provided\n"
 +
 +#: tools/symcryptrun.c:513
 +msgid "cannot allocate args vector\n"
 +msgstr "cannot allocate args vector\n"
 +
 +#: tools/symcryptrun.c:531
 +#, c-format
 +msgid "could not create pipe: %s\n"
 +msgstr "could not create pipe: %s\n"
 +
 +#: tools/symcryptrun.c:538
 +#, c-format
 +msgid "could not create pty: %s\n"
 +msgstr "could not create pty: %s\n"
 +
 +#: tools/symcryptrun.c:554
 +#, c-format
 +msgid "could not fork: %s\n"
 +msgstr "could not fork: %s\n"
 +
 +#: tools/symcryptrun.c:582
 +#, c-format
 +msgid "execv failed: %s\n"
 +msgstr "execv failed: %s\n"
 +
 +#: tools/symcryptrun.c:611
 +#, c-format
 +msgid "select failed: %s\n"
 +msgstr "select failed: %s\n"
 +
 +#: tools/symcryptrun.c:628
 +#, c-format
 +msgid "read failed: %s\n"
 +msgstr "read failed: %s\n"
 +
 +#: tools/symcryptrun.c:680
 +#, c-format
 +msgid "pty read failed: %s\n"
 +msgstr "pty read failed: %s\n"
 +
 +#: tools/symcryptrun.c:732
 +#, c-format
 +msgid "waitpid failed: %s\n"
 +msgstr "waitpid failed: %s\n"
 +
 +#: tools/symcryptrun.c:746
 +#, c-format
 +msgid "child aborted with status %i\n"
 +msgstr "child aborted with status %i\n"
 +
 +#: tools/symcryptrun.c:801
 +#, c-format
 +msgid "cannot allocate infile string: %s\n"
 +msgstr "cannot allocate infile string: %s\n"
 +
 +#: tools/symcryptrun.c:814
 +#, c-format
 +msgid "cannot allocate outfile string: %s\n"
 +msgstr "cannot allocate outfile string: %s\n"
 +
 +#: tools/symcryptrun.c:987
 +#, c-format
 +msgid "either %s or %s must be given\n"
 +msgstr "either %s or %s must be given\n"
 +
 +#: tools/symcryptrun.c:1009
 +msgid "no class provided\n"
 +msgstr "no class provided\n"
 +
 +#: tools/symcryptrun.c:1018
 +#, c-format
 +msgid "class %s is not supported\n"
 +msgstr "class %s is not supported\n"
 +
 +#: tools/gpg-check-pattern.c:144
 +msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 +msgstr "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 +
 +#: tools/gpg-check-pattern.c:147
 +msgid ""
 +"Syntax: gpg-check-pattern [options] patternfile\n"
 +"Check a passphrase given on stdin against the patternfile\n"
 +msgstr ""
 +"Syntax: gpg-check-pattern [options] patternfile\n"
 +"Check a passphrase given on stdin against the patternfile\n"
diff --cc po/en at quot.po
index 1f9f420,0000000..a11fd60
mode 100644,000000..100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@@ -1,10548 -1,0 +1,10622 @@@
 +# English translations for GNU gnupg package.
 +# Copyright (C) 2016 Free Software Foundation, Inc.
 +# This file is distributed under the same license as the GNU gnupg package.
 +# Automatically generated, 2016.
 +#
 +# All this catalog "translates" are quotation characters.
 +# The msgids must be ASCII and therefore cannot contain real quotation
 +# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
 +# and double quote (0x22). These substitutes look strange; see
 +# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
 +#
 +# This catalog translates grave accent (0x60) and apostrophe (0x27) to
 +# left single quotation mark (U+2018) and right single quotation mark (U+2019).
 +# It also translates pairs of apostrophe (0x27) to
 +# left single quotation mark (U+2018) and right single quotation mark (U+2019)
 +# and pairs of quotation mark (0x22) to
 +# left double quotation mark (U+201C) and right double quotation mark (U+201D).
 +#
 +# When output to an UTF-8 terminal, the quotation characters appear perfectly.
 +# When output to an ISO-8859-1 terminal, the single quotation marks are
 +# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
 +# grave/acute accent (by libiconv), and the double quotation marks are
 +# transliterated to 0x22.
 +# When output to an ASCII terminal, the single quotation marks are
 +# transliterated to apostrophes, and the double quotation marks are
 +# transliterated to 0x22.
 +#
 +msgid ""
 +msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.15\n"
++"Project-Id-Version: GNU gnupg 2.1.16\n"
 +"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
- "PO-Revision-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
++"PO-Revision-Date: 2016-11-18 16:54+0100\n"
 +"Last-Translator: Automatically generated\n"
 +"Language-Team: none\n"
 +"Language: en\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 +
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
 +#, c-format
 +msgid "failed to acquire the pinentry lock: %s\n"
 +msgstr "failed to acquire the pinentry lock: %s\n"
 +
 +#. TRANSLATORS: These are labels for buttons etc used in
 +#. Pinentries.  An underscore indicates that the next letter
 +#. should be used as an accelerator.  Double the underscore for
 +#. a literal one.  The actual to be translated text starts after
 +#. the second vertical bar.  Note that gpg-agent has been set to
 +#. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
 +msgid "|pinentry-label|_OK"
 +msgstr "|pinentry-label|_OK"
 +
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
 +msgid "|pinentry-label|_Cancel"
 +msgstr "|pinentry-label|_Cancel"
 +
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
 +msgid "|pinentry-label|_Yes"
 +msgstr "|pinentry-label|_Yes"
 +
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
 +msgid "|pinentry-label|_No"
 +msgstr "|pinentry-label|_No"
 +
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
 +msgid "|pinentry-label|PIN:"
 +msgstr "|pinentry-label|PIN:"
 +
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
 +msgid "|pinentry-label|_Save in password manager"
 +msgstr "|pinentry-label|_Save in password manager"
 +
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
 +msgid "Do you really want to make your passphrase visible on the screen?"
 +msgstr "Do you really want to make your passphrase visible on the screen?"
 +
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
 +msgid "|pinentry-tt|Make passphrase visible"
 +msgstr "|pinentry-tt|Make passphrase visible"
 +
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
 +msgid "|pinentry-tt|Hide passphrase"
 +msgstr "|pinentry-tt|Hide passphrase"
 +
 +#. TRANSLATORS: This string is displayed by Pinentry as the label
 +#. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
 +msgid "Quality:"
 +msgstr "Quality:"
 +
 +#. TRANSLATORS: This string is a tooltip, shown by pinentry when
 +#. hovering over the quality bar.  Please use an appropriate
 +#. string to describe what this is about.  The length of the
 +#. 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:758
++#: agent/call-pinentry.c:793
 +msgid "pinentry.qualitybar.tooltip"
 +msgstr "pinentry.qualitybar.tooltip"
 +
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
 +msgid ""
 +"Please enter your PIN, so that the secret key can be unlocked for this "
 +"session"
 +msgstr ""
 +"Please enter your PIN, so that the secret key can be unlocked for this "
 +"session"
 +
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
 +msgid ""
 +"Please enter your passphrase, so that the secret key can be unlocked for "
 +"this session"
 +msgstr ""
 +"Please enter your passphrase, so that the secret key can be unlocked for "
 +"this session"
 +
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +msgid "PIN:"
 +msgstr "PIN:"
 +
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
 +msgid "Passphrase:"
 +msgstr "Passphrase:"
 +
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
 +msgid "does not match - try again"
 +msgstr "does not match - try again"
 +
 +#. TRANSLATORS: The string is appended to an error message in
 +#. the pinentry.  The %s is the actual error message, the
 +#. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
 +#, c-format
 +msgid "SETERROR %s (try %d of %d)"
 +msgstr "SETERROR %s (try %d of %d)"
 +
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
 +msgid "Repeat:"
 +msgstr "Repeat:"
 +
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
 +msgid "PIN too long"
 +msgstr "PIN too long"
 +
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
 +msgid "Passphrase too long"
 +msgstr "Passphrase too long"
 +
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
 +msgid "Invalid characters in PIN"
 +msgstr "Invalid characters in PIN"
 +
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
 +msgid "PIN too short"
 +msgstr "PIN too short"
 +
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
 +msgid "Bad PIN"
 +msgstr "Bad PIN"
 +
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
 +msgid "Bad Passphrase"
 +msgstr "Bad Passphrase"
 +
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
 +#, c-format
 +msgid "ssh keys greater than %d bits are not supported\n"
 +msgstr "ssh keys greater than %d bits are not supported\n"
 +
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
 +#, c-format
 +msgid "can't create '%s': %s\n"
 +msgstr "can't create '%s': %s\n"
 +
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
 +#, c-format
 +msgid "can't open '%s': %s\n"
 +msgstr "can't open '%s': %s\n"
 +
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
 +#, c-format
 +msgid "error getting serial number of card: %s\n"
 +msgstr "error getting serial number of card: %s\n"
 +
 +#: agent/command-ssh.c:2419
 +#, c-format
 +msgid "detected card with S/N: %s\n"
 +msgstr "detected card with S/N: %s\n"
 +
 +#: agent/command-ssh.c:2424
 +#, c-format
 +msgid "no authentication key for ssh on card: %s\n"
 +msgstr "no authentication key for ssh on card: %s\n"
 +
 +#: agent/command-ssh.c:2444
 +#, c-format
 +msgid "no suitable card key found: %s\n"
 +msgstr "no suitable card key found: %s\n"
 +
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "shadowing the key failed: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "error writing key: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
 +#, c-format
 +msgid ""
 +"An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 +"allow this?"
 +msgstr ""
 +"An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 +"allow this?"
 +
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
 +msgid "Allow"
 +msgstr "Allow"
 +
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
 +msgid "Deny"
 +msgstr "Deny"
 +
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
 +#, c-format
 +msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 +msgstr "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 +
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
 +msgid "Please re-enter this passphrase"
 +msgstr "Please re-enter this passphrase"
 +
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
 +#, c-format
 +msgid ""
 +"Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 +"%s%%0Awithin gpg-agent's key storage"
 +msgstr ""
 +"Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 +"%s%%0Awithin gpg-agent's key storage"
 +
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
 +#, c-format
 +msgid "failed to create stream from socket: %s\n"
 +msgstr "failed to create stream from socket: %s\n"
 +
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
 +msgid "Please insert the card with serial number"
 +msgstr "Please insert the card with serial number"
 +
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
 +msgid "Please remove the current card and insert the one with serial number"
 +msgstr "Please remove the current card and insert the one with serial number"
 +
 +#: agent/divert-scd.c:204
 +msgid "Admin PIN"
 +msgstr "Admin PIN"
 +
 +#. TRANSLATORS: A PUK is the Personal Unblocking Code
 +#. used to unblock a PIN.
 +#: agent/divert-scd.c:209
 +msgid "PUK"
 +msgstr "PUK"
 +
 +#: agent/divert-scd.c:216
 +msgid "Reset Code"
 +msgstr "Reset Code"
 +
 +#: agent/divert-scd.c:242
 +#, c-format
 +msgid "%s%%0A%%0AUse the reader's pinpad for input."
 +msgstr "%s%%0A%%0AUse the reader's pinpad for input."
 +
 +#: agent/divert-scd.c:291
 +msgid "Repeat this Reset Code"
 +msgstr "Repeat this Reset Code"
 +
 +#: agent/divert-scd.c:293
 +msgid "Repeat this PUK"
 +msgstr "Repeat this PUK"
 +
 +#: agent/divert-scd.c:294
 +msgid "Repeat this PIN"
 +msgstr "Repeat this PIN"
 +
 +#: agent/divert-scd.c:299
 +msgid "Reset Code not correctly repeated; try again"
 +msgstr "Reset Code not correctly repeated; try again"
 +
 +#: agent/divert-scd.c:301
 +msgid "PUK not correctly repeated; try again"
 +msgstr "PUK not correctly repeated; try again"
 +
 +#: agent/divert-scd.c:302
 +msgid "PIN not correctly repeated; try again"
 +msgstr "PIN not correctly repeated; try again"
 +
 +#: agent/divert-scd.c:314
 +#, c-format
 +msgid "Please enter the PIN%s%s%s to unlock the card"
 +msgstr "Please enter the PIN%s%s%s to unlock the card"
 +
 +#: agent/genkey.c:110 sm/certreqgen-ui.c:394
 +#, c-format
 +msgid "error creating temporary file: %s\n"
 +msgstr "error creating temporary file: %s\n"
 +
 +#: agent/genkey.c:117
 +#, c-format
 +msgid "error writing to temporary file: %s\n"
 +msgstr "error writing to temporary file: %s\n"
 +
 +#: agent/genkey.c:158 agent/genkey.c:164
 +msgid "Enter new passphrase"
 +msgstr "Enter new passphrase"
 +
 +#: agent/genkey.c:172
 +msgid "Take this one anyway"
 +msgstr "Take this one anyway"
 +
 +#: agent/genkey.c:202
 +#, c-format
 +msgid ""
 +"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 +msgstr ""
 +"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 +
 +#: agent/genkey.c:204
 +#, c-format
 +msgid ""
 +"You have not entered a passphrase - this is in general a bad idea!%0APlease "
 +"confirm that you do not want to have any protection on your key."
 +msgstr ""
 +"You have not entered a passphrase - this is in general a bad idea!%0APlease "
 +"confirm that you do not want to have any protection on your key."
 +
 +#: agent/genkey.c:216
 +msgid "Yes, protection is not needed"
 +msgstr "Yes, protection is not needed"
 +
 +#: agent/genkey.c:233
 +#, c-format
 +msgid "A passphrase should be at least %u character long."
 +msgid_plural "A passphrase should be at least %u characters long."
 +msgstr[0] "A passphrase should be at least %u character long."
 +msgstr[1] "A passphrase should be at least %u characters long."
 +
 +#: agent/genkey.c:252
 +#, c-format
 +msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 +msgid_plural ""
 +"A passphrase should contain at least %u digits or%%0Aspecial characters."
 +msgstr[0] ""
 +"A passphrase should contain at least %u digit or%%0Aspecial character."
 +msgstr[1] ""
 +"A passphrase should contain at least %u digits or%%0Aspecial characters."
 +
 +#: agent/genkey.c:278
 +#, c-format
 +msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 +msgstr "A passphrase may not be a known term or match%%0Acertain pattern."
 +
 +#: agent/genkey.c:293
 +msgid "Warning: You have entered an insecure passphrase."
 +msgstr "Warning: You have entered an insecure passphrase."
 +
 +#: agent/genkey.c:480
 +#, c-format
 +msgid "Please enter the passphrase to%0Aprotect your new key"
 +msgstr "Please enter the passphrase to%0Aprotect your new key"
 +
 +#: agent/genkey.c:606
 +msgid "Please enter the new passphrase"
 +msgstr "Please enter the new passphrase"
 +
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
 +msgid ""
 +"@Options:\n"
 +" "
 +msgstr ""
 +"@Options:\n"
 +" "
 +
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
 +msgid "run in daemon mode (background)"
 +msgstr "run in daemon mode (background)"
 +
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
 +msgid "run in server mode (foreground)"
 +msgstr "run in server mode (foreground)"
 +
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
++msgid "run in supervised mode"
++msgstr "run in supervised mode"
++
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
 +msgid "verbose"
 +msgstr "verbose"
 +
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
 +msgid "be somewhat more quiet"
 +msgstr "be somewhat more quiet"
 +
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
 +msgid "sh-style command output"
 +msgstr "sh-style command output"
 +
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
 +msgid "csh-style command output"
 +msgstr "csh-style command output"
 +
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
 +msgid "|FILE|read options from FILE"
 +msgstr "|FILE|read options from FILE"
 +
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
 +msgid "do not detach from the console"
 +msgstr "do not detach from the console"
 +
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
 +msgid "do not grab keyboard and mouse"
 +msgstr "do not grab keyboard and mouse"
 +
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
 +msgid "use a log file for the server"
 +msgstr "use a log file for the server"
 +
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
 +msgid "|PGM|use PGM as the PIN-Entry program"
 +msgstr "|PGM|use PGM as the PIN-Entry program"
 +
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
 +msgid "|PGM|use PGM as the SCdaemon program"
 +msgstr "|PGM|use PGM as the SCdaemon program"
 +
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
 +msgid "do not use the SCdaemon"
 +msgstr "do not use the SCdaemon"
 +
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
 +msgid "|NAME|accept some commands via NAME"
 +msgstr "|NAME|accept some commands via NAME"
 +
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
 +msgid "ignore requests to change the TTY"
 +msgstr "ignore requests to change the TTY"
 +
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
 +msgid "ignore requests to change the X display"
 +msgstr "ignore requests to change the X display"
 +
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
 +msgid "|N|expire cached PINs after N seconds"
 +msgstr "|N|expire cached PINs after N seconds"
 +
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
 +msgid "do not use the PIN cache when signing"
 +msgstr "do not use the PIN cache when signing"
 +
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
 +msgid "disallow the use of an external password cache"
 +msgstr "disallow the use of an external password cache"
 +
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
 +msgid "disallow clients to mark keys as \"trusted\""
 +msgstr "disallow clients to mark keys as “trusted”"
 +
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
 +msgid "allow presetting passphrase"
 +msgstr "allow presetting passphrase"
 +
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
 +msgid "disallow caller to override the pinentry"
 +msgstr "disallow caller to override the pinentry"
 +
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
 +msgid "allow passphrase to be prompted through Emacs"
 +msgstr "allow passphrase to be prompted through Emacs"
 +
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
 +msgid "enable ssh support"
 +msgstr "enable ssh support"
 +
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
 +msgid "enable putty support"
 +msgstr "enable putty support"
 +
 +#. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
 +msgid "Please report bugs to <@EMAIL@>.\n"
 +msgstr "Please report bugs to <@EMAIL@>.\n"
 +
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
 +msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 +msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 +
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
 +msgid ""
 +"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 +"Secret key management for @GNUPG@\n"
 +msgstr ""
 +"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 +"Secret key management for @GNUPG@\n"
 +
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
 +#, c-format
 +msgid "invalid debug-level '%s' given\n"
 +msgstr "invalid debug-level ‘%s’ given\n"
 +
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
 +#, c-format
 +msgid "Note: no default option file '%s'\n"
 +msgstr "Note: no default option file ‘%s’\n"
 +
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
 +#, c-format
 +msgid "option file '%s': %s\n"
 +msgstr "option file '%s': %s\n"
 +
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
 +#, c-format
 +msgid "reading options from '%s'\n"
 +msgstr "reading options from ‘%s’\n"
 +
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
 +#, c-format
 +msgid "Note: '%s' is not considered an option\n"
 +msgstr "Note: ‘%s’ is not considered an option\n"
 +
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
 +#, c-format
 +msgid "can't create socket: %s\n"
 +msgstr "can't create socket: %s\n"
 +
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
 +#, c-format
 +msgid "socket name '%s' is too long\n"
 +msgstr "socket name ‘%s’ is too long\n"
 +
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
 +msgid "a gpg-agent is already running - not starting a new one\n"
 +msgstr "a gpg-agent is already running - not starting a new one\n"
 +
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
 +msgid "error getting nonce for the socket\n"
 +msgstr "error getting nonce for the socket\n"
 +
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
 +#, c-format
 +msgid "error binding socket to '%s': %s\n"
 +msgstr "error binding socket to '%s': %s\n"
 +
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
 +#, c-format
 +msgid "can't set permissions of '%s': %s\n"
 +msgstr "can't set permissions of '%s': %s\n"
 +
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
 +#, c-format
 +msgid "listen() failed: %s\n"
 +msgstr "listen() failed: %s\n"
 +
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
 +#, c-format
 +msgid "listening on socket '%s'\n"
 +msgstr "listening on socket ‘%s’\n"
 +
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
 +#, c-format
 +msgid "can't create directory '%s': %s\n"
 +msgstr "can't create directory '%s': %s\n"
 +
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
 +#, c-format
 +msgid "directory '%s' created\n"
 +msgstr "directory ‘%s’ created\n"
 +
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
 +#, c-format
 +msgid "stat() failed for '%s': %s\n"
 +msgstr "stat() failed for '%s': %s\n"
 +
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
 +#, c-format
 +msgid "can't use '%s' as home directory\n"
 +msgstr "can't use ‘%s’ as home directory\n"
 +
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
 +#, c-format
 +msgid "error reading nonce on fd %d: %s\n"
 +msgstr "error reading nonce on fd %d: %s\n"
 +
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
 +#, c-format
 +msgid "handler 0x%lx for fd %d started\n"
 +msgstr "handler 0x%lx for fd %d started\n"
 +
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
 +#, c-format
 +msgid "handler 0x%lx for fd %d terminated\n"
 +msgstr "handler 0x%lx for fd %d terminated\n"
 +
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
 +#, c-format
 +msgid "ssh handler 0x%lx for fd %d started\n"
 +msgstr "ssh handler 0x%lx for fd %d started\n"
 +
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
 +#, c-format
 +msgid "ssh handler 0x%lx for fd %d terminated\n"
 +msgstr "ssh handler 0x%lx for fd %d terminated\n"
 +
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
 +#, c-format
 +msgid "npth_pselect failed: %s - waiting 1s\n"
 +msgstr "npth_pselect failed: %s - waiting 1s\n"
 +
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
 +#, c-format
 +msgid "%s %s stopped\n"
 +msgstr "%s %s stopped\n"
 +
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
 +msgid "no gpg-agent running in this session\n"
 +msgstr "no gpg-agent running in this session\n"
 +
 +#: agent/preset-passphrase.c:99
 +msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 +msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 +
 +#: agent/preset-passphrase.c:102
 +msgid ""
 +"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 +"Password cache maintenance\n"
 +msgstr ""
 +"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 +"Password cache maintenance\n"
 +
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
 +msgid ""
 +"@Commands:\n"
 +" "
 +msgstr ""
 +"@Commands:\n"
 +" "
 +
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
 +msgid ""
 +"@\n"
 +"Options:\n"
 +" "
 +msgstr ""
 +"@\n"
 +"Options:\n"
 +" "
 +
 +#: agent/protect-tool.c:154
 +msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 +msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
 +
 +#: agent/protect-tool.c:156
 +msgid ""
 +"Syntax: gpg-protect-tool [options] [args]\n"
 +"Secret key maintenance tool\n"
 +msgstr ""
 +"Syntax: gpg-protect-tool [options] [args]\n"
 +"Secret key maintenance tool\n"
 +
 +#: agent/protect-tool.c:693
 +msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 +msgstr "Please enter the passphrase to unprotect the PKCS#12 object."
 +
 +#: agent/protect-tool.c:698
 +msgid "Please enter the passphrase to protect the new PKCS#12 object."
 +msgstr "Please enter the passphrase to protect the new PKCS#12 object."
 +
 +#: agent/protect-tool.c:704
 +msgid ""
 +"Please enter the passphrase to protect the imported object within the GnuPG "
 +"system."
 +msgstr ""
 +"Please enter the passphrase to protect the imported object within the GnuPG "
 +"system."
 +
 +#: agent/protect-tool.c:709
 +msgid ""
 +"Please enter the passphrase or the PIN\n"
 +"needed to complete this operation."
 +msgstr ""
 +"Please enter the passphrase or the PIN\n"
 +"needed to complete this operation."
 +
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
 +msgid "cancelled\n"
 +msgstr "cancelled\n"
 +
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
 +#, c-format
 +msgid "error while asking for the passphrase: %s\n"
 +msgstr "error while asking for the passphrase: %s\n"
 +
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
 +#, c-format
 +msgid "error opening '%s': %s\n"
 +msgstr "error opening '%s': %s\n"
 +
 +#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
 +#, c-format
 +msgid "file '%s', line %d: %s\n"
 +msgstr "file '%s', line %d: %s\n"
 +
 +#: agent/trustlist.c:192 agent/trustlist.c:200
 +#, c-format
 +msgid "statement \"%s\" ignored in '%s', line %d\n"
 +msgstr "statement “%s” ignored in '%s', line %d\n"
 +
 +#: agent/trustlist.c:206
 +#, c-format
 +msgid "system trustlist '%s' not available\n"
 +msgstr "system trustlist ‘%s’ not available\n"
 +
 +#: agent/trustlist.c:250
 +#, c-format
 +msgid "bad fingerprint in '%s', line %d\n"
 +msgstr "bad fingerprint in '%s', line %d\n"
 +
 +#: agent/trustlist.c:275 agent/trustlist.c:282
 +#, c-format
 +msgid "invalid keyflag in '%s', line %d\n"
 +msgstr "invalid keyflag in '%s', line %d\n"
 +
 +#: agent/trustlist.c:316 common/helpfile.c:136
 +#, c-format
 +msgid "error reading '%s', line %d: %s\n"
 +msgstr "error reading '%s', line %d: %s\n"
 +
 +#: agent/trustlist.c:434 agent/trustlist.c:503
 +msgid "error reading list of trusted root certificates\n"
 +msgstr "error reading list of trusted root certificates\n"
 +
 +#. TRANSLATORS: This prompt is shown by the Pinentry
 +#. and has one special property: A "%%0A" is used by
 +#. Pinentry to insert a line break.  The double
 +#. percent sign is actually needed because it is also
 +#. a printf format string.  If you need to insert a
 +#. plain % sign, you need to encode it as "%%25".  The
 +#. "%s" gets replaced by the name as stored in the
 +#. certificate.
 +#: agent/trustlist.c:664
 +#, c-format
 +msgid ""
 +"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 +"certificates?"
 +msgstr ""
 +"Do you ultimately trust%%0A  “%s”%%0Ato correctly certify user certificates?"
 +
 +#: agent/trustlist.c:673 common/audit.c:467
 +msgid "Yes"
 +msgstr "Yes"
 +
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
 +msgid "No"
 +msgstr "No"
 +
 +#. TRANSLATORS: This prompt is shown by the Pinentry and has
 +#. one special property: A "%%0A" is used by Pinentry to
 +#. insert a line break.  The double percent sign is actually
 +#. needed because it is also a printf format string.  If you
 +#. need to insert a plain % sign, you need to encode it as
 +#. "%%25".  The second "%s" gets replaced by a hexdecimal
 +#. fingerprint string whereas the first one receives the name
 +#. as stored in the certificate.
 +#: agent/trustlist.c:707
 +#, c-format
 +msgid ""
 +"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
 +"fingerprint:%%0A  %s"
 +msgstr ""
 +"Please verify that the certificate identified as:%%0A  “%s”%%0Ahas the "
 +"fingerprint:%%0A  %s"
 +
 +#. TRANSLATORS: "Correct" is the label of a button and intended
 +#. to be hit if the fingerprint matches the one of the CA.  The
 +#. other button is "the default "Cancel" of the Pinentry.
 +#: agent/trustlist.c:721
 +msgid "Correct"
 +msgstr "Correct"
 +
 +#: agent/trustlist.c:721
 +msgid "Wrong"
 +msgstr "Wrong"
 +
- #: agent/findkey.c:252
++#: agent/findkey.c:261
 +#, c-format
 +msgid "Note: This passphrase has never been changed.%0APlease change it now."
 +msgstr "Note: This passphrase has never been changed.%0APlease change it now."
 +
- #: agent/findkey.c:268
++#: agent/findkey.c:277
 +#, c-format
 +msgid ""
 +"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 +"it now."
 +msgstr ""
 +"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 +"it now."
 +
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
 +msgid "Change passphrase"
 +msgstr "Change passphrase"
 +
- #: agent/findkey.c:290
++#: agent/findkey.c:299
 +msgid "I'll change it later"
 +msgstr "I'll change it later"
 +
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
 +#, c-format
 +msgid ""
 +"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 +"%%0A?"
 +msgstr ""
 +"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 +"%%0A?"
 +
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
 +msgid "Delete key"
 +msgstr "Delete key"
 +
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
 +msgid ""
 +"Warning: This key is also listed for use with SSH!\n"
 +"Deleting the key might remove your ability to access remote machines."
 +msgstr ""
 +"Warning: This key is also listed for use with SSH!\n"
 +"Deleting the key might remove your ability to access remote machines."
 +
 +#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
 +msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 +msgstr "DSA requires the hash length to be a multiple of 8 bits\n"
 +
 +#: agent/pksign.c:187 sm/certcheck.c:97
 +#, c-format
 +msgid "%s key uses an unsafe (%u bit) hash\n"
 +msgstr "%s key uses an unsafe (%u bit) hash\n"
 +
- #: agent/pksign.c:204
++#: agent/pksign.c:202
 +#, c-format
 +msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 +msgstr "a %zu bit hash is not valid for a %u bit %s key\n"
 +
- #: agent/pksign.c:512
++#: agent/pksign.c:508
 +#, c-format
 +msgid "checking created signature failed: %s\n"
 +msgstr "checking created signature failed: %s\n"
 +
 +#: agent/cvt-openpgp.c:338
 +msgid "secret key parts are not available\n"
 +msgstr "secret key parts are not available\n"
 +
 +#: agent/cvt-openpgp.c:344
 +#, c-format
 +msgid "public key algorithm %d (%s) is not supported\n"
 +msgstr "public key algorithm %d (%s) is not supported\n"
 +
 +#: agent/cvt-openpgp.c:448
 +#, c-format
 +msgid "protection algorithm %d (%s) is not supported\n"
 +msgstr "protection algorithm %d (%s) is not supported\n"
 +
 +#: agent/cvt-openpgp.c:455
 +#, c-format
 +msgid "protection hash algorithm %d (%s) is not supported\n"
 +msgstr "protection hash algorithm %d (%s) is not supported\n"
 +
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
 +#, c-format
 +msgid "error creating a pipe: %s\n"
 +msgstr "error creating a pipe: %s\n"
 +
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
 +#, c-format
 +msgid "error creating a stream for a pipe: %s\n"
 +msgstr "error creating a stream for a pipe: %s\n"
 +
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
 +#, c-format
 +msgid "error forking process: %s\n"
 +msgstr "error forking process: %s\n"
 +
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
 +#, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "waiting for processes to terminate failed: %s\n"
++msgid "waiting for process %d to terminate failed: %s\n"
++msgstr "waiting for process %d to terminate failed: %s\n"
 +
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
 +#, c-format
 +msgid "error running '%s': probably not installed\n"
 +msgstr "error running '%s': probably not installed\n"
 +
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
 +#, c-format
 +msgid "error running '%s': exit status %d\n"
 +msgstr "error running '%s': exit status %d\n"
 +
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
 +#, c-format
 +msgid "error running '%s': terminated\n"
 +msgstr "error running '%s': terminated\n"
 +
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
 +#, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "error getting exit code of process %d: %s\n"
++msgid "waiting for processes to terminate failed: %s\n"
++msgstr "waiting for processes to terminate failed: %s\n"
 +
- #: common/exechelp-w32ce.c:767
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
 +#, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "waiting for process %d to terminate failed: %s\n"
++msgid "error getting exit code of process %d: %s\n"
++msgstr "error getting exit code of process %d: %s\n"
 +
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
 +#, c-format
 +msgid "can't connect to '%s': %s\n"
 +msgstr "can't connect to '%s': %s\n"
 +
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
 +msgid "problem setting the gpg-agent options\n"
 +msgstr "problem setting the gpg-agent options\n"
 +
- #: common/sysutils.c:124
++#: common/sysutils.c:144
 +#, c-format
 +msgid "can't disable core dumps: %s\n"
 +msgstr "can't disable core dumps: %s\n"
 +
- #: common/sysutils.c:219
++#: common/sysutils.c:239
 +#, c-format
 +msgid "Warning: unsafe ownership on %s \"%s\"\n"
 +msgstr "Warning: unsafe ownership on %s “%s”\n"
 +
- #: common/sysutils.c:251
++#: common/sysutils.c:271
 +#, c-format
 +msgid "Warning: unsafe permissions on %s \"%s\"\n"
 +msgstr "Warning: unsafe permissions on %s “%s”\n"
 +
++#: common/sysutils.c:659
++#, c-format
++msgid "waiting for file '%s' to become accessible ...\n"
++msgstr "waiting for file ‘%s’ to become accessible ...\n"
++
++#: common/sysutils.c:685
++#, c-format
++msgid "renaming '%s' to '%s' failed: %s\n"
++msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
++
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
 +msgid "yes"
 +msgstr "yes"
 +
 +#: common/yesno.c:46 common/yesno.c:87
 +msgid "yY"
 +msgstr "yY"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:48 common/yesno.c:84
 +msgid "no"
 +msgstr "no"
 +
 +#: common/yesno.c:49 common/yesno.c:88
 +msgid "nN"
 +msgstr "nN"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:86
 +msgid "quit"
 +msgstr "quit"
 +
 +#: common/yesno.c:89
 +msgid "qQ"
 +msgstr "qQ"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:123
 +msgid "okay|okay"
 +msgstr "okay|okay"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:125
 +msgid "cancel|cancel"
 +msgstr "cancel|cancel"
 +
 +#: common/yesno.c:126
 +msgid "oO"
 +msgstr "oO"
 +
 +#: common/yesno.c:127
 +msgid "cC"
 +msgstr "cC"
 +
 +#: common/miscellaneous.c:86
 +#, c-format
 +msgid "out of core in secure memory while allocating %lu bytes"
 +msgstr "out of core in secure memory while allocating %lu bytes"
 +
 +#: common/miscellaneous.c:89
 +#, c-format
 +msgid "out of core while allocating %lu bytes"
 +msgstr "out of core while allocating %lu bytes"
 +
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
 +#, c-format
 +msgid "error allocating enough memory: %s\n"
 +msgstr "error allocating enough memory: %s\n"
 +
 +#: common/miscellaneous.c:143
 +#, c-format
 +msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 +msgstr "%s:%u: obsolete option “%s” - it has no effect\n"
 +
 +#: common/miscellaneous.c:146
 +#, c-format
 +msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 +msgstr "WARNING: “%s%s” is an obsolete option - it has no effect\n"
 +
 +#: common/miscellaneous.c:554
 +#, c-format
 +msgid "unknown debug flag '%s' ignored\n"
 +msgstr "unknown debug flag ‘%s’ ignored\n"
 +
- #: common/asshelp.c:417
++#: common/asshelp.c:380
 +#, c-format
 +msgid "no running gpg-agent - starting '%s'\n"
 +msgstr "no running gpg-agent - starting ‘%s’\n"
 +
- #: common/asshelp.c:477
++#: common/asshelp.c:440
 +#, c-format
 +msgid "waiting for the agent to come up ... (%ds)\n"
 +msgstr "waiting for the agent to come up ... (%ds)\n"
 +
- #: common/asshelp.c:485
++#: common/asshelp.c:448
 +msgid "connection to agent established\n"
 +msgstr "connection to agent established\n"
 +
- #: common/asshelp.c:525
++#: common/asshelp.c:488
 +msgid "connection to agent is in restricted mode\n"
 +msgstr "connection to agent is in restricted mode\n"
 +
- #: common/asshelp.c:582
++#: common/asshelp.c:545
 +#, c-format
 +msgid "no running Dirmngr - starting '%s'\n"
 +msgstr "no running Dirmngr - starting ‘%s’\n"
 +
- #: common/asshelp.c:630
++#: common/asshelp.c:593
 +#, c-format
 +msgid "waiting for the dirmngr to come up ... (%ds)\n"
 +msgstr "waiting for the dirmngr to come up ... (%ds)\n"
 +
- #: common/asshelp.c:639
++#: common/asshelp.c:602
 +msgid "connection to the dirmngr established\n"
 +msgstr "connection to the dirmngr established\n"
 +
 +#. TRANSLATORS: Copy the prefix between the vertical bars
 +#. verbatim.  It will not be printed.
 +#: common/audit.c:474
 +msgid "|audit-log-result|Good"
 +msgstr "|audit-log-result|Good"
 +
 +#: common/audit.c:477
 +msgid "|audit-log-result|Bad"
 +msgstr "|audit-log-result|Bad"
 +
 +#: common/audit.c:479
 +msgid "|audit-log-result|Not supported"
 +msgstr "|audit-log-result|Not supported"
 +
 +#: common/audit.c:481
 +msgid "|audit-log-result|No certificate"
 +msgstr "|audit-log-result|No certificate"
 +
 +#: common/audit.c:483
 +msgid "|audit-log-result|Not enabled"
 +msgstr "|audit-log-result|Not enabled"
 +
 +#: common/audit.c:485
 +msgid "|audit-log-result|Error"
 +msgstr "|audit-log-result|Error"
 +
 +#: common/audit.c:487
 +msgid "|audit-log-result|Not used"
 +msgstr "|audit-log-result|Not used"
 +
 +#: common/audit.c:489
 +msgid "|audit-log-result|Okay"
 +msgstr "|audit-log-result|Okay"
 +
 +#: common/audit.c:491
 +msgid "|audit-log-result|Skipped"
 +msgstr "|audit-log-result|Skipped"
 +
 +#: common/audit.c:493
 +msgid "|audit-log-result|Some"
 +msgstr "|audit-log-result|Some"
 +
 +#: common/audit.c:726
 +msgid "Certificate chain available"
 +msgstr "Certificate chain available"
 +
 +#: common/audit.c:733
 +msgid "root certificate missing"
 +msgstr "root certificate missing"
 +
 +#: common/audit.c:759
 +msgid "Data encryption succeeded"
 +msgstr "Data encryption succeeded"
 +
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
 +msgid "Data available"
 +msgstr "Data available"
 +
 +#: common/audit.c:767
 +msgid "Session key created"
 +msgstr "Session key created"
 +
 +#: common/audit.c:772 common/audit.c:912 common/audit.c:919
 +#, c-format
 +msgid "algorithm: %s"
 +msgstr "algorithm: %s"
 +
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
 +#, c-format
 +msgid "unsupported algorithm: %s"
 +msgstr "unsupported algorithm: %s"
 +
 +#: common/audit.c:778 common/audit.c:925
 +msgid "seems to be not encrypted"
 +msgstr "seems to be not encrypted"
 +
 +#: common/audit.c:784 common/audit.c:933
 +msgid "Number of recipients"
 +msgstr "Number of recipients"
 +
 +#: common/audit.c:792 common/audit.c:956
 +#, c-format
 +msgid "Recipient %d"
 +msgstr "Recipient %d"
 +
 +#: common/audit.c:825
 +msgid "Data signing succeeded"
 +msgstr "Data signing succeeded"
 +
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
 +#, c-format
 +msgid "data hash algorithm: %s"
 +msgstr "data hash algorithm: %s"
 +
 +#: common/audit.c:862
 +#, c-format
 +msgid "Signer %d"
 +msgstr "Signer %d"
 +
 +#: common/audit.c:866 common/audit.c:1065
 +#, c-format
 +msgid "attr hash algorithm: %s"
 +msgstr "attr hash algorithm: %s"
 +
 +#: common/audit.c:901
 +msgid "Data decryption succeeded"
 +msgstr "Data decryption succeeded"
 +
 +#: common/audit.c:910
 +msgid "Encryption algorithm supported"
 +msgstr "Encryption algorithm supported"
 +
 +#: common/audit.c:993
 +msgid "Data verification succeeded"
 +msgstr "Data verification succeeded"
 +
 +#: common/audit.c:1002
 +msgid "Signature available"
 +msgstr "Signature available"
 +
 +#: common/audit.c:1024
 +msgid "Parsing data succeeded"
 +msgstr "Parsing data succeeded"
 +
 +#: common/audit.c:1036
 +#, c-format
 +msgid "bad data hash algorithm: %s"
 +msgstr "bad data hash algorithm: %s"
 +
 +#: common/audit.c:1051
 +#, c-format
 +msgid "Signature %d"
 +msgstr "Signature %d"
 +
 +#: common/audit.c:1079
 +msgid "Certificate chain valid"
 +msgstr "Certificate chain valid"
 +
 +#: common/audit.c:1090
 +msgid "Root certificate trustworthy"
 +msgstr "Root certificate trustworthy"
 +
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
 +msgid "no CRL found for certificate"
 +msgstr "no CRL found for certificate"
 +
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
 +msgid "the available CRL is too old"
 +msgstr "the available CRL is too old"
 +
 +#: common/audit.c:1119
 +msgid "CRL/OCSP check of certificates"
 +msgstr "CRL/OCSP check of certificates"
 +
 +#: common/audit.c:1139
 +msgid "Included certificates"
 +msgstr "Included certificates"
 +
 +#: common/audit.c:1194
 +msgid "No audit log entries."
 +msgstr "No audit log entries."
 +
 +#: common/audit.c:1243
 +msgid "Unknown operation"
 +msgstr "Unknown operation"
 +
 +#: common/audit.c:1261
 +msgid "Gpg-Agent usable"
 +msgstr "Gpg-Agent usable"
 +
 +#: common/audit.c:1271
 +msgid "Dirmngr usable"
 +msgstr "Dirmngr usable"
 +
 +#: common/audit.c:1307
 +#, c-format
 +msgid "No help available for '%s'."
 +msgstr "No help available for '%s'."
 +
 +#: common/helpfile.c:90
 +msgid "ignoring garbage line"
 +msgstr "ignoring garbage line"
 +
- #: common/gettime.c:893
++#: common/gettime.c:887
 +msgid "[none]"
 +msgstr "[none]"
 +
 +#: common/argparse.c:365
 +msgid "argument not expected"
 +msgstr "argument not expected"
 +
 +#: common/argparse.c:367
 +msgid "read error"
 +msgstr "read error"
 +
 +#: common/argparse.c:369
 +msgid "keyword too long"
 +msgstr "keyword too long"
 +
 +#: common/argparse.c:371
 +msgid "missing argument"
 +msgstr "missing argument"
 +
 +#: common/argparse.c:373
 +msgid "invalid argument"
 +msgstr "invalid argument"
 +
 +#: common/argparse.c:375
 +msgid "invalid command"
 +msgstr "invalid command"
 +
 +#: common/argparse.c:377
 +msgid "invalid alias definition"
 +msgstr "invalid alias definition"
 +
 +#: common/argparse.c:379
 +msgid "out of core"
 +msgstr "out of core"
 +
 +#: common/argparse.c:381
 +msgid "invalid option"
 +msgstr "invalid option"
 +
 +#: common/argparse.c:389
 +#, c-format
 +msgid "missing argument for option \"%.50s\"\n"
 +msgstr "missing argument for option “%.50s”\n"
 +
 +#: common/argparse.c:391
 +#, c-format
 +msgid "invalid argument for option \"%.50s\"\n"
 +msgstr "invalid argument for option “%.50s”\n"
 +
 +#: common/argparse.c:393
 +#, c-format
 +msgid "option \"%.50s\" does not expect an argument\n"
 +msgstr "option “%.50s” does not expect an argument\n"
 +
 +#: common/argparse.c:395
 +#, c-format
 +msgid "invalid command \"%.50s\"\n"
 +msgstr "invalid command “%.50s”\n"
 +
 +#: common/argparse.c:397
 +#, c-format
 +msgid "option \"%.50s\" is ambiguous\n"
 +msgstr "option “%.50s” is ambiguous\n"
 +
 +#: common/argparse.c:399
 +#, c-format
 +msgid "command \"%.50s\" is ambiguous\n"
 +msgstr "command “%.50s” is ambiguous\n"
 +
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
 +msgid "out of core\n"
 +msgstr "out of core\n"
 +
 +#: common/argparse.c:403
 +#, c-format
 +msgid "invalid option \"%.50s\"\n"
 +msgstr "invalid option “%.50s”\n"
 +
 +#: common/utf8conv.c:123
 +#, c-format
 +msgid "conversion from '%s' to '%s' not available\n"
 +msgstr "conversion from ‘%s’ to ‘%s’ not available\n"
 +
 +#: common/utf8conv.c:131
 +#, c-format
 +msgid "iconv_open failed: %s\n"
 +msgstr "iconv_open failed: %s\n"
 +
 +#: common/utf8conv.c:385 common/utf8conv.c:651
 +#, c-format
 +msgid "conversion from '%s' to '%s' failed: %s\n"
 +msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
 +
 +#: common/dotlock.c:707
 +#, c-format
 +msgid "failed to create temporary file '%s': %s\n"
 +msgstr "failed to create temporary file '%s': %s\n"
 +
 +#: common/dotlock.c:771
 +#, c-format
 +msgid "error writing to '%s': %s\n"
 +msgstr "error writing to '%s': %s\n"
 +
 +#: common/dotlock.c:1116
 +#, c-format
 +msgid "removing stale lockfile (created by %d)\n"
 +msgstr "removing stale lockfile (created by %d)\n"
 +
 +#: common/dotlock.c:1152
 +#, c-format
 +msgid "waiting for lock (held by %d%s) %s...\n"
 +msgstr "waiting for lock (held by %d%s) %s...\n"
 +
 +#: common/dotlock.c:1153
 +msgid "(deadlock?) "
 +msgstr "(deadlock?) "
 +
 +#: common/dotlock.c:1192
 +#, c-format
 +msgid "lock '%s' not made: %s\n"
 +msgstr "lock ‘%s’ not made: %s\n"
 +
 +#: common/dotlock.c:1219
 +#, c-format
 +msgid "waiting for lock %s...\n"
 +msgstr "waiting for lock %s...\n"
 +
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
 +#, c-format
 +msgid "%s is too old (need %s, have %s)\n"
 +msgstr "%s is too old (need %s, have %s)\n"
 +
 +#: g10/armor.c:424
 +#, c-format
 +msgid "armor: %s\n"
 +msgstr "armor: %s\n"
 +
 +#: g10/armor.c:463
 +msgid "invalid armor header: "
 +msgstr "invalid armor header: "
 +
 +#: g10/armor.c:474
 +msgid "armor header: "
 +msgstr "armor header: "
 +
 +#: g10/armor.c:487
 +msgid "invalid clearsig header\n"
 +msgstr "invalid clearsig header\n"
 +
 +#: g10/armor.c:500
 +msgid "unknown armor header: "
 +msgstr "unknown armor header: "
 +
 +#: g10/armor.c:553
 +msgid "nested clear text signatures\n"
 +msgstr "nested clear text signatures\n"
 +
 +#: g10/armor.c:688
 +msgid "unexpected armor: "
 +msgstr "unexpected armor: "
 +
 +#: g10/armor.c:701
 +msgid "invalid dash escaped line: "
 +msgstr "invalid dash escaped line: "
 +
 +#: g10/armor.c:873 g10/armor.c:1490
 +#, c-format
 +msgid "invalid radix64 character %02X skipped\n"
 +msgstr "invalid radix64 character %02X skipped\n"
 +
 +#: g10/armor.c:916
 +msgid "premature eof (no CRC)\n"
 +msgstr "premature eof (no CRC)\n"
 +
 +#: g10/armor.c:950
 +msgid "premature eof (in CRC)\n"
 +msgstr "premature eof (in CRC)\n"
 +
 +#: g10/armor.c:958
 +msgid "malformed CRC\n"
 +msgstr "malformed CRC\n"
 +
 +#: g10/armor.c:962 g10/armor.c:1527
 +#, c-format
 +msgid "CRC error; %06lX - %06lX\n"
 +msgstr "CRC error; %06lX - %06lX\n"
 +
 +#: g10/armor.c:982
 +msgid "premature eof (in trailer)\n"
 +msgstr "premature eof (in trailer)\n"
 +
 +#: g10/armor.c:986
 +msgid "error in trailer line\n"
 +msgstr "error in trailer line\n"
 +
 +#: g10/armor.c:1303
 +msgid "no valid OpenPGP data found.\n"
 +msgstr "no valid OpenPGP data found.\n"
 +
 +#: g10/armor.c:1308
 +#, c-format
 +msgid "invalid armor: line longer than %d characters\n"
 +msgstr "invalid armor: line longer than %d characters\n"
 +
 +#: g10/armor.c:1312
 +msgid ""
 +"quoted printable character in armor - probably a buggy MTA has been used\n"
 +msgstr ""
 +"quoted printable character in armor - probably a buggy MTA has been used\n"
 +
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
 +#, c-format
 +msgid "[ not human readable (%zu bytes: %s%s) ]"
 +msgstr "[ not human readable (%zu bytes: %s%s) ]"
 +
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
 +msgid ""
 +"a notation name must have only printable characters or spaces, and end with "
 +"an '='\n"
 +msgstr ""
 +"a notation name must have only printable characters or spaces, and end with "
 +"an ‘=’\n"
 +
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
 +msgid "a user notation name must contain the '@' character\n"
 +msgstr "a user notation name must contain the ‘@’ character\n"
 +
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
 +msgid "a notation name must not contain more than one '@' character\n"
 +msgstr "a notation name must not contain more than one ‘@’ character\n"
 +
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
 +msgid "a notation value must not use any control characters\n"
 +msgstr "a notation value must not use any control characters\n"
 +
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
 +msgid "a notation name may not contain an '=' character\n"
 +msgstr "a notation name may not contain an ‘=’ character\n"
 +
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
 +msgid "a notation name must have only printable characters or spaces\n"
 +msgstr "a notation name must have only printable characters or spaces\n"
 +
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
 +msgid "WARNING: invalid notation data found\n"
 +msgstr "WARNING: invalid notation data found\n"
 +
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
 +#, c-format
 +msgid "failed to proxy %s inquiry to client\n"
 +msgstr "failed to proxy %s inquiry to client\n"
 +
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
 +msgid "Enter passphrase: "
 +msgstr "Enter passphrase: "
 +
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
 +#, c-format
 +msgid "error getting version from '%s': %s\n"
 +msgstr "error getting version from '%s': %s\n"
 +
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
 +#, c-format
 +msgid "server '%s' is older than us (%s < %s)"
 +msgstr "server ‘%s’ is older than us (%s < %s)"
 +
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
 +#, c-format
 +msgid "WARNING: %s\n"
 +msgstr "WARNING: %s\n"
 +
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
 +#, c-format
 +msgid "OpenPGP card not available: %s\n"
 +msgstr "OpenPGP card not available: %s\n"
 +
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
 +#, c-format
 +msgid "OpenPGP card no. %s detected\n"
 +msgstr "OpenPGP card no. %s detected\n"
 +
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
 +msgid "can't do this in batch mode\n"
 +msgstr "can't do this in batch mode\n"
 +
 +#: g10/card-util.c:107
 +msgid "This command is only available for version 2 cards\n"
 +msgstr "This command is only available for version 2 cards\n"
 +
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
 +msgid "Reset Code not or not anymore available\n"
 +msgstr "Reset Code not or not anymore available\n"
 +
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
 +msgid "Your selection? "
 +msgstr "Your selection? "
 +
 +#: g10/card-util.c:279 g10/card-util.c:330
 +msgid "[not set]"
 +msgstr "[not set]"
 +
 +#: g10/card-util.c:533
 +msgid "male"
 +msgstr "male"
 +
 +#: g10/card-util.c:534
 +msgid "female"
 +msgstr "female"
 +
 +#: g10/card-util.c:534
 +msgid "unspecified"
 +msgstr "unspecified"
 +
 +#: g10/card-util.c:561
 +msgid "not forced"
 +msgstr "not forced"
 +
 +#: g10/card-util.c:561
 +msgid "forced"
 +msgstr "forced"
 +
- #: g10/card-util.c:636
++#: g10/card-util.c:647
 +msgid "Error: Only plain ASCII is currently allowed.\n"
 +msgstr "Error: Only plain ASCII is currently allowed.\n"
 +
- #: g10/card-util.c:638
++#: g10/card-util.c:649
 +msgid "Error: The \"<\" character may not be used.\n"
 +msgstr "Error: The “<” character may not be used.\n"
 +
- #: g10/card-util.c:640
++#: g10/card-util.c:651
 +msgid "Error: Double spaces are not allowed.\n"
 +msgstr "Error: Double spaces are not allowed.\n"
 +
- #: g10/card-util.c:657
++#: g10/card-util.c:668
 +msgid "Cardholder's surname: "
 +msgstr "Cardholder's surname: "
 +
- #: g10/card-util.c:659
++#: g10/card-util.c:670
 +msgid "Cardholder's given name: "
 +msgstr "Cardholder's given name: "
 +
- #: g10/card-util.c:677
++#: g10/card-util.c:688
 +#, c-format
 +msgid "Error: Combined name too long (limit is %d characters).\n"
 +msgstr "Error: Combined name too long (limit is %d characters).\n"
 +
- #: g10/card-util.c:698
++#: g10/card-util.c:709
 +msgid "URL to retrieve public key: "
 +msgstr "URL to retrieve public key: "
 +
- #: g10/card-util.c:706
++#: g10/card-util.c:717
 +#, c-format
 +msgid "Error: URL too long (limit is %d characters).\n"
 +msgstr "Error: URL too long (limit is %d characters).\n"
 +
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
 +#, c-format
 +msgid "error reading '%s': %s\n"
 +msgstr "error reading '%s': %s\n"
 +
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
 +#, c-format
 +msgid "error writing '%s': %s\n"
 +msgstr "error writing '%s': %s\n"
 +
- #: g10/card-util.c:861
++#: g10/card-util.c:872
 +msgid "Login data (account name): "
 +msgstr "Login data (account name): "
 +
- #: g10/card-util.c:871
++#: g10/card-util.c:882
 +#, c-format
 +msgid "Error: Login data too long (limit is %d characters).\n"
 +msgstr "Error: Login data too long (limit is %d characters).\n"
 +
- #: g10/card-util.c:907
++#: g10/card-util.c:918
 +msgid "Private DO data: "
 +msgstr "Private DO data: "
 +
- #: g10/card-util.c:917
++#: g10/card-util.c:928
 +#, c-format
 +msgid "Error: Private DO too long (limit is %d characters).\n"
 +msgstr "Error: Private DO too long (limit is %d characters).\n"
 +
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
 +msgid "Language preferences: "
 +msgstr "Language preferences: "
 +
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
 +msgid "Error: invalid length of preference string.\n"
 +msgstr "Error: invalid length of preference string.\n"
 +
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
 +msgid "Error: invalid characters in preference string.\n"
 +msgstr "Error: invalid characters in preference string.\n"
 +
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
 +msgid "Sex ((M)ale, (F)emale or space): "
 +msgstr "Sex ((M)ale, (F)emale or space): "
 +
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
 +msgid "Error: invalid response.\n"
 +msgstr "Error: invalid response.\n"
 +
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
 +msgid "CA fingerprint: "
 +msgstr "CA fingerprint: "
 +
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
 +msgid "Error: invalid formatted fingerprint.\n"
 +msgstr "Error: invalid formatted fingerprint.\n"
 +
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
 +#, c-format
 +msgid "key operation not possible: %s\n"
 +msgstr "key operation not possible: %s\n"
 +
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
 +msgid "not an OpenPGP card"
 +msgstr "not an OpenPGP card"
 +
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
 +#, c-format
 +msgid "error getting current key info: %s\n"
 +msgstr "error getting current key info: %s\n"
 +
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
 +msgid "Replace existing key? (y/N) "
 +msgstr "Replace existing key? (y/N) "
 +
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
 +msgid ""
 +"Note: There is no guarantee that the card supports the requested size.\n"
 +"      If the key generation does not succeed, please check the\n"
 +"      documentation of your card to see what sizes are allowed.\n"
 +msgstr ""
 +"Note: There is no guarantee that the card supports the requested size.\n"
 +"      If the key generation does not succeed, please check the\n"
 +"      documentation of your card to see what sizes are allowed.\n"
 +
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
 +#, c-format
 +msgid "What keysize do you want for the Signature key? (%u) "
 +msgstr "What keysize do you want for the Signature key? (%u) "
 +
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
 +#, c-format
 +msgid "What keysize do you want for the Encryption key? (%u) "
 +msgstr "What keysize do you want for the Encryption key? (%u) "
 +
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
 +#, c-format
 +msgid "What keysize do you want for the Authentication key? (%u) "
 +msgstr "What keysize do you want for the Authentication key? (%u) "
 +
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
 +#, c-format
 +msgid "rounded up to %u bits\n"
 +msgstr "rounded up to %u bits\n"
 +
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
 +#, c-format
 +msgid "%s keysizes must be in the range %u-%u\n"
 +msgstr "%s keysizes must be in the range %u-%u\n"
 +
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
 +#, c-format
 +msgid "The card will now be re-configured to generate a key of %u bits\n"
 +msgstr "The card will now be re-configured to generate a key of %u bits\n"
 +
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
 +#, c-format
 +msgid "error changing size of key %d to %u bits: %s\n"
 +msgstr "error changing size of key %d to %u bits: %s\n"
 +
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
 +msgid "Make off-card backup of encryption key? (Y/n) "
 +msgstr "Make off-card backup of encryption key? (Y/n) "
 +
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
 +msgid "Note: keys are already stored on the card!\n"
 +msgstr "Note: keys are already stored on the card!\n"
 +
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
 +msgid "Replace existing keys? (y/N) "
 +msgstr "Replace existing keys? (y/N) "
 +
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
 +#, c-format
 +msgid ""
 +"Please note that the factory settings of the PINs are\n"
 +"   PIN = '%s'     Admin PIN = '%s'\n"
 +"You should change them using the command --change-pin\n"
 +msgstr ""
 +"Please note that the factory settings of the PINs are\n"
 +"   PIN = ‘%s’     Admin PIN = ‘%s’\n"
 +"You should change them using the command --change-pin\n"
 +
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
 +msgid "Please select the type of key to generate:\n"
 +msgstr "Please select the type of key to generate:\n"
 +
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
 +msgid "   (1) Signature key\n"
 +msgstr "   (1) Signature key\n"
 +
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
 +msgid "   (2) Encryption key\n"
 +msgstr "   (2) Encryption key\n"
 +
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
 +msgid "   (3) Authentication key\n"
 +msgstr "   (3) Authentication key\n"
 +
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
 +msgid "Invalid selection.\n"
 +msgstr "Invalid selection.\n"
 +
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
 +msgid "Please select where to store the key:\n"
 +msgstr "Please select where to store the key:\n"
 +
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
 +#, c-format
 +msgid "KEYTOCARD failed: %s\n"
 +msgstr "KEYTOCARD failed: %s\n"
 +
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
 +msgid "This command is not supported by this card\n"
 +msgstr "This command is not supported by this card\n"
 +
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
 +msgid "Note: This command destroys all keys stored on the card!\n"
 +msgstr "Note: This command destroys all keys stored on the card!\n"
 +
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
 +msgid "Continue? (y/N) "
 +msgstr "Continue? (y/N) "
 +
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
 +msgid "Really do a factory reset? (enter \"yes\") "
 +msgstr "Really do a factory reset? (enter “yes”) "
 +
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
 +msgid "quit this menu"
 +msgstr "quit this menu"
 +
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
 +msgid "show admin commands"
 +msgstr "show admin commands"
 +
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
 +msgid "show this help"
 +msgstr "show this help"
 +
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
 +msgid "list all available data"
 +msgstr "list all available data"
 +
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
 +msgid "change card holder's name"
 +msgstr "change card holder's name"
 +
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
 +msgid "change URL to retrieve key"
 +msgstr "change URL to retrieve key"
 +
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
 +msgid "fetch the key specified in the card URL"
 +msgstr "fetch the key specified in the card URL"
 +
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
 +msgid "change the login name"
 +msgstr "change the login name"
 +
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
 +msgid "change the language preferences"
 +msgstr "change the language preferences"
 +
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
 +msgid "change card holder's sex"
 +msgstr "change card holder's sex"
 +
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
 +msgid "change a CA fingerprint"
 +msgstr "change a CA fingerprint"
 +
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
 +msgid "toggle the signature force PIN flag"
 +msgstr "toggle the signature force PIN flag"
 +
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
 +msgid "generate new keys"
 +msgstr "generate new keys"
 +
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
 +msgid "menu to change or unblock the PIN"
 +msgstr "menu to change or unblock the PIN"
 +
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
 +msgid "verify the PIN and list all data"
 +msgstr "verify the PIN and list all data"
 +
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
 +msgid "unblock the PIN using a Reset Code"
 +msgstr "unblock the PIN using a Reset Code"
 +
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
 +msgid "destroy all keys and data"
 +msgstr "destroy all keys and data"
 +
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
 +msgid "gpg/card> "
 +msgstr "gpg/card> "
 +
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
 +msgid "Admin-only command\n"
 +msgstr "Admin-only command\n"
 +
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
 +msgid "Admin commands are allowed\n"
 +msgstr "Admin commands are allowed\n"
 +
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
 +msgid "Admin commands are not allowed\n"
 +msgstr "Admin commands are not allowed\n"
 +
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
 +msgid "Invalid command  (try \"help\")\n"
 +msgstr "Invalid command  (try “help”)\n"
 +
 +#: g10/decrypt.c:191 g10/encrypt.c:955
 +msgid "--output doesn't work for this command\n"
 +msgstr "--output doesn't work for this command\n"
 +
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
 +#, c-format
 +msgid "can't open '%s'\n"
 +msgstr "can't open ‘%s’\n"
 +
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
 +#, c-format
 +msgid "key \"%s\" not found: %s\n"
 +msgstr "key “%s” not found: %s\n"
 +
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
 +#, c-format
 +msgid "error reading keyblock: %s\n"
 +msgstr "error reading keyblock: %s\n"
 +
 +#: g10/delkey.c:118 g10/getkey.c:579
 +#, c-format
 +msgid "key \"%s\" not found\n"
 +msgstr "key “%s” not found\n"
 +
 +#: g10/delkey.c:129 g10/delkey.c:136
 +msgid "(unless you specify the key by fingerprint)\n"
 +msgstr "(unless you specify the key by fingerprint)\n"
 +
 +#: g10/delkey.c:135
 +msgid "can't do this in batch mode without \"--yes\"\n"
 +msgstr "can't do this in batch mode without “--yes”\n"
 +
 +#: g10/delkey.c:148
 +msgid "Delete this key from the keyring? (y/N) "
 +msgstr "Delete this key from the keyring? (y/N) "
 +
 +#: g10/delkey.c:158
 +msgid "This is a secret key! - really delete? (y/N) "
 +msgstr "This is a secret key! - really delete? (y/N) "
 +
 +#: g10/delkey.c:201
 +#, c-format
 +msgid "deleting secret %s failed: %s\n"
 +msgstr "deleting secret %s failed: %s\n"
 +
 +#: g10/delkey.c:203
 +msgid "key"
 +msgstr "key"
 +
 +#: g10/delkey.c:203
 +msgid "subkey"
 +msgstr "subkey"
 +
 +#: g10/delkey.c:226
 +#, c-format
 +msgid "deleting keyblock failed: %s\n"
 +msgstr "deleting keyblock failed: %s\n"
 +
 +#: g10/delkey.c:239
 +msgid "ownertrust information cleared\n"
 +msgstr "ownertrust information cleared\n"
 +
 +#: g10/delkey.c:275
 +#, c-format
 +msgid "there is a secret key for public key \"%s\"!\n"
 +msgstr "there is a secret key for public key “%s”!\n"
 +
 +#: g10/delkey.c:277
 +msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 +msgstr "use option “--delete-secret-keys” to delete it first.\n"
 +
 +#: g10/encrypt.c:232 g10/sign.c:1292
 +#, c-format
 +msgid "error creating passphrase: %s\n"
 +msgstr "error creating passphrase: %s\n"
 +
 +#: g10/encrypt.c:239
 +msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 +msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
 +
 +#: g10/encrypt.c:253
 +#, c-format
 +msgid "using cipher %s\n"
 +msgstr "using cipher %s\n"
 +
 +#: g10/encrypt.c:263 g10/encrypt.c:624
 +#, c-format
 +msgid "'%s' already compressed\n"
 +msgstr "‘%s’ already compressed\n"
 +
 +#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
 +#, c-format
 +msgid "WARNING: '%s' is an empty file\n"
 +msgstr "WARNING: ‘%s’ is an empty file\n"
 +
 +#: g10/encrypt.c:557
 +#, c-format
 +msgid "reading from '%s'\n"
 +msgstr "reading from ‘%s’\n"
 +
 +#: g10/encrypt.c:605
 +#, c-format
 +msgid ""
 +"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 +msgstr ""
 +"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 +
 +#: g10/encrypt.c:707 g10/sign.c:984
 +#, c-format
 +msgid ""
 +"WARNING: forcing compression algorithm %s (%d) violates recipient "
 +"preferences\n"
 +msgstr ""
 +"WARNING: forcing compression algorithm %s (%d) violates recipient "
 +"preferences\n"
 +
 +#: g10/encrypt.c:817
 +#, c-format
 +msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 +msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 +
 +#: g10/encrypt.c:903
 +#, c-format
 +msgid "%s/%s encrypted for: \"%s\"\n"
 +msgstr "%s/%s encrypted for: “%s”\n"
 +
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
 +#, c-format
 +msgid "you may not use %s while in %s mode\n"
 +msgstr "you may not use %s while in %s mode\n"
 +
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
 +#, c-format
 +msgid "%s encrypted data\n"
 +msgstr "%s encrypted data\n"
 +
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
 +#, c-format
 +msgid "encrypted with unknown algorithm %d\n"
 +msgstr "encrypted with unknown algorithm %d\n"
 +
 +#: g10/decrypt-data.c:164 sm/decrypt.c:127
 +msgid ""
 +"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 +msgstr ""
 +"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 +
 +#: g10/decrypt-data.c:176
 +msgid "problem handling encrypted packet\n"
 +msgstr "problem handling encrypted packet\n"
 +
 +#: g10/exec.c:60
 +msgid "no remote program execution supported\n"
 +msgstr "no remote program execution supported\n"
 +
 +#: g10/exec.c:319
 +msgid ""
 +"external program calls are disabled due to unsafe options file permissions\n"
 +msgstr ""
 +"external program calls are disabled due to unsafe options file permissions\n"
 +
 +#: g10/exec.c:349
 +msgid "this platform requires temporary files when calling external programs\n"
 +msgstr ""
 +"this platform requires temporary files when calling external programs\n"
 +
 +#: g10/exec.c:427
 +#, c-format
 +msgid "unable to execute program '%s': %s\n"
 +msgstr "unable to execute program '%s': %s\n"
 +
 +#: g10/exec.c:430
 +#, c-format
 +msgid "unable to execute shell '%s': %s\n"
 +msgstr "unable to execute shell '%s': %s\n"
 +
 +#: g10/exec.c:521
 +#, c-format
 +msgid "system error while calling external program: %s\n"
 +msgstr "system error while calling external program: %s\n"
 +
 +#: g10/exec.c:532 g10/exec.c:599
 +msgid "unnatural exit of external program\n"
 +msgstr "unnatural exit of external program\n"
 +
 +#: g10/exec.c:547
 +msgid "unable to execute external program\n"
 +msgstr "unable to execute external program\n"
 +
 +#: g10/exec.c:564
 +#, c-format
 +msgid "unable to read external program response: %s\n"
 +msgstr "unable to read external program response: %s\n"
 +
 +#: g10/exec.c:610 g10/exec.c:617
 +#, c-format
 +msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 +msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 +
 +#: g10/exec.c:622
 +#, c-format
 +msgid "WARNING: unable to remove temp directory '%s': %s\n"
 +msgstr "WARNING: unable to remove temp directory '%s': %s\n"
 +
- #: g10/export.c:102
++#: g10/export.c:106
 +msgid "export signatures that are marked as local-only"
 +msgstr "export signatures that are marked as local-only"
 +
- #: g10/export.c:104
++#: g10/export.c:108
 +msgid "export attribute user IDs (generally photo IDs)"
 +msgstr "export attribute user IDs (generally photo IDs)"
 +
- #: g10/export.c:106
++#: g10/export.c:110
 +msgid "export revocation keys marked as \"sensitive\""
 +msgstr "export revocation keys marked as “sensitive”"
 +
- #: g10/export.c:108
++#: g10/export.c:112
 +msgid "remove unusable parts from key during export"
 +msgstr "remove unusable parts from key during export"
 +
- #: g10/export.c:110
++#: g10/export.c:114
 +msgid "remove as much as possible from key during export"
 +msgstr "remove as much as possible from key during export"
 +
- #: g10/export.c:1204
++#: g10/export.c:1218
 +msgid " - skipped"
 +msgstr " - skipped"
 +
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
 +#, c-format
 +msgid "writing to '%s'\n"
 +msgstr "writing to ‘%s’\n"
 +
- #: g10/export.c:1660
++#: g10/export.c:1675
 +#, c-format
 +msgid "key %s: key material on-card - skipped\n"
 +msgstr "key %s: key material on-card - skipped\n"
 +
- #: g10/export.c:1846
++#: g10/export.c:1861
 +msgid "exporting secret keys not allowed\n"
 +msgstr "exporting secret keys not allowed\n"
 +
- #: g10/export.c:1923
++#: g10/export.c:1938
 +#, c-format
 +msgid "key %s: PGP 2.x style key - skipped\n"
 +msgstr "key %s: PGP 2.x style key - skipped\n"
 +
- #: g10/export.c:2004
++#: g10/export.c:2026
 +msgid "WARNING: nothing exported\n"
 +msgstr "WARNING: nothing exported\n"
 +
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
 +#, c-format
 +msgid "error creating '%s': %s\n"
 +msgstr "error creating '%s': %s\n"
 +
 +#: g10/getkey.c:257
 +msgid "[User ID not found]"
 +msgstr "[User ID not found]"
 +
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
 +#, c-format
 +msgid "(check argument of option '%s')\n"
 +msgstr "(check argument of option '%s')\n"
 +
 +#: g10/getkey.c:516
 +#, c-format
 +msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
 +msgstr "Warning: ‘%s’ should be a long key ID or a fingerprint\n"
 +
 +#: g10/getkey.c:546
 +#, c-format
 +msgid "error looking up: %s\n"
 +msgstr "error looking up: %s\n"
 +
 +#: g10/getkey.c:636
 +#, c-format
 +msgid "Warning: %s appears in the keyring %d times\n"
 +msgstr "Warning: %s appears in the keyring %d times\n"
 +
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
 +#, c-format
 +msgid "automatically retrieved '%s' via %s\n"
 +msgstr "automatically retrieved ‘%s’ via %s\n"
 +
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
 +#, c-format
 +msgid "error retrieving '%s' via %s: %s\n"
 +msgstr "error retrieving ‘%s’ via %s: %s\n"
 +
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
 +msgid "No fingerprint"
 +msgstr "No fingerprint"
 +
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
 +#, c-format
 +msgid "secret key \"%s\" not found: %s\n"
 +msgstr "secret key “%s” not found: %s\n"
 +
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
 +#, c-format
 +msgid "Warning: not using '%s' as default key: %s\n"
 +msgstr "Warning: not using ‘%s’ as default key: %s\n"
 +
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
 +#, c-format
 +msgid "using \"%s\" as default secret key for signing\n"
 +msgstr "using “%s” as default secret key for signing\n"
 +
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
 +#, c-format
 +msgid "all values passed to '%s' ignored\n"
 +msgstr "all values passed to ‘%s’ ignored\n"
 +
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
 +#, c-format
 +msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 +msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 +
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
 +#, c-format
 +msgid "using subkey %s instead of primary key %s\n"
 +msgstr "using subkey %s instead of primary key %s\n"
 +
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
 +msgid "make a signature"
 +msgstr "make a signature"
 +
- #: g10/gpg.c:421
++#: g10/gpg.c:425
 +msgid "make a clear text signature"
 +msgstr "make a clear text signature"
 +
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
 +msgid "make a detached signature"
 +msgstr "make a detached signature"
 +
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
 +msgid "encrypt data"
 +msgstr "encrypt data"
 +
- #: g10/gpg.c:425
++#: g10/gpg.c:429
 +msgid "encryption only with symmetric cipher"
 +msgstr "encryption only with symmetric cipher"
 +
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
 +msgid "decrypt data (default)"
 +msgstr "decrypt data (default)"
 +
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
 +msgid "verify a signature"
 +msgstr "verify a signature"
 +
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
 +msgid "list keys"
 +msgstr "list keys"
 +
- #: g10/gpg.c:433
++#: g10/gpg.c:437
 +msgid "list keys and signatures"
 +msgstr "list keys and signatures"
 +
- #: g10/gpg.c:434
++#: g10/gpg.c:438
 +msgid "list and check key signatures"
 +msgstr "list and check key signatures"
 +
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
 +msgid "list keys and fingerprints"
 +msgstr "list keys and fingerprints"
 +
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
 +msgid "list secret keys"
 +msgstr "list secret keys"
 +
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
 +msgid "generate a new key pair"
 +msgstr "generate a new key pair"
 +
- #: g10/gpg.c:440
++#: g10/gpg.c:444
 +msgid "quickly generate a new key pair"
 +msgstr "quickly generate a new key pair"
 +
- #: g10/gpg.c:442
++#: g10/gpg.c:446
 +msgid "quickly add a new user-id"
 +msgstr "quickly add a new user-id"
 +
- #: g10/gpg.c:445
++#: g10/gpg.c:449
 +msgid "quickly revoke a user-id"
 +msgstr "quickly revoke a user-id"
 +
- #: g10/gpg.c:447
++#: g10/gpg.c:451
 +msgid "full featured key pair generation"
 +msgstr "full featured key pair generation"
 +
- #: g10/gpg.c:448
++#: g10/gpg.c:452
 +msgid "generate a revocation certificate"
 +msgstr "generate a revocation certificate"
 +
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
 +msgid "remove keys from the public keyring"
 +msgstr "remove keys from the public keyring"
 +
- #: g10/gpg.c:452
++#: g10/gpg.c:456
 +msgid "remove keys from the secret keyring"
 +msgstr "remove keys from the secret keyring"
 +
- #: g10/gpg.c:454
++#: g10/gpg.c:458
 +msgid "quickly sign a key"
 +msgstr "quickly sign a key"
 +
- #: g10/gpg.c:456
++#: g10/gpg.c:460
 +msgid "quickly sign a key locally"
 +msgstr "quickly sign a key locally"
 +
- #: g10/gpg.c:457
++#: g10/gpg.c:461
 +msgid "sign a key"
 +msgstr "sign a key"
 +
- #: g10/gpg.c:458
++#: g10/gpg.c:462
 +msgid "sign a key locally"
 +msgstr "sign a key locally"
 +
- #: g10/gpg.c:459
++#: g10/gpg.c:463
 +msgid "sign or edit a key"
 +msgstr "sign or edit a key"
 +
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
 +msgid "change a passphrase"
 +msgstr "change a passphrase"
 +
- #: g10/gpg.c:463
++#: g10/gpg.c:467
 +msgid "export keys"
 +msgstr "export keys"
 +
- #: g10/gpg.c:464
++#: g10/gpg.c:468
 +msgid "export keys to a keyserver"
 +msgstr "export keys to a keyserver"
 +
- #: g10/gpg.c:465
++#: g10/gpg.c:469
 +msgid "import keys from a keyserver"
 +msgstr "import keys from a keyserver"
 +
- #: g10/gpg.c:467
++#: g10/gpg.c:471
 +msgid "search for keys on a keyserver"
 +msgstr "search for keys on a keyserver"
 +
- #: g10/gpg.c:469
++#: g10/gpg.c:473
 +msgid "update all keys from a keyserver"
 +msgstr "update all keys from a keyserver"
 +
- #: g10/gpg.c:475
++#: g10/gpg.c:479
 +msgid "import/merge keys"
 +msgstr "import/merge keys"
 +
- #: g10/gpg.c:478
++#: g10/gpg.c:482
 +msgid "print the card status"
 +msgstr "print the card status"
 +
- #: g10/gpg.c:479
++#: g10/gpg.c:483
 +msgid "change data on a card"
 +msgstr "change data on a card"
 +
- #: g10/gpg.c:480
++#: g10/gpg.c:484
 +msgid "change a card's PIN"
 +msgstr "change a card's PIN"
 +
- #: g10/gpg.c:492
++#: g10/gpg.c:496
 +msgid "update the trust database"
 +msgstr "update the trust database"
 +
- #: g10/gpg.c:501
++#: g10/gpg.c:505
 +msgid "print message digests"
 +msgstr "print message digests"
 +
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
 +msgid "run in server mode"
 +msgstr "run in server mode"
 +
- #: g10/gpg.c:506
++#: g10/gpg.c:510
 +msgid "|VALUE|set the TOFU policy for a key"
 +msgstr "|VALUE|set the TOFU policy for a key"
 +
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
 +msgid "create ascii armored output"
 +msgstr "create ascii armored output"
 +
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
 +msgid "|USER-ID|encrypt for USER-ID"
 +msgstr "|USER-ID|encrypt for USER-ID"
 +
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
 +msgid "|USER-ID|use USER-ID to sign or decrypt"
 +msgstr "|USER-ID|use USER-ID to sign or decrypt"
 +
- #: g10/gpg.c:535
++#: g10/gpg.c:539
 +msgid "|N|set compress level to N (0 disables)"
 +msgstr "|N|set compress level to N (0 disables)"
 +
- #: g10/gpg.c:542
++#: g10/gpg.c:546
 +msgid "use canonical text mode"
 +msgstr "use canonical text mode"
 +
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
 +msgid "|FILE|write output to FILE"
 +msgstr "|FILE|write output to FILE"
 +
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
 +msgid "do not make any changes"
 +msgstr "do not make any changes"
 +
- #: g10/gpg.c:575
++#: g10/gpg.c:579
 +msgid "prompt before overwriting"
 +msgstr "prompt before overwriting"
 +
- #: g10/gpg.c:623
++#: g10/gpg.c:628
 +msgid "use strict OpenPGP behavior"
 +msgstr "use strict OpenPGP behavior"
 +
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
 +msgid ""
 +"@\n"
 +"(See the man page for a complete listing of all commands and options)\n"
 +msgstr ""
 +"@\n"
 +"(See the man page for a complete listing of all commands and options)\n"
 +
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
 +msgid ""
 +"@\n"
 +"Examples:\n"
 +"\n"
 +" -se -r Bob [file]          sign and encrypt for user Bob\n"
 +" --clearsign [file]         make a clear text signature\n"
 +" --detach-sign [file]       make a detached signature\n"
 +" --list-keys [names]        show keys\n"
 +" --fingerprint [names]      show fingerprints\n"
 +msgstr ""
 +"@\n"
 +"Examples:\n"
 +"\n"
 +" -se -r Bob [file]          sign and encrypt for user Bob\n"
 +" --clearsign [file]         make a clear text signature\n"
 +" --detach-sign [file]       make a detached signature\n"
 +" --list-keys [names]        show keys\n"
 +" --fingerprint [names]      show fingerprints\n"
 +
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
 +msgid "Usage: @GPG@ [options] [files] (-h for help)"
 +msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 +
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
 +msgid ""
 +"Syntax: @GPG@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt\n"
 +"Default operation depends on the input data\n"
 +msgstr ""
 +"Syntax: @GPG@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt\n"
 +"Default operation depends on the input data\n"
 +
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
 +msgid ""
 +"\n"
 +"Supported algorithms:\n"
 +msgstr ""
 +"\n"
 +"Supported algorithms:\n"
 +
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
 +msgid "Pubkey: "
 +msgstr "Pubkey: "
 +
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
 +msgid "Cipher: "
 +msgstr "Cipher: "
 +
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
 +msgid "Hash: "
 +msgstr "Hash: "
 +
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
 +msgid "Compression: "
 +msgstr "Compression: "
 +
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
 +#, c-format
 +msgid "usage: %s [options] %s\n"
 +msgstr "usage: %s [options] %s\n"
 +
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
 +msgid "conflicting commands\n"
 +msgstr "conflicting commands\n"
 +
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
 +#, c-format
 +msgid "no = sign found in group definition '%s'\n"
 +msgstr "no = sign found in group definition ‘%s’\n"
 +
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
 +#, c-format
 +msgid "WARNING: unsafe ownership on homedir '%s'\n"
 +msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 +
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
 +#, c-format
 +msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 +msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 +
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
 +#, c-format
 +msgid "WARNING: unsafe ownership on extension '%s'\n"
 +msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 +
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
 +#, c-format
 +msgid "WARNING: unsafe permissions on homedir '%s'\n"
 +msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 +
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
 +#, c-format
 +msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 +msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 +
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
 +#, c-format
 +msgid "WARNING: unsafe permissions on extension '%s'\n"
 +msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 +
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
 +#, c-format
 +msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 +msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘%s’\n"
 +
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
 +#, c-format
 +msgid ""
 +"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 +msgstr ""
 +"WARNING: unsafe enclosing directory ownership on configuration file ‘%s’\n"
 +
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
 +#, c-format
 +msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 +msgstr "WARNING: unsafe enclosing directory ownership on extension ‘%s’\n"
 +
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
 +#, c-format
 +msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 +msgstr "WARNING: unsafe enclosing directory permissions on homedir ‘%s’\n"
 +
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
 +#, c-format
 +msgid ""
 +"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 +msgstr ""
 +"WARNING: unsafe enclosing directory permissions on configuration file ‘%s’\n"
 +
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
 +#, c-format
 +msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 +msgstr "WARNING: unsafe enclosing directory permissions on extension ‘%s’\n"
 +
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
 +#, c-format
 +msgid "unknown configuration item '%s'\n"
 +msgstr "unknown configuration item ‘%s’\n"
 +
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
 +msgid "display photo IDs during key listings"
 +msgstr "display photo IDs during key listings"
 +
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
 +msgid "show key usage information during key listings"
 +msgstr "show key usage information during key listings"
 +
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
 +msgid "show policy URLs during signature listings"
 +msgstr "show policy URLs during signature listings"
 +
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
 +msgid "show all notations during signature listings"
 +msgstr "show all notations during signature listings"
 +
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
 +msgid "show IETF standard notations during signature listings"
 +msgstr "show IETF standard notations during signature listings"
 +
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
 +msgid "show user-supplied notations during signature listings"
 +msgstr "show user-supplied notations during signature listings"
 +
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
 +msgid "show preferred keyserver URLs during signature listings"
 +msgstr "show preferred keyserver URLs during signature listings"
 +
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
 +msgid "show user ID validity during key listings"
 +msgstr "show user ID validity during key listings"
 +
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
 +msgid "show revoked and expired user IDs in key listings"
 +msgstr "show revoked and expired user IDs in key listings"
 +
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
 +msgid "show revoked and expired subkeys in key listings"
 +msgstr "show revoked and expired subkeys in key listings"
 +
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
 +msgid "show the keyring name in key listings"
 +msgstr "show the keyring name in key listings"
 +
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
 +msgid "show expiration dates during signature listings"
 +msgstr "show expiration dates during signature listings"
 +
- #: g10/gpg.c:2011
- msgid "available TOFU policies:\n"
- msgstr "available TOFU policies:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
++#, c-format
++msgid "valid values for option '%s':\n"
++msgstr "valid values for option '%s':\n"
 +
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
 +#, c-format
 +msgid "unknown TOFU policy '%s'\n"
 +msgstr "unknown TOFU policy ‘%s’\n"
 +
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
 +msgid "(use \"help\" to list choices)\n"
 +msgstr "(use “help” to list choices)\n"
 +
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
++#, c-format
++msgid "invalid value for option '%s'\n"
++msgstr "invalid value for option ‘%s’\n"
++
++#: g10/gpg.c:2203
 +#, c-format
 +msgid "Note: old default options file '%s' ignored\n"
 +msgstr "Note: old default options file ‘%s’ ignored\n"
 +
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
 +#, c-format
 +msgid "Note: %s is not for normal use!\n"
 +msgstr "Note: %s is not for normal use!\n"
 +
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
 +#, c-format
 +msgid "'%s' is not a valid signature expiration\n"
 +msgstr "‘%s’ is not a valid signature expiration\n"
 +
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
 +#, c-format
 +msgid "\"%s\" is not a proper mail address\n"
 +msgstr "“%s” is not a proper mail address\n"
 +
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
 +#, c-format
 +msgid "invalid pinentry mode '%s'\n"
 +msgstr "invalid pinentry mode ‘%s’\n"
 +
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
 +#, c-format
 +msgid "'%s' is not a valid character set\n"
 +msgstr "‘%s’ is not a valid character set\n"
 +
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
 +msgid "could not parse keyserver URL\n"
 +msgstr "could not parse keyserver URL\n"
 +
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
 +#, c-format
 +msgid "%s:%d: invalid keyserver options\n"
 +msgstr "%s:%d: invalid keyserver options\n"
 +
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
 +msgid "invalid keyserver options\n"
 +msgstr "invalid keyserver options\n"
 +
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
 +#, c-format
 +msgid "%s:%d: invalid import options\n"
 +msgstr "%s:%d: invalid import options\n"
 +
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
 +msgid "invalid import options\n"
 +msgstr "invalid import options\n"
 +
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
 +#, c-format
 +msgid "invalid filter option: %s\n"
 +msgstr "invalid filter option: %s\n"
 +
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
 +#, c-format
 +msgid "%s:%d: invalid export options\n"
 +msgstr "%s:%d: invalid export options\n"
 +
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
 +msgid "invalid export options\n"
 +msgstr "invalid export options\n"
 +
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
 +#, c-format
 +msgid "%s:%d: invalid list options\n"
 +msgstr "%s:%d: invalid list options\n"
 +
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
 +msgid "invalid list options\n"
 +msgstr "invalid list options\n"
 +
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
 +msgid "display photo IDs during signature verification"
 +msgstr "display photo IDs during signature verification"
 +
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
 +msgid "show policy URLs during signature verification"
 +msgstr "show policy URLs during signature verification"
 +
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
 +msgid "show all notations during signature verification"
 +msgstr "show all notations during signature verification"
 +
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
 +msgid "show IETF standard notations during signature verification"
 +msgstr "show IETF standard notations during signature verification"
 +
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
 +msgid "show user-supplied notations during signature verification"
 +msgstr "show user-supplied notations during signature verification"
 +
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
 +msgid "show preferred keyserver URLs during signature verification"
 +msgstr "show preferred keyserver URLs during signature verification"
 +
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
 +msgid "show user ID validity during signature verification"
 +msgstr "show user ID validity during signature verification"
 +
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
 +msgid "show revoked and expired user IDs in signature verification"
 +msgstr "show revoked and expired user IDs in signature verification"
 +
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
 +msgid "show only the primary user ID in signature verification"
 +msgstr "show only the primary user ID in signature verification"
 +
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
 +msgid "validate signatures with PKA data"
 +msgstr "validate signatures with PKA data"
 +
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
 +msgid "elevate the trust of signatures with valid PKA data"
 +msgstr "elevate the trust of signatures with valid PKA data"
 +
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
 +#, c-format
 +msgid "%s:%d: invalid verify options\n"
 +msgstr "%s:%d: invalid verify options\n"
 +
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
 +msgid "invalid verify options\n"
 +msgstr "invalid verify options\n"
 +
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
 +#, c-format
 +msgid "unable to set exec-path to %s\n"
 +msgstr "unable to set exec-path to %s\n"
 +
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
 +#, c-format
 +msgid "%s:%d: invalid auto-key-locate list\n"
 +msgstr "%s:%d: invalid auto-key-locate list\n"
 +
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
 +msgid "invalid auto-key-locate list\n"
 +msgstr "invalid auto-key-locate list\n"
 +
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
 +msgid "WARNING: program may create a core file!\n"
 +msgstr "WARNING: program may create a core file!\n"
 +
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
 +#, c-format
 +msgid "WARNING: %s overrides %s\n"
 +msgstr "WARNING: %s overrides %s\n"
 +
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
 +#, c-format
 +msgid "%s not allowed with %s!\n"
 +msgstr "%s not allowed with %s!\n"
 +
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
 +#, c-format
 +msgid "%s makes no sense with %s!\n"
 +msgstr "%s makes no sense with %s!\n"
 +
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
 +msgid "WARNING: running with faked system time: "
 +msgstr "WARNING: running with faked system time: "
 +
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
 +#, c-format
 +msgid "will not run with insecure memory due to %s\n"
 +msgstr "will not run with insecure memory due to %s\n"
 +
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
 +msgid "selected cipher algorithm is invalid\n"
 +msgstr "selected cipher algorithm is invalid\n"
 +
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
 +msgid "selected digest algorithm is invalid\n"
 +msgstr "selected digest algorithm is invalid\n"
 +
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
 +msgid "selected compression algorithm is invalid\n"
 +msgstr "selected compression algorithm is invalid\n"
 +
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
 +msgid "selected certification digest algorithm is invalid\n"
 +msgstr "selected certification digest algorithm is invalid\n"
 +
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
 +msgid "completes-needed must be greater than 0\n"
 +msgstr "completes-needed must be greater than 0\n"
 +
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
 +msgid "marginals-needed must be greater than 1\n"
 +msgstr "marginals-needed must be greater than 1\n"
 +
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
 +msgid "max-cert-depth must be in the range from 1 to 255\n"
 +msgstr "max-cert-depth must be in the range from 1 to 255\n"
 +
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
 +msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 +msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 +
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
 +msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 +msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 +
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
 +msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 +msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 +
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
 +msgid "invalid S2K mode; must be 0, 1 or 3\n"
 +msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 +
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
 +msgid "invalid default preferences\n"
 +msgstr "invalid default preferences\n"
 +
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
 +msgid "invalid personal cipher preferences\n"
 +msgstr "invalid personal cipher preferences\n"
 +
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
 +msgid "invalid personal digest preferences\n"
 +msgstr "invalid personal digest preferences\n"
 +
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
 +msgid "invalid personal compress preferences\n"
 +msgstr "invalid personal compress preferences\n"
 +
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
 +#, c-format
 +msgid "%s does not yet work with %s\n"
 +msgstr "%s does not yet work with %s\n"
 +
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
 +#, c-format
 +msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 +msgstr "you may not use cipher algorithm ‘%s’ while in %s mode\n"
 +
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
 +#, c-format
 +msgid "you may not use digest algorithm '%s' while in %s mode\n"
 +msgstr "you may not use digest algorithm ‘%s’ while in %s mode\n"
 +
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
 +#, c-format
 +msgid "you may not use compression algorithm '%s' while in %s mode\n"
 +msgstr "you may not use compression algorithm ‘%s’ while in %s mode\n"
 +
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
 +#, c-format
 +msgid "failed to initialize the TrustDB: %s\n"
 +msgstr "failed to initialize the TrustDB: %s\n"
 +
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
 +msgid "WARNING: recipients (-r) given without using public key encryption\n"
 +msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 +
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
 +msgid "--store [filename]"
 +msgstr "--store [filename]"
 +
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
 +msgid "--symmetric [filename]"
 +msgstr "--symmetric [filename]"
 +
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
 +#, c-format
 +msgid "symmetric encryption of '%s' failed: %s\n"
 +msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 +
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
 +msgid "--encrypt [filename]"
 +msgstr "--encrypt [filename]"
 +
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
 +msgid "--symmetric --encrypt [filename]"
 +msgstr "--symmetric --encrypt [filename]"
 +
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
 +msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 +msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 +
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
 +#, c-format
 +msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 +msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
 +
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
 +msgid "--sign [filename]"
 +msgstr "--sign [filename]"
 +
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
 +msgid "--sign --encrypt [filename]"
 +msgstr "--sign --encrypt [filename]"
 +
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
 +msgid "--symmetric --sign --encrypt [filename]"
 +msgstr "--symmetric --sign --encrypt [filename]"
 +
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
 +msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 +msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 +
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
 +#, c-format
 +msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 +msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 +
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
 +msgid "--sign --symmetric [filename]"
 +msgstr "--sign --symmetric [filename]"
 +
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
 +msgid "--clearsign [filename]"
 +msgstr "--clearsign [filename]"
 +
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
 +msgid "--decrypt [filename]"
 +msgstr "--decrypt [filename]"
 +
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
 +msgid "--sign-key user-id"
 +msgstr "--sign-key user-id"
 +
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
 +msgid "--lsign-key user-id"
 +msgstr "--lsign-key user-id"
 +
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
 +msgid "--edit-key user-id [commands]"
 +msgstr "--edit-key user-id [commands]"
 +
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
 +msgid "--passwd <user-id>"
 +msgstr "--passwd <user-id>"
 +
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
 +#, c-format
 +msgid "keyserver send failed: %s\n"
 +msgstr "keyserver send failed: %s\n"
 +
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
 +#, c-format
 +msgid "keyserver receive failed: %s\n"
 +msgstr "keyserver receive failed: %s\n"
 +
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
 +#, c-format
 +msgid "key export failed: %s\n"
 +msgstr "key export failed: %s\n"
 +
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
 +#, c-format
 +msgid "export as ssh key failed: %s\n"
 +msgstr "export as ssh key failed: %s\n"
 +
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
 +#, c-format
 +msgid "keyserver search failed: %s\n"
 +msgstr "keyserver search failed: %s\n"
 +
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
 +#, c-format
 +msgid "keyserver refresh failed: %s\n"
 +msgstr "keyserver refresh failed: %s\n"
 +
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
 +#, c-format
 +msgid "dearmoring failed: %s\n"
 +msgstr "dearmoring failed: %s\n"
 +
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
 +#, c-format
 +msgid "enarmoring failed: %s\n"
 +msgstr "enarmoring failed: %s\n"
 +
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
 +#, c-format
 +msgid "invalid hash algorithm '%s'\n"
 +msgstr "invalid hash algorithm ‘%s’\n"
 +
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
 +#, c-format
 +msgid "error parsing key specification '%s': %s\n"
 +msgstr "error parsing key specification '%s': %s\n"
 +
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
 +#, c-format
 +msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 +msgstr "‘%s’ does not appear to be a valid key ID, fingerprint or keygrip\n"
 +
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
 +msgid "[filename]"
 +msgstr "[filename]"
 +
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
 +msgid "Go ahead and type your message ...\n"
 +msgstr "Go ahead and type your message ...\n"
 +
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
 +msgid "the given certification policy URL is invalid\n"
 +msgstr "the given certification policy URL is invalid\n"
 +
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
 +msgid "the given signature policy URL is invalid\n"
 +msgstr "the given signature policy URL is invalid\n"
 +
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
 +msgid "the given preferred keyserver URL is invalid\n"
 +msgstr "the given preferred keyserver URL is invalid\n"
 +
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
 +msgid "|FILE|take the keys from the keyring FILE"
 +msgstr "|FILE|take the keys from the keyring FILE"
 +
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
 +msgid "make timestamp conflicts only a warning"
 +msgstr "make timestamp conflicts only a warning"
 +
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
 +msgid "|FD|write status info to this FD"
 +msgstr "|FD|write status info to this FD"
 +
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
 +msgid "|ALGO|reject signatures made with ALGO"
 +msgstr "|ALGO|reject signatures made with ALGO"
 +
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
 +msgid "Usage: gpgv [options] [files] (-h for help)"
 +msgstr "Usage: gpgv [options] [files] (-h for help)"
 +
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
 +msgid ""
 +"Syntax: gpgv [options] [files]\n"
 +"Check signatures against known trusted keys\n"
 +msgstr ""
 +"Syntax: gpgv [options] [files]\n"
 +"Check signatures against known trusted keys\n"
 +
 +#: g10/helptext.c:72
 +msgid "No help available"
 +msgstr "No help available"
 +
 +#: g10/helptext.c:82
 +#, c-format
 +msgid "No help available for '%s'"
 +msgstr "No help available for ‘%s’"
 +
- #: g10/import.c:138
++#: g10/import.c:151
 +msgid "import signatures that are marked as local-only"
 +msgstr "import signatures that are marked as local-only"
 +
- #: g10/import.c:141
++#: g10/import.c:154
 +msgid "repair damage from the pks keyserver during import"
 +msgstr "repair damage from the pks keyserver during import"
 +
- #: g10/import.c:144
++#: g10/import.c:157
 +msgid "do not clear the ownertrust values during import"
 +msgstr "do not clear the ownertrust values during import"
 +
- #: g10/import.c:147
++#: g10/import.c:160
 +msgid "do not update the trustdb after import"
 +msgstr "do not update the trustdb after import"
 +
- #: g10/import.c:150
++#: g10/import.c:163
 +msgid "show key during import"
 +msgstr "show key during import"
 +
- #: g10/import.c:153
++#: g10/import.c:166
 +msgid "only accept updates to existing keys"
 +msgstr "only accept updates to existing keys"
 +
- #: g10/import.c:156
++#: g10/import.c:169
 +msgid "remove unusable parts from key after import"
 +msgstr "remove unusable parts from key after import"
 +
- #: g10/import.c:159
++#: g10/import.c:172
 +msgid "remove as much as possible from key after import"
 +msgstr "remove as much as possible from key after import"
 +
- #: g10/import.c:162
++#: g10/import.c:175
 +msgid "run import filters and export key immediately"
 +msgstr "run import filters and export key immediately"
 +
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
 +#, c-format
 +msgid "skipping block of type %d\n"
 +msgstr "skipping block of type %d\n"
 +
- #: g10/import.c:542
++#: g10/import.c:585
 +#, c-format
 +msgid "%lu keys processed so far\n"
 +msgstr "%lu keys processed so far\n"
 +
- #: g10/import.c:612
++#: g10/import.c:655
 +#, c-format
 +msgid "Total number processed: %lu\n"
 +msgstr "Total number processed: %lu\n"
 +
- #: g10/import.c:615
++#: g10/import.c:658
 +#, c-format
 +msgid "    skipped PGP-2 keys: %lu\n"
 +msgstr "    skipped PGP-2 keys: %lu\n"
 +
- #: g10/import.c:617
++#: g10/import.c:660
 +#, c-format
 +msgid "      skipped new keys: %lu\n"
 +msgstr "      skipped new keys: %lu\n"
 +
- #: g10/import.c:620
++#: g10/import.c:663
 +#, c-format
 +msgid "          w/o user IDs: %lu\n"
 +msgstr "          w/o user IDs: %lu\n"
 +
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
 +#, c-format
 +msgid "              imported: %lu"
 +msgstr "              imported: %lu"
 +
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
 +#, c-format
 +msgid "             unchanged: %lu\n"
 +msgstr "             unchanged: %lu\n"
 +
- #: g10/import.c:629
++#: g10/import.c:672
 +#, c-format
 +msgid "          new user IDs: %lu\n"
 +msgstr "          new user IDs: %lu\n"
 +
- #: g10/import.c:631
++#: g10/import.c:674
 +#, c-format
 +msgid "           new subkeys: %lu\n"
 +msgstr "           new subkeys: %lu\n"
 +
- #: g10/import.c:633
++#: g10/import.c:676
 +#, c-format
 +msgid "        new signatures: %lu\n"
 +msgstr "        new signatures: %lu\n"
 +
- #: g10/import.c:635
++#: g10/import.c:678
 +#, c-format
 +msgid "   new key revocations: %lu\n"
 +msgstr "   new key revocations: %lu\n"
 +
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
 +#, c-format
 +msgid "      secret keys read: %lu\n"
 +msgstr "      secret keys read: %lu\n"
 +
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
 +#, c-format
 +msgid "  secret keys imported: %lu\n"
 +msgstr "  secret keys imported: %lu\n"
 +
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
 +#, c-format
 +msgid " secret keys unchanged: %lu\n"
 +msgstr " secret keys unchanged: %lu\n"
 +
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
 +#, c-format
 +msgid "          not imported: %lu\n"
 +msgstr "          not imported: %lu\n"
 +
- #: g10/import.c:645
++#: g10/import.c:688
 +#, c-format
 +msgid "    signatures cleaned: %lu\n"
 +msgstr "    signatures cleaned: %lu\n"
 +
- #: g10/import.c:647
++#: g10/import.c:690
 +#, c-format
 +msgid "      user IDs cleaned: %lu\n"
 +msgstr "      user IDs cleaned: %lu\n"
 +
- #: g10/import.c:991
++#: g10/import.c:1034
 +#, c-format
 +msgid ""
 +"WARNING: key %s contains preferences for unavailable\n"
 +"algorithms on these user IDs:\n"
 +msgstr ""
 +"WARNING: key %s contains preferences for unavailable\n"
 +"algorithms on these user IDs:\n"
 +
- #: g10/import.c:1033
++#: g10/import.c:1076
 +#, c-format
 +msgid "         \"%s\": preference for cipher algorithm %s\n"
 +msgstr "         “%s”: preference for cipher algorithm %s\n"
 +
- #: g10/import.c:1048
++#: g10/import.c:1091
 +#, c-format
 +msgid "         \"%s\": preference for digest algorithm %s\n"
 +msgstr "         “%s”: preference for digest algorithm %s\n"
 +
- #: g10/import.c:1060
++#: g10/import.c:1103
 +#, c-format
 +msgid "         \"%s\": preference for compression algorithm %s\n"
 +msgstr "         “%s”: preference for compression algorithm %s\n"
 +
- #: g10/import.c:1073
++#: g10/import.c:1116
 +msgid "it is strongly suggested that you update your preferences and\n"
 +msgstr "it is strongly suggested that you update your preferences and\n"
 +
- #: g10/import.c:1075
++#: g10/import.c:1118
 +msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 +msgstr ""
 +"re-distribute this key to avoid potential algorithm mismatch problems\n"
 +
- #: g10/import.c:1100
++#: g10/import.c:1143
 +#, c-format
 +msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 +msgstr "you can update your preferences with: gpg --edit-key %s updpref save\n"
 +
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
 +#, c-format
 +msgid "key %s: no user ID\n"
 +msgstr "key %s: no user ID\n"
 +
- #: g10/import.c:1312
++#: g10/import.c:1385
 +#, c-format
 +msgid "key %s: %s\n"
 +msgstr "key %s: %s\n"
 +
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
 +msgid "rejected by import screener"
 +msgstr "rejected by import screener"
 +
- #: g10/import.c:1343
++#: g10/import.c:1416
 +#, c-format
 +msgid "key %s: PKS subkey corruption repaired\n"
 +msgstr "key %s: PKS subkey corruption repaired\n"
 +
- #: g10/import.c:1361
++#: g10/import.c:1434
 +#, c-format
 +msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 +msgstr "key %s: accepted non self-signed user ID “%s”\n"
 +
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
 +#, c-format
 +msgid "key %s: no valid user IDs\n"
 +msgstr "key %s: no valid user IDs\n"
 +
- #: g10/import.c:1373
++#: g10/import.c:1446
 +msgid "this may be caused by a missing self-signature\n"
 +msgstr "this may be caused by a missing self-signature\n"
 +
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
 +#, c-format
 +msgid "key %s: public key not found: %s\n"
 +msgstr "key %s: public key not found: %s\n"
 +
- #: g10/import.c:1437
++#: g10/import.c:1522
 +#, c-format
 +msgid "key %s: new key - skipped\n"
 +msgstr "key %s: new key - skipped\n"
 +
- #: g10/import.c:1452
++#: g10/import.c:1537
 +#, c-format
 +msgid "no writable keyring found: %s\n"
 +msgstr "no writable keyring found: %s\n"
 +
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
 +#, c-format
 +msgid "error writing keyring '%s': %s\n"
 +msgstr "error writing keyring '%s': %s\n"
 +
- #: g10/import.c:1481
++#: g10/import.c:1566
 +#, c-format
 +msgid "key %s: public key \"%s\" imported\n"
 +msgstr "key %s: public key “%s” imported\n"
 +
- #: g10/import.c:1505
++#: g10/import.c:1590
 +#, c-format
 +msgid "key %s: doesn't match our copy\n"
 +msgstr "key %s: doesn't match our copy\n"
 +
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
 +#, c-format
 +msgid "key %s: can't locate original keyblock: %s\n"
 +msgstr "key %s: can't locate original keyblock: %s\n"
 +
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
 +#, c-format
 +msgid "key %s: can't read original keyblock: %s\n"
 +msgstr "key %s: can't read original keyblock: %s\n"
 +
- #: g10/import.c:1572
++#: g10/import.c:1657
 +#, c-format
 +msgid "key %s: \"%s\" 1 new user ID\n"
 +msgstr "key %s: “%s” 1 new user ID\n"
 +
- #: g10/import.c:1575
++#: g10/import.c:1660
 +#, c-format
 +msgid "key %s: \"%s\" %d new user IDs\n"
 +msgstr "key %s: “%s” %d new user IDs\n"
 +
- #: g10/import.c:1578
++#: g10/import.c:1663
 +#, c-format
 +msgid "key %s: \"%s\" 1 new signature\n"
 +msgstr "key %s: “%s” 1 new signature\n"
 +
- #: g10/import.c:1581
++#: g10/import.c:1666
 +#, c-format
 +msgid "key %s: \"%s\" %d new signatures\n"
 +msgstr "key %s: “%s” %d new signatures\n"
 +
- #: g10/import.c:1584
++#: g10/import.c:1669
 +#, c-format
 +msgid "key %s: \"%s\" 1 new subkey\n"
 +msgstr "key %s: “%s” 1 new subkey\n"
 +
- #: g10/import.c:1587
++#: g10/import.c:1672
 +#, c-format
 +msgid "key %s: \"%s\" %d new subkeys\n"
 +msgstr "key %s: “%s” %d new subkeys\n"
 +
- #: g10/import.c:1590
++#: g10/import.c:1675
 +#, c-format
 +msgid "key %s: \"%s\" %d signature cleaned\n"
 +msgstr "key %s: “%s” %d signature cleaned\n"
 +
- #: g10/import.c:1593
++#: g10/import.c:1678
 +#, c-format
 +msgid "key %s: \"%s\" %d signatures cleaned\n"
 +msgstr "key %s: “%s” %d signatures cleaned\n"
 +
- #: g10/import.c:1596
++#: g10/import.c:1681
 +#, c-format
 +msgid "key %s: \"%s\" %d user ID cleaned\n"
 +msgstr "key %s: “%s” %d user ID cleaned\n"
 +
- #: g10/import.c:1599
++#: g10/import.c:1684
 +#, c-format
 +msgid "key %s: \"%s\" %d user IDs cleaned\n"
 +msgstr "key %s: “%s” %d user IDs cleaned\n"
 +
- #: g10/import.c:1622
++#: g10/import.c:1707
 +#, c-format
 +msgid "key %s: \"%s\" not changed\n"
 +msgstr "key %s: “%s” not changed\n"
 +
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
 +#, c-format
 +msgid "key %s: secret key imported\n"
 +msgstr "key %s: secret key imported\n"
 +
- #: g10/import.c:1942
++#: g10/import.c:2027
 +#, c-format
 +msgid "key %s: secret key already exists\n"
 +msgstr "key %s: secret key already exists\n"
 +
- #: g10/import.c:1950
++#: g10/import.c:2035
 +#, c-format
 +msgid "key %s: error sending to agent: %s\n"
 +msgstr "key %s: error sending to agent: %s\n"
 +
- #: g10/import.c:2055
++#: g10/import.c:2140
 +#, c-format
 +msgid "secret key %s: %s\n"
 +msgstr "secret key %s: %s\n"
 +
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
 +msgid "importing secret keys not allowed\n"
 +msgstr "importing secret keys not allowed\n"
 +
- #: g10/import.c:2099
++#: g10/import.c:2184
 +#, c-format
 +msgid "key %s: secret key with invalid cipher %d - skipped\n"
 +msgstr "key %s: secret key with invalid cipher %d - skipped\n"
 +
 +#. TRANSLATORS: For smartcard, each private key on
 +#. host has a reference (stub) to a smartcard and
 +#. actual private key data is stored on the card.  A
 +#. single smartcard can have up to three private key
 +#. data.  Importing private key stub is always
 +#. skipped in 2.1, and it returns
 +#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
 +#. suggested to run 'gpg --card-status', then,
 +#. references to a card will be automatically
 +#. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
 +#, c-format
 +msgid "To migrate '%s', with each smartcard, run: %s\n"
 +msgstr "To migrate '%s', with each smartcard, run: %s\n"
 +
- #: g10/import.c:2226
++#: g10/import.c:2311
 +#, c-format
 +msgid "key %s: no public key - can't apply revocation certificate\n"
 +msgstr "key %s: no public key - can't apply revocation certificate\n"
 +
- #: g10/import.c:2275
++#: g10/import.c:2360
 +#, c-format
 +msgid "key %s: invalid revocation certificate: %s - rejected\n"
 +msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 +
- #: g10/import.c:2308
++#: g10/import.c:2393
 +#, c-format
 +msgid "key %s: \"%s\" revocation certificate imported\n"
 +msgstr "key %s: “%s” revocation certificate imported\n"
 +
- #: g10/import.c:2384
++#: g10/import.c:2469
 +#, c-format
 +msgid "key %s: no user ID for signature\n"
 +msgstr "key %s: no user ID for signature\n"
 +
- #: g10/import.c:2401
++#: g10/import.c:2486
 +#, c-format
 +msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 +msgstr "key %s: unsupported public key algorithm on user ID “%s”\n"
 +
- #: g10/import.c:2403
++#: g10/import.c:2488
 +#, c-format
 +msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 +msgstr "key %s: invalid self-signature on user ID “%s”\n"
 +
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
 +#, c-format
 +msgid "key %s: unsupported public key algorithm\n"
 +msgstr "key %s: unsupported public key algorithm\n"
 +
- #: g10/import.c:2421
++#: g10/import.c:2506
 +#, c-format
 +msgid "key %s: invalid direct key signature\n"
 +msgstr "key %s: invalid direct key signature\n"
 +
- #: g10/import.c:2435
++#: g10/import.c:2520
 +#, c-format
 +msgid "key %s: no subkey for key binding\n"
 +msgstr "key %s: no subkey for key binding\n"
 +
- #: g10/import.c:2448
++#: g10/import.c:2533
 +#, c-format
 +msgid "key %s: invalid subkey binding\n"
 +msgstr "key %s: invalid subkey binding\n"
 +
- #: g10/import.c:2464
++#: g10/import.c:2549
 +#, c-format
 +msgid "key %s: removed multiple subkey binding\n"
 +msgstr "key %s: removed multiple subkey binding\n"
 +
- #: g10/import.c:2486
++#: g10/import.c:2571
 +#, c-format
 +msgid "key %s: no subkey for key revocation\n"
 +msgstr "key %s: no subkey for key revocation\n"
 +
- #: g10/import.c:2499
++#: g10/import.c:2584
 +#, c-format
 +msgid "key %s: invalid subkey revocation\n"
 +msgstr "key %s: invalid subkey revocation\n"
 +
- #: g10/import.c:2514
++#: g10/import.c:2599
 +#, c-format
 +msgid "key %s: removed multiple subkey revocation\n"
 +msgstr "key %s: removed multiple subkey revocation\n"
 +
- #: g10/import.c:2556
++#: g10/import.c:2641
 +#, c-format
 +msgid "key %s: skipped user ID \"%s\"\n"
 +msgstr "key %s: skipped user ID “%s”\n"
 +
- #: g10/import.c:2580
++#: g10/import.c:2665
 +#, c-format
 +msgid "key %s: skipped subkey\n"
 +msgstr "key %s: skipped subkey\n"
 +
- #: g10/import.c:2609
++#: g10/import.c:2694
 +#, c-format
 +msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 +msgstr "key %s: non exportable signature (class 0x%02X) - skipped\n"
 +
- #: g10/import.c:2620
++#: g10/import.c:2705
 +#, c-format
 +msgid "key %s: revocation certificate at wrong place - skipped\n"
 +msgstr "key %s: revocation certificate at wrong place - skipped\n"
 +
- #: g10/import.c:2638
++#: g10/import.c:2723
 +#, c-format
 +msgid "key %s: invalid revocation certificate: %s - skipped\n"
 +msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 +
- #: g10/import.c:2652
++#: g10/import.c:2737
 +#, c-format
 +msgid "key %s: subkey signature in wrong place - skipped\n"
 +msgstr "key %s: subkey signature in wrong place - skipped\n"
 +
- #: g10/import.c:2660
++#: g10/import.c:2745
 +#, c-format
 +msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 +msgstr "key %s: unexpected signature class (0x%02X) - skipped\n"
 +
- #: g10/import.c:2789
++#: g10/import.c:2887
 +#, c-format
 +msgid "key %s: duplicated user ID detected - merged\n"
 +msgstr "key %s: duplicated user ID detected - merged\n"
 +
- #: g10/import.c:2853
++#: g10/import.c:2951
 +#, c-format
 +msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 +msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
 +
- #: g10/import.c:2869
++#: g10/import.c:2967
 +#, c-format
 +msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 +msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
 +
- #: g10/import.c:2933
++#: g10/import.c:3031
 +#, c-format
 +msgid "key %s: \"%s\" revocation certificate added\n"
 +msgstr "key %s: “%s” revocation certificate added\n"
 +
- #: g10/import.c:2971
++#: g10/import.c:3069
 +#, c-format
 +msgid "key %s: direct key signature added\n"
 +msgstr "key %s: direct key signature added\n"
 +
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
 +#, c-format
 +msgid "error creating keybox '%s': %s\n"
 +msgstr "error creating keybox '%s': %s\n"
 +
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
 +#, c-format
 +msgid "error creating keyring '%s': %s\n"
 +msgstr "error creating keyring '%s': %s\n"
 +
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
 +#, c-format
 +msgid "keybox '%s' created\n"
 +msgstr "keybox ‘%s’ created\n"
 +
- #: g10/keydb.c:443
++#: g10/keydb.c:445
 +#, c-format
 +msgid "keyring '%s' created\n"
 +msgstr "keyring ‘%s’ created\n"
 +
- #: g10/keydb.c:822
++#: g10/keydb.c:823
 +#, c-format
 +msgid "keyblock resource '%s': %s\n"
 +msgstr "keyblock resource '%s': %s\n"
 +
- #: g10/keydb.c:907
++#: g10/keydb.c:911
 +#, c-format
 +msgid "error opening key DB: %s\n"
 +msgstr "error opening key DB: %s\n"
 +
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
 +#, c-format
 +msgid "failed to rebuild keyring cache: %s\n"
 +msgstr "failed to rebuild keyring cache: %s\n"
 +
 +#: g10/keyedit.c:264
 +msgid "[revocation]"
 +msgstr "[revocation]"
 +
 +#: g10/keyedit.c:264
 +msgid "[self-signature]"
 +msgstr "[self-signature]"
 +
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
++#, c-format
++msgid "error allocating memory: %s\n"
++msgstr "error allocating memory: %s\n"
++
++#: g10/keyedit.c:629
 +#, c-format
 +msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 +msgstr ""
 +"can't check signature with unsupported public-key algorithm (%d): %s.\n"
 +
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
 +#, c-format
 +msgid ""
 +"can't check signature with unsupported message-digest algorithm %d: %s.\n"
 +msgstr ""
 +"can't check signature with unsupported message-digest algorithm %d: %s.\n"
 +
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
 +msgid " (reordered signatures follow)"
 +msgstr " (reordered signatures follow)"
 +
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
 +#, c-format
 +msgid "key %s:\n"
 +msgstr "key %s:\n"
 +
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
 +#, c-format
 +msgid "%d duplicate signature removed\n"
 +msgid_plural "%d duplicate signatures removed\n"
 +msgstr[0] "%d duplicate signature removed\n"
 +msgstr[1] "%d duplicate signatures removed\n"
 +
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
 +#, c-format
 +msgid "%d signature not checked due to a missing key\n"
 +msgid_plural "%d signatures not checked due to missing keys\n"
 +msgstr[0] "%d signature not checked due to a missing key\n"
 +msgstr[1] "%d signatures not checked due to missing keys\n"
 +
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
 +#, c-format
 +msgid "%d bad signature\n"
 +msgid_plural "%d bad signatures\n"
 +msgstr[0] "%d bad signature\n"
 +msgstr[1] "%d bad signatures\n"
 +
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
 +#, c-format
 +msgid "%d signature reordered\n"
 +msgid_plural "%d signatures reordered\n"
 +msgstr[0] "%d signature reordered\n"
 +msgstr[1] "%d signatures reordered\n"
 +
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
 +#, c-format
 +msgid ""
 +"Warning: errors found and only checked self-signatures, run '%s' to check "
 +"all signatures.\n"
 +msgstr ""
 +"Warning: errors found and only checked self-signatures, run ‘%s’ to check "
 +"all signatures.\n"
 +
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
 +msgid ""
 +"Please decide how far you trust this user to correctly verify other users' "
 +"keys\n"
 +"(by looking at passports, checking fingerprints from different sources, "
 +"etc.)\n"
 +msgstr ""
 +"Please decide how far you trust this user to correctly verify other users' "
 +"keys\n"
 +"(by looking at passports, checking fingerprints from different sources, "
 +"etc.)\n"
 +
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
 +#, c-format
 +msgid "  %d = I trust marginally\n"
 +msgstr "  %d = I trust marginally\n"
 +
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
 +#, c-format
 +msgid "  %d = I trust fully\n"
 +msgstr "  %d = I trust fully\n"
 +
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
 +msgid ""
 +"Please enter the depth of this trust signature.\n"
 +"A depth greater than 1 allows the key you are signing to make\n"
 +"trust signatures on your behalf.\n"
 +msgstr ""
 +"Please enter the depth of this trust signature.\n"
 +"A depth greater than 1 allows the key you are signing to make\n"
 +"trust signatures on your behalf.\n"
 +
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
 +msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 +msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
 +
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
 +#, c-format
 +msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 +msgstr "Skipping user ID “%s”, which is not a text ID.\n"
 +
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
 +#, c-format
 +msgid "User ID \"%s\" is revoked."
 +msgstr "User ID “%s” is revoked."
 +
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
 +msgid "Are you sure you still want to sign it? (y/N) "
 +msgstr "Are you sure you still want to sign it? (y/N) "
 +
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
 +msgid "  Unable to sign.\n"
 +msgstr "  Unable to sign.\n"
 +
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
 +#, c-format
 +msgid "User ID \"%s\" is expired."
 +msgstr "User ID “%s” is expired."
 +
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
 +#, c-format
 +msgid "User ID \"%s\" is not self-signed."
 +msgstr "User ID “%s” is not self-signed."
 +
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
 +#, c-format
 +msgid "User ID \"%s\" is signable.  "
 +msgstr "User ID “%s” is signable.  "
 +
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
 +msgid "Sign it? (y/N) "
 +msgstr "Sign it? (y/N) "
 +
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
 +#, c-format
 +msgid ""
 +"The self-signature on \"%s\"\n"
 +"is a PGP 2.x-style signature.\n"
 +msgstr ""
 +"The self-signature on “%s”\n"
 +"is a PGP 2.x-style signature.\n"
 +
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
 +msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 +msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 +
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
 +#, c-format
 +msgid ""
 +"Your current signature on \"%s\"\n"
 +"has expired.\n"
 +msgstr ""
 +"Your current signature on “%s”\n"
 +"has expired.\n"
 +
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
 +msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 +msgstr ""
 +"Do you want to issue a new signature to replace the expired one? (y/N) "
 +
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
 +#, c-format
 +msgid ""
 +"Your current signature on \"%s\"\n"
 +"is a local signature.\n"
 +msgstr ""
 +"Your current signature on “%s”\n"
 +"is a local signature.\n"
 +
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
 +msgid "Do you want to promote it to a full exportable signature? (y/N) "
 +msgstr "Do you want to promote it to a full exportable signature? (y/N) "
 +
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
 +#, c-format
 +msgid "\"%s\" was already locally signed by key %s\n"
 +msgstr "“%s” was already locally signed by key %s\n"
 +
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
 +#, c-format
 +msgid "\"%s\" was already signed by key %s\n"
 +msgstr "“%s” was already signed by key %s\n"
 +
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
 +msgid "Do you want to sign it again anyway? (y/N) "
 +msgstr "Do you want to sign it again anyway? (y/N) "
 +
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
 +#, c-format
 +msgid "Nothing to sign with key %s\n"
 +msgstr "Nothing to sign with key %s\n"
 +
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
 +msgid "This key has expired!"
 +msgstr "This key has expired!"
 +
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
 +#, c-format
 +msgid "This key is due to expire on %s.\n"
 +msgstr "This key is due to expire on %s.\n"
 +
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
 +msgid "Do you want your signature to expire at the same time? (Y/n) "
 +msgstr "Do you want your signature to expire at the same time? (Y/n) "
 +
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
 +msgid ""
 +"How carefully have you verified the key you are about to sign actually "
 +"belongs\n"
 +"to the person named above?  If you don't know what to answer, enter \"0\".\n"
 +msgstr ""
 +"How carefully have you verified the key you are about to sign actually "
 +"belongs\n"
 +"to the person named above?  If you don't know what to answer, enter “0”.\n"
 +
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
 +#, c-format
 +msgid "   (0) I will not answer.%s\n"
 +msgstr "   (0) I will not answer.%s\n"
 +
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
 +#, c-format
 +msgid "   (1) I have not checked at all.%s\n"
 +msgstr "   (1) I have not checked at all.%s\n"
 +
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
 +#, c-format
 +msgid "   (2) I have done casual checking.%s\n"
 +msgstr "   (2) I have done casual checking.%s\n"
 +
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
 +#, c-format
 +msgid "   (3) I have done very careful checking.%s\n"
 +msgstr "   (3) I have done very careful checking.%s\n"
 +
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
 +msgid "Your selection? (enter '?' for more information): "
 +msgstr "Your selection? (enter ‘?’ for more information): "
 +
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
 +#, c-format
 +msgid ""
 +"Are you sure that you want to sign this key with your\n"
 +"key \"%s\" (%s)\n"
 +msgstr ""
 +"Are you sure that you want to sign this key with your\n"
 +"key “%s” (%s)\n"
 +
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
 +msgid "This will be a self-signature.\n"
 +msgstr "This will be a self-signature.\n"
 +
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
 +msgid "WARNING: the signature will not be marked as non-exportable.\n"
 +msgstr "WARNING: the signature will not be marked as non-exportable.\n"
 +
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
 +msgid "WARNING: the signature will not be marked as non-revocable.\n"
 +msgstr "WARNING: the signature will not be marked as non-revocable.\n"
 +
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
 +msgid "The signature will be marked as non-exportable.\n"
 +msgstr "The signature will be marked as non-exportable.\n"
 +
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
 +msgid "The signature will be marked as non-revocable.\n"
 +msgstr "The signature will be marked as non-revocable.\n"
 +
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
 +msgid "I have not checked this key at all.\n"
 +msgstr "I have not checked this key at all.\n"
 +
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
 +msgid "I have checked this key casually.\n"
 +msgstr "I have checked this key casually.\n"
 +
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
 +msgid "I have checked this key very carefully.\n"
 +msgstr "I have checked this key very carefully.\n"
 +
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
 +msgid "Really sign? (y/N) "
 +msgstr "Really sign? (y/N) "
 +
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
 +#, c-format
 +msgid "signing failed: %s\n"
 +msgstr "signing failed: %s\n"
 +
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
 +msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 +msgstr "Key has only stub or on-card key items - no passphrase to change.\n"
 +
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
 +#, c-format
 +msgid "key %s: error changing passphrase: %s\n"
 +msgstr "key %s: error changing passphrase: %s\n"
 +
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
 +msgid "save and quit"
 +msgstr "save and quit"
 +
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
 +msgid "show key fingerprint"
 +msgstr "show key fingerprint"
 +
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
 +msgid "show the keygrip"
 +msgstr "show the keygrip"
 +
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
 +msgid "list key and user IDs"
 +msgstr "list key and user IDs"
 +
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
 +msgid "select user ID N"
 +msgstr "select user ID N"
 +
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
 +msgid "select subkey N"
 +msgstr "select subkey N"
 +
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
 +msgid "check signatures"
 +msgstr "check signatures"
 +
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
 +msgid "sign selected user IDs [* see below for related commands]"
 +msgstr "sign selected user IDs [* see below for related commands]"
 +
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
 +msgid "sign selected user IDs locally"
 +msgstr "sign selected user IDs locally"
 +
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
 +msgid "sign selected user IDs with a trust signature"
 +msgstr "sign selected user IDs with a trust signature"
 +
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
 +msgid "sign selected user IDs with a non-revocable signature"
 +msgstr "sign selected user IDs with a non-revocable signature"
 +
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
 +msgid "add a user ID"
 +msgstr "add a user ID"
 +
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
 +msgid "add a photo ID"
 +msgstr "add a photo ID"
 +
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
 +msgid "delete selected user IDs"
 +msgstr "delete selected user IDs"
 +
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
 +msgid "add a subkey"
 +msgstr "add a subkey"
 +
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
 +msgid "add a key to a smartcard"
 +msgstr "add a key to a smartcard"
 +
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
 +msgid "move a key to a smartcard"
 +msgstr "move a key to a smartcard"
 +
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
 +msgid "move a backup key to a smartcard"
 +msgstr "move a backup key to a smartcard"
 +
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
 +msgid "delete selected subkeys"
 +msgstr "delete selected subkeys"
 +
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
 +msgid "add a revocation key"
 +msgstr "add a revocation key"
 +
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
 +msgid "delete signatures from the selected user IDs"
 +msgstr "delete signatures from the selected user IDs"
 +
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
 +msgid "change the expiration date for the key or selected subkeys"
 +msgstr "change the expiration date for the key or selected subkeys"
 +
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
 +msgid "flag the selected user ID as primary"
 +msgstr "flag the selected user ID as primary"
 +
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
 +msgid "list preferences (expert)"
 +msgstr "list preferences (expert)"
 +
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
 +msgid "list preferences (verbose)"
 +msgstr "list preferences (verbose)"
 +
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
 +msgid "set preference list for the selected user IDs"
 +msgstr "set preference list for the selected user IDs"
 +
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
 +msgid "set the preferred keyserver URL for the selected user IDs"
 +msgstr "set the preferred keyserver URL for the selected user IDs"
 +
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
 +msgid "set a notation for the selected user IDs"
 +msgstr "set a notation for the selected user IDs"
 +
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
 +msgid "change the passphrase"
 +msgstr "change the passphrase"
 +
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
 +msgid "change the ownertrust"
 +msgstr "change the ownertrust"
 +
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
 +msgid "revoke signatures on the selected user IDs"
 +msgstr "revoke signatures on the selected user IDs"
 +
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
 +msgid "revoke selected user IDs"
 +msgstr "revoke selected user IDs"
 +
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
 +msgid "revoke key or selected subkeys"
 +msgstr "revoke key or selected subkeys"
 +
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
 +msgid "enable key"
 +msgstr "enable key"
 +
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
 +msgid "disable key"
 +msgstr "disable key"
 +
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
 +msgid "show selected photo IDs"
 +msgstr "show selected photo IDs"
 +
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
 +msgid "compact unusable user IDs and remove unusable signatures from key"
 +msgstr "compact unusable user IDs and remove unusable signatures from key"
 +
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
 +msgid "compact unusable user IDs and remove all signatures from key"
 +msgstr "compact unusable user IDs and remove all signatures from key"
 +
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
 +msgid "Secret key is available.\n"
 +msgstr "Secret key is available.\n"
 +
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
 +msgid "Need the secret key to do this.\n"
 +msgstr "Need the secret key to do this.\n"
 +
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
 +msgid ""
 +"* The 'sign' command may be prefixed with an 'l' for local signatures "
 +"(lsign),\n"
 +"  a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
 +"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 +msgstr ""
 +"* The ‘sign’ command may be prefixed with an ‘l’ for local signatures "
 +"(lsign),\n"
 +"  a ‘t’ for trust signatures (tsign), an ‘nr’ for non-revocable signatures\n"
 +"  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 +
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
 +msgid "Key is revoked."
 +msgstr "Key is revoked."
 +
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
 +msgid "Really sign all user IDs? (y/N) "
 +msgstr "Really sign all user IDs? (y/N) "
 +
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
 +msgid "Really sign all text user IDs? (y/N) "
 +msgstr "Really sign all text user IDs? (y/N) "
 +
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
 +msgid "Hint: Select the user IDs to sign\n"
 +msgstr "Hint: Select the user IDs to sign\n"
 +
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
 +#, c-format
 +msgid "Unknown signature type '%s'\n"
 +msgstr "Unknown signature type ‘%s’\n"
 +
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
 +#, c-format
 +msgid "This command is not allowed while in %s mode.\n"
 +msgstr "This command is not allowed while in %s mode.\n"
 +
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
 +msgid "You must select at least one user ID.\n"
 +msgstr "You must select at least one user ID.\n"
 +
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
 +#, c-format
 +msgid "(Use the '%s' command.)\n"
 +msgstr "(Use the ‘%s’ command.)\n"
 +
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
 +msgid "You can't delete the last user ID!\n"
 +msgstr "You can't delete the last user ID!\n"
 +
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
 +msgid "Really remove all selected user IDs? (y/N) "
 +msgstr "Really remove all selected user IDs? (y/N) "
 +
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
 +msgid "Really remove this user ID? (y/N) "
 +msgstr "Really remove this user ID? (y/N) "
 +
 +#. TRANSLATORS: Please take care: This is about
 +#. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
 +msgid "Really move the primary key? (y/N) "
 +msgstr "Really move the primary key? (y/N) "
 +
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
 +msgid "You must select exactly one key.\n"
 +msgstr "You must select exactly one key.\n"
 +
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
 +msgid "Command expects a filename argument\n"
 +msgstr "Command expects a filename argument\n"
 +
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
 +#, c-format
 +msgid "Can't open '%s': %s\n"
 +msgstr "Can't open '%s': %s\n"
 +
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
 +#, c-format
 +msgid "Error reading backup key from '%s': %s\n"
 +msgstr "Error reading backup key from '%s': %s\n"
 +
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
 +msgid "You must select at least one key.\n"
 +msgstr "You must select at least one key.\n"
 +
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
 +msgid "Do you really want to delete the selected keys? (y/N) "
 +msgstr "Do you really want to delete the selected keys? (y/N) "
 +
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
 +msgid "Do you really want to delete this key? (y/N) "
 +msgstr "Do you really want to delete this key? (y/N) "
 +
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
 +msgid "Really revoke all selected user IDs? (y/N) "
 +msgstr "Really revoke all selected user IDs? (y/N) "
 +
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
 +msgid "Really revoke this user ID? (y/N) "
 +msgstr "Really revoke this user ID? (y/N) "
 +
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
 +msgid "Do you really want to revoke the entire key? (y/N) "
 +msgstr "Do you really want to revoke the entire key? (y/N) "
 +
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
 +msgid "Do you really want to revoke the selected subkeys? (y/N) "
 +msgstr "Do you really want to revoke the selected subkeys? (y/N) "
 +
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
 +msgid "Do you really want to revoke this subkey? (y/N) "
 +msgstr "Do you really want to revoke this subkey? (y/N) "
 +
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
 +msgid "Owner trust may not be set while using a user provided trust database\n"
 +msgstr ""
 +"Owner trust may not be set while using a user provided trust database\n"
 +
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
 +msgid "Set preference list to:\n"
 +msgstr "Set preference list to:\n"
 +
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
 +msgid "Really update the preferences for the selected user IDs? (y/N) "
 +msgstr "Really update the preferences for the selected user IDs? (y/N) "
 +
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
 +msgid "Really update the preferences? (y/N) "
 +msgstr "Really update the preferences? (y/N) "
 +
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
 +msgid "Save changes? (y/N) "
 +msgstr "Save changes? (y/N) "
 +
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
 +msgid "Quit without saving? (y/N) "
 +msgstr "Quit without saving? (y/N) "
 +
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
 +#, c-format
 +msgid "update failed: %s\n"
 +msgstr "update failed: %s\n"
 +
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
 +msgid "Key not changed so no update needed.\n"
 +msgstr "Key not changed so no update needed.\n"
 +
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
 +#, c-format
 +msgid "User ID revocation failed: %s\n"
 +msgstr "User ID revocation failed: %s\n"
 +
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
 +#, c-format
 +msgid "\"%s\" is not a fingerprint\n"
 +msgstr "“%s” is not a fingerprint\n"
 +
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
 +#, c-format
 +msgid "\"%s\" is not the primary fingerprint\n"
 +msgstr "“%s” is not the primary fingerprint\n"
 +
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
 +#, c-format
 +msgid "Invalid user ID '%s': %s\n"
 +msgstr "Invalid user ID '%s': %s\n"
 +
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
 +msgid "No matching user IDs."
 +msgstr "No matching user IDs."
 +
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
 +msgid "Nothing to sign.\n"
 +msgstr "Nothing to sign.\n"
 +
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
 +msgid "Digest: "
 +msgstr "Digest: "
 +
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
 +msgid "Features: "
 +msgstr "Features: "
 +
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
 +msgid "Keyserver no-modify"
 +msgstr "Keyserver no-modify"
 +
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
 +msgid "Preferred keyserver: "
 +msgstr "Preferred keyserver: "
 +
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
 +msgid "Notations: "
 +msgstr "Notations: "
 +
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
 +msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 +msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 +
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
 +#, c-format
 +msgid "The following key was revoked on %s by %s key %s\n"
 +msgstr "The following key was revoked on %s by %s key %s\n"
 +
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
 +#, c-format
 +msgid "This key may be revoked by %s key %s"
 +msgstr "This key may be revoked by %s key %s"
 +
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
 +msgid "(sensitive)"
 +msgstr "(sensitive)"
 +
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
 +#, c-format
 +msgid "created: %s"
 +msgstr "created: %s"
 +
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
 +#, c-format
 +msgid "revoked: %s"
 +msgstr "revoked: %s"
 +
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
 +#, c-format
 +msgid "expired: %s"
 +msgstr "expired: %s"
 +
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
 +#, c-format
 +msgid "expires: %s"
 +msgstr "expires: %s"
 +
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
 +#, c-format
 +msgid "usage: %s"
 +msgstr "usage: %s"
 +
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
 +msgid "card-no: "
 +msgstr "card-no: "
 +
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
 +#, c-format
 +msgid "trust: %s"
 +msgstr "trust: %s"
 +
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
 +#, c-format
 +msgid "validity: %s"
 +msgstr "validity: %s"
 +
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
 +msgid "This key has been disabled"
 +msgstr "This key has been disabled"
 +
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
 +msgid ""
 +"Please note that the shown key validity is not necessarily correct\n"
 +"unless you restart the program.\n"
 +msgstr ""
 +"Please note that the shown key validity is not necessarily correct\n"
 +"unless you restart the program.\n"
 +
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
 +msgid "revoked"
 +msgstr "revoked"
 +
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
 +msgid "expired"
 +msgstr "expired"
 +
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
 +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 ""
 +"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:4227
++#: g10/keyedit.c:4240
 +msgid "WARNING: Your encryption subkey expires soon.\n"
 +msgstr "WARNING: Your encryption subkey expires soon.\n"
 +
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
 +msgid "You may want to change its expiration date too.\n"
 +msgstr "You may want to change its expiration date too.\n"
 +
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
 +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 ""
 +"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 +"versions\n"
 +"         of PGP to reject this key.\n"
 +
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
 +msgid "Are you sure you still want to add it? (y/N) "
 +msgstr "Are you sure you still want to add it? (y/N) "
 +
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
 +msgid "You may not add a photo ID to a PGP2-style key.\n"
 +msgstr "You may not add a photo ID to a PGP2-style key.\n"
 +
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
 +msgid "Such a user ID already exists on this key!\n"
 +msgstr "Such a user ID already exists on this key!\n"
 +
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
 +msgid "Delete this good signature? (y/N/q)"
 +msgstr "Delete this good signature? (y/N/q)"
 +
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
 +msgid "Delete this invalid signature? (y/N/q)"
 +msgstr "Delete this invalid signature? (y/N/q)"
 +
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
 +msgid "Delete this unknown signature? (y/N/q)"
 +msgstr "Delete this unknown signature? (y/N/q)"
 +
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
 +msgid "Really delete this self-signature? (y/N)"
 +msgstr "Really delete this self-signature? (y/N)"
 +
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
 +#, c-format
 +msgid "Deleted %d signature.\n"
 +msgid_plural "Deleted %d signatures.\n"
 +msgstr[0] "Deleted %d signature.\n"
 +msgstr[1] "Deleted %d signatures.\n"
 +
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
 +msgid "Nothing deleted.\n"
 +msgstr "Nothing deleted.\n"
 +
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
 +msgid "invalid"
 +msgstr "invalid"
 +
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
 +#, c-format
 +msgid "User ID \"%s\" compacted: %s\n"
 +msgstr "User ID “%s” compacted: %s\n"
 +
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
 +#, c-format
 +msgid "User ID \"%s\": %d signature removed\n"
 +msgid_plural "User ID \"%s\": %d signatures removed\n"
 +msgstr[0] "User ID “%s”: %d signature removed\n"
 +msgstr[1] "User ID “%s”: %d signatures removed\n"
 +
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
 +#, c-format
 +msgid "User ID \"%s\": already minimized\n"
 +msgstr "User ID “%s”: already minimized\n"
 +
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
 +#, c-format
 +msgid "User ID \"%s\": already clean\n"
 +msgstr "User ID “%s”: already clean\n"
 +
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
 +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 ""
 +"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"
 +
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
 +msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 +msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 +
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
 +msgid "Enter the user ID of the designated revoker: "
 +msgstr "Enter the user ID of the designated revoker: "
 +
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
 +msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 +msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 +
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
 +msgid "you cannot appoint a key as its own designated revoker\n"
 +msgstr "you cannot appoint a key as its own designated revoker\n"
 +
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
 +msgid "this key has already been designated as a revoker\n"
 +msgstr "this key has already been designated as a revoker\n"
 +
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
 +msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 +msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 +
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
 +msgid ""
 +"Are you sure you want to appoint this key as a designated revoker? (y/N) "
 +msgstr ""
 +"Are you sure you want to appoint this key as a designated revoker? (y/N) "
 +
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
 +msgid ""
 +"Are you sure you want to change the expiration time for multiple subkeys? (y/"
 +"N) "
 +msgstr ""
 +"Are you sure you want to change the expiration time for multiple subkeys? (y/"
 +"N) "
 +
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
 +msgid "Changing expiration time for a subkey.\n"
 +msgstr "Changing expiration time for a subkey.\n"
 +
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
 +msgid "Changing expiration time for the primary key.\n"
 +msgstr "Changing expiration time for the primary key.\n"
 +
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
 +msgid "You can't change the expiration date of a v3 key\n"
 +msgstr "You can't change the expiration date of a v3 key\n"
 +
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
 +#, c-format
 +msgid "signing subkey %s is already cross-certified\n"
 +msgstr "signing subkey %s is already cross-certified\n"
 +
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
 +#, c-format
 +msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 +msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
 +
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
 +msgid "Please select exactly one user ID.\n"
 +msgstr "Please select exactly one user ID.\n"
 +
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
 +#, c-format
 +msgid "skipping v3 self-signature on user ID \"%s\"\n"
 +msgstr "skipping v3 self-signature on user ID “%s”\n"
 +
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
 +msgid "Enter your preferred keyserver URL: "
 +msgstr "Enter your preferred keyserver URL: "
 +
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
 +msgid "Are you sure you want to replace it? (y/N) "
 +msgstr "Are you sure you want to replace it? (y/N) "
 +
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
 +msgid "Are you sure you want to delete it? (y/N) "
 +msgstr "Are you sure you want to delete it? (y/N) "
 +
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
 +msgid "Enter the notation: "
 +msgstr "Enter the notation: "
 +
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
 +msgid "Proceed? (y/N) "
 +msgstr "Proceed? (y/N) "
 +
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
 +#, c-format
 +msgid "No user ID with index %d\n"
 +msgstr "No user ID with index %d\n"
 +
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
 +#, c-format
 +msgid "No user ID with hash %s\n"
 +msgstr "No user ID with hash %s\n"
 +
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
 +#, c-format
 +msgid "No subkey with key ID '%s'.\n"
 +msgstr "No subkey with key ID '%s'.\n"
 +
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
 +#, c-format
 +msgid "No subkey with index %d\n"
 +msgstr "No subkey with index %d\n"
 +
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
 +#, c-format
 +msgid "user ID: \"%s\"\n"
 +msgstr "user ID: “%s”\n"
 +
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
 +#, c-format
 +msgid "signed by your key %s on %s%s%s\n"
 +msgstr "signed by your key %s on %s%s%s\n"
 +
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
 +msgid " (non-exportable)"
 +msgstr " (non-exportable)"
 +
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
 +#, c-format
 +msgid "This signature expired on %s.\n"
 +msgstr "This signature expired on %s.\n"
 +
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
 +msgid "Are you sure you still want to revoke it? (y/N) "
 +msgstr "Are you sure you still want to revoke it? (y/N) "
 +
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
 +msgid "Create a revocation certificate for this signature? (y/N) "
 +msgstr "Create a revocation certificate for this signature? (y/N) "
 +
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
 +msgid "Not signed by you.\n"
 +msgstr "Not signed by you.\n"
 +
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
 +#, c-format
 +msgid "You have signed these user IDs on key %s:\n"
 +msgstr "You have signed these user IDs on key %s:\n"
 +
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
 +msgid " (non-revocable)"
 +msgstr " (non-revocable)"
 +
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
 +#, c-format
 +msgid "revoked by your key %s on %s\n"
 +msgstr "revoked by your key %s on %s\n"
 +
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
 +msgid "You are about to revoke these signatures:\n"
 +msgstr "You are about to revoke these signatures:\n"
 +
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
 +msgid "Really create the revocation certificates? (y/N) "
 +msgstr "Really create the revocation certificates? (y/N) "
 +
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
 +msgid "no secret key\n"
 +msgstr "no secret key\n"
 +
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
 +#, c-format
 +msgid "tried to revoke a non-user ID: %s\n"
 +msgstr "tried to revoke a non-user ID: %s\n"
 +
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
 +#, c-format
 +msgid "user ID \"%s\" is already revoked\n"
 +msgstr "user ID “%s” is already revoked\n"
 +
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
 +#, c-format
 +msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 +msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
 +
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
 +#, c-format
 +msgid "Key %s is already revoked.\n"
 +msgstr "Key %s is already revoked.\n"
 +
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
 +#, c-format
 +msgid "Subkey %s is already revoked.\n"
 +msgstr "Subkey %s is already revoked.\n"
 +
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
 +#, c-format
 +msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 +msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 +
- #: g10/keygen.c:295
++#: g10/keygen.c:305
 +#, c-format
 +msgid "preference '%s' duplicated\n"
 +msgstr "preference ‘%s’ duplicated\n"
 +
- #: g10/keygen.c:302
++#: g10/keygen.c:312
 +msgid "too many cipher preferences\n"
 +msgstr "too many cipher preferences\n"
 +
- #: g10/keygen.c:304
++#: g10/keygen.c:314
 +msgid "too many digest preferences\n"
 +msgstr "too many digest preferences\n"
 +
- #: g10/keygen.c:306
++#: g10/keygen.c:316
 +msgid "too many compression preferences\n"
 +msgstr "too many compression preferences\n"
 +
- #: g10/keygen.c:447
++#: g10/keygen.c:457
 +#, c-format
 +msgid "invalid item '%s' in preference string\n"
 +msgstr "invalid item ‘%s’ in preference string\n"
 +
- #: g10/keygen.c:926
++#: g10/keygen.c:936
 +msgid "writing direct signature\n"
 +msgstr "writing direct signature\n"
 +
- #: g10/keygen.c:972
++#: g10/keygen.c:982
 +msgid "writing self signature\n"
 +msgstr "writing self signature\n"
 +
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
 +msgid "writing key binding signature\n"
 +msgstr "writing key binding signature\n"
 +
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
 +#, c-format
 +msgid "keysize invalid; using %u bits\n"
 +msgstr "keysize invalid; using %u bits\n"
 +
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
 +#, c-format
 +msgid "keysize rounded up to %u bits\n"
 +msgstr "keysize rounded up to %u bits\n"
 +
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
 +msgid ""
 +"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 +msgstr ""
 +"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 +
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
 +msgid "Sign"
 +msgstr "Sign"
 +
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
 +msgid "Certify"
 +msgstr "Certify"
 +
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
 +msgid "Encrypt"
 +msgstr "Encrypt"
 +
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
 +msgid "Authenticate"
 +msgstr "Authenticate"
 +
 +#. TRANSLATORS: Please use only plain ASCII characters for the
 +#. translation.  If this is not possible use single digits.  The
 +#. string needs to 8 bytes long. Here is a description of the
 +#. functions:
 +#.
 +#. s = Toggle signing capability
 +#. e = Toggle encryption capability
 +#. a = Toggle authentication capability
 +#. q = Finish
 +#.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
 +msgid "SsEeAaQq"
 +msgstr "SsEeAaQq"
 +
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
 +#, c-format
 +msgid "Possible actions for a %s key: "
 +msgstr "Possible actions for a %s key: "
 +
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
 +msgid "Current allowed actions: "
 +msgstr "Current allowed actions: "
 +
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
 +#, c-format
 +msgid "   (%c) Toggle the sign capability\n"
 +msgstr "   (%c) Toggle the sign capability\n"
 +
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
 +#, c-format
 +msgid "   (%c) Toggle the encrypt capability\n"
 +msgstr "   (%c) Toggle the encrypt capability\n"
 +
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
 +#, c-format
 +msgid "   (%c) Toggle the authenticate capability\n"
 +msgstr "   (%c) Toggle the authenticate capability\n"
 +
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
 +#, c-format
 +msgid "   (%c) Finished\n"
 +msgstr "   (%c) Finished\n"
 +
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
 +msgid "Please select what kind of key you want:\n"
 +msgstr "Please select what kind of key you want:\n"
 +
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
 +#, c-format
 +msgid "   (%d) RSA and RSA (default)\n"
 +msgstr "   (%d) RSA and RSA (default)\n"
 +
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
 +#, c-format
 +msgid "   (%d) DSA and Elgamal\n"
 +msgstr "   (%d) DSA and Elgamal\n"
 +
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
 +#, c-format
 +msgid "   (%d) DSA (sign only)\n"
 +msgstr "   (%d) DSA (sign only)\n"
 +
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
 +#, c-format
 +msgid "   (%d) RSA (sign only)\n"
 +msgstr "   (%d) RSA (sign only)\n"
 +
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
 +#, c-format
 +msgid "   (%d) Elgamal (encrypt only)\n"
 +msgstr "   (%d) Elgamal (encrypt only)\n"
 +
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
 +#, c-format
 +msgid "   (%d) RSA (encrypt only)\n"
 +msgstr "   (%d) RSA (encrypt only)\n"
 +
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
 +#, c-format
 +msgid "   (%d) DSA (set your own capabilities)\n"
 +msgstr "   (%d) DSA (set your own capabilities)\n"
 +
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
 +#, c-format
 +msgid "   (%d) RSA (set your own capabilities)\n"
 +msgstr "   (%d) RSA (set your own capabilities)\n"
 +
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
 +#, c-format
 +msgid "   (%d) ECC and ECC\n"
 +msgstr "   (%d) ECC and ECC\n"
 +
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
 +#, c-format
 +msgid "  (%d) ECC (sign only)\n"
 +msgstr "  (%d) ECC (sign only)\n"
 +
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
 +#, c-format
 +msgid "  (%d) ECC (set your own capabilities)\n"
 +msgstr "  (%d) ECC (set your own capabilities)\n"
 +
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
 +#, c-format
 +msgid "  (%d) ECC (encrypt only)\n"
 +msgstr "  (%d) ECC (encrypt only)\n"
 +
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
 +#, c-format
 +msgid "  (%d) Existing key\n"
 +msgstr "  (%d) Existing key\n"
 +
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
 +msgid "Enter the keygrip: "
 +msgstr "Enter the keygrip: "
 +
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
 +msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 +msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 +
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
 +msgid "No key with this keygrip\n"
 +msgstr "No key with this keygrip\n"
 +
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
 +#, c-format
 +msgid "rounded to %u bits\n"
 +msgstr "rounded to %u bits\n"
 +
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
 +#, c-format
 +msgid "%s keys may be between %u and %u bits long.\n"
 +msgstr "%s keys may be between %u and %u bits long.\n"
 +
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
 +#, c-format
 +msgid "What keysize do you want for the subkey? (%u) "
 +msgstr "What keysize do you want for the subkey? (%u) "
 +
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
 +#, c-format
 +msgid "What keysize do you want? (%u) "
 +msgstr "What keysize do you want? (%u) "
 +
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
 +#, c-format
 +msgid "Requested keysize is %u bits\n"
 +msgstr "Requested keysize is %u bits\n"
 +
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
 +msgid "Please select which elliptic curve you want:\n"
 +msgstr "Please select which elliptic curve you want:\n"
 +
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
 +msgid ""
 +"Please specify how long the key should be valid.\n"
 +"         0 = key does not expire\n"
 +"      <n>  = key expires in n days\n"
 +"      <n>w = key expires in n weeks\n"
 +"      <n>m = key expires in n months\n"
 +"      <n>y = key expires in n years\n"
 +msgstr ""
 +"Please specify how long the key should be valid.\n"
 +"         0 = key does not expire\n"
 +"      <n>  = key expires in n days\n"
 +"      <n>w = key expires in n weeks\n"
 +"      <n>m = key expires in n months\n"
 +"      <n>y = key expires in n years\n"
 +
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
 +msgid ""
 +"Please specify how long the signature should be valid.\n"
 +"         0 = signature does not expire\n"
 +"      <n>  = signature expires in n days\n"
 +"      <n>w = signature expires in n weeks\n"
 +"      <n>m = signature expires in n months\n"
 +"      <n>y = signature expires in n years\n"
 +msgstr ""
 +"Please specify how long the signature should be valid.\n"
 +"         0 = signature does not expire\n"
 +"      <n>  = signature expires in n days\n"
 +"      <n>w = signature expires in n weeks\n"
 +"      <n>m = signature expires in n months\n"
 +"      <n>y = signature expires in n years\n"
 +
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
 +msgid "Key is valid for? (0) "
 +msgstr "Key is valid for? (0) "
 +
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
 +#, c-format
 +msgid "Signature is valid for? (%s) "
 +msgstr "Signature is valid for? (%s) "
 +
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
 +msgid "invalid value\n"
 +msgstr "invalid value\n"
 +
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
 +msgid "Key does not expire at all\n"
 +msgstr "Key does not expire at all\n"
 +
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
 +msgid "Signature does not expire at all\n"
 +msgstr "Signature does not expire at all\n"
 +
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
 +#, c-format
 +msgid "Key expires at %s\n"
 +msgstr "Key expires at %s\n"
 +
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
 +#, c-format
 +msgid "Signature expires at %s\n"
 +msgstr "Signature expires at %s\n"
 +
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
 +msgid ""
 +"Your system can't display dates beyond 2038.\n"
 +"However, it will be correctly handled up to 2106.\n"
 +msgstr ""
 +"Your system can't display dates beyond 2038.\n"
 +"However, it will be correctly handled up to 2106.\n"
 +
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
 +msgid "Is this correct? (y/N) "
 +msgstr "Is this correct? (y/N) "
 +
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
 +msgid ""
 +"\n"
 +"GnuPG needs to construct a user ID to identify your key.\n"
 +"\n"
 +msgstr ""
 +"\n"
 +"GnuPG needs to construct a user ID to identify your key.\n"
 +"\n"
 +
 +#. TRANSLATORS: This string is in general not anymore used
 +#. but you should keep your existing translation.  In case
 +#. the new string is not translated this old string will
 +#. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
 +msgid ""
 +"\n"
 +"You need a user ID to identify your key; the software constructs the user "
 +"ID\n"
 +"from the Real Name, Comment and Email Address in this form:\n"
 +"    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
 +"\n"
 +msgstr ""
 +"\n"
 +"You need a user ID to identify your key; the software constructs the user "
 +"ID\n"
 +"from the Real Name, Comment and Email Address in this form:\n"
 +"    “Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>”\n"
 +"\n"
 +
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
 +msgid "Real name: "
 +msgstr "Real name: "
 +
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
 +msgid "Invalid character in name\n"
 +msgstr "Invalid character in name\n"
 +
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
 +#, c-format
 +msgid "The characters '%s' and '%s' may not appear in name\n"
 +msgstr "The characters ‘%s’ and ‘%s’ may not appear in name\n"
 +
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
 +msgid "Name may not start with a digit\n"
 +msgstr "Name may not start with a digit\n"
 +
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
 +msgid "Name must be at least 5 characters long\n"
 +msgstr "Name must be at least 5 characters long\n"
 +
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
 +msgid "Email address: "
 +msgstr "Email address: "
 +
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
 +msgid "Not a valid email address\n"
 +msgstr "Not a valid email address\n"
 +
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
 +msgid "Comment: "
 +msgstr "Comment: "
 +
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
 +msgid "Invalid character in comment\n"
 +msgstr "Invalid character in comment\n"
 +
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
 +#, c-format
 +msgid "You are using the '%s' character set.\n"
 +msgstr "You are using the ‘%s’ character set.\n"
 +
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
 +#, c-format
 +msgid ""
 +"You selected this USER-ID:\n"
 +"    \"%s\"\n"
 +"\n"
 +msgstr ""
 +"You selected this USER-ID:\n"
 +"    “%s”\n"
 +"\n"
 +
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
 +msgid "Please don't put the email address into the real name or the comment\n"
 +msgstr "Please don't put the email address into the real name or the comment\n"
 +
 +#. TRANSLATORS: These are the allowed answers in
 +#. lower and uppercase.  Below you will find the matching
 +#. string which should be translated accordingly and the
 +#. letter changed to match the one in the answer string.
 +#.
 +#. n = Change name
 +#. c = Change comment
 +#. e = Change email
 +#. o = Okay (ready, continue)
 +#. q = Quit
 +#.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
 +msgid "NnCcEeOoQq"
 +msgstr "NnCcEeOoQq"
 +
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
 +msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 +msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 +
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
 +msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 +msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 +
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
 +msgid "Change (N)ame, (E)mail, or (Q)uit? "
 +msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 +
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
 +msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 +msgstr "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 +
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
 +msgid "Please correct the error first\n"
 +msgstr "Please correct the error first\n"
 +
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
 +msgid ""
 +"We need to generate a lot of random bytes. It is a good idea to perform\n"
 +"some other action (type on the keyboard, move the mouse, utilize the\n"
 +"disks) during the prime generation; this gives the random number\n"
 +"generator a better chance to gain enough entropy.\n"
 +msgstr ""
 +"We need to generate a lot of random bytes. It is a good idea to perform\n"
 +"some other action (type on the keyboard, move the mouse, utilize the\n"
 +"disks) during the prime generation; this gives the random number\n"
 +"generator a better chance to gain enough entropy.\n"
 +
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
 +#, c-format
 +msgid "Key generation failed: %s\n"
 +msgstr "Key generation failed: %s\n"
 +
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
 +#, c-format
 +msgid ""
 +"About to create a key for:\n"
 +"    \"%s\"\n"
 +"\n"
 +msgstr ""
 +"About to create a key for:\n"
 +"    “%s”\n"
 +"\n"
 +
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
 +msgid "Continue? (Y/n) "
 +msgstr "Continue? (Y/n) "
 +
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
 +#, c-format
 +msgid "A key for \"%s\" already exists\n"
 +msgstr "A key for “%s” already exists\n"
 +
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
 +msgid "Create anyway? (y/N) "
 +msgstr "Create anyway? (y/N) "
 +
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
 +msgid "creating anyway\n"
 +msgstr "creating anyway\n"
 +
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
 +#, c-format
 +msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 +msgstr "Note: Use “%s %s” for a full featured key generation dialog.\n"
 +
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
 +msgid "Key generation canceled.\n"
 +msgstr "Key generation canceled.\n"
 +
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
 +#, c-format
 +msgid "can't create backup file '%s': %s\n"
 +msgstr "can't create backup file '%s': %s\n"
 +
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
 +#, c-format
 +msgid "Note: backup of card key saved to '%s'\n"
 +msgstr "Note: backup of card key saved to ‘%s’\n"
 +
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
 +#, c-format
 +msgid "writing public key to '%s'\n"
 +msgstr "writing public key to ‘%s’\n"
 +
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
 +#, c-format
 +msgid "no writable public keyring found: %s\n"
 +msgstr "no writable public keyring found: %s\n"
 +
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
 +#, c-format
 +msgid "error writing public keyring '%s': %s\n"
 +msgstr "error writing public keyring '%s': %s\n"
 +
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
 +msgid "public and secret key created and signed.\n"
 +msgstr "public and secret key created and signed.\n"
 +
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
 +msgid ""
 +"Note that this key cannot be used for encryption.  You may want to use\n"
 +"the command \"--edit-key\" to generate a subkey for this purpose.\n"
 +msgstr ""
 +"Note that this key cannot be used for encryption.  You may want to use\n"
 +"the command “--edit-key” to generate a subkey for this purpose.\n"
 +
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
 +#, c-format
 +msgid ""
 +"key has been created %lu second in future (time warp or clock problem)\n"
 +msgstr ""
 +"key has been created %lu second in future (time warp or clock problem)\n"
 +
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
 +#, c-format
 +msgid ""
 +"key has been created %lu seconds in future (time warp or clock problem)\n"
 +msgstr ""
 +"key has been created %lu seconds in future (time warp or clock problem)\n"
 +
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
 +msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 +msgstr "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 +
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
 +msgid "Secret parts of primary key are not available.\n"
 +msgstr "Secret parts of primary key are not available.\n"
 +
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
 +msgid "Secret parts of primary key are stored on-card.\n"
 +msgstr "Secret parts of primary key are stored on-card.\n"
 +
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
 +msgid "Really create? (y/N) "
 +msgstr "Really create? (y/N) "
 +
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
 +msgid "never     "
 +msgstr "never     "
 +
 +#: g10/keylist.c:331
 +msgid "Critical signature policy: "
 +msgstr "Critical signature policy: "
 +
 +#: g10/keylist.c:333
 +msgid "Signature policy: "
 +msgstr "Signature policy: "
 +
 +#: g10/keylist.c:375
 +msgid "Critical preferred keyserver: "
 +msgstr "Critical preferred keyserver: "
 +
 +#: g10/keylist.c:428
 +msgid "Critical signature notation: "
 +msgstr "Critical signature notation: "
 +
 +#: g10/keylist.c:430
 +msgid "Signature notation: "
 +msgstr "Signature notation: "
 +
 +#: g10/keylist.c:472
 +#, c-format
 +msgid "%d good signature\n"
 +msgid_plural "%d good signatures\n"
 +msgstr[0] "%d good signature\n"
 +msgstr[1] "%d good signatures\n"
 +
 +#: g10/keylist.c:485
 +#, c-format
 +msgid "%d signature not checked due to an error\n"
 +msgid_plural "%d signatures not checked due to errors\n"
 +msgstr[0] "%d signature not checked due to an error\n"
 +msgstr[1] "%d signatures not checked due to errors\n"
 +
 +#: g10/keylist.c:567
 +#, c-format
 +msgid "Warning: %lu key skipped due to its large size\n"
 +msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
 +msgstr[0] "Warning: %lu key skipped due to its large size\n"
 +msgstr[1] "Warning: %lu keys skipped due to their large sizes\n"
 +
 +#: g10/keylist.c:589
 +msgid "Keyring"
 +msgstr "Keyring"
 +
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
 +msgid "Primary key fingerprint:"
 +msgstr "Primary key fingerprint:"
 +
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
 +msgid "     Subkey fingerprint:"
 +msgstr "     Subkey fingerprint:"
 +
 +#. TRANSLATORS: this should fit into 24 bytes so that the
 +#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
 +msgid " Primary key fingerprint:"
 +msgstr " Primary key fingerprint:"
 +
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
 +msgid "      Subkey fingerprint:"
 +msgstr "      Subkey fingerprint:"
 +
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
 +msgid "      Key fingerprint ="
 +msgstr "      Key fingerprint ="
 +
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
 +msgid "      Card serial no. ="
 +msgstr "      Card serial no. ="
 +
 +#: g10/keyring.c:1498
 +#, c-format
 +msgid "caching keyring '%s'\n"
 +msgstr "caching keyring ‘%s’\n"
 +
 +#: g10/keyring.c:1572
 +#, c-format
 +msgid "%lu keys cached so far (%lu signature)\n"
 +msgid_plural "%lu keys cached so far (%lu signatures)\n"
 +msgstr[0] "%lu keys cached so far (%lu signature)\n"
 +msgstr[1] "%lu keys cached so far (%lu signatures)\n"
 +
 +#: g10/keyring.c:1588
 +#, c-format
 +msgid "%lu key cached"
 +msgid_plural "%lu keys cached"
 +msgstr[0] "%lu key cached"
 +msgstr[1] "%lu keys cached"
 +
 +#: g10/keyring.c:1590
 +#, c-format
 +msgid " (%lu signature)\n"
 +msgid_plural " (%lu signatures)\n"
 +msgstr[0] " (%lu signature)\n"
 +msgstr[1] " (%lu signatures)\n"
 +
 +#: g10/keyring.c:1665
 +#, c-format
 +msgid "%s: keyring created\n"
 +msgstr "%s: keyring created\n"
 +
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
 +msgid "override proxy options set for dirmngr"
 +msgstr "override proxy options set for dirmngr"
 +
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
 +msgid "include revoked keys in search results"
 +msgstr "include revoked keys in search results"
 +
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
 +msgid "include subkeys when searching by key ID"
 +msgstr "include subkeys when searching by key ID"
 +
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
 +msgid "override timeout options set for dirmngr"
 +msgstr "override timeout options set for dirmngr"
 +
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
 +msgid "automatically retrieve keys when verifying signatures"
 +msgstr "automatically retrieve keys when verifying signatures"
 +
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
 +msgid "honor the preferred keyserver URL set on the key"
 +msgstr "honor the preferred keyserver URL set on the key"
 +
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
 +msgid "honor the PKA record set on a key when retrieving keys"
 +msgstr "honor the PKA record set on a key when retrieving keys"
 +
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
 +msgid "disabled"
 +msgstr "disabled"
 +
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
 +msgid "Enter number(s), N)ext, or Q)uit > "
 +msgstr "Enter number(s), N)ext, or Q)uit > "
 +
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
 +#, c-format
 +msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 +msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 +
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
 +#, c-format
 +msgid "\"%s\" not a key ID: skipping\n"
 +msgstr "“%s” not a key ID: skipping\n"
 +
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
 +#, c-format
 +msgid "refreshing %d key from %s\n"
 +msgid_plural "refreshing %d keys from %s\n"
 +msgstr[0] "refreshing %d key from %s\n"
 +msgstr[1] "refreshing %d keys from %s\n"
 +
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
 +#, c-format
 +msgid "WARNING: unable to refresh key %s via %s: %s\n"
 +msgstr "WARNING: unable to refresh key %s via %s: %s\n"
 +
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
 +#, c-format
 +msgid "key \"%s\" not found on keyserver\n"
 +msgstr "key “%s” not found on keyserver\n"
 +
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
 +msgid "key not found on keyserver\n"
 +msgstr "key not found on keyserver\n"
 +
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
 +msgid "no keyserver known (use option --keyserver)\n"
 +msgstr "no keyserver known (use option --keyserver)\n"
 +
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
 +#, c-format
 +msgid "requesting key %s from %s server %s\n"
 +msgstr "requesting key %s from %s server %s\n"
 +
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
 +#, c-format
 +msgid "requesting key %s from %s\n"
 +msgstr "requesting key %s from %s\n"
 +
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
 +msgid "no keyserver known\n"
 +msgstr "no keyserver known\n"
 +
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
 +#, c-format
 +msgid "skipped \"%s\": %s\n"
 +msgstr "skipped “%s”: %s\n"
 +
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
 +#, c-format
 +msgid "sending key %s to %s\n"
 +msgstr "sending key %s to %s\n"
 +
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
 +#, c-format
 +msgid "requesting key from '%s'\n"
 +msgstr "requesting key from ‘%s’\n"
 +
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
 +#, c-format
 +msgid "WARNING: unable to fetch URI %s: %s\n"
 +msgstr "WARNING: unable to fetch URI %s: %s\n"
 +
 +#: g10/mainproc.c:254
 +#, c-format
 +msgid "weird size for an encrypted session key (%d)\n"
 +msgstr "weird size for an encrypted session key (%d)\n"
 +
 +#: g10/mainproc.c:302
 +#, c-format
 +msgid "%s encrypted session key\n"
 +msgstr "%s encrypted session key\n"
 +
 +#: g10/mainproc.c:312
 +#, c-format
 +msgid "passphrase generated with unknown digest algorithm %d\n"
 +msgstr "passphrase generated with unknown digest algorithm %d\n"
 +
 +#: g10/mainproc.c:378
 +#, c-format
 +msgid "public key is %s\n"
 +msgstr "public key is %s\n"
 +
 +#: g10/mainproc.c:456
 +msgid "public key encrypted data: good DEK\n"
 +msgstr "public key encrypted data: good DEK\n"
 +
 +#: g10/mainproc.c:489
 +#, c-format
 +msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 +msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
 +
 +#: g10/mainproc.c:493 g10/pkclist.c:228
 +#, c-format
 +msgid "      \"%s\"\n"
 +msgstr "      “%s”\n"
 +
 +#: g10/mainproc.c:497
 +#, c-format
 +msgid "encrypted with %s key, ID %s\n"
 +msgstr "encrypted with %s key, ID %s\n"
 +
 +#: g10/mainproc.c:514
 +#, c-format
 +msgid "public key decryption failed: %s\n"
 +msgstr "public key decryption failed: %s\n"
 +
 +#: g10/mainproc.c:530
 +#, c-format
 +msgid "encrypted with %lu passphrases\n"
 +msgstr "encrypted with %lu passphrases\n"
 +
 +#: g10/mainproc.c:532
 +msgid "encrypted with 1 passphrase\n"
 +msgstr "encrypted with 1 passphrase\n"
 +
 +#: g10/mainproc.c:566 g10/mainproc.c:587
 +#, c-format
 +msgid "assuming %s encrypted data\n"
 +msgstr "assuming %s encrypted data\n"
 +
 +#: g10/mainproc.c:573
 +#, c-format
 +msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 +msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 +
 +#: g10/mainproc.c:618 g10/mainproc.c:632
 +msgid "WARNING: message was not integrity protected\n"
 +msgstr "WARNING: message was not integrity protected\n"
 +
 +#: g10/mainproc.c:628
 +msgid "decryption okay\n"
 +msgstr "decryption okay\n"
 +
 +#: g10/mainproc.c:637
 +msgid "WARNING: encrypted message has been manipulated!\n"
 +msgstr "WARNING: encrypted message has been manipulated!\n"
 +
 +#: g10/mainproc.c:653
 +#, c-format
 +msgid "decryption failed: %s\n"
 +msgstr "decryption failed: %s\n"
 +
 +#: g10/mainproc.c:676
 +msgid "Note: sender requested \"for-your-eyes-only\"\n"
 +msgstr "Note: sender requested “for-your-eyes-only”\n"
 +
 +#: g10/mainproc.c:678
 +#, c-format
 +msgid "original file name='%.*s'\n"
 +msgstr "original file name='%.*s'\n"
 +
 +#: g10/mainproc.c:748
 +msgid "WARNING: multiple plaintexts seen\n"
 +msgstr "WARNING: multiple plaintexts seen\n"
 +
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
 +msgid "standalone revocation - use \"gpg --import\" to apply\n"
 +msgstr "standalone revocation - use “gpg --import” to apply\n"
 +
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
 +msgid "no signature found\n"
 +msgstr "no signature found\n"
 +
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
 +#, c-format
 +msgid "BAD signature from \"%s\""
 +msgstr "BAD signature from “%s”"
 +
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
 +#, c-format
 +msgid "Expired signature from \"%s\""
 +msgstr "Expired signature from “%s”"
 +
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
 +#, c-format
 +msgid "Good signature from \"%s\""
 +msgstr "Good signature from “%s”"
 +
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
 +msgid "signature verification suppressed\n"
 +msgstr "signature verification suppressed\n"
 +
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
 +msgid "can't handle this ambiguous signature data\n"
 +msgstr "can't handle this ambiguous signature data\n"
 +
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
 +#, c-format
 +msgid "Signature made %s\n"
 +msgstr "Signature made %s\n"
 +
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
 +#, c-format
 +msgid "               using %s key %s\n"
 +msgstr "               using %s key %s\n"
 +
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
 +#, c-format
 +msgid "Signature made %s using %s key ID %s\n"
 +msgstr "Signature made %s using %s key ID %s\n"
 +
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
 +#, c-format
 +msgid "               issuer \"%s\"\n"
 +msgstr "               issuer “%s”\n"
 +
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
 +msgid "Key available at: "
 +msgstr "Key available at: "
 +
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
 +msgid "[uncertain]"
 +msgstr "[uncertain]"
 +
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
 +#, c-format
 +msgid "                aka \"%s\""
 +msgstr "                aka “%s”"
 +
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
 +#, c-format
 +msgid "Signature expired %s\n"
 +msgstr "Signature expired %s\n"
 +
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
 +#, c-format
 +msgid "Signature expires %s\n"
 +msgstr "Signature expires %s\n"
 +
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
 +#, c-format
 +msgid "%s signature, digest algorithm %s%s%s\n"
 +msgstr "%s signature, digest algorithm %s%s%s\n"
 +
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
 +msgid "binary"
 +msgstr "binary"
 +
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
 +msgid "textmode"
 +msgstr "textmode"
 +
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
 +msgid "unknown"
 +msgstr "unknown"
 +
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
 +msgid ", key algorithm "
 +msgstr ", key algorithm "
 +
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
 +#, c-format
 +msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 +msgstr "WARNING: not a detached signature; file ‘%s’ was NOT verified!\n"
 +
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
 +#, c-format
 +msgid "Can't check signature: %s\n"
 +msgstr "Can't check signature: %s\n"
 +
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
 +msgid "not a detached signature\n"
 +msgstr "not a detached signature\n"
 +
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
 +msgid ""
 +"WARNING: multiple signatures detected.  Only the first will be checked.\n"
 +msgstr ""
 +"WARNING: multiple signatures detected.  Only the first will be checked.\n"
 +
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
 +#, c-format
 +msgid "standalone signature of class 0x%02x\n"
 +msgstr "standalone signature of class 0x%02x\n"
 +
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
 +msgid "old style (PGP 2.x) signature\n"
 +msgstr "old style (PGP 2.x) signature\n"
 +
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
 +#, c-format
 +msgid "fstat of '%s' failed in %s: %s\n"
 +msgstr "fstat of ‘%s’ failed in %s: %s\n"
 +
 +#: g10/misc.c:170
 +#, c-format
 +msgid "fstat(%d) failed in %s: %s\n"
 +msgstr "fstat(%d) failed in %s: %s\n"
 +
 +#: g10/misc.c:279
 +#, c-format
 +msgid "WARNING: using experimental public key algorithm %s\n"
 +msgstr "WARNING: using experimental public key algorithm %s\n"
 +
 +#: g10/misc.c:286
 +msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 +msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 +
 +#: g10/misc.c:300
 +#, c-format
 +msgid "WARNING: using experimental cipher algorithm %s\n"
 +msgstr "WARNING: using experimental cipher algorithm %s\n"
 +
 +#: g10/misc.c:319
 +#, c-format
 +msgid "WARNING: using experimental digest algorithm %s\n"
 +msgstr "WARNING: using experimental digest algorithm %s\n"
 +
 +#: g10/misc.c:328
 +#, c-format
 +msgid "WARNING: digest algorithm %s is deprecated\n"
 +msgstr "WARNING: digest algorithm %s is deprecated\n"
 +
 +#: g10/misc.c:353
 +#, c-format
 +msgid "Note: signatures using the %s algorithm are rejected\n"
 +msgstr "Note: signatures using the %s algorithm are rejected\n"
 +
 +#: g10/misc.c:375
 +#, c-format
 +msgid "(reported error: %s)\n"
 +msgstr "(reported error: %s)\n"
 +
 +#: g10/misc.c:378
 +#, c-format
 +msgid "(reported error: %s <%s>)\n"
 +msgstr "(reported error: %s <%s>)\n"
 +
 +#: g10/misc.c:397
 +msgid "(further info: "
 +msgstr "(further info: "
 +
 +#: g10/misc.c:1056
 +#, c-format
 +msgid "%s:%d: deprecated option \"%s\"\n"
 +msgstr "%s:%d: deprecated option “%s”\n"
 +
 +#: g10/misc.c:1060
 +#, c-format
 +msgid "WARNING: \"%s\" is a deprecated option\n"
 +msgstr "WARNING: “%s” is a deprecated option\n"
 +
 +#: g10/misc.c:1062
 +#, c-format
 +msgid "please use \"%s%s\" instead\n"
 +msgstr "please use “%s%s” instead\n"
 +
 +#: g10/misc.c:1069
 +#, c-format
 +msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 +msgstr "WARNING: “%s” is a deprecated command - do not use it\n"
 +
 +#: g10/misc.c:1079
 +#, c-format
 +msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 +msgstr "%s:%u: “%s” is obsolete in this file - it only has effect in %s\n"
 +
 +#: g10/misc.c:1083
 +#, c-format
 +msgid ""
 +"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 +msgstr ""
 +"WARNING: “%s%s” is an obsolete option - it has no effect except on %s\n"
 +
 +#: g10/misc.c:1147
 +msgid "Uncompressed"
 +msgstr "Uncompressed"
 +
 +#. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: g10/misc.c:1172
 +msgid "uncompressed|none"
 +msgstr "uncompressed|none"
 +
- #: g10/misc.c:1292
++#: g10/misc.c:1297
 +#, c-format
 +msgid "this message may not be usable by %s\n"
 +msgstr "this message may not be usable by %s\n"
 +
- #: g10/misc.c:1467
++#: g10/misc.c:1472
 +#, c-format
 +msgid "ambiguous option '%s'\n"
 +msgstr "ambiguous option ‘%s’\n"
 +
- #: g10/misc.c:1492
++#: g10/misc.c:1497
 +#, c-format
 +msgid "unknown option '%s'\n"
 +msgstr "unknown option ‘%s’\n"
 +
- #: g10/misc.c:1730
++#: g10/misc.c:1735
 +msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 +msgstr ""
 +"ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 +
- #: g10/misc.c:1752
++#: g10/misc.c:1757
 +#, c-format
 +msgid "unknown weak digest '%s'\n"
 +msgstr "unknown weak digest ‘%s’\n"
 +
 +#: g10/openfile.c:84
 +#, c-format
 +msgid "File '%s' exists. "
 +msgstr "File ‘%s’ exists. "
 +
 +#: g10/openfile.c:88
 +msgid "Overwrite? (y/N) "
 +msgstr "Overwrite? (y/N) "
 +
 +#: g10/openfile.c:123
 +#, c-format
 +msgid "%s: unknown suffix\n"
 +msgstr "%s: unknown suffix\n"
 +
 +#: g10/openfile.c:147
 +msgid "Enter new filename"
 +msgstr "Enter new filename"
 +
 +#: g10/openfile.c:218
 +msgid "writing to stdout\n"
 +msgstr "writing to stdout\n"
 +
 +#: g10/openfile.c:366
 +#, c-format
 +msgid "assuming signed data in '%s'\n"
 +msgstr "assuming signed data in ‘%s’\n"
 +
 +#: g10/openfile.c:457
 +#, c-format
 +msgid "new configuration file '%s' created\n"
 +msgstr "new configuration file ‘%s’ created\n"
 +
 +#: g10/openfile.c:498
 +#, c-format
 +msgid "WARNING: options in '%s' are not yet active during this run\n"
 +msgstr "WARNING: options in ‘%s’ are not yet active during this run\n"
 +
 +#: g10/parse-packet.c:257
 +#, c-format
 +msgid "can't handle public key algorithm %d\n"
 +msgstr "can't handle public key algorithm %d\n"
 +
 +#: g10/parse-packet.c:1113
 +msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 +msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
 +
 +#: g10/parse-packet.c:1649
 +#, c-format
 +msgid "subpacket of type %d has critical bit set\n"
 +msgstr "subpacket of type %d has critical bit set\n"
 +
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
 +#, c-format
 +msgid "problem with the agent: %s\n"
 +msgstr "problem with the agent: %s\n"
 +
 +#: g10/passphrase.c:241
 +msgid "Enter passphrase\n"
 +msgstr "Enter passphrase\n"
 +
 +#: g10/passphrase.c:252
 +msgid "cancelled by user\n"
 +msgstr "cancelled by user\n"
 +
 +#: g10/passphrase.c:489
 +#, c-format
 +msgid " (main key ID %s)"
 +msgstr " (main key ID %s)"
 +
 +#: g10/passphrase.c:496
 +msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 +msgstr "Please enter the passphrase to unlock the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:500
 +msgid "Please enter the passphrase to import the OpenPGP secret key:"
 +msgstr "Please enter the passphrase to import the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:505
 +msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 +msgstr "Please enter the passphrase to export the OpenPGP secret subkey:"
 +
 +#: g10/passphrase.c:508
 +msgid "Please enter the passphrase to export the OpenPGP secret key:"
 +msgstr "Please enter the passphrase to export the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:513
 +msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 +msgstr ""
 +"Do you really want to permanently delete the OpenPGP secret subkey key:"
 +
 +#: g10/passphrase.c:516
 +msgid "Do you really want to permanently delete the OpenPGP secret key:"
 +msgstr "Do you really want to permanently delete the OpenPGP secret key:"
 +
 +#: g10/passphrase.c:525
 +#, c-format
 +msgid ""
 +"%s\n"
 +"\"%.*s\"\n"
 +"%u-bit %s key, ID %s,\n"
 +"created %s%s.\n"
 +"%s"
 +msgstr ""
 +"%s\n"
 +"“%.*s”\n"
 +"%u-bit %s key, ID %s,\n"
 +"created %s%s.\n"
 +"%s"
 +
 +#: g10/photoid.c:77
 +msgid ""
 +"\n"
 +"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
 +"Remember that the image is stored within your public key.  If you use a\n"
 +"very large picture, your key will become very large as well!\n"
 +"Keeping the image close to 240x288 is a good size to use.\n"
 +msgstr ""
 +"\n"
 +"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
 +"Remember that the image is stored within your public key.  If you use a\n"
 +"very large picture, your key will become very large as well!\n"
 +"Keeping the image close to 240x288 is a good size to use.\n"
 +
 +#: g10/photoid.c:99
 +msgid "Enter JPEG filename for photo ID: "
 +msgstr "Enter JPEG filename for photo ID: "
 +
 +#: g10/photoid.c:120
 +#, c-format
 +msgid "unable to open JPEG file '%s': %s\n"
 +msgstr "unable to open JPEG file '%s': %s\n"
 +
 +#: g10/photoid.c:131
 +#, c-format
 +msgid "This JPEG is really large (%d bytes) !\n"
 +msgstr "This JPEG is really large (%d bytes) !\n"
 +
 +#: g10/photoid.c:133
 +msgid "Are you sure you want to use it? (y/N) "
 +msgstr "Are you sure you want to use it? (y/N) "
 +
 +#: g10/photoid.c:149
 +#, c-format
 +msgid "'%s' is not a JPEG file\n"
 +msgstr "‘%s’ is not a JPEG file\n"
 +
 +#: g10/photoid.c:168
 +msgid "Is this photo correct (y/N/q)? "
 +msgstr "Is this photo correct (y/N/q)? "
 +
 +#: g10/photoid.c:380
 +msgid "unable to display photo ID!\n"
 +msgstr "unable to display photo ID!\n"
 +
 +#: g10/pkclist.c:72 g10/revoke.c:757
 +msgid "No reason specified"
 +msgstr "No reason specified"
 +
 +#: g10/pkclist.c:74 g10/revoke.c:759
 +msgid "Key is superseded"
 +msgstr "Key is superseded"
 +
 +#: g10/pkclist.c:76 g10/revoke.c:758
 +msgid "Key has been compromised"
 +msgstr "Key has been compromised"
 +
 +#: g10/pkclist.c:78 g10/revoke.c:760
 +msgid "Key is no longer used"
 +msgstr "Key is no longer used"
 +
 +#: g10/pkclist.c:80 g10/revoke.c:761
 +msgid "User ID is no longer valid"
 +msgstr "User ID is no longer valid"
 +
 +#: g10/pkclist.c:84
 +msgid "reason for revocation: "
 +msgstr "reason for revocation: "
 +
 +#: g10/pkclist.c:100
 +msgid "revocation comment: "
 +msgstr "revocation comment: "
 +
 +#. TRANSLATORS: These are the allowed answers in lower and
 +#. uppercase.  Below you will find the matching strings which
 +#. should be translated accordingly and the letter changed to
 +#. match the one in the answer string.
 +#.
 +#. i = please show me more information
 +#. m = back to the main menu
 +#. s = skip this key
 +#. q = quit
 +#.
 +#: g10/pkclist.c:216
 +msgid "iImMqQsS"
 +msgstr "iImMqQsS"
 +
 +#: g10/pkclist.c:224
 +msgid "No trust value assigned to:\n"
 +msgstr "No trust value assigned to:\n"
 +
 +#: g10/pkclist.c:257
 +#, c-format
 +msgid "  aka \"%s\"\n"
 +msgstr "  aka “%s”\n"
 +
 +#: g10/pkclist.c:267
 +msgid ""
 +"How much do you trust that this key actually belongs to the named user?\n"
 +msgstr ""
 +"How much do you trust that this key actually belongs to the named user?\n"
 +
 +#: g10/pkclist.c:282
 +#, c-format
 +msgid "  %d = I don't know or won't say\n"
 +msgstr "  %d = I don't know or won't say\n"
 +
 +#: g10/pkclist.c:284
 +#, c-format
 +msgid "  %d = I do NOT trust\n"
 +msgstr "  %d = I do NOT trust\n"
 +
 +#: g10/pkclist.c:290
 +#, c-format
 +msgid "  %d = I trust ultimately\n"
 +msgstr "  %d = I trust ultimately\n"
 +
 +#: g10/pkclist.c:296
 +msgid "  m = back to the main menu\n"
 +msgstr "  m = back to the main menu\n"
 +
 +#: g10/pkclist.c:299
 +msgid "  s = skip this key\n"
 +msgstr "  s = skip this key\n"
 +
 +#: g10/pkclist.c:300
 +msgid "  q = quit\n"
 +msgstr "  q = quit\n"
 +
 +#: g10/pkclist.c:304
 +#, c-format
 +msgid ""
 +"The minimum trust level for this key is: %s\n"
 +"\n"
 +msgstr ""
 +"The minimum trust level for this key is: %s\n"
 +"\n"
 +
 +#: g10/pkclist.c:310 g10/revoke.c:786
 +msgid "Your decision? "
 +msgstr "Your decision? "
 +
 +#: g10/pkclist.c:331
 +msgid "Do you really want to set this key to ultimate trust? (y/N) "
 +msgstr "Do you really want to set this key to ultimate trust? (y/N) "
 +
 +#: g10/pkclist.c:345
 +msgid "Certificates leading to an ultimately trusted key:\n"
 +msgstr "Certificates leading to an ultimately trusted key:\n"
 +
 +#: g10/pkclist.c:434
 +#, c-format
 +msgid "%s: There is no assurance this key belongs to the named user\n"
 +msgstr "%s: There is no assurance this key belongs to the named user\n"
 +
 +#: g10/pkclist.c:439
 +#, c-format
 +msgid "%s: There is limited assurance this key belongs to the named user\n"
 +msgstr "%s: There is limited assurance this key belongs to the named user\n"
 +
 +#: g10/pkclist.c:445
 +msgid "This key probably belongs to the named user\n"
 +msgstr "This key probably belongs to the named user\n"
 +
 +#: g10/pkclist.c:450
 +msgid "This key belongs to us\n"
 +msgstr "This key belongs to us\n"
 +
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
++#, c-format
++msgid "%s: This key is bad!  It has been marked as untrusted!\n"
++msgstr "%s: This key is bad!  It has been marked as untrusted!\n"
++
++#: g10/pkclist.c:484
++msgid ""
++"This key has is bad!  It has been marked as untrusted!  If you\n"
++"*really* know what you are doing, you may answer the next\n"
++"question with yes.\n"
++msgstr ""
++"This key has is bad!  It has been marked as untrusted!  If you\n"
++"*really* know what you are doing, you may answer the next\n"
++"question with yes.\n"
++
++#: g10/pkclist.c:489
 +msgid ""
 +"It is NOT certain that the key belongs to the person named\n"
 +"in the user ID.  If you *really* know what you are doing,\n"
 +"you may answer the next question with yes.\n"
 +msgstr ""
 +"It is NOT certain that the key belongs to the person named\n"
 +"in the user ID.  If you *really* know what you are doing,\n"
 +"you may answer the next question with yes.\n"
 +
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
 +msgid "Use this key anyway? (y/N) "
 +msgstr "Use this key anyway? (y/N) "
 +
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
 +msgid "WARNING: Using untrusted key!\n"
 +msgstr "WARNING: Using untrusted key!\n"
 +
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
 +msgid "WARNING: this key might be revoked (revocation key not present)\n"
 +msgstr "WARNING: this key might be revoked (revocation key not present)\n"
 +
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
 +msgid "WARNING: This key has been revoked by its designated revoker!\n"
 +msgstr "WARNING: This key has been revoked by its designated revoker!\n"
 +
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
 +msgid "WARNING: This key has been revoked by its owner!\n"
 +msgstr "WARNING: This key has been revoked by its owner!\n"
 +
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
 +msgid "         This could mean that the signature is forged.\n"
 +msgstr "         This could mean that the signature is forged.\n"
 +
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
 +msgid "WARNING: This subkey has been revoked by its owner!\n"
 +msgstr "WARNING: This subkey has been revoked by its owner!\n"
 +
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
 +msgid "Note: This key has been disabled.\n"
 +msgstr "Note: This key has been disabled.\n"
 +
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
 +#, c-format
 +msgid "Note: Verified signer's address is '%s'\n"
 +msgstr "Note: Verified signer's address is ‘%s’\n"
 +
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
 +#, c-format
 +msgid "Note: Signer's address '%s' does not match DNS entry\n"
 +msgstr "Note: Signer's address ‘%s’ does not match DNS entry\n"
 +
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
 +msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 +msgstr "trustlevel adjusted to FULL due to valid PKA info\n"
 +
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
 +msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 +msgstr "trustlevel adjusted to NEVER due to bad PKA info\n"
 +
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
 +msgid "Note: This key has expired!\n"
 +msgstr "Note: This key has expired!\n"
 +
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
 +msgid "WARNING: This key is not certified with a trusted signature!\n"
 +msgstr "WARNING: This key is not certified with a trusted signature!\n"
 +
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
 +msgid ""
 +"         There is no indication that the signature belongs to the owner.\n"
 +msgstr ""
 +"         There is no indication that the signature belongs to the owner.\n"
 +
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
 +msgid "WARNING: We do NOT trust this key!\n"
 +msgstr "WARNING: We do NOT trust this key!\n"
 +
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
 +msgid "         The signature is probably a FORGERY.\n"
 +msgstr "         The signature is probably a FORGERY.\n"
 +
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
 +msgid ""
 +"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 +msgstr ""
 +"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 +
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
 +msgid "         It is not certain that the signature belongs to the owner.\n"
 +msgstr "         It is not certain that the signature belongs to the owner.\n"
 +
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
 +#, c-format
 +msgid "%s: skipped: %s\n"
 +msgstr "%s: skipped: %s\n"
 +
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
 +#, c-format
 +msgid "%s: skipped: public key is disabled\n"
 +msgstr "%s: skipped: public key is disabled\n"
 +
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
 +#, c-format
 +msgid "%s: skipped: public key already present\n"
 +msgstr "%s: skipped: public key already present\n"
 +
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
 +#, c-format
 +msgid "can't encrypt to '%s'\n"
 +msgstr "can't encrypt to ‘%s’\n"
 +
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
 +#, c-format
 +msgid "option '%s' given, but no valid default keys given\n"
 +msgstr "option ‘%s’ given, but no valid default keys given\n"
 +
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
 +#, c-format
 +msgid "option '%s' given, but option '%s' not given\n"
 +msgstr "option ‘%s’ given, but option ‘%s’ not given\n"
 +
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
 +msgid "You did not specify a user ID. (you may use \"-r\")\n"
 +msgstr "You did not specify a user ID. (you may use “-r”)\n"
 +
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
 +msgid "Current recipients:\n"
 +msgstr "Current recipients:\n"
 +
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
 +msgid ""
 +"\n"
 +"Enter the user ID.  End with an empty line: "
 +msgstr ""
 +"\n"
 +"Enter the user ID.  End with an empty line: "
 +
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
 +msgid "No such user ID.\n"
 +msgstr "No such user ID.\n"
 +
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
 +msgid "skipped: public key already set as default recipient\n"
 +msgstr "skipped: public key already set as default recipient\n"
 +
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
 +msgid "Public key is disabled.\n"
 +msgstr "Public key is disabled.\n"
 +
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
 +msgid "skipped: public key already set\n"
 +msgstr "skipped: public key already set\n"
 +
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
 +#, c-format
 +msgid "unknown default recipient \"%s\"\n"
 +msgstr "unknown default recipient “%s”\n"
 +
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
 +msgid "no valid addressees\n"
 +msgstr "no valid addressees\n"
 +
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
 +#, c-format
 +msgid "Note: key %s has no %s feature\n"
 +msgstr "Note: key %s has no %s feature\n"
 +
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
 +#, c-format
 +msgid "Note: key %s has no preference for %s\n"
 +msgstr "Note: key %s has no preference for %s\n"
 +
 +#: g10/plaintext.c:84
 +msgid "data not saved; use option \"--output\" to save it\n"
 +msgstr "data not saved; use option “--output” to save it\n"
 +
 +#: g10/plaintext.c:598
 +msgid "Detached signature.\n"
 +msgstr "Detached signature.\n"
 +
 +#: g10/plaintext.c:606
 +msgid "Please enter name of data file: "
 +msgstr "Please enter name of data file: "
 +
 +#: g10/plaintext.c:643
 +msgid "reading stdin ...\n"
 +msgstr "reading stdin ...\n"
 +
 +#: g10/plaintext.c:688
 +msgid "no signed data\n"
 +msgstr "no signed data\n"
 +
 +#: g10/plaintext.c:706
 +#, c-format
 +msgid "can't open signed data '%s'\n"
 +msgstr "can't open signed data ‘%s’\n"
 +
 +#: g10/plaintext.c:741
 +#, c-format
 +msgid "can't open signed data fd=%d: %s\n"
 +msgstr "can't open signed data fd=%d: %s\n"
 +
 +#: g10/pubkey-enc.c:116
 +#, c-format
 +msgid "anonymous recipient; trying secret key %s ...\n"
 +msgstr "anonymous recipient; trying secret key %s ...\n"
 +
 +#: g10/pubkey-enc.c:123
 +msgid "okay, we are the anonymous recipient.\n"
 +msgstr "okay, we are the anonymous recipient.\n"
 +
 +#: g10/pubkey-enc.c:282
 +msgid "old encoding of the DEK is not supported\n"
 +msgstr "old encoding of the DEK is not supported\n"
 +
 +#: g10/pubkey-enc.c:310
 +#, c-format
 +msgid "cipher algorithm %d%s is unknown or disabled\n"
 +msgstr "cipher algorithm %d%s is unknown or disabled\n"
 +
 +#: g10/pubkey-enc.c:352
 +#, c-format
 +msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 +msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
 +
 +#: g10/pubkey-enc.c:377
 +#, c-format
 +msgid "Note: secret key %s expired at %s\n"
 +msgstr "Note: secret key %s expired at %s\n"
 +
 +#: g10/pubkey-enc.c:384
 +msgid "Note: key has been revoked"
 +msgstr "Note: key has been revoked"
 +
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
 +#, c-format
 +msgid "build_packet failed: %s\n"
 +msgstr "build_packet failed: %s\n"
 +
 +#: g10/revoke.c:144
 +#, c-format
 +msgid "key %s has no user IDs\n"
 +msgstr "key %s has no user IDs\n"
 +
 +#: g10/revoke.c:312
 +msgid "To be revoked by:\n"
 +msgstr "To be revoked by:\n"
 +
 +#: g10/revoke.c:316
 +msgid "(This is a sensitive revocation key)\n"
 +msgstr "(This is a sensitive revocation key)\n"
 +
 +#: g10/revoke.c:322
 +msgid "Secret key is not available.\n"
 +msgstr "Secret key is not available.\n"
 +
 +#: g10/revoke.c:327
 +msgid "Create a designated revocation certificate for this key? (y/N) "
 +msgstr "Create a designated revocation certificate for this key? (y/N) "
 +
 +#: g10/revoke.c:336 g10/revoke.c:727
 +msgid "ASCII armored output forced.\n"
 +msgstr "ASCII armored output forced.\n"
 +
 +#: g10/revoke.c:352 g10/revoke.c:479
 +#, c-format
 +msgid "make_keysig_packet failed: %s\n"
 +msgstr "make_keysig_packet failed: %s\n"
 +
 +#: g10/revoke.c:415
 +msgid "Revocation certificate created.\n"
 +msgstr "Revocation certificate created.\n"
 +
 +#: g10/revoke.c:421
 +#, c-format
 +msgid "no revocation keys found for \"%s\"\n"
 +msgstr "no revocation keys found for “%s”\n"
 +
 +#: g10/revoke.c:551
 +msgid "This is a revocation certificate for the OpenPGP key:"
 +msgstr "This is a revocation certificate for the OpenPGP key:"
 +
 +#: g10/revoke.c:567
 +msgid ""
 +"A revocation certificate is a kind of \"kill switch\" to publicly\n"
 +"declare that a key shall not anymore be used.  It is not possible\n"
 +"to retract such a revocation certificate once it has been published."
 +msgstr ""
 +"A revocation certificate is a kind of “kill switch” to publicly\n"
 +"declare that a key shall not anymore be used.  It is not possible\n"
 +"to retract such a revocation certificate once it has been published."
 +
 +#: g10/revoke.c:570
 +msgid ""
 +"Use it to revoke this key in case of a compromise or loss of\n"
 +"the secret key.  However, if the secret key is still accessible,\n"
 +"it is better to generate a new revocation certificate and give\n"
 +"a reason for the revocation.  For details see the description of\n"
 +"of the gpg command \"--gen-revoke\" in the GnuPG manual."
 +msgstr ""
 +"Use it to revoke this key in case of a compromise or loss of\n"
 +"the secret key.  However, if the secret key is still accessible,\n"
 +"it is better to generate a new revocation certificate and give\n"
 +"a reason for the revocation.  For details see the description of\n"
 +"of the gpg command “--gen-revoke” in the GnuPG manual."
 +
 +#: g10/revoke.c:575
 +msgid ""
 +"To avoid an accidental use of this file, a colon has been inserted\n"
 +"before the 5 dashes below.  Remove this colon with a text editor\n"
 +"before importing and publishing this revocation certificate."
 +msgstr ""
 +"To avoid an accidental use of this file, a colon has been inserted\n"
 +"before the 5 dashes below.  Remove this colon with a text editor\n"
 +"before importing and publishing this revocation certificate."
 +
 +#: g10/revoke.c:590
 +#, c-format
 +msgid "revocation certificate stored as '%s.rev'\n"
 +msgstr "revocation certificate stored as ‘%s.rev’\n"
 +
 +#: g10/revoke.c:634
 +#, c-format
 +msgid "secret key \"%s\" not found\n"
 +msgstr "secret key “%s” not found\n"
 +
 +#. TRANSLATORS: The %s prints a key specification which
 +#. for example has been given at the command line.  Several lines
 +#. lines with secret key infos are printed after this message.
 +#: g10/revoke.c:661
 +#, c-format
 +msgid "'%s' matches multiple secret keys:\n"
 +msgstr "‘%s’ matches multiple secret keys:\n"
 +
 +#: g10/revoke.c:688
 +#, c-format
 +msgid "error searching the keyring: %s\n"
 +msgstr "error searching the keyring: %s\n"
 +
 +#: g10/revoke.c:711
 +msgid "Create a revocation certificate for this key? (y/N) "
 +msgstr "Create a revocation certificate for this key? (y/N) "
 +
 +#: g10/revoke.c:735
 +msgid ""
 +"Revocation certificate created.\n"
 +"\n"
 +"Please move it to a medium which you can hide away; if Mallory gets\n"
 +"access to this certificate he can use it to make your key unusable.\n"
 +"It is smart to print this certificate and store it away, just in case\n"
 +"your media become unreadable.  But have some caution:  The print system of\n"
 +"your machine might store the data and make it available to others!\n"
 +msgstr ""
 +"Revocation certificate created.\n"
 +"\n"
 +"Please move it to a medium which you can hide away; if Mallory gets\n"
 +"access to this certificate he can use it to make your key unusable.\n"
 +"It is smart to print this certificate and store it away, just in case\n"
 +"your media become unreadable.  But have some caution:  The print system of\n"
 +"your machine might store the data and make it available to others!\n"
 +
 +#: g10/revoke.c:769
 +msgid "Please select the reason for the revocation:\n"
 +msgstr "Please select the reason for the revocation:\n"
 +
 +#: g10/revoke.c:779
 +msgid "Cancel"
 +msgstr "Cancel"
 +
 +#: g10/revoke.c:781
 +#, c-format
 +msgid "(Probably you want to select %d here)\n"
 +msgstr "(Probably you want to select %d here)\n"
 +
 +#: g10/revoke.c:822
 +msgid "Enter an optional description; end it with an empty line:\n"
 +msgstr "Enter an optional description; end it with an empty line:\n"
 +
 +#: g10/revoke.c:850
 +#, c-format
 +msgid "Reason for revocation: %s\n"
 +msgstr "Reason for revocation: %s\n"
 +
 +#: g10/revoke.c:852
 +msgid "(No description given)\n"
 +msgstr "(No description given)\n"
 +
 +#: g10/revoke.c:857
 +msgid "Is this okay? (y/N) "
 +msgstr "Is this okay? (y/N) "
 +
 +#: g10/seskey.c:62 sm/encrypt.c:123
 +msgid "weak key created - retrying\n"
 +msgstr "weak key created - retrying\n"
 +
 +#: g10/seskey.c:66
 +#, c-format
 +msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 +msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 +
 +#: g10/seskey.c:306
 +#, c-format
 +msgid "%s key %s uses an unsafe (%zu bit) hash\n"
 +msgstr "%s key %s uses an unsafe (%zu bit) hash\n"
 +
 +#: g10/seskey.c:324
 +#, c-format
 +msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 +msgstr "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 +
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
 +msgid "WARNING: signature digest conflict in message\n"
 +msgstr "WARNING: signature digest conflict in message\n"
 +
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
 +#, c-format
 +msgid "WARNING: signing subkey %s is not cross-certified\n"
 +msgstr "WARNING: signing subkey %s is not cross-certified\n"
 +
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
 +#, c-format
 +msgid "please see %s for more information\n"
 +msgstr "please see %s for more information\n"
 +
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
 +#, c-format
 +msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 +msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
 +
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
 +#, c-format
 +msgid "public key %s is %lu second newer than the signature\n"
 +msgid_plural "public key %s is %lu seconds newer than the signature\n"
 +msgstr[0] "public key %s is %lu second newer than the signature\n"
 +msgstr[1] "public key %s is %lu seconds newer than the signature\n"
 +
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
 +#, c-format
 +msgid "public key %s is %lu day newer than the signature\n"
 +msgid_plural "public key %s is %lu days newer than the signature\n"
 +msgstr[0] "public key %s is %lu day newer than the signature\n"
 +msgstr[1] "public key %s is %lu days newer than the signature\n"
 +
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
 +#, c-format
 +msgid ""
 +"key %s was created %lu second in the future (time warp or clock problem)\n"
 +msgid_plural ""
 +"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 +msgstr[0] ""
 +"key %s was created %lu second in the future (time warp or clock problem)\n"
 +msgstr[1] ""
 +"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 +
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
 +#, c-format
 +msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 +msgid_plural ""
 +"key %s was created %lu days in the future (time warp or clock problem)\n"
 +msgstr[0] ""
 +"key %s was created %lu day in the future (time warp or clock problem)\n"
 +msgstr[1] ""
 +"key %s was created %lu days in the future (time warp or clock problem)\n"
 +
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
 +#, c-format
 +msgid "Note: signature key %s expired %s\n"
 +msgstr "Note: signature key %s expired %s\n"
 +
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
 +#, c-format
 +msgid "Note: signature key %s has been revoked\n"
 +msgstr "Note: signature key %s has been revoked\n"
 +
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
 +#, c-format
 +msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 +msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
 +
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
 +#, c-format
 +msgid "key %s: no subkey for subkey revocation signature\n"
 +msgstr "key %s: no subkey for subkey revocation signature\n"
 +
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
 +#, c-format
 +msgid "key %s: no subkey for subkey binding signature\n"
 +msgstr "key %s: no subkey for subkey binding signature\n"
 +
 +#: g10/sign.c:88
 +#, c-format
 +msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 +msgstr ""
 +"WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 +
 +#: g10/sign.c:114
 +#, c-format
 +msgid ""
 +"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 +msgstr ""
 +"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 +
 +#: g10/sign.c:137
 +#, c-format
 +msgid ""
 +"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 +"unexpanded.\n"
 +msgstr ""
 +"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 +"unexpanded.\n"
 +
 +#: g10/sign.c:329
 +#, c-format
 +msgid "%s/%s signature from: \"%s\"\n"
 +msgstr "%s/%s signature from: “%s”\n"
 +
 +#: g10/sign.c:878
 +#, c-format
 +msgid ""
 +"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 +msgstr ""
 +"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 +
 +#: g10/sign.c:1009
 +msgid "signing:"
 +msgstr "signing:"
 +
 +#: g10/sign.c:1286
 +#, c-format
 +msgid "%s encryption will be used\n"
 +msgstr "%s encryption will be used\n"
 +
 +#: g10/skclist.c:155 g10/skclist.c:236
 +msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 +msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
 +
 +#: g10/skclist.c:187
 +#, c-format
 +msgid "skipped \"%s\": duplicated\n"
 +msgstr "skipped “%s”: duplicated\n"
 +
 +#: g10/skclist.c:206
 +msgid "skipped: secret key already present\n"
 +msgstr "skipped: secret key already present\n"
 +
 +#: g10/skclist.c:225
 +msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 +msgstr ""
 +"this is a PGP generated Elgamal key which is not secure for signatures!"
 +
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
 +#, c-format
 +msgid "trust record %lu, type %d: write failed: %s\n"
 +msgstr "trust record %lu, type %d: write failed: %s\n"
 +
 +#: g10/tdbdump.c:105
 +#, c-format
 +msgid ""
 +"# List of assigned trustvalues, created %s\n"
 +"# (Use \"gpg --import-ownertrust\" to restore them)\n"
 +msgstr ""
 +"# List of assigned trustvalues, created %s\n"
 +"# (Use “gpg --import-ownertrust” to restore them)\n"
 +
 +#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
 +#, c-format
 +msgid "error in '%s': %s\n"
 +msgstr "error in '%s': %s\n"
 +
 +#: g10/tdbdump.c:162
 +msgid "line too long"
 +msgstr "line too long"
 +
 +#: g10/tdbdump.c:170
 +msgid "colon missing"
 +msgstr "colon missing"
 +
 +#: g10/tdbdump.c:176
 +msgid "invalid fingerprint"
 +msgstr "invalid fingerprint"
 +
 +#: g10/tdbdump.c:181
 +msgid "ownertrust value missing"
 +msgstr "ownertrust value missing"
 +
 +#: g10/tdbdump.c:217
 +#, c-format
 +msgid "error finding trust record in '%s': %s\n"
 +msgstr "error finding trust record in '%s': %s\n"
 +
 +#: g10/tdbdump.c:221
 +#, c-format
 +msgid "read error in '%s': %s\n"
 +msgstr "read error in '%s': %s\n"
 +
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
 +#, c-format
 +msgid "trustdb: sync failed: %s\n"
 +msgstr "trustdb: sync failed: %s\n"
 +
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
 +#, c-format
 +msgid "can't create lock for '%s'\n"
 +msgstr "can't create lock for ‘%s’\n"
 +
 +#: g10/tdbio.c:146
 +#, c-format
 +msgid "can't lock '%s'\n"
 +msgstr "can't lock ‘%s’\n"
 +
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
 +#, c-format
 +msgid "trustdb rec %lu: lseek failed: %s\n"
 +msgstr "trustdb rec %lu: lseek failed: %s\n"
 +
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
 +#, c-format
 +msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 +msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 +
 +#: g10/tdbio.c:352
 +msgid "trustdb transaction too large\n"
 +msgstr "trustdb transaction too large\n"
 +
 +#: g10/tdbio.c:682
 +#, c-format
 +msgid "%s: directory does not exist!\n"
 +msgstr "%s: directory does not exist!\n"
 +
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
 +#, c-format
 +msgid "can't access '%s': %s\n"
 +msgstr "can't access '%s': %s\n"
 +
 +#: g10/tdbio.c:724
 +#, c-format
 +msgid "%s: failed to create version record: %s"
 +msgstr "%s: failed to create version record: %s"
 +
 +#: g10/tdbio.c:729
 +#, c-format
 +msgid "%s: invalid trustdb created\n"
 +msgstr "%s: invalid trustdb created\n"
 +
 +#: g10/tdbio.c:732
 +#, c-format
 +msgid "%s: trustdb created\n"
 +msgstr "%s: trustdb created\n"
 +
 +#: g10/tdbio.c:788
 +msgid "Note: trustdb not writable\n"
 +msgstr "Note: trustdb not writable\n"
 +
 +#: g10/tdbio.c:797
 +#, c-format
 +msgid "%s: invalid trustdb\n"
 +msgstr "%s: invalid trustdb\n"
 +
 +#: g10/tdbio.c:834
 +#, c-format
 +msgid "%s: failed to create hashtable: %s\n"
 +msgstr "%s: failed to create hashtable: %s\n"
 +
 +#: g10/tdbio.c:842
 +#, c-format
 +msgid "%s: error updating version record: %s\n"
 +msgstr "%s: error updating version record: %s\n"
 +
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
 +#, c-format
 +msgid "%s: error reading version record: %s\n"
 +msgstr "%s: error reading version record: %s\n"
 +
 +#: g10/tdbio.c:938
 +#, c-format
 +msgid "%s: error writing version record: %s\n"
 +msgstr "%s: error writing version record: %s\n"
 +
 +#: g10/tdbio.c:1461
 +#, c-format
 +msgid "trustdb: lseek failed: %s\n"
 +msgstr "trustdb: lseek failed: %s\n"
 +
 +#: g10/tdbio.c:1472
 +#, c-format
 +msgid "trustdb: read failed (n=%d): %s\n"
 +msgstr "trustdb: read failed (n=%d): %s\n"
 +
 +#: g10/tdbio.c:1497
 +#, c-format
 +msgid "%s: not a trustdb file\n"
 +msgstr "%s: not a trustdb file\n"
 +
 +#: g10/tdbio.c:1522
 +#, c-format
 +msgid "%s: version record with recnum %lu\n"
 +msgstr "%s: version record with recnum %lu\n"
 +
 +#: g10/tdbio.c:1528
 +#, c-format
 +msgid "%s: invalid file version %d\n"
 +msgstr "%s: invalid file version %d\n"
 +
 +#: g10/tdbio.c:1748
 +#, c-format
 +msgid "%s: error reading free record: %s\n"
 +msgstr "%s: error reading free record: %s\n"
 +
 +#: g10/tdbio.c:1757
 +#, c-format
 +msgid "%s: error writing dir record: %s\n"
 +msgstr "%s: error writing dir record: %s\n"
 +
 +#: g10/tdbio.c:1768
 +#, c-format
 +msgid "%s: failed to zero a record: %s\n"
 +msgstr "%s: failed to zero a record: %s\n"
 +
 +#: g10/tdbio.c:1804
 +#, c-format
 +msgid "%s: failed to append a record: %s\n"
 +msgstr "%s: failed to append a record: %s\n"
 +
 +#: g10/tdbio.c:1865
 +msgid "Error: The trustdb is corrupted.\n"
 +msgstr "Error: The trustdb is corrupted.\n"
 +
 +#: g10/textfilter.c:146
 +#, c-format
 +msgid "can't handle text lines longer than %d characters\n"
 +msgstr "can't handle text lines longer than %d characters\n"
 +
 +#: g10/textfilter.c:241
 +#, c-format
 +msgid "input line longer than %d characters\n"
 +msgstr "input line longer than %d characters\n"
 +
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
 +#, c-format
 +msgid "error beginning transaction on TOFU database: %s\n"
 +msgstr "error beginning transaction on TOFU database: %s\n"
 +
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
 +#, c-format
 +msgid "error committing transaction on TOFU database: %s\n"
 +msgstr "error committing transaction on TOFU database: %s\n"
 +
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
 +#, c-format
 +msgid "error rolling back transaction on TOFU database: %s\n"
 +msgstr "error rolling back transaction on TOFU database: %s\n"
 +
- #: g10/tofu.c:435
++#: g10/tofu.c:501
 +#, c-format
 +msgid "unsupported TOFU database version: %s\n"
 +msgstr "unsupported TOFU database version: %s\n"
 +
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
 +#, c-format
 +msgid "error reading TOFU database: %s\n"
 +msgstr "error reading TOFU database: %s\n"
 +
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
 +#, c-format
 +msgid "error determining TOFU database's version: %s\n"
 +msgstr "error determining TOFU database's version: %s\n"
 +
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
 +#, c-format
 +msgid "error initializing TOFU database: %s\n"
 +msgstr "error initializing TOFU database: %s\n"
 +
- #: g10/tofu.c:658
++#: g10/tofu.c:765
 +#, c-format
 +msgid "error opening TOFU database '%s': %s\n"
 +msgstr "error opening TOFU database '%s': %s\n"
 +
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
 +#, c-format
 +msgid "error updating TOFU database: %s\n"
 +msgstr "error updating TOFU database: %s\n"
 +
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
 +#, c-format
- msgid "The binding %s is NOT known."
- msgstr "The binding %s is NOT known."
++msgid ""
++"This is the first time the email address \"%s\" is being used with key %s."
++msgstr ""
++"This is the first time the email address “%s” is being used with key %s."
 +
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
 +#, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
++msgid "The email address \"%s\" is associated with %d keys!"
++msgstr "The email address “%s” is associated with %d keys!"
++
++#: g10/tofu.c:1251
++msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 +msgstr ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
++"  Since this binding's policy was 'auto', it has been changed to 'ask'."
 +
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
 +#, c-format
 +msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
++"Please indicate whether this email address should be associated with key %s "
++"or whether you think someone is impersonating \"%s\"."
 +msgstr ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
++"Please indicate whether this email address should be associated with key %s "
++"or whether you think someone is impersonating “%s”."
 +
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
 +#, c-format
 +msgid "error gathering other user IDs: %s\n"
 +msgstr "error gathering other user IDs: %s\n"
 +
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr "Known user IDs associated with this key:\n"
++#: g10/tofu.c:1523
++msgid "This key's user IDs:\n"
++msgstr "This key's user IDs:\n"
 +
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
 +#, c-format
 +msgid "policy: %s"
 +msgstr "policy: %s"
 +
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
 +#, c-format
 +msgid "error gathering signature stats: %s\n"
 +msgstr "error gathering signature stats: %s\n"
 +
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
 +#, c-format
 +msgid "The email address \"%s\" is associated with %d key:\n"
 +msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 +msgstr[0] "The email address “%s” is associated with %d key:\n"
 +msgstr[1] "The email address “%s” is associated with %d keys:\n"
 +
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
 +#, c-format
 +msgid "Statistics for keys with the email address \"%s\":\n"
 +msgstr "Statistics for keys with the email address “%s”:\n"
 +
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
++msgid ", "
++msgstr ", "
++
++#: g10/tofu.c:1693
 +msgid "this key"
 +msgstr "this key"
 +
- #: g10/tofu.c:1342
++#: g10/tofu.c:1715
 +#, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] "%ld message signed in the future."
- msgstr[1] "%ld messages signed in the future."
++msgid "Verified %d message"
++msgid_plural "Verified %d messages"
++msgstr[0] "Verified %d message"
++msgstr[1] "Verified %d messages"
 +
- #: g10/tofu.c:1351
++#: g10/tofu.c:1719
 +#, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "%ld message signed"
- msgstr[1] "%ld messages signed"
++msgid "Encrypted %d message"
++msgid_plural "Encrypted %d messages"
++msgstr[0] "Encrypted %d message"
++msgstr[1] "Encrypted %d messages"
 +
- #: g10/tofu.c:1357
++#: g10/tofu.c:1734
 +#, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
- msgstr[0] " over the past %ld day."
- msgstr[1] " over the past %ld days."
++msgid " over the past day."
++msgid_plural " over the past %d days."
++msgstr[0] " over the past day."
++msgstr[1] " over the past %d days."
 +
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
 +#, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
- msgstr[0] " over the past %ld week."
- msgstr[1] " over the past %ld weeks."
++msgid " over the past month."
++msgid_plural " over the past %d months."
++msgstr[0] " over the past month."
++msgstr[1] " over the past %d months."
 +
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
 +#, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
- msgstr[0] " over the past %ld month."
- msgstr[1] " over the past %ld months."
++msgid " over the past year."
++msgid_plural " over the past %d years."
++msgstr[0] " over the past year."
++msgstr[1] " over the past %d years."
++
++#: g10/tofu.c:1752
++msgid " in the past."
++msgstr " in the past."
 +
 +#. TRANSLATORS: Please translate the text found in the source
 +#. * file below.  We don't directly internationalize that text so
 +#. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
 +msgid "TOFU detected a binding conflict"
 +msgstr "TOFU detected a binding conflict"
 +
 +#. TRANSLATORS: Two letters (normally the lower and upper case
 +#. * version of the hotkey) for each of the five choices.  If
 +#. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
 +msgid "gGaAuUrRbB"
 +msgstr "gGaAuUrRbB"
 +
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
 +msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 +msgstr "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 +
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
++msgid "Defaulting to unknown."
++msgstr "Defaulting to unknown."
++
++#: g10/tofu.c:1938 g10/tofu.c:2074
++msgid "TOFU db corruption detected.\n"
++msgstr "TOFU db corruption detected.\n"
++
++#: g10/tofu.c:1994
++#, c-format
++msgid "resetting keydb: %s\n"
++msgstr "resetting keydb: %s\n"
++
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
 +#, c-format
 +msgid "error setting TOFU binding's trust level to %s\n"
 +msgstr "error setting TOFU binding's trust level to %s\n"
 +
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
 +#, c-format
 +msgid "error changing TOFU policy: %s\n"
 +msgstr "error changing TOFU policy: %s\n"
 +
 +#. TRANSLATORS: The tilde ('~') is used here to indicate a
 +#. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
 +#, c-format
 +msgid "%d~year"
 +msgid_plural "%d~years"
 +msgstr[0] "%d~year"
 +msgstr[1] "%d~years"
 +
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
 +#, c-format
 +msgid "%d~month"
 +msgid_plural "%d~months"
 +msgstr[0] "%d~month"
 +msgstr[1] "%d~months"
 +
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
 +#, c-format
 +msgid "%d~day"
 +msgid_plural "%d~days"
 +msgstr[0] "%d~day"
 +msgstr[1] "%d~days"
 +
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
 +#, c-format
 +msgid "%d~hour"
 +msgid_plural "%d~hours"
 +msgstr[0] "%d~hour"
 +msgstr[1] "%d~hours"
 +
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
 +#, c-format
 +msgid "%d~minute"
 +msgid_plural "%d~minutes"
 +msgstr[0] "%d~minute"
 +msgstr[1] "%d~minutes"
 +
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
 +#, c-format
 +msgid "%d~second"
 +msgid_plural "%d~seconds"
 +msgstr[0] "%d~second"
 +msgstr[1] "%d~seconds"
 +
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
 +#, c-format
- msgid "Have never verified a message signed by key %s!\n"
- msgstr "Have never verified a message signed by key %s!\n"
++msgid "%s: "
++msgstr "%s: "
 +
- #: g10/tofu.c:1976
++#: g10/tofu.c:2806
 +#, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
- "Failed to collect signature statistics for “%s”\n"
- "(key %s)\n"
++msgid "Verified %ld signatures"
++msgstr "Verified %ld signatures"
 +
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
 +#, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "Verified %ld messages signed by “%s”."
++msgid "Verified %ld signature in the past %s"
++msgid_plural "Verified %ld signatures in the past %s"
++msgstr[0] "Verified %ld signature in the past %s"
++msgstr[1] "Verified %ld signatures in the past %s"
 +
- #: g10/tofu.c:2007
++#: g10/tofu.c:2826
 +#, c-format
- msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- "Verified %ld message signed by “%s”\n"
- "in the past %s."
- msgstr[1] ""
- "Verified %ld messages signed by “%s”\n"
- "in the past %s."
++msgid ", and encrypted %ld messages"
++msgstr ", and encrypted %ld messages"
 +
- #: g10/tofu.c:2018
++#: g10/tofu.c:2835
 +#, c-format
- msgid "The most recent message was verified %s ago."
- msgstr "The most recent message was verified %s ago."
++msgid ", and encrypted %ld message in the past %s"
++msgid_plural ", and encrypted %ld messages in the past %s"
++msgstr[0] ", and encrypted %ld message in the past %s"
++msgstr[1] ", and encrypted %ld messages in the past %s"
++
++#: g10/tofu.c:2880
++msgid ""
++"Warning: we have yet to see a message signed using this key and user id!\n"
++msgstr ""
++"Warning: we have yet to see a message signed using this key and user id!\n"
++
++#: g10/tofu.c:2883
++msgid ""
++"Warning: we've only seen one message signed using this key and user id!\n"
++msgstr ""
++"Warning: we've only seen one message signed using this key and user id!\n"
 +
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
- msgstr "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
++msgid "Warning: you have yet to encrypt a message to this key!\n"
++msgstr "Warning: you have yet to encrypt a message to this key!\n"
 +
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
- msgstr "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
++msgid "Warning: you have only encrypted one message to this key!\n"
++msgstr "Warning: you have only encrypted one message to this key!\n"
 +
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
 +#, c-format
 +msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
++"Warning: if you think you've seen more signatures by this key and user id, "
 +"then this key might be a forgery!  Carefully examine the email address for "
 +"small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +msgid_plural ""
- "Warning: if you think you've seen more than %ld messages signed by this key, "
- "then this key might be a forgery!  Carefully examine the email address for "
- "small variations.  If the key is suspect, then use\n"
++"Warning: if you think you've seen more signatures by this key and these user "
++"ids, then this key might be a forgery!  Carefully examine the email "
++"addresses for small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +msgstr[0] ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
++"Warning: if you think you've seen more signatures by this key and user id, "
 +"then this key might be a forgery!  Carefully examine the email address for "
 +"small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +msgstr[1] ""
- "Warning: if you think you've seen more than %ld messages signed by this key, "
- "then this key might be a forgery!  Carefully examine the email address for "
- "small variations.  If the key is suspect, then use\n"
++"Warning: if you think you've seen more signatures by this key and these user "
++"ids, then this key might be a forgery!  Carefully examine the email "
++"addresses for small variations.  If the key is suspect, then use\n"
 +"  %s\n"
 +"to mark it as being bad.\n"
 +
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
 +#, c-format
 +msgid "error opening TOFU database: %s\n"
 +msgstr "error opening TOFU database: %s\n"
 +
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
++#, c-format
++msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
++msgstr "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
++
++#: g10/tofu.c:3515
++#, c-format
++msgid "error setting policy for key %s, user id \"%s\": %s"
++msgstr "error setting policy for key %s, user id “%s”: %s"
++
++#: g10/trustdb.c:216
 +#, c-format
 +msgid "'%s' is not a valid long keyID\n"
 +msgstr "‘%s’ is not a valid long keyID\n"
 +
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
 +#, c-format
 +msgid "key %s: accepted as trusted key\n"
 +msgstr "key %s: accepted as trusted key\n"
 +
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
 +#, c-format
 +msgid "key %s occurs more than once in the trustdb\n"
 +msgstr "key %s occurs more than once in the trustdb\n"
 +
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
 +#, c-format
 +msgid "key %s: no public key for trusted key - skipped\n"
 +msgstr "key %s: no public key for trusted key - skipped\n"
 +
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
 +#, c-format
 +msgid "key %s marked as ultimately trusted\n"
 +msgstr "key %s marked as ultimately trusted\n"
 +
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
 +#, c-format
 +msgid "trust record %lu, req type %d: read failed: %s\n"
 +msgstr "trust record %lu, req type %d: read failed: %s\n"
 +
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
 +#, c-format
 +msgid "trust record %lu is not of requested type %d\n"
 +msgstr "trust record %lu is not of requested type %d\n"
 +
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
 +msgid "You may try to re-create the trustdb using the commands:\n"
 +msgstr "You may try to re-create the trustdb using the commands:\n"
 +
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
 +msgid "If that does not work, please consult the manual\n"
 +msgstr "If that does not work, please consult the manual\n"
 +
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
 +#, c-format
 +msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 +msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
 +
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
 +#, c-format
 +msgid "using %s trust model\n"
 +msgstr "using %s trust model\n"
 +
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
 +msgid "no need for a trustdb check\n"
 +msgstr "no need for a trustdb check\n"
 +
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
 +#, c-format
 +msgid "next trustdb check due at %s\n"
 +msgstr "next trustdb check due at %s\n"
 +
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
 +#, c-format
 +msgid "no need for a trustdb check with '%s' trust model\n"
 +msgstr "no need for a trustdb check with ‘%s’ trust model\n"
 +
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
 +#, c-format
 +msgid "no need for a trustdb update with '%s' trust model\n"
 +msgstr "no need for a trustdb update with ‘%s’ trust model\n"
 +
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
 +#, c-format
 +msgid "public key %s not found: %s\n"
 +msgstr "public key %s not found: %s\n"
 +
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
 +msgid "please do a --check-trustdb\n"
 +msgstr "please do a --check-trustdb\n"
 +
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
 +msgid "checking the trustdb\n"
 +msgstr "checking the trustdb\n"
 +
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
 +#, c-format
 +msgid "%d key processed"
 +msgid_plural "%d keys processed"
 +msgstr[0] "%d key processed"
 +msgstr[1] "%d keys processed"
 +
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
 +#, c-format
 +msgid " (%d validity count cleared)\n"
 +msgid_plural " (%d validity counts cleared)\n"
 +msgstr[0] " (%d validity count cleared)\n"
 +msgstr[1] " (%d validity counts cleared)\n"
 +
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
 +msgid "no ultimately trusted keys found\n"
 +msgstr "no ultimately trusted keys found\n"
 +
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
 +#, c-format
 +msgid "public key of ultimately trusted key %s not found\n"
 +msgstr "public key of ultimately trusted key %s not found\n"
 +
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
 +#, c-format
 +msgid ""
 +"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 +msgstr ""
 +"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 +
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
 +#, c-format
 +msgid "unable to update trustdb version record: write failed: %s\n"
 +msgstr "unable to update trustdb version record: write failed: %s\n"
 +
 +#: g10/trust.c:105
 +msgid "undefined"
 +msgstr "undefined"
 +
 +#: g10/trust.c:106
 +msgid "never"
 +msgstr "never"
 +
 +#: g10/trust.c:107
 +msgid "marginal"
 +msgstr "marginal"
 +
 +#: g10/trust.c:108
 +msgid "full"
 +msgstr "full"
 +
 +#: g10/trust.c:109
 +msgid "ultimate"
 +msgstr "ultimate"
 +
 +#. TRANSLATORS: these strings are similar to those in
 +#. trust_value_to_string(), but are a fixed length.  This is needed to
 +#. make attractive information listings where columns line up
 +#. properly.  The value "10" should be the length of the strings you
 +#. choose to translate to.  This is the length in printable columns.
 +#. It gets passed to atoi() so everything after the number is
 +#. essentially a comment and need not be translated.  Either key and
 +#. uid are both NULL, or neither are NULL.
 +#: g10/trust.c:146
 +msgid "10 translator see trust.c:uid_trust_string_fixed"
 +msgstr "10 translator see trust.c:uid_trust_string_fixed"
 +
 +#: g10/trust.c:149
 +msgid "[ revoked]"
 +msgstr "[ revoked]"
 +
 +#: g10/trust.c:151 g10/trust.c:157
 +msgid "[ expired]"
 +msgstr "[ expired]"
 +
 +#: g10/trust.c:156
 +msgid "[ unknown]"
 +msgstr "[ unknown]"
 +
 +#: g10/trust.c:158
 +msgid "[  undef ]"
 +msgstr "[  undef ]"
 +
 +#: g10/trust.c:159
 +msgid "[  never ]"
 +msgstr "[  never ]"
 +
 +#: g10/trust.c:160
 +msgid "[marginal]"
 +msgstr "[marginal]"
 +
 +#: g10/trust.c:161
 +msgid "[  full  ]"
 +msgstr "[  full  ]"
 +
 +#: g10/trust.c:162
 +msgid "[ultimate]"
 +msgstr "[ultimate]"
 +
 +#: g10/verify.c:117
 +msgid ""
 +"the signature could not be verified.\n"
 +"Please remember that the signature file (.sig or .asc)\n"
 +"should be the first file given on the command line.\n"
 +msgstr ""
 +"the signature could not be verified.\n"
 +"Please remember that the signature file (.sig or .asc)\n"
 +"should be the first file given on the command line.\n"
 +
 +#: g10/verify.c:204
 +#, c-format
 +msgid "input line %u too long or missing LF\n"
 +msgstr "input line %u too long or missing LF\n"
 +
 +#: g10/verify.c:253
 +#, c-format
 +msgid "can't open fd %d: %s\n"
 +msgstr "can't open fd %d: %s\n"
 +
 +#: kbx/kbxutil.c:92
 +msgid "set debugging flags"
 +msgstr "set debugging flags"
 +
 +#: kbx/kbxutil.c:93
 +msgid "enable full debugging"
 +msgstr "enable full debugging"
 +
 +#: kbx/kbxutil.c:117
 +msgid "Usage: kbxutil [options] [files] (-h for help)"
 +msgstr "Usage: kbxutil [options] [files] (-h for help)"
 +
 +#: kbx/kbxutil.c:120
 +msgid ""
 +"Syntax: kbxutil [options] [files]\n"
 +"List, export, import Keybox data\n"
 +msgstr ""
 +"Syntax: kbxutil [options] [files]\n"
 +"List, export, import Keybox data\n"
 +
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
 +#, c-format
 +msgid "RSA modulus missing or not of size %d bits\n"
 +msgstr "RSA modulus missing or not of size %d bits\n"
 +
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
 +#, c-format
 +msgid "RSA public exponent missing or larger than %d bits\n"
 +msgstr "RSA public exponent missing or larger than %d bits\n"
 +
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
 +#, c-format
 +msgid "PIN callback returned error: %s\n"
 +msgstr "PIN callback returned error: %s\n"
 +
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
 +msgid "the NullPIN has not yet been changed\n"
 +msgstr "the NullPIN has not yet been changed\n"
 +
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
 +msgid "|N|Please enter a new PIN for the standard keys."
 +msgstr "|N|Please enter a new PIN for the standard keys."
 +
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
 +msgid "||Please enter the PIN for the standard keys."
 +msgstr "||Please enter the PIN for the standard keys."
 +
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
 +msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 +msgstr ""
 +"|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 +
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
 +msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 +msgstr "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 +
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
 +msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 +msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
 +
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
 +msgid "||Please enter the PIN for the key to create qualified signatures."
 +msgstr "||Please enter the PIN for the key to create qualified signatures."
 +
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
 +msgid ""
 +"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +msgstr ""
 +"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
 +msgid ""
 +"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +msgstr ""
 +"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 +"qualified signatures."
 +
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
 +#, c-format
 +msgid "error getting new PIN: %s\n"
 +msgstr "error getting new PIN: %s\n"
 +
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
 +#, c-format
 +msgid "failed to store the fingerprint: %s\n"
 +msgstr "failed to store the fingerprint: %s\n"
 +
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
 +#, c-format
 +msgid "failed to store the creation date: %s\n"
 +msgstr "failed to store the creation date: %s\n"
 +
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "reading public key failed: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "response does not contain the public key data\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
 +msgid "response does not contain the RSA modulus\n"
 +msgstr "response does not contain the RSA modulus\n"
 +
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
 +msgid "response does not contain the RSA public exponent\n"
 +msgstr "response does not contain the RSA public exponent\n"
 +
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
- msgstr "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
++msgid "response does not contain the EC public key\n"
++msgstr "response does not contain the EC public key\n"
++
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
++msgid "response does not contain the public key data\n"
++msgstr "response does not contain the public key data\n"
++
++#: scd/app-openpgp.c:1551
++#, c-format
++msgid "reading public key failed: %s\n"
++msgstr "reading public key failed: %s\n"
 +
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1903
 +#, c-format
 +msgid "using default PIN as %s\n"
 +msgstr "using default PIN as %s\n"
 +
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
 +#, c-format
 +msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 +msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
 +
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
 +#, c-format
 +msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 +msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
 +
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
 +msgid "||Please enter the PIN"
 +msgstr "||Please enter the PIN"
 +
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
 +#, c-format
 +msgid "PIN for CHV%d is too short; minimum length is %d\n"
 +msgstr "PIN for CHV%d is too short; minimum length is %d\n"
 +
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
 +#, c-format
 +msgid "verify CHV%d failed: %s\n"
 +msgstr "verify CHV%d failed: %s\n"
 +
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
 +msgid "error retrieving CHV status from card\n"
 +msgstr "error retrieving CHV status from card\n"
 +
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
 +msgid "card is permanently locked!\n"
 +msgstr "card is permanently locked!\n"
 +
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
 +#, c-format
 +msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 +msgid_plural ""
 +"%d Admin PIN attempts remaining before card is permanently locked\n"
 +msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
 +msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
 +
 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 +#. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
 +#, c-format
 +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 +msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 +
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
 +msgid "|A|Please enter the Admin PIN"
 +msgstr "|A|Please enter the Admin PIN"
 +
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
 +msgid "access to admin commands is not configured\n"
 +msgstr "access to admin commands is not configured\n"
 +
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
 +msgid "||Please enter the Reset Code for the card"
 +msgstr "||Please enter the Reset Code for the card"
 +
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
 +#, c-format
 +msgid "Reset Code is too short; minimum length is %d\n"
 +msgstr "Reset Code is too short; minimum length is %d\n"
 +
 +#. TRANSLATORS: Do not translate the "|*|" prefixes but
 +#. keep it at the start of the string.  We need this elsewhere
 +#. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
 +msgid "|RN|New Reset Code"
 +msgstr "|RN|New Reset Code"
 +
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
 +msgid "|AN|New Admin PIN"
 +msgstr "|AN|New Admin PIN"
 +
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
 +msgid "|N|New PIN"
 +msgstr "|N|New PIN"
 +
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
 +msgid "||Please enter the Admin PIN and New Admin PIN"
 +msgstr "||Please enter the Admin PIN and New Admin PIN"
 +
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
 +msgid "||Please enter the PIN and New PIN"
 +msgstr "||Please enter the PIN and New PIN"
 +
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
 +msgid "error reading application data\n"
 +msgstr "error reading application data\n"
 +
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
 +msgid "error reading fingerprint DO\n"
 +msgstr "error reading fingerprint DO\n"
 +
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
 +msgid "key already exists\n"
 +msgstr "key already exists\n"
 +
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
 +msgid "existing key will be replaced\n"
 +msgstr "existing key will be replaced\n"
 +
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
 +msgid "generating new key\n"
 +msgstr "generating new key\n"
 +
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
 +msgid "writing new key\n"
 +msgstr "writing new key\n"
 +
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
 +msgid "creation timestamp missing\n"
 +msgstr "creation timestamp missing\n"
 +
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
 +#, c-format
 +msgid "RSA prime %s missing or not of size %d bits\n"
 +msgstr "RSA prime %s missing or not of size %d bits\n"
 +
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
 +#, c-format
 +msgid "failed to store the key: %s\n"
 +msgstr "failed to store the key: %s\n"
 +
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
 +msgid "unsupported curve\n"
 +msgstr "unsupported curve\n"
 +
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
 +msgid "please wait while key is being generated ...\n"
 +msgstr "please wait while key is being generated ...\n"
 +
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
 +msgid "generating key failed\n"
 +msgstr "generating key failed\n"
 +
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
 +#, c-format
 +msgid "key generation completed (%d second)\n"
 +msgid_plural "key generation completed (%d seconds)\n"
 +msgstr[0] "key generation completed (%d second)\n"
 +msgstr[1] "key generation completed (%d seconds)\n"
 +
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
 +msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 +msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 +
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
 +msgid "fingerprint on card does not match requested one\n"
 +msgstr "fingerprint on card does not match requested one\n"
 +
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
 +#, c-format
 +msgid "card does not support digest algorithm %s\n"
 +msgstr "card does not support digest algorithm %s\n"
 +
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
 +#, c-format
 +msgid "signatures created so far: %lu\n"
 +msgstr "signatures created so far: %lu\n"
 +
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
 +msgid ""
 +"verification of Admin PIN is currently prohibited through this command\n"
 +msgstr ""
 +"verification of Admin PIN is currently prohibited through this command\n"
 +
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
 +#, c-format
 +msgid "can't access %s - invalid OpenPGP card?\n"
 +msgstr "can't access %s - invalid OpenPGP card?\n"
 +
 +#: scd/app-dinsig.c:299
 +msgid "||Please enter your PIN at the reader's pinpad"
 +msgstr "||Please enter your PIN at the reader's pinpad"
 +
 +#. TRANSLATORS: Do not translate the "|*|" prefixes but
 +#. keep it at the start of the string.  We need this elsewhere
 +#. to get some infos on the string.
 +#: scd/app-dinsig.c:529
 +msgid "|N|Initial New PIN"
 +msgstr "|N|Initial New PIN"
 +
 +#: scd/scdaemon.c:114
 +msgid "run in multi server mode (foreground)"
 +msgstr "run in multi server mode (foreground)"
 +
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
 +msgid "|LEVEL|set the debugging level to LEVEL"
 +msgstr "|LEVEL|set the debugging level to LEVEL"
 +
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
 +msgid "|FILE|write a log to FILE"
 +msgstr "|FILE|write a log to FILE"
 +
 +#: scd/scdaemon.c:134
 +msgid "|N|connect to reader at port N"
 +msgstr "|N|connect to reader at port N"
 +
 +#: scd/scdaemon.c:136
 +msgid "|NAME|use NAME as ct-API driver"
 +msgstr "|NAME|use NAME as ct-API driver"
 +
 +#: scd/scdaemon.c:138
 +msgid "|NAME|use NAME as PC/SC driver"
 +msgstr "|NAME|use NAME as PC/SC driver"
 +
 +#: scd/scdaemon.c:141
 +msgid "do not use the internal CCID driver"
 +msgstr "do not use the internal CCID driver"
 +
 +#: scd/scdaemon.c:147
 +msgid "|N|disconnect the card after N seconds of inactivity"
 +msgstr "|N|disconnect the card after N seconds of inactivity"
 +
 +#: scd/scdaemon.c:150
 +msgid "do not use a reader's pinpad"
 +msgstr "do not use a reader's pinpad"
 +
 +#: scd/scdaemon.c:155
 +msgid "deny the use of admin card commands"
 +msgstr "deny the use of admin card commands"
 +
 +#: scd/scdaemon.c:158
 +msgid "use variable length input for pinpad"
 +msgstr "use variable length input for pinpad"
 +
 +#: scd/scdaemon.c:287
 +msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 +msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
 +
 +#: scd/scdaemon.c:289
 +msgid ""
 +"Syntax: scdaemon [options] [command [args]]\n"
 +"Smartcard daemon for @GNUPG@\n"
 +msgstr ""
 +"Syntax: scdaemon [options] [command [args]]\n"
 +"Smartcard daemon for @GNUPG@\n"
 +
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
 +msgid "please use the option '--daemon' to run the program in the background\n"
 +msgstr ""
 +"please use the option ‘--daemon’ to run the program in the background\n"
 +
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
 +#, c-format
 +msgid "handler for fd %d started\n"
 +msgstr "handler for fd %d started\n"
 +
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
 +#, c-format
 +msgid "handler for fd %d terminated\n"
 +msgstr "handler for fd %d terminated\n"
 +
 +#: sm/base64.c:327
 +#, c-format
 +msgid "invalid radix64 character %02x skipped\n"
 +msgstr "invalid radix64 character %02x skipped\n"
 +
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
 +msgid "no dirmngr running in this session\n"
 +msgstr "no dirmngr running in this session\n"
 +
 +#: sm/certchain.c:194
 +#, c-format
 +msgid "validation model requested by certificate: %s"
 +msgstr "validation model requested by certificate: %s"
 +
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
 +msgid "chain"
 +msgstr "chain"
 +
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
 +msgid "shell"
 +msgstr "shell"
 +
 +#: sm/certchain.c:256 dirmngr/validate.c:107
 +#, c-format
 +msgid "critical certificate extension %s is not supported"
 +msgstr "critical certificate extension %s is not supported"
 +
 +#: sm/certchain.c:295 dirmngr/validate.c:205
 +msgid "issuer certificate is not marked as a CA"
 +msgstr "issuer certificate is not marked as a CA"
 +
 +#: sm/certchain.c:333
 +msgid "critical marked policy without configured policies"
 +msgstr "critical marked policy without configured policies"
 +
 +#: sm/certchain.c:343
 +#, c-format
 +msgid "failed to open '%s': %s\n"
 +msgstr "failed to open '%s': %s\n"
 +
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
 +msgid "Note: non-critical certificate policy not allowed"
 +msgstr "Note: non-critical certificate policy not allowed"
 +
 +#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
 +msgid "certificate policy not allowed"
 +msgstr "certificate policy not allowed"
 +
- #: sm/certchain.c:527
++#: sm/certchain.c:538
 +msgid "looking up issuer at external location\n"
 +msgstr "looking up issuer at external location\n"
 +
- #: sm/certchain.c:546
++#: sm/certchain.c:558
 +#, c-format
 +msgid "number of issuers matching: %d\n"
 +msgstr "number of issuers matching: %d\n"
 +
- #: sm/certchain.c:590
++#: sm/certchain.c:606
 +msgid "looking up issuer from the Dirmngr cache\n"
 +msgstr "looking up issuer from the Dirmngr cache\n"
 +
- #: sm/certchain.c:614
++#: sm/certchain.c:631
 +#, c-format
 +msgid "number of matching certificates: %d\n"
 +msgstr "number of matching certificates: %d\n"
 +
- #: sm/certchain.c:616
++#: sm/certchain.c:634
 +#, c-format
 +msgid "dirmngr cache-only key lookup failed: %s\n"
 +msgstr "dirmngr cache-only key lookup failed: %s\n"
 +
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
 +msgid "failed to allocate keyDB handle\n"
 +msgstr "failed to allocate keyDB handle\n"
 +
- #: sm/certchain.c:981
++#: sm/certchain.c:999
 +msgid "certificate has been revoked"
 +msgstr "certificate has been revoked"
 +
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
 +msgid "the status of the certificate is unknown"
 +msgstr "the status of the certificate is unknown"
 +
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
 +msgid "please make sure that the \"dirmngr\" is properly installed\n"
 +msgstr "please make sure that the “dirmngr” is properly installed\n"
 +
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
 +#, c-format
 +msgid "checking the CRL failed: %s"
 +msgstr "checking the CRL failed: %s"
 +
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
 +#, c-format
 +msgid "certificate with invalid validity: %s"
 +msgstr "certificate with invalid validity: %s"
 +
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
 +msgid "certificate not yet valid"
 +msgstr "certificate not yet valid"
 +
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
 +msgid "root certificate not yet valid"
 +msgstr "root certificate not yet valid"
 +
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
 +msgid "intermediate certificate not yet valid"
 +msgstr "intermediate certificate not yet valid"
 +
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
 +msgid "certificate has expired"
 +msgstr "certificate has expired"
 +
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
 +msgid "root certificate has expired"
 +msgstr "root certificate has expired"
 +
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
 +msgid "intermediate certificate has expired"
 +msgstr "intermediate certificate has expired"
 +
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
 +#, c-format
 +msgid "required certificate attributes missing: %s%s%s"
 +msgstr "required certificate attributes missing: %s%s%s"
 +
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
 +msgid "certificate with invalid validity"
 +msgstr "certificate with invalid validity"
 +
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
 +msgid "signature not created during lifetime of certificate"
 +msgstr "signature not created during lifetime of certificate"
 +
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
 +msgid "certificate not created during lifetime of issuer"
 +msgstr "certificate not created during lifetime of issuer"
 +
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
 +msgid "intermediate certificate not created during lifetime of issuer"
 +msgstr "intermediate certificate not created during lifetime of issuer"
 +
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
 +msgid "  (  signature created at "
 +msgstr "  (  signature created at "
 +
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
 +msgid "  (certificate created at "
 +msgstr "  (certificate created at "
 +
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
 +msgid "  (certificate valid from "
 +msgstr "  (certificate valid from "
 +
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
 +msgid "  (     issuer valid from "
 +msgstr "  (     issuer valid from "
 +
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
 +#, c-format
 +msgid "fingerprint=%s\n"
 +msgstr "fingerprint=%s\n"
 +
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
 +msgid "root certificate has now been marked as trusted\n"
 +msgstr "root certificate has now been marked as trusted\n"
 +
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
 +msgid "interactive marking as trusted not enabled in gpg-agent\n"
 +msgstr "interactive marking as trusted not enabled in gpg-agent\n"
 +
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
 +msgid "interactive marking as trusted disabled for this session\n"
 +msgstr "interactive marking as trusted disabled for this session\n"
 +
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
 +msgid "WARNING: creation time of signature not known - assuming current time"
 +msgstr "WARNING: creation time of signature not known - assuming current time"
 +
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
 +msgid "no issuer found in certificate"
 +msgstr "no issuer found in certificate"
 +
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
 +msgid "self-signed certificate has a BAD signature"
 +msgstr "self-signed certificate has a BAD signature"
 +
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
 +msgid "root certificate is not marked trusted"
 +msgstr "root certificate is not marked trusted"
 +
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
 +#, c-format
 +msgid "checking the trust list failed: %s\n"
 +msgstr "checking the trust list failed: %s\n"
 +
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
 +msgid "certificate chain too long\n"
 +msgstr "certificate chain too long\n"
 +
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
 +msgid "issuer certificate not found"
 +msgstr "issuer certificate not found"
 +
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
 +msgid "certificate has a BAD signature"
 +msgstr "certificate has a BAD signature"
 +
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
 +msgid "found another possible matching CA certificate - trying again"
 +msgstr "found another possible matching CA certificate - trying again"
 +
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
 +#, c-format
 +msgid "certificate chain longer than allowed by CA (%d)"
 +msgstr "certificate chain longer than allowed by CA (%d)"
 +
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
 +msgid "certificate is good\n"
 +msgstr "certificate is good\n"
 +
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
 +msgid "intermediate certificate is good\n"
 +msgstr "intermediate certificate is good\n"
 +
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
 +msgid "root certificate is good\n"
 +msgstr "root certificate is good\n"
 +
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
 +msgid "switching to chain model"
 +msgstr "switching to chain model"
 +
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
 +#, c-format
 +msgid "validation model used: %s"
 +msgstr "validation model used: %s"
 +
 +#: sm/certcheck.c:107
 +#, c-format
 +msgid "a %u bit hash is not valid for a %u bit %s key\n"
 +msgstr "a %u bit hash is not valid for a %u bit %s key\n"
 +
 +#: sm/certcheck.c:244 sm/verify.c:202
 +msgid "(this is the MD2 algorithm)\n"
 +msgstr "(this is the MD2 algorithm)\n"
 +
 +#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
 +msgid "none"
 +msgstr "none"
 +
 +#: sm/certdump.c:552 sm/certdump.c:617
 +msgid "[Error - invalid encoding]"
 +msgstr "[Error - invalid encoding]"
 +
 +#: sm/certdump.c:560
 +msgid "[Error - out of core]"
 +msgstr "[Error - out of core]"
 +
 +#: sm/certdump.c:596
 +msgid "[Error - No name]"
 +msgstr "[Error - No name]"
 +
 +#: sm/certdump.c:623
 +msgid "[Error - invalid DN]"
 +msgstr "[Error - invalid DN]"
 +
 +#: sm/certdump.c:833
 +#, c-format
 +msgid ""
 +"Please enter the passphrase to unlock the secret key for the X.509 "
 +"certificate:\n"
 +"\"%s\"\n"
 +"S/N %s, ID 0x%08lX,\n"
 +"created %s, expires %s.\n"
 +msgstr ""
 +"Please enter the passphrase to unlock the secret key for the X.509 "
 +"certificate:\n"
 +"“%s”\n"
 +"S/N %s, ID 0x%08lX,\n"
 +"created %s, expires %s.\n"
 +
 +#: sm/certlist.c:122 dirmngr/validate.c:1075
 +msgid "no key usage specified - assuming all usages\n"
 +msgstr "no key usage specified - assuming all usages\n"
 +
 +#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
 +#, c-format
 +msgid "error getting key usage information: %s\n"
 +msgstr "error getting key usage information: %s\n"
 +
 +#: sm/certlist.c:142 dirmngr/validate.c:1095
 +msgid "certificate should not have been used for certification\n"
 +msgstr "certificate should not have been used for certification\n"
 +
 +#: sm/certlist.c:154 dirmngr/validate.c:1107
 +msgid "certificate should not have been used for OCSP response signing\n"
 +msgstr "certificate should not have been used for OCSP response signing\n"
 +
 +#: sm/certlist.c:165 dirmngr/validate.c:1127
 +msgid "certificate should not have been used for encryption\n"
 +msgstr "certificate should not have been used for encryption\n"
 +
 +#: sm/certlist.c:166 dirmngr/validate.c:1129
 +msgid "certificate should not have been used for signing\n"
 +msgstr "certificate should not have been used for signing\n"
 +
 +#: sm/certlist.c:167 dirmngr/validate.c:1130
 +msgid "certificate is not usable for encryption\n"
 +msgstr "certificate is not usable for encryption\n"
 +
 +#: sm/certlist.c:168 dirmngr/validate.c:1131
 +msgid "certificate is not usable for signing\n"
 +msgstr "certificate is not usable for signing\n"
 +
 +#: sm/certreqgen.c:464
 +#, c-format
 +msgid "line %d: invalid algorithm\n"
 +msgstr "line %d: invalid algorithm\n"
 +
 +#: sm/certreqgen.c:478
 +#, c-format
 +msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 +msgstr "line %d: invalid key length %u (valid are %d to %d)\n"
 +
 +#: sm/certreqgen.c:496
 +#, c-format
 +msgid "line %d: no subject name given\n"
 +msgstr "line %d: no subject name given\n"
 +
 +#: sm/certreqgen.c:505
 +#, c-format
 +msgid "line %d: invalid subject name label '%.*s'\n"
 +msgstr "line %d: invalid subject name label ‘%.*s’\n"
 +
 +#: sm/certreqgen.c:508
 +#, c-format
 +msgid "line %d: invalid subject name '%s' at pos %d\n"
 +msgstr "line %d: invalid subject name ‘%s’ at pos %d\n"
 +
 +#: sm/certreqgen.c:525
 +#, c-format
 +msgid "line %d: not a valid email address\n"
 +msgstr "line %d: not a valid email address\n"
 +
 +#: sm/certreqgen.c:544
 +#, c-format
 +msgid "line %d: invalid serial number\n"
 +msgstr "line %d: invalid serial number\n"
 +
 +#: sm/certreqgen.c:560
 +#, c-format
 +msgid "line %d: invalid issuer name label '%.*s'\n"
 +msgstr "line %d: invalid issuer name label ‘%.*s’\n"
 +
 +#: sm/certreqgen.c:563
 +#, c-format
 +msgid "line %d: invalid issuer name '%s' at pos %d\n"
 +msgstr "line %d: invalid issuer name ‘%s’ at pos %d\n"
 +
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
 +#, c-format
 +msgid "line %d: invalid date given\n"
 +msgstr "line %d: invalid date given\n"
 +
 +#: sm/certreqgen.c:599
 +#, c-format
 +msgid "line %d: error getting signing key by keygrip '%s': %s\n"
 +msgstr "line %d: error getting signing key by keygrip '%s': %s\n"
 +
 +#: sm/certreqgen.c:618
 +#, c-format
 +msgid "line %d: invalid hash algorithm given\n"
 +msgstr "line %d: invalid hash algorithm given\n"
 +
 +#: sm/certreqgen.c:633
 +#, c-format
 +msgid "line %d: invalid authority-key-id\n"
 +msgstr "line %d: invalid authority-key-id\n"
 +
 +#: sm/certreqgen.c:648
 +#, c-format
 +msgid "line %d: invalid subject-key-id\n"
 +msgstr "line %d: invalid subject-key-id\n"
 +
 +#: sm/certreqgen.c:686
 +#, c-format
 +msgid "line %d: invalid extension syntax\n"
 +msgstr "line %d: invalid extension syntax\n"
 +
 +#: sm/certreqgen.c:699
 +#, c-format
 +msgid "line %d: error reading key '%s' from card: %s\n"
 +msgstr "line %d: error reading key ‘%s’ from card: %s\n"
 +
 +#: sm/certreqgen.c:712
 +#, c-format
 +msgid "line %d: error getting key by keygrip '%s': %s\n"
 +msgstr "line %d: error getting key by keygrip '%s': %s\n"
 +
 +#: sm/certreqgen.c:729
 +#, c-format
 +msgid "line %d: key generation failed: %s <%s>\n"
 +msgstr "line %d: key generation failed: %s <%s>\n"
 +
 +#: sm/certreqgen.c:1324
 +msgid ""
 +"To complete this certificate request please enter the passphrase for the key "
 +"you just created once more.\n"
 +msgstr ""
 +"To complete this certificate request please enter the passphrase for the key "
 +"you just created once more.\n"
 +
 +#: sm/certreqgen-ui.c:162
 +#, c-format
 +msgid "   (%d) RSA\n"
 +msgstr "   (%d) RSA\n"
 +
 +#: sm/certreqgen-ui.c:163
 +#, c-format
 +msgid "   (%d) Existing key\n"
 +msgstr "   (%d) Existing key\n"
 +
 +#: sm/certreqgen-ui.c:164
 +#, c-format
 +msgid "   (%d) Existing key from card\n"
 +msgstr "   (%d) Existing key from card\n"
 +
 +#: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
 +#, c-format
 +msgid "error reading the card: %s\n"
 +msgstr "error reading the card: %s\n"
 +
 +#: sm/certreqgen-ui.c:237
 +#, c-format
 +msgid "Serial number of the card: %s\n"
 +msgstr "Serial number of the card: %s\n"
 +
 +#: sm/certreqgen-ui.c:249
 +msgid "Available keys:\n"
 +msgstr "Available keys:\n"
 +
 +#: sm/certreqgen-ui.c:280
 +#, c-format
 +msgid "Possible actions for a %s key:\n"
 +msgstr "Possible actions for a %s key:\n"
 +
 +#: sm/certreqgen-ui.c:281
 +#, c-format
 +msgid "   (%d) sign, encrypt\n"
 +msgstr "   (%d) sign, encrypt\n"
 +
 +#: sm/certreqgen-ui.c:282
 +#, c-format
 +msgid "   (%d) sign\n"
 +msgstr "   (%d) sign\n"
 +
 +#: sm/certreqgen-ui.c:283
 +#, c-format
 +msgid "   (%d) encrypt\n"
 +msgstr "   (%d) encrypt\n"
 +
 +#: sm/certreqgen-ui.c:307
 +msgid "Enter the X.509 subject name: "
 +msgstr "Enter the X.509 subject name: "
 +
 +#: sm/certreqgen-ui.c:311
 +msgid "No subject name given\n"
 +msgstr "No subject name given\n"
 +
 +#: sm/certreqgen-ui.c:315
 +#, c-format
 +msgid "Invalid subject name label '%.*s'\n"
 +msgstr "Invalid subject name label ‘%.*s’\n"
 +
 +#. TRANSLATORS: The 22 in the second string is the
 +#. length of the first string up to the "%s".  Please
 +#. adjust it do the length of your translation.  The
 +#. second string is merely passed to atoi so you can
 +#. drop everything after the number.
 +#: sm/certreqgen-ui.c:324
 +#, c-format
 +msgid "Invalid subject name '%s'\n"
 +msgstr "Invalid subject name ‘%s’\n"
 +
 +#: sm/certreqgen-ui.c:326
 +msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 +msgstr "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 +
 +#: sm/certreqgen-ui.c:338
 +msgid "Enter email addresses"
 +msgstr "Enter email addresses"
 +
 +#: sm/certreqgen-ui.c:339
 +msgid " (end with an empty line):\n"
 +msgstr " (end with an empty line):\n"
 +
 +#: sm/certreqgen-ui.c:343
 +msgid "Enter DNS names"
 +msgstr "Enter DNS names"
 +
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
 +msgid " (optional; end with an empty line):\n"
 +msgstr " (optional; end with an empty line):\n"
 +
 +#: sm/certreqgen-ui.c:348
 +msgid "Enter URIs"
 +msgstr "Enter URIs"
 +
 +#: sm/certreqgen-ui.c:355
 +msgid "Create self-signed certificate? (y/N) "
 +msgstr "Create self-signed certificate? (y/N) "
 +
 +#: sm/certreqgen-ui.c:382
 +msgid "These parameters are used:\n"
 +msgstr "These parameters are used:\n"
 +
 +#: sm/certreqgen-ui.c:400
 +msgid "Now creating self-signed certificate.  "
 +msgstr "Now creating self-signed certificate.  "
 +
 +#: sm/certreqgen-ui.c:402
 +msgid "Now creating certificate request.  "
 +msgstr "Now creating certificate request.  "
 +
 +#: sm/certreqgen-ui.c:403
 +msgid "This may take a while ...\n"
 +msgstr "This may take a while ...\n"
 +
 +#: sm/certreqgen-ui.c:414
 +msgid "Ready.\n"
 +msgstr "Ready.\n"
 +
 +#: sm/certreqgen-ui.c:417
 +msgid "Ready.  You should now send this request to your CA.\n"
 +msgstr "Ready.  You should now send this request to your CA.\n"
 +
 +#: sm/certreqgen-ui.c:423
 +msgid "resource problem: out of core\n"
 +msgstr "resource problem: out of core\n"
 +
 +#: sm/decrypt.c:330
 +msgid "(this is the RC2 algorithm)\n"
 +msgstr "(this is the RC2 algorithm)\n"
 +
 +#: sm/decrypt.c:332
 +msgid "(this does not seem to be an encrypted message)\n"
 +msgstr "(this does not seem to be an encrypted message)\n"
 +
 +#: sm/delete.c:51 sm/delete.c:112
 +#, c-format
 +msgid "certificate '%s' not found: %s\n"
 +msgstr "certificate ‘%s’ not found: %s\n"
 +
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
 +#, c-format
 +msgid "error locking keybox: %s\n"
 +msgstr "error locking keybox: %s\n"
 +
 +#: sm/delete.c:143
 +#, c-format
 +msgid "duplicated certificate '%s' deleted\n"
 +msgstr "duplicated certificate ‘%s’ deleted\n"
 +
 +#: sm/delete.c:145
 +#, c-format
 +msgid "certificate '%s' deleted\n"
 +msgstr "certificate ‘%s’ deleted\n"
 +
 +#: sm/delete.c:175
 +#, c-format
 +msgid "deleting certificate \"%s\" failed: %s\n"
 +msgstr "deleting certificate “%s” failed: %s\n"
 +
 +#: sm/encrypt.c:328
 +msgid "no valid recipients given\n"
 +msgstr "no valid recipients given\n"
 +
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
 +msgid "list external keys"
 +msgstr "list external keys"
 +
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
 +msgid "list certificate chain"
 +msgstr "list certificate chain"
 +
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
 +msgid "import certificates"
 +msgstr "import certificates"
 +
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
 +msgid "export certificates"
 +msgstr "export certificates"
 +
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
 +msgid "register a smartcard"
 +msgstr "register a smartcard"
 +
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
 +msgid "pass a command to the dirmngr"
 +msgstr "pass a command to the dirmngr"
 +
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
 +msgid "invoke gpg-protect-tool"
 +msgstr "invoke gpg-protect-tool"
 +
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
 +msgid "create base-64 encoded output"
 +msgstr "create base-64 encoded output"
 +
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
 +msgid "assume input is in PEM format"
 +msgstr "assume input is in PEM format"
 +
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
 +msgid "assume input is in base-64 format"
 +msgstr "assume input is in base-64 format"
 +
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
 +msgid "assume input is in binary format"
 +msgstr "assume input is in binary format"
 +
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
 +msgid "never consult a CRL"
 +msgstr "never consult a CRL"
 +
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
 +msgid "check validity using OCSP"
 +msgstr "check validity using OCSP"
 +
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
 +msgid "|N|number of certificates to include"
 +msgstr "|N|number of certificates to include"
 +
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
 +msgid "|FILE|take policy information from FILE"
 +msgstr "|FILE|take policy information from FILE"
 +
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
 +msgid "do not check certificate policies"
 +msgstr "do not check certificate policies"
 +
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
 +msgid "fetch missing issuer certificates"
 +msgstr "fetch missing issuer certificates"
 +
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
 +msgid "don't use the terminal at all"
 +msgstr "don't use the terminal at all"
 +
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
 +msgid "|FILE|write a server mode log to FILE"
 +msgstr "|FILE|write a server mode log to FILE"
 +
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
 +msgid "|FILE|write an audit log to FILE"
 +msgstr "|FILE|write an audit log to FILE"
 +
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
 +msgid "batch mode: never ask"
 +msgstr "batch mode: never ask"
 +
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
 +msgid "assume yes on most questions"
 +msgstr "assume yes on most questions"
 +
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
 +msgid "assume no on most questions"
 +msgstr "assume no on most questions"
 +
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
 +msgid "|FILE|add keyring to the list of keyrings"
 +msgstr "|FILE|add keyring to the list of keyrings"
 +
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
 +msgid "|USER-ID|use USER-ID as default secret key"
 +msgstr "|USER-ID|use USER-ID as default secret key"
 +
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
 +msgid "|SPEC|use this keyserver to lookup keys"
 +msgstr "|SPEC|use this keyserver to lookup keys"
 +
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
 +msgid "|NAME|use cipher algorithm NAME"
 +msgstr "|NAME|use cipher algorithm NAME"
 +
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
 +msgid "|NAME|use message digest algorithm NAME"
 +msgstr "|NAME|use message digest algorithm NAME"
 +
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
 +msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 +msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 +
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
 +msgid ""
 +"Syntax: @GPGSM@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 +"Default operation depends on the input data\n"
 +msgstr ""
 +"Syntax: @GPGSM@ [options] [files]\n"
 +"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 +"Default operation depends on the input data\n"
 +
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
 +#, c-format
 +msgid "Note: won't be able to encrypt to '%s': %s\n"
 +msgstr "Note: won't be able to encrypt to '%s': %s\n"
 +
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
 +#, c-format
 +msgid "unknown validation model '%s'\n"
 +msgstr "unknown validation model ‘%s’\n"
 +
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
 +#, c-format
 +msgid "%s:%u: no hostname given\n"
 +msgstr "%s:%u: no hostname given\n"
 +
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
 +#, c-format
 +msgid "%s:%u: password given without user\n"
 +msgstr "%s:%u: password given without user\n"
 +
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
 +#, c-format
 +msgid "%s:%u: skipping this line\n"
 +msgstr "%s:%u: skipping this line\n"
 +
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
 +msgid "could not parse keyserver\n"
 +msgstr "could not parse keyserver\n"
 +
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
 +#, c-format
 +msgid "importing common certificates '%s'\n"
 +msgstr "importing common certificates ‘%s’\n"
 +
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
 +#, c-format
 +msgid "can't sign using '%s': %s\n"
 +msgstr "can't sign using '%s': %s\n"
 +
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
 +msgid "invalid command (there is no implicit command)\n"
 +msgstr "invalid command (there is no implicit command)\n"
 +
 +#: sm/import.c:127
 +#, c-format
 +msgid "total number processed: %lu\n"
 +msgstr "total number processed: %lu\n"
 +
 +#: sm/import.c:246
 +msgid "error storing certificate\n"
 +msgstr "error storing certificate\n"
 +
 +#: sm/import.c:254
 +msgid "basic certificate checks failed - not imported\n"
 +msgstr "basic certificate checks failed - not imported\n"
 +
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
 +#, c-format
 +msgid "error getting stored flags: %s\n"
 +msgstr "error getting stored flags: %s\n"
 +
 +#: sm/import.c:526 sm/import.c:558
 +#, c-format
 +msgid "error importing certificate: %s\n"
 +msgstr "error importing certificate: %s\n"
 +
 +#: sm/import.c:746 tools/gpg-connect-agent.c:1433
 +#, c-format
 +msgid "error reading input: %s\n"
 +msgstr "error reading input: %s\n"
 +
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
 +msgid "failed to get the fingerprint\n"
 +msgstr "failed to get the fingerprint\n"
 +
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
 +#, c-format
 +msgid "problem looking for existing certificate: %s\n"
 +msgstr "problem looking for existing certificate: %s\n"
 +
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
 +#, c-format
 +msgid "error finding writable keyDB: %s\n"
 +msgstr "error finding writable keyDB: %s\n"
 +
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
 +#, c-format
 +msgid "error storing certificate: %s\n"
 +msgstr "error storing certificate: %s\n"
 +
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
 +#, c-format
 +msgid "problem re-searching certificate: %s\n"
 +msgstr "problem re-searching certificate: %s\n"
 +
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
 +#, c-format
 +msgid "error storing flags: %s\n"
 +msgstr "error storing flags: %s\n"
 +
 +#: sm/keylist.c:657
 +msgid "Error - "
 +msgstr "Error - "
 +
 +#: sm/misc.c:58
 +msgid "GPG_TTY has not been set - using maybe bogus default\n"
 +msgstr "GPG_TTY has not been set - using maybe bogus default\n"
 +
 +#: sm/qualified.c:105
 +#, c-format
 +msgid "invalid formatted fingerprint in '%s', line %d\n"
 +msgstr "invalid formatted fingerprint in '%s', line %d\n"
 +
 +#: sm/qualified.c:123
 +#, c-format
 +msgid "invalid country code in '%s', line %d\n"
 +msgstr "invalid country code in '%s', line %d\n"
 +
 +#: sm/qualified.c:206
 +#, c-format
 +msgid ""
 +"You are about to create a signature using your certificate:\n"
 +"\"%s\"\n"
 +"This will create a qualified signature by law equated to a handwritten "
 +"signature.\n"
 +"\n"
 +"%s%sAre you really sure that you want to do this?"
 +msgstr ""
 +"You are about to create a signature using your certificate:\n"
 +"“%s”\n"
 +"This will create a qualified signature by law equated to a handwritten "
 +"signature.\n"
 +"\n"
 +"%s%sAre you really sure that you want to do this?"
 +
 +#: sm/qualified.c:215 sm/verify.c:617
 +msgid ""
 +"Note, that this software is not officially approved to create or verify such "
 +"signatures.\n"
 +msgstr ""
 +"Note, that this software is not officially approved to create or verify such "
 +"signatures.\n"
 +
 +#: sm/qualified.c:282
 +#, c-format
 +msgid ""
 +"You are about to create a signature using your certificate:\n"
 +"\"%s\"\n"
 +"Note, that this certificate will NOT create a qualified signature!"
 +msgstr ""
 +"You are about to create a signature using your certificate:\n"
 +"“%s”\n"
 +"Note, that this certificate will NOT create a qualified signature!"
 +
 +#: sm/sign.c:451
 +#, c-format
 +msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 +msgstr "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 +
 +#: sm/sign.c:465
 +#, c-format
 +msgid "hash algorithm used for signer %d: %s (%s)\n"
 +msgstr "hash algorithm used for signer %d: %s (%s)\n"
 +
 +#: sm/sign.c:517
 +#, c-format
 +msgid "checking for qualified certificate failed: %s\n"
 +msgstr "checking for qualified certificate failed: %s\n"
 +
 +#: sm/verify.c:450
 +msgid "Signature made "
 +msgstr "Signature made "
 +
 +#: sm/verify.c:454
 +msgid "[date not given]"
 +msgstr "[date not given]"
 +
 +#: sm/verify.c:455
 +#, c-format
 +msgid " using certificate ID 0x%08lX\n"
 +msgstr " using certificate ID 0x%08lX\n"
 +
 +#: sm/verify.c:474
 +msgid ""
 +"invalid signature: message digest attribute does not match computed one\n"
 +msgstr ""
 +"invalid signature: message digest attribute does not match computed one\n"
 +
 +#: sm/verify.c:595
 +msgid "Good signature from"
 +msgstr "Good signature from"
 +
 +#: sm/verify.c:596
 +msgid "                aka"
 +msgstr "                aka"
 +
 +#: sm/verify.c:614
 +msgid "This is a qualified signature\n"
 +msgstr "This is a qualified signature\n"
 +
 +#: dirmngr/certcache.c:106
 +#, c-format
 +msgid "can't initialize certificate cache lock: %s\n"
 +msgstr "can't initialize certificate cache lock: %s\n"
 +
 +#: dirmngr/certcache.c:117
 +#, c-format
 +msgid "can't acquire read lock on the certificate cache: %s\n"
 +msgstr "can't acquire read lock on the certificate cache: %s\n"
 +
 +#: dirmngr/certcache.c:128
 +#, c-format
 +msgid "can't acquire write lock on the certificate cache: %s\n"
 +msgstr "can't acquire write lock on the certificate cache: %s\n"
 +
 +#: dirmngr/certcache.c:139
 +#, c-format
 +msgid "can't release lock on the certificate cache: %s\n"
 +msgstr "can't release lock on the certificate cache: %s\n"
 +
 +#: dirmngr/certcache.c:267
 +#, c-format
 +msgid "dropping %u certificates from the cache\n"
 +msgstr "dropping %u certificates from the cache\n"
 +
 +#: dirmngr/certcache.c:387
 +#, c-format
 +msgid "can't parse certificate '%s': %s\n"
 +msgstr "can't parse certificate '%s': %s\n"
 +
 +#: dirmngr/certcache.c:395
 +#, c-format
 +msgid "certificate '%s' already cached\n"
 +msgstr "certificate ‘%s’ already cached\n"
 +
 +#: dirmngr/certcache.c:399
 +#, c-format
 +msgid "trusted certificate '%s' loaded\n"
 +msgstr "trusted certificate ‘%s’ loaded\n"
 +
 +#: dirmngr/certcache.c:401
 +#, c-format
 +msgid "certificate '%s' loaded\n"
 +msgstr "certificate ‘%s’ loaded\n"
 +
 +#: dirmngr/certcache.c:405
 +#, c-format
 +msgid "  SHA1 fingerprint = %s\n"
 +msgstr "  SHA1 fingerprint = %s\n"
 +
 +#: dirmngr/certcache.c:408
 +msgid "   issuer ="
 +msgstr "   issuer ="
 +
 +#: dirmngr/certcache.c:409
 +msgid "  subject ="
 +msgstr "  subject ="
 +
 +#: dirmngr/certcache.c:413
 +#, c-format
 +msgid "error loading certificate '%s': %s\n"
 +msgstr "error loading certificate '%s': %s\n"
 +
 +#: dirmngr/certcache.c:489
 +#, c-format
 +msgid "permanently loaded certificates: %u\n"
 +msgstr "permanently loaded certificates: %u\n"
 +
 +#: dirmngr/certcache.c:491
 +#, c-format
 +msgid "    runtime cached certificates: %u\n"
 +msgstr "    runtime cached certificates: %u\n"
 +
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
 +msgid "certificate already cached\n"
 +msgstr "certificate already cached\n"
 +
 +#: dirmngr/certcache.c:508
 +msgid "certificate cached\n"
 +msgstr "certificate cached\n"
 +
 +#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
 +#: dirmngr/dirmngr-client.c:389
 +#, c-format
 +msgid "error caching certificate: %s\n"
 +msgstr "error caching certificate: %s\n"
 +
 +#: dirmngr/certcache.c:593
 +#, c-format
 +msgid "invalid SHA1 fingerprint string '%s'\n"
 +msgstr "invalid SHA1 fingerprint string ‘%s’\n"
 +
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
 +#, c-format
 +msgid "error fetching certificate by S/N: %s\n"
 +msgstr "error fetching certificate by S/N: %s\n"
 +
 +#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
 +#, c-format
 +msgid "error fetching certificate by subject: %s\n"
 +msgstr "error fetching certificate by subject: %s\n"
 +
 +#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
 +msgid "no issuer found in certificate\n"
 +msgstr "no issuer found in certificate\n"
 +
 +#: dirmngr/certcache.c:1325
 +#, c-format
 +msgid "error getting authorityKeyIdentifier: %s\n"
 +msgstr "error getting authorityKeyIdentifier: %s\n"
 +
 +#: dirmngr/crlcache.c:213
 +#, c-format
 +msgid "creating directory '%s'\n"
 +msgstr "creating directory ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:217
 +#, c-format
 +msgid "error creating directory '%s': %s\n"
 +msgstr "error creating directory '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:245
 +#, c-format
 +msgid "ignoring database dir '%s'\n"
 +msgstr "ignoring database dir ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:254
 +#, c-format
 +msgid "error reading directory '%s': %s\n"
 +msgstr "error reading directory '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:275
 +#, c-format
 +msgid "removing cache file '%s'\n"
 +msgstr "removing cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:284
 +#, c-format
 +msgid "not removing file '%s'\n"
 +msgstr "not removing file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
 +#, c-format
 +msgid "error closing cache file: %s\n"
 +msgstr "error closing cache file: %s\n"
 +
 +#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
 +#, c-format
 +msgid "failed to open cache dir file '%s': %s\n"
 +msgstr "failed to open cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:421
 +#, c-format
 +msgid "error creating new cache dir file '%s': %s\n"
 +msgstr "error creating new cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:428
 +#, c-format
 +msgid "error writing new cache dir file '%s': %s\n"
 +msgstr "error writing new cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:435
 +#, c-format
 +msgid "error closing new cache dir file '%s': %s\n"
 +msgstr "error closing new cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:440
 +#, c-format
 +msgid "new cache dir file '%s' created\n"
 +msgstr "new cache dir file ‘%s’ created\n"
 +
 +#: dirmngr/crlcache.c:445
 +#, c-format
 +msgid "failed to re-open cache dir file '%s': %s\n"
 +msgstr "failed to re-open cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:473
 +#, c-format
 +msgid "first record of '%s' is not the version\n"
 +msgstr "first record of ‘%s’ is not the version\n"
 +
 +#: dirmngr/crlcache.c:488
 +msgid "old version of cache directory - cleaning up\n"
 +msgstr "old version of cache directory - cleaning up\n"
 +
 +#: dirmngr/crlcache.c:504
 +msgid "old version of cache directory - giving up\n"
 +msgstr "old version of cache directory - giving up\n"
 +
 +#: dirmngr/crlcache.c:615
 +#, c-format
 +msgid "extra field detected in crl record of '%s' line %u\n"
 +msgstr "extra field detected in crl record of ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:623
 +#, c-format
 +msgid "invalid line detected in '%s' line %u\n"
 +msgstr "invalid line detected in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:632
 +#, c-format
 +msgid "duplicate entry detected in '%s' line %u\n"
 +msgstr "duplicate entry detected in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:647
 +#, c-format
 +msgid "unsupported record type in '%s' line %u skipped\n"
 +msgstr "unsupported record type in ‘%s’ line %u skipped\n"
 +
 +#: dirmngr/crlcache.c:673
 +#, c-format
 +msgid "invalid issuer hash in '%s' line %u\n"
 +msgstr "invalid issuer hash in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:679
 +#, c-format
 +msgid "no issuer DN in '%s' line %u\n"
 +msgstr "no issuer DN in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:686
 +#, c-format
 +msgid "invalid timestamp in '%s' line %u\n"
 +msgstr "invalid timestamp in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:692
 +#, c-format
 +msgid "WARNING: invalid cache file hash in '%s' line %u\n"
 +msgstr "WARNING: invalid cache file hash in ‘%s’ line %u\n"
 +
 +#: dirmngr/crlcache.c:698
 +msgid "detected errors in cache dir file\n"
 +msgstr "detected errors in cache dir file\n"
 +
 +#: dirmngr/crlcache.c:699
 +msgid "please check the reason and manually delete that file\n"
 +msgstr "please check the reason and manually delete that file\n"
 +
 +#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
 +#, c-format
 +msgid "failed to create temporary cache dir file '%s': %s\n"
 +msgstr "failed to create temporary cache dir file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:937
 +#, c-format
 +msgid "error closing '%s': %s\n"
 +msgstr "error closing '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:949
 +#, c-format
 +msgid "error renaming '%s' to '%s': %s\n"
 +msgstr "error renaming ‘%s’ to '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1003
 +#, c-format
 +msgid "can't hash '%s': %s\n"
 +msgstr "can't hash '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1011
 +#, c-format
 +msgid "error setting up MD5 hash context: %s\n"
 +msgstr "error setting up MD5 hash context: %s\n"
 +
 +#: dirmngr/crlcache.c:1027
 +#, c-format
 +msgid "error hashing '%s': %s\n"
 +msgstr "error hashing '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1055
 +#, c-format
 +msgid "invalid formatted checksum for '%s'\n"
 +msgstr "invalid formatted checksum for ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:1108
 +msgid "too many open cache files; can't open anymore\n"
 +msgstr "too many open cache files; can't open anymore\n"
 +
 +#: dirmngr/crlcache.c:1126
 +#, c-format
 +msgid "opening cache file '%s'\n"
 +msgstr "opening cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:1145
 +#, c-format
 +msgid "error opening cache file '%s': %s\n"
 +msgstr "error opening cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:1154
 +#, c-format
 +msgid "error initializing cache file '%s' for reading: %s\n"
 +msgstr "error initializing cache file ‘%s’ for reading: %s\n"
 +
 +#: dirmngr/crlcache.c:1175
 +msgid "calling unlock_db_file on a closed file\n"
 +msgstr "calling unlock_db_file on a closed file\n"
 +
 +#: dirmngr/crlcache.c:1177
 +msgid "calling unlock_db_file on an unlocked file\n"
 +msgstr "calling unlock_db_file on an unlocked file\n"
 +
 +#: dirmngr/crlcache.c:1231
 +#, c-format
 +msgid "failed to create a new cache object: %s\n"
 +msgstr "failed to create a new cache object: %s\n"
 +
 +#: dirmngr/crlcache.c:1286
 +#, c-format
 +msgid "no CRL available for issuer id %s\n"
 +msgstr "no CRL available for issuer id %s\n"
 +
 +#: dirmngr/crlcache.c:1293
 +#, c-format
 +msgid "cached CRL for issuer id %s too old; update required\n"
 +msgstr "cached CRL for issuer id %s too old; update required\n"
 +
 +#: dirmngr/crlcache.c:1307
 +#, c-format
 +msgid ""
 +"force-crl-refresh active and %d minutes passed for issuer id %s; update "
 +"required\n"
 +msgstr ""
 +"force-crl-refresh active and %d minutes passed for issuer id %s; update "
 +"required\n"
 +
 +#: dirmngr/crlcache.c:1315
 +#, c-format
 +msgid "force-crl-refresh active for issuer id %s; update required\n"
 +msgstr "force-crl-refresh active for issuer id %s; update required\n"
 +
 +#: dirmngr/crlcache.c:1324
 +#, c-format
 +msgid "available CRL for issuer ID %s can't be used\n"
 +msgstr "available CRL for issuer ID %s can't be used\n"
 +
 +#: dirmngr/crlcache.c:1335
 +#, c-format
 +msgid "cached CRL for issuer id %s tampered; we need to update\n"
 +msgstr "cached CRL for issuer id %s tampered; we need to update\n"
 +
 +#: dirmngr/crlcache.c:1347
 +msgid "WARNING: invalid cache record length for S/N "
 +msgstr "WARNING: invalid cache record length for S/N "
 +
 +#: dirmngr/crlcache.c:1357
 +#, c-format
 +msgid "problem reading cache record for S/N %s: %s\n"
 +msgstr "problem reading cache record for S/N %s: %s\n"
 +
 +#: dirmngr/crlcache.c:1360
 +#, c-format
 +msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
 +msgstr "S/N %s is not valid; reason=%02X  date=%.15s\n"
 +
 +#: dirmngr/crlcache.c:1371
 +#, c-format
 +msgid "S/N %s is valid, it is not listed in the CRL\n"
 +msgstr "S/N %s is valid, it is not listed in the CRL\n"
 +
 +#: dirmngr/crlcache.c:1379
 +#, c-format
 +msgid "error getting data from cache file: %s\n"
 +msgstr "error getting data from cache file: %s\n"
 +
 +#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
 +#, c-format
 +msgid "unknown hash algorithm '%s'\n"
 +msgstr "unknown hash algorithm ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:1549
 +#, c-format
 +msgid "gcry_md_open for algorithm %d failed: %s\n"
 +msgstr "gcry_md_open for algorithm %d failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1586 dirmngr/crlcache.c:1605
 +msgid "got an invalid S-expression from libksba\n"
 +msgstr "got an invalid S-expression from libksba\n"
 +
 +#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
 +#, c-format
 +msgid "converting S-expression failed: %s\n"
 +msgstr "converting S-expression failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
 +#, c-format
 +msgid "creating S-expression failed: %s\n"
 +msgstr "creating S-expression failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1699
 +#, c-format
 +msgid "ksba_crl_parse failed: %s\n"
 +msgstr "ksba_crl_parse failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1714
 +#, c-format
 +msgid "error getting update times of CRL: %s\n"
 +msgstr "error getting update times of CRL: %s\n"
 +
 +#: dirmngr/crlcache.c:1721
 +#, c-format
 +msgid "update times of this CRL: this=%s next=%s\n"
 +msgstr "update times of this CRL: this=%s next=%s\n"
 +
 +#: dirmngr/crlcache.c:1725
 +msgid "nextUpdate not given; assuming a validity period of one day\n"
 +msgstr "nextUpdate not given; assuming a validity period of one day\n"
 +
 +#: dirmngr/crlcache.c:1745
 +#, c-format
 +msgid "error getting CRL item: %s\n"
 +msgstr "error getting CRL item: %s\n"
 +
 +#: dirmngr/crlcache.c:1760
 +#, c-format
 +msgid "error inserting item into temporary cache file: %s\n"
 +msgstr "error inserting item into temporary cache file: %s\n"
 +
 +#: dirmngr/crlcache.c:1787
 +#, c-format
 +msgid "no CRL issuer found in CRL: %s\n"
 +msgstr "no CRL issuer found in CRL: %s\n"
 +
 +#: dirmngr/crlcache.c:1802
 +msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 +msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
 +
 +#: dirmngr/crlcache.c:1847
 +#, c-format
 +msgid "CRL signature verification failed: %s\n"
 +msgstr "CRL signature verification failed: %s\n"
 +
 +#: dirmngr/crlcache.c:1858
 +#, c-format
 +msgid "error checking validity of CRL issuer certificate: %s\n"
 +msgstr "error checking validity of CRL issuer certificate: %s\n"
 +
 +#: dirmngr/crlcache.c:2001
 +#, c-format
 +msgid "ksba_crl_new failed: %s\n"
 +msgstr "ksba_crl_new failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2008
 +#, c-format
 +msgid "ksba_crl_set_reader failed: %s\n"
 +msgstr "ksba_crl_set_reader failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2042
 +#, c-format
 +msgid "removed stale temporary cache file '%s'\n"
 +msgstr "removed stale temporary cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:2046
 +#, c-format
 +msgid "problem removing stale temporary cache file '%s': %s\n"
 +msgstr "problem removing stale temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2056
 +#, c-format
 +msgid "error creating temporary cache file '%s': %s\n"
 +msgstr "error creating temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2066
 +#, c-format
 +msgid "crl_parse_insert failed: %s\n"
 +msgstr "crl_parse_insert failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2076
 +#, c-format
 +msgid "error finishing temporary cache file '%s': %s\n"
 +msgstr "error finishing temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2083
 +#, c-format
 +msgid "error closing temporary cache file '%s': %s\n"
 +msgstr "error closing temporary cache file '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2108
 +#, c-format
 +msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 +msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 +
 +#: dirmngr/crlcache.c:2112
 +#, c-format
 +msgid "new CRL still too old; it expired on %s\n"
 +msgstr "new CRL still too old; it expired on %s\n"
 +
 +#: dirmngr/crlcache.c:2128
 +#, c-format
 +msgid "unknown critical CRL extension %s\n"
 +msgstr "unknown critical CRL extension %s\n"
 +
 +#: dirmngr/crlcache.c:2138
 +#, c-format
 +msgid "error reading CRL extensions: %s\n"
 +msgstr "error reading CRL extensions: %s\n"
 +
 +#: dirmngr/crlcache.c:2189
 +#, c-format
 +msgid "creating cache file '%s'\n"
 +msgstr "creating cache file ‘%s’\n"
 +
 +#: dirmngr/crlcache.c:2221
 +#, c-format
 +msgid "problem renaming '%s' to '%s': %s\n"
 +msgstr "problem renaming ‘%s’ to '%s': %s\n"
 +
 +#: dirmngr/crlcache.c:2235
 +msgid ""
 +"updating the DIR file failed - cache entry will get lost with the next "
 +"program start\n"
 +msgstr ""
 +"updating the DIR file failed - cache entry will get lost with the next "
 +"program start\n"
 +
 +#: dirmngr/crlcache.c:2272
 +#, c-format
 +msgid "Begin CRL dump (retrieved via %s)\n"
 +msgstr "Begin CRL dump (retrieved via %s)\n"
 +
 +#: dirmngr/crlcache.c:2295
 +msgid ""
 +" ERROR: The CRL will not be used because it was still too old after an "
 +"update!\n"
 +msgstr ""
 +" ERROR: The CRL will not be used because it was still too old after an "
 +"update!\n"
 +
 +#: dirmngr/crlcache.c:2298
 +msgid ""
 +" ERROR: The CRL will not be used due to an unknown critical extension!\n"
 +msgstr ""
 +" ERROR: The CRL will not be used due to an unknown critical extension!\n"
 +
 +#: dirmngr/crlcache.c:2301
 +msgid " ERROR: The CRL will not be used\n"
 +msgstr " ERROR: The CRL will not be used\n"
 +
 +#: dirmngr/crlcache.c:2308
 +msgid " ERROR: This cached CRL may have been tampered with!\n"
 +msgstr " ERROR: This cached CRL may have been tampered with!\n"
 +
 +#: dirmngr/crlcache.c:2326
 +msgid " WARNING: invalid cache record length\n"
 +msgstr " WARNING: invalid cache record length\n"
 +
 +#: dirmngr/crlcache.c:2333
 +#, c-format
 +msgid "problem reading cache record: %s\n"
 +msgstr "problem reading cache record: %s\n"
 +
 +#: dirmngr/crlcache.c:2344
 +#, c-format
 +msgid "problem reading cache key: %s\n"
 +msgstr "problem reading cache key: %s\n"
 +
 +#: dirmngr/crlcache.c:2375
 +#, c-format
 +msgid "error reading cache entry from db: %s\n"
 +msgstr "error reading cache entry from db: %s\n"
 +
 +#: dirmngr/crlcache.c:2378
 +msgid "End CRL dump\n"
 +msgstr "End CRL dump\n"
 +
 +#: dirmngr/crlcache.c:2499
 +#, c-format
 +msgid "crl_fetch via DP failed: %s\n"
 +msgstr "crl_fetch via DP failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2510
 +#, c-format
 +msgid "crl_cache_insert via DP failed: %s\n"
 +msgstr "crl_cache_insert via DP failed: %s\n"
 +
 +#: dirmngr/crlcache.c:2570
 +#, c-format
 +msgid "crl_cache_insert via issuer failed: %s\n"
 +msgstr "crl_cache_insert via issuer failed: %s\n"
 +
 +#: dirmngr/crlfetch.c:74
 +msgid "reader to file mapping table full - waiting\n"
 +msgstr "reader to file mapping table full - waiting\n"
 +
 +#: dirmngr/crlfetch.c:182
 +msgid "using \"http\" instead of \"https\"\n"
 +msgstr "using “http” instead of “https”\n"
 +
 +#: dirmngr/crlfetch.c:193 dirmngr/crlfetch.c:289 dirmngr/crlfetch.c:327
 +#: dirmngr/crlfetch.c:359
 +#, c-format
 +msgid "CRL access not possible due to disabled %s\n"
 +msgstr "CRL access not possible due to disabled %s\n"
 +
 +#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
 +#: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
 +#, c-format
 +msgid "error initializing reader object: %s\n"
 +msgstr "error initializing reader object: %s\n"
 +
 +#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
 +#, c-format
 +msgid "URL '%s' redirected to '%s' (%u)\n"
 +msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
 +
 +#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
 +msgid "too many redirections\n"
 +msgstr "too many redirections\n"
 +
 +#: dirmngr/crlfetch.c:274
 +#, c-format
 +msgid "error retrieving '%s': %s\n"
 +msgstr "error retrieving '%s': %s\n"
 +
 +#: dirmngr/crlfetch.c:279
 +#, c-format
 +msgid "error retrieving '%s': http status %u\n"
 +msgstr "error retrieving '%s': http status %u\n"
 +
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
 +msgid "CRL access not possible due to Tor mode\n"
 +msgstr "CRL access not possible due to Tor mode\n"
 +
 +#: dirmngr/crlfetch.c:386
 +#, c-format
 +msgid "certificate search not possible due to disabled %s\n"
 +msgstr "certificate search not possible due to disabled %s\n"
 +
 +#: dirmngr/dirmngr-client.c:71
 +msgid "use OCSP instead of CRLs"
 +msgstr "use OCSP instead of CRLs"
 +
 +#: dirmngr/dirmngr-client.c:72
 +msgid "check whether a dirmngr is running"
 +msgstr "check whether a dirmngr is running"
 +
 +#: dirmngr/dirmngr-client.c:73
 +msgid "add a certificate to the cache"
 +msgstr "add a certificate to the cache"
 +
 +#: dirmngr/dirmngr-client.c:74
 +msgid "validate a certificate"
 +msgstr "validate a certificate"
 +
 +#: dirmngr/dirmngr-client.c:75
 +msgid "lookup a certificate"
 +msgstr "lookup a certificate"
 +
 +#: dirmngr/dirmngr-client.c:76
 +msgid "lookup only locally stored certificates"
 +msgstr "lookup only locally stored certificates"
 +
 +#: dirmngr/dirmngr-client.c:77
 +msgid "expect an URL for --lookup"
 +msgstr "expect an URL for --lookup"
 +
 +#: dirmngr/dirmngr-client.c:78
 +msgid "load a CRL into the dirmngr"
 +msgstr "load a CRL into the dirmngr"
 +
 +#: dirmngr/dirmngr-client.c:79
 +msgid "special mode for use by Squid"
 +msgstr "special mode for use by Squid"
 +
 +#: dirmngr/dirmngr-client.c:80
 +msgid "expect certificates in PEM format"
 +msgstr "expect certificates in PEM format"
 +
 +#: dirmngr/dirmngr-client.c:82
 +msgid "force the use of the default OCSP responder"
 +msgstr "force the use of the default OCSP responder"
 +
 +#: dirmngr/dirmngr-client.c:169
 +msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 +msgstr "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
 +
 +#: dirmngr/dirmngr-client.c:173
 +msgid ""
 +"Syntax: dirmngr-client [options] [certfile|pattern]\n"
 +"Test an X.509 certificate against a CRL or do an OCSP check\n"
 +"The process returns 0 if the certificate is valid, 1 if it is\n"
 +"not valid and other error codes for general failures\n"
 +msgstr ""
 +"Syntax: dirmngr-client [options] [certfile|pattern]\n"
 +"Test an X.509 certificate against a CRL or do an OCSP check\n"
 +"The process returns 0 if the certificate is valid, 1 if it is\n"
 +"not valid and other error codes for general failures\n"
 +
 +#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
 +#, c-format
 +msgid "error reading certificate from stdin: %s\n"
 +msgstr "error reading certificate from stdin: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:281
 +#, c-format
 +msgid "error reading certificate from '%s': %s\n"
 +msgstr "error reading certificate from '%s': %s\n"
 +
 +#: dirmngr/dirmngr-client.c:295
 +msgid "certificate too large to make any sense\n"
 +msgstr "certificate too large to make any sense\n"
 +
 +#: dirmngr/dirmngr-client.c:310
 +#, c-format
 +msgid "can't connect to the dirmngr: %s\n"
 +msgstr "can't connect to the dirmngr: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:332
 +#, c-format
 +msgid "lookup failed: %s\n"
 +msgstr "lookup failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:347
 +#, c-format
 +msgid "loading CRL '%s' failed: %s\n"
 +msgstr "loading CRL ‘%s’ failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:375
 +msgid "a dirmngr daemon is up and running\n"
 +msgstr "a dirmngr daemon is up and running\n"
 +
 +#: dirmngr/dirmngr-client.c:397
 +#, c-format
 +msgid "validation of certificate failed: %s\n"
 +msgstr "validation of certificate failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
 +msgid "certificate is valid\n"
 +msgstr "certificate is valid\n"
 +
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
 +msgid "certificate has been revoked\n"
 +msgstr "certificate has been revoked\n"
 +
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
 +#, c-format
 +msgid "certificate check failed: %s\n"
 +msgstr "certificate check failed: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:428
 +#, c-format
 +msgid "got status: '%s'\n"
 +msgstr "got status: ‘%s’\n"
 +
 +#: dirmngr/dirmngr-client.c:443
 +#, c-format
 +msgid "error writing base64 encoding: %s\n"
 +msgstr "error writing base64 encoding: %s\n"
 +
 +#: dirmngr/dirmngr-client.c:701
 +#, c-format
 +msgid "unsupported inquiry '%s'\n"
 +msgstr "unsupported inquiry ‘%s’\n"
 +
 +#: dirmngr/dirmngr-client.c:803
 +msgid "absolute file name expected\n"
 +msgstr "absolute file name expected\n"
 +
 +#: dirmngr/dirmngr-client.c:848
 +#, c-format
 +msgid "looking up '%s'\n"
 +msgstr "looking up ‘%s’\n"
 +
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
 +msgid "list the contents of the CRL cache"
 +msgstr "list the contents of the CRL cache"
 +
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
 +msgid "|FILE|load CRL from FILE into cache"
 +msgstr "|FILE|load CRL from FILE into cache"
 +
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
 +msgid "|URL|fetch a CRL from URL"
 +msgstr "|URL|fetch a CRL from URL"
 +
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
 +msgid "shutdown the dirmngr"
 +msgstr "shutdown the dirmngr"
 +
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
 +msgid "flush the cache"
 +msgstr "flush the cache"
 +
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
 +msgid "|FILE|write server mode logs to FILE"
 +msgstr "|FILE|write server mode logs to FILE"
 +
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
 +msgid "run without asking a user"
 +msgstr "run without asking a user"
 +
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
 +msgid "force loading of outdated CRLs"
 +msgstr "force loading of outdated CRLs"
 +
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
 +msgid "allow sending OCSP requests"
 +msgstr "allow sending OCSP requests"
 +
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
++msgid "allow online software version check"
++msgstr "allow online software version check"
++
++#: dirmngr/dirmngr.c:182
 +msgid "inhibit the use of HTTP"
 +msgstr "inhibit the use of HTTP"
 +
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
 +msgid "inhibit the use of LDAP"
 +msgstr "inhibit the use of LDAP"
 +
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
 +msgid "ignore HTTP CRL distribution points"
 +msgstr "ignore HTTP CRL distribution points"
 +
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
 +msgid "ignore LDAP CRL distribution points"
 +msgstr "ignore LDAP CRL distribution points"
 +
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
 +msgid "ignore certificate contained OCSP service URLs"
 +msgstr "ignore certificate contained OCSP service URLs"
 +
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
 +msgid "|URL|redirect all HTTP requests to URL"
 +msgstr "|URL|redirect all HTTP requests to URL"
 +
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
 +msgid "|HOST|use HOST for LDAP queries"
 +msgstr "|HOST|use HOST for LDAP queries"
 +
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
 +msgid "do not use fallback hosts with --ldap-proxy"
 +msgstr "do not use fallback hosts with --ldap-proxy"
 +
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
 +msgid "|FILE|read LDAP server list from FILE"
 +msgstr "|FILE|read LDAP server list from FILE"
 +
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
 +msgid "add new servers discovered in CRL distribution points to serverlist"
 +msgstr "add new servers discovered in CRL distribution points to serverlist"
 +
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
 +msgid "|N|set LDAP timeout to N seconds"
 +msgstr "|N|set LDAP timeout to N seconds"
 +
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
 +msgid "|URL|use OCSP responder at URL"
 +msgstr "|URL|use OCSP responder at URL"
 +
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
 +msgid "|FPR|OCSP response signed by FPR"
 +msgstr "|FPR|OCSP response signed by FPR"
 +
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
 +msgid "|N|do not return more than N items in one query"
 +msgstr "|N|do not return more than N items in one query"
 +
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
 +msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 +msgstr "|FILE|use the CA certificates in FILE for HKP over TLS"
 +
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
 +msgid "route all network traffic via Tor"
 +msgstr "route all network traffic via Tor"
 +
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
 +msgid ""
 +"@\n"
 +"(See the \"info\" manual for a complete listing of all commands and "
 +"options)\n"
 +msgstr ""
 +"@\n"
 +"(See the “info” manual for a complete listing of all commands and options)\n"
 +
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
 +msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 +msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 +
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
 +msgid ""
 +"Syntax: @DIRMNGR@ [options] [command [args]]\n"
 +"Keyserver, CRL, and OCSP access for @GNUPG@\n"
 +msgstr ""
 +"Syntax: @DIRMNGR@ [options] [command [args]]\n"
 +"Keyserver, CRL, and OCSP access for @GNUPG@\n"
 +
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
 +#, c-format
 +msgid "valid debug levels are: %s\n"
 +msgstr "valid debug levels are: %s\n"
 +
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
 +#, c-format
 +msgid "usage: %s [options] "
 +msgstr "usage: %s [options] "
 +
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
 +msgid "colons are not allowed in the socket name\n"
 +msgstr "colons are not allowed in the socket name\n"
 +
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
 +#, c-format
 +msgid "fetching CRL from '%s' failed: %s\n"
 +msgstr "fetching CRL from ‘%s’ failed: %s\n"
 +
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
 +#, c-format
 +msgid "processing CRL from '%s' failed: %s\n"
 +msgstr "processing CRL from ‘%s’ failed: %s\n"
 +
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
 +#, c-format
 +msgid "%s:%u: line too long - skipped\n"
 +msgstr "%s:%u: line too long - skipped\n"
 +
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
 +#, c-format
 +msgid "%s:%u: invalid fingerprint detected\n"
 +msgstr "%s:%u: invalid fingerprint detected\n"
 +
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
 +#, c-format
 +msgid "%s:%u: read error: %s\n"
 +msgstr "%s:%u: read error: %s\n"
 +
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
 +#, c-format
 +msgid "%s:%u: garbage at end of line ignored\n"
 +msgstr "%s:%u: garbage at end of line ignored\n"
 +
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
 +msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 +msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
 +
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
 +msgid "SIGUSR2 received - no action defined\n"
 +msgstr "SIGUSR2 received - no action defined\n"
 +
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
 +msgid "SIGTERM received - shutting down ...\n"
 +msgstr "SIGTERM received - shutting down ...\n"
 +
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
 +#, c-format
 +msgid "SIGTERM received - still %d active connections\n"
 +msgstr "SIGTERM received - still %d active connections\n"
 +
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
 +msgid "shutdown forced\n"
 +msgstr "shutdown forced\n"
 +
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
 +msgid "SIGINT received - immediate shutdown\n"
 +msgstr "SIGINT received - immediate shutdown\n"
 +
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
 +#, c-format
 +msgid "signal %d received - no action defined\n"
 +msgstr "signal %d received - no action defined\n"
 +
 +#: dirmngr/dirmngr_ldap.c:138
 +msgid "return all values in a record oriented format"
 +msgstr "return all values in a record oriented format"
 +
 +#: dirmngr/dirmngr_ldap.c:141
 +msgid "|NAME|ignore host part and connect through NAME"
 +msgstr "|NAME|ignore host part and connect through NAME"
 +
 +#: dirmngr/dirmngr_ldap.c:142
 +msgid "|NAME|connect to host NAME"
 +msgstr "|NAME|connect to host NAME"
 +
 +#: dirmngr/dirmngr_ldap.c:143
 +msgid "|N|connect to port N"
 +msgstr "|N|connect to port N"
 +
 +#: dirmngr/dirmngr_ldap.c:144
 +msgid "|NAME|use user NAME for authentication"
 +msgstr "|NAME|use user NAME for authentication"
 +
 +#: dirmngr/dirmngr_ldap.c:145
 +msgid "|PASS|use password PASS for authentication"
 +msgstr "|PASS|use password PASS for authentication"
 +
 +#: dirmngr/dirmngr_ldap.c:147
 +msgid "take password from $DIRMNGR_LDAP_PASS"
 +msgstr "take password from $DIRMNGR_LDAP_PASS"
 +
 +#: dirmngr/dirmngr_ldap.c:148
 +msgid "|STRING|query DN STRING"
 +msgstr "|STRING|query DN STRING"
 +
 +#: dirmngr/dirmngr_ldap.c:149
 +msgid "|STRING|use STRING as filter expression"
 +msgstr "|STRING|use STRING as filter expression"
 +
 +#: dirmngr/dirmngr_ldap.c:150
 +msgid "|STRING|return the attribute STRING"
 +msgstr "|STRING|return the attribute STRING"
 +
 +#: dirmngr/dirmngr_ldap.c:209
 +msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 +msgstr "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 +
 +#: dirmngr/dirmngr_ldap.c:212
 +msgid ""
 +"Syntax: dirmngr_ldap [options] [URL]\n"
 +"Internal LDAP helper for Dirmngr\n"
 +"Interface and options may change without notice\n"
 +msgstr ""
 +"Syntax: dirmngr_ldap [options] [URL]\n"
 +"Internal LDAP helper for Dirmngr\n"
 +"Interface and options may change without notice\n"
 +
 +#: dirmngr/dirmngr_ldap.c:337
 +#, c-format
 +msgid "invalid port number %d\n"
 +msgstr "invalid port number %d\n"
 +
 +#: dirmngr/dirmngr_ldap.c:413
 +#, c-format
 +msgid "scanning result for attribute '%s'\n"
 +msgstr "scanning result for attribute ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
 +#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
 +#: dirmngr/dirmngr_ldap.c:677
 +#, c-format
 +msgid "error writing to stdout: %s\n"
 +msgstr "error writing to stdout: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:437
 +#, c-format
 +msgid "          available attribute '%s'\n"
 +msgstr "          available attribute ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:475
 +#, c-format
 +msgid "attribute '%s' not found\n"
 +msgstr "attribute ‘%s’ not found\n"
 +
 +#: dirmngr/dirmngr_ldap.c:482
 +#, c-format
 +msgid "found attribute '%s'\n"
 +msgstr "found attribute ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:591
 +#, c-format
 +msgid "processing url '%s'\n"
 +msgstr "processing url ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:593
 +#, c-format
 +msgid "          user '%s'\n"
 +msgstr "          user ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:595
 +#, c-format
 +msgid "          pass '%s'\n"
 +msgstr "          pass ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:597
 +#, c-format
 +msgid "          host '%s'\n"
 +msgstr "          host ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:598
 +#, c-format
 +msgid "          port %d\n"
 +msgstr "          port %d\n"
 +
 +#: dirmngr/dirmngr_ldap.c:600
 +#, c-format
 +msgid "            DN '%s'\n"
 +msgstr "            DN ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:602
 +#, c-format
 +msgid "        filter '%s'\n"
 +msgstr "        filter ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
 +#, c-format
 +msgid "          attr '%s'\n"
 +msgstr "          attr ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:616
 +#, c-format
 +msgid "no host name in '%s'\n"
 +msgstr "no host name in ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:621
 +#, c-format
 +msgid "no attribute given for query '%s'\n"
 +msgstr "no attribute given for query ‘%s’\n"
 +
 +#: dirmngr/dirmngr_ldap.c:627
 +msgid "WARNING: using first attribute only\n"
 +msgstr "WARNING: using first attribute only\n"
 +
 +#: dirmngr/dirmngr_ldap.c:636
 +#, c-format
 +msgid "LDAP init to '%s:%d' failed: %s\n"
 +msgstr "LDAP init to ‘%s:%d’ failed: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:659
 +#, c-format
 +msgid "binding to '%s:%d' failed: %s\n"
 +msgstr "binding to ‘%s:%d’ failed: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:686
 +#, c-format
 +msgid "searching '%s' failed: %s\n"
 +msgstr "searching ‘%s’ failed: %s\n"
 +
 +#: dirmngr/dirmngr_ldap.c:718
 +#, c-format
 +msgid "'%s' is not an LDAP URL\n"
 +msgstr "‘%s’ is not an LDAP URL\n"
 +
 +#: dirmngr/dirmngr_ldap.c:724
 +#, c-format
 +msgid "'%s' is an invalid LDAP URL\n"
 +msgstr "‘%s’ is an invalid LDAP URL\n"
 +
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, c-format
- msgid "error allocating memory: %s\n"
- msgstr "error allocating memory: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
 +#, c-format
 +msgid "error printing log line: %s\n"
 +msgstr "error printing log line: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:236
 +#, c-format
 +msgid "error reading log from ldap wrapper %d: %s\n"
 +msgstr "error reading log from ldap wrapper %d: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:304
 +#, c-format
 +msgid "npth_select failed: %s - waiting 1s\n"
 +msgstr "npth_select failed: %s - waiting 1s\n"
 +
 +#: dirmngr/ldap-wrapper.c:343
 +#, c-format
 +msgid "ldap wrapper %d ready"
 +msgstr "ldap wrapper %d ready"
 +
 +#: dirmngr/ldap-wrapper.c:352
 +#, c-format
 +msgid "ldap wrapper %d ready: timeout\n"
 +msgstr "ldap wrapper %d ready: timeout\n"
 +
 +#: dirmngr/ldap-wrapper.c:355
 +#, c-format
 +msgid "ldap wrapper %d ready: exitcode=%d\n"
 +msgstr "ldap wrapper %d ready: exitcode=%d\n"
 +
 +#: dirmngr/ldap-wrapper.c:364
 +#, c-format
 +msgid "waiting for ldap wrapper %d failed: %s\n"
 +msgstr "waiting for ldap wrapper %d failed: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:376
 +#, c-format
 +msgid "ldap wrapper %d stalled - killing\n"
 +msgstr "ldap wrapper %d stalled - killing\n"
 +
 +#: dirmngr/ldap-wrapper.c:444
 +#, c-format
 +msgid "error spawning ldap wrapper reaper thread: %s\n"
 +msgstr "error spawning ldap wrapper reaper thread: %s\n"
 +
 +#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
 +#, c-format
 +msgid "reading from ldap wrapper %d failed: %s\n"
 +msgstr "reading from ldap wrapper %d failed: %s\n"
 +
 +#: dirmngr/ldap.c:91
 +#, c-format
 +msgid "invalid char 0x%02x in host name - not added\n"
 +msgstr "invalid char 0x%02x in host name - not added\n"
 +
 +#: dirmngr/ldap.c:95
 +#, c-format
 +msgid "adding '%s:%d' to the ldap server list\n"
 +msgstr "adding ‘%s:%d’ to the ldap server list\n"
 +
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
 +#, c-format
 +msgid "malloc failed: %s\n"
 +msgstr "malloc failed: %s\n"
 +
 +#: dirmngr/ldap.c:627
 +#, c-format
 +msgid "start_cert_fetch: invalid pattern '%s'\n"
 +msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
 +
 +#: dirmngr/ldap.c:840
 +msgid "ldap_search hit the size limit of the server\n"
 +msgstr "ldap_search hit the size limit of the server\n"
 +
 +#: dirmngr/misc.c:170
 +msgid "invalid canonical S-expression found\n"
 +msgstr "invalid canonical S-expression found\n"
 +
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
 +#, c-format
 +msgid "gcry_md_open failed: %s\n"
 +msgstr "gcry_md_open failed: %s\n"
 +
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
 +#, c-format
 +msgid "oops: ksba_cert_hash failed: %s\n"
 +msgstr "oops: ksba_cert_hash failed: %s\n"
 +
 +#: dirmngr/misc.c:518
 +msgid "bad URL encoding detected\n"
 +msgstr "bad URL encoding detected\n"
 +
 +#: dirmngr/ocsp.c:80
 +#, c-format
 +msgid "error reading from responder: %s\n"
 +msgstr "error reading from responder: %s\n"
 +
 +#: dirmngr/ocsp.c:98
 +#, c-format
 +msgid "response from server too large; limit is %d bytes\n"
 +msgstr "response from server too large; limit is %d bytes\n"
 +
 +#: dirmngr/ocsp.c:139
 +msgid "OCSP request not possible due to Tor mode\n"
 +msgstr "OCSP request not possible due to Tor mode\n"
 +
 +#: dirmngr/ocsp.c:145
 +msgid "OCSP request not possible due to disabled HTTP\n"
 +msgstr "OCSP request not possible due to disabled HTTP\n"
 +
 +#: dirmngr/ocsp.c:152
 +#, c-format
 +msgid "error setting OCSP target: %s\n"
 +msgstr "error setting OCSP target: %s\n"
 +
 +#: dirmngr/ocsp.c:170
 +#, c-format
 +msgid "error building OCSP request: %s\n"
 +msgstr "error building OCSP request: %s\n"
 +
 +#: dirmngr/ocsp.c:181
 +#, c-format
 +msgid "error connecting to '%s': %s\n"
 +msgstr "error connecting to '%s': %s\n"
 +
 +#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
 +#, c-format
 +msgid "error reading HTTP response for '%s': %s\n"
 +msgstr "error reading HTTP response for '%s': %s\n"
 +
 +#: dirmngr/ocsp.c:240
 +#, c-format
 +msgid "error accessing '%s': http status %u\n"
 +msgstr "error accessing '%s': http status %u\n"
 +
 +#: dirmngr/ocsp.c:265
 +#, c-format
 +msgid "error parsing OCSP response for '%s': %s\n"
 +msgstr "error parsing OCSP response for '%s': %s\n"
 +
 +#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
 +#, c-format
 +msgid "OCSP responder at '%s' status: %s\n"
 +msgstr "OCSP responder at ‘%s’ status: %s\n"
 +
 +#: dirmngr/ocsp.c:293
 +#, c-format
 +msgid "hashing the OCSP response for '%s' failed: %s\n"
 +msgstr "hashing the OCSP response for ‘%s’ failed: %s\n"
 +
 +#: dirmngr/ocsp.c:328
 +msgid "not signed by a default OCSP signer's certificate"
 +msgstr "not signed by a default OCSP signer's certificate"
 +
 +#: dirmngr/ocsp.c:413
 +msgid "only SHA-1 is supported for OCSP responses\n"
 +msgstr "only SHA-1 is supported for OCSP responses\n"
 +
 +#: dirmngr/ocsp.c:464
 +#, c-format
 +msgid "allocating list item failed: %s\n"
 +msgstr "allocating list item failed: %s\n"
 +
 +#: dirmngr/ocsp.c:479
 +#, c-format
 +msgid "error getting responder ID: %s\n"
 +msgstr "error getting responder ID: %s\n"
 +
 +#: dirmngr/ocsp.c:514
 +msgid "no suitable certificate found to verify the OCSP response\n"
 +msgstr "no suitable certificate found to verify the OCSP response\n"
 +
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
 +#, c-format
 +msgid "issuer certificate not found: %s\n"
 +msgstr "issuer certificate not found: %s\n"
 +
 +#: dirmngr/ocsp.c:563
 +msgid "caller did not return the target certificate\n"
 +msgstr "caller did not return the target certificate\n"
 +
 +#: dirmngr/ocsp.c:570
 +msgid "caller did not return the issuing certificate\n"
 +msgstr "caller did not return the issuing certificate\n"
 +
 +#: dirmngr/ocsp.c:580
 +#, c-format
 +msgid "failed to allocate OCSP context: %s\n"
 +msgstr "failed to allocate OCSP context: %s\n"
 +
 +#: dirmngr/ocsp.c:614
 +#, c-format
 +msgid "can't get authorityInfoAccess: %s\n"
 +msgstr "can't get authorityInfoAccess: %s\n"
 +
 +#: dirmngr/ocsp.c:621
 +msgid "no default OCSP responder defined\n"
 +msgstr "no default OCSP responder defined\n"
 +
 +#: dirmngr/ocsp.c:627
 +msgid "no default OCSP signer defined\n"
 +msgstr "no default OCSP signer defined\n"
 +
 +#: dirmngr/ocsp.c:634
 +#, c-format
 +msgid "using default OCSP responder '%s'\n"
 +msgstr "using default OCSP responder ‘%s’\n"
 +
 +#: dirmngr/ocsp.c:639
 +#, c-format
 +msgid "using OCSP responder '%s'\n"
 +msgstr "using OCSP responder ‘%s’\n"
 +
 +#: dirmngr/ocsp.c:646
 +#, c-format
 +msgid "failed to establish a hashing context for OCSP: %s\n"
 +msgstr "failed to establish a hashing context for OCSP: %s\n"
 +
 +#: dirmngr/ocsp.c:676
 +#, c-format
 +msgid "error getting OCSP status for target certificate: %s\n"
 +msgstr "error getting OCSP status for target certificate: %s\n"
 +
 +#: dirmngr/ocsp.c:701
 +#, c-format
 +msgid "certificate status is: %s  (this=%s  next=%s)\n"
 +msgstr "certificate status is: %s  (this=%s  next=%s)\n"
 +
 +#: dirmngr/ocsp.c:702
 +msgid "good"
 +msgstr "good"
 +
 +#: dirmngr/ocsp.c:708
 +#, c-format
 +msgid "certificate has been revoked at: %s due to: %s\n"
 +msgstr "certificate has been revoked at: %s due to: %s\n"
 +
 +#: dirmngr/ocsp.c:743
 +msgid "OCSP responder returned a status in the future\n"
 +msgstr "OCSP responder returned a status in the future\n"
 +
 +#: dirmngr/ocsp.c:755
 +msgid "OCSP responder returned a non-current status\n"
 +msgstr "OCSP responder returned a non-current status\n"
 +
 +#: dirmngr/ocsp.c:770
 +msgid "OCSP responder returned an too old status\n"
 +msgstr "OCSP responder returned an too old status\n"
 +
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
 +#, c-format
 +msgid "assuan_inquire(%s) failed: %s\n"
 +msgstr "assuan_inquire(%s) failed: %s\n"
 +
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
 +msgid "ldapserver missing"
 +msgstr "ldapserver missing"
 +
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
 +msgid "serialno missing in cert ID"
 +msgstr "serialno missing in cert ID"
 +
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
 +#, c-format
 +msgid "assuan_inquire failed: %s\n"
 +msgstr "assuan_inquire failed: %s\n"
 +
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
 +#, c-format
 +msgid "fetch_cert_by_url failed: %s\n"
 +msgstr "fetch_cert_by_url failed: %s\n"
 +
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
 +#, c-format
 +msgid "error sending data: %s\n"
 +msgstr "error sending data: %s\n"
 +
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
 +#, c-format
 +msgid "start_cert_fetch failed: %s\n"
 +msgstr "start_cert_fetch failed: %s\n"
 +
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
 +#, c-format
 +msgid "fetch_next_cert failed: %s\n"
 +msgstr "fetch_next_cert failed: %s\n"
 +
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
 +#, c-format
 +msgid "max_replies %d exceeded\n"
 +msgstr "max_replies %d exceeded\n"
 +
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
 +#, c-format
 +msgid "can't allocate control structure: %s\n"
 +msgstr "can't allocate control structure: %s\n"
 +
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
 +#, c-format
 +msgid "failed to allocate assuan context: %s\n"
 +msgstr "failed to allocate assuan context: %s\n"
 +
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
 +#, c-format
 +msgid "failed to initialize the server: %s\n"
 +msgstr "failed to initialize the server: %s\n"
 +
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
 +#, c-format
 +msgid "failed to the register commands with Assuan: %s\n"
 +msgstr "failed to the register commands with Assuan: %s\n"
 +
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
 +#, c-format
 +msgid "Assuan accept problem: %s\n"
 +msgstr "Assuan accept problem: %s\n"
 +
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
 +#, c-format
 +msgid "Assuan processing failed: %s\n"
 +msgstr "Assuan processing failed: %s\n"
 +
 +#: dirmngr/validate.c:201
 +msgid "accepting root CA not marked as a CA"
 +msgstr "accepting root CA not marked as a CA"
 +
 +#: dirmngr/validate.c:227
 +msgid "CRL checking too deeply nested\n"
 +msgstr "CRL checking too deeply nested\n"
 +
 +#: dirmngr/validate.c:245
 +msgid "not checking CRL for"
 +msgstr "not checking CRL for"
 +
 +#: dirmngr/validate.c:250
 +msgid "checking CRL for"
 +msgstr "checking CRL for"
 +
 +#: dirmngr/validate.c:528
 +msgid "selfsigned certificate has a BAD signature"
 +msgstr "selfsigned certificate has a BAD signature"
 +
 +#: dirmngr/validate.c:561
 +#, c-format
 +msgid "checking trustworthiness of root certificate failed: %s\n"
 +msgstr "checking trustworthiness of root certificate failed: %s\n"
 +
 +#: dirmngr/validate.c:738
 +msgid "certificate chain is good\n"
 +msgstr "certificate chain is good\n"
 +
 +#: dirmngr/validate.c:968
 +msgid "DSA requires the use of a 160 bit hash algorithm\n"
 +msgstr "DSA requires the use of a 160 bit hash algorithm\n"
 +
 +#: dirmngr/validate.c:1116
 +msgid "certificate should not have been used for CRL signing\n"
 +msgstr "certificate should not have been used for CRL signing\n"
 +
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
 +msgid "quiet"
 +msgstr "quiet"
 +
 +#: tools/gpg-connect-agent.c:79
 +msgid "print data out hex encoded"
 +msgstr "print data out hex encoded"
 +
 +#: tools/gpg-connect-agent.c:80
 +msgid "decode received data lines"
 +msgstr "decode received data lines"
 +
 +#: tools/gpg-connect-agent.c:81
 +msgid "connect to the dirmngr"
 +msgstr "connect to the dirmngr"
 +
 +#: tools/gpg-connect-agent.c:84
 +msgid "|NAME|connect to Assuan socket NAME"
 +msgstr "|NAME|connect to Assuan socket NAME"
 +
 +#: tools/gpg-connect-agent.c:86
 +msgid "|ADDR|connect to Assuan server at ADDR"
 +msgstr "|ADDR|connect to Assuan server at ADDR"
 +
 +#: tools/gpg-connect-agent.c:88
 +msgid "run the Assuan server given on the command line"
 +msgstr "run the Assuan server given on the command line"
 +
 +#: tools/gpg-connect-agent.c:90
 +msgid "do not use extended connect mode"
 +msgstr "do not use extended connect mode"
 +
 +#: tools/gpg-connect-agent.c:92
 +msgid "|FILE|run commands from FILE on startup"
 +msgstr "|FILE|run commands from FILE on startup"
 +
 +#: tools/gpg-connect-agent.c:93
 +msgid "run /subst on startup"
 +msgstr "run /subst on startup"
 +
 +#: tools/gpg-connect-agent.c:205
 +msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
 +msgstr "Usage: @GPG at -connect-agent [options] (-h for help)"
 +
 +#: tools/gpg-connect-agent.c:208
 +msgid ""
 +"Syntax: @GPG at -connect-agent [options]\n"
 +"Connect to a running agent and send commands\n"
 +msgstr ""
 +"Syntax: @GPG at -connect-agent [options]\n"
 +"Connect to a running agent and send commands\n"
 +
 +#: tools/gpg-connect-agent.c:1247
 +#, c-format
 +msgid "option \"%s\" requires a program and optional arguments\n"
 +msgstr "option “%s” requires a program and optional arguments\n"
 +
 +#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
 +#: tools/gpg-connect-agent.c:1270
 +#, c-format
 +msgid "option \"%s\" ignored due to \"%s\"\n"
 +msgstr "option “%s” ignored due to “%s”\n"
 +
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
 +#, c-format
 +msgid "receiving line failed: %s\n"
 +msgstr "receiving line failed: %s\n"
 +
 +#: tools/gpg-connect-agent.c:1458
 +msgid "line too long - skipped\n"
 +msgstr "line too long - skipped\n"
 +
 +#: tools/gpg-connect-agent.c:1462
 +msgid "line shortened due to embedded Nul character\n"
 +msgstr "line shortened due to embedded Nul character\n"
 +
 +#: tools/gpg-connect-agent.c:1837
 +#, c-format
 +msgid "unknown command '%s'\n"
 +msgstr "unknown command ‘%s’\n"
 +
 +#: tools/gpg-connect-agent.c:1855
 +#, c-format
 +msgid "sending line failed: %s\n"
 +msgstr "sending line failed: %s\n"
 +
 +#: tools/gpg-connect-agent.c:2251
 +#, c-format
 +msgid "error sending standard options: %s\n"
 +msgstr "error sending standard options: %s\n"
 +
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
 +#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
 +msgid "Options controlling the diagnostic output"
 +msgstr "Options controlling the diagnostic output"
 +
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
 +#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
 +msgid "Options controlling the configuration"
 +msgstr "Options controlling the configuration"
 +
 +#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
 +#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
 +msgid "Options useful for debugging"
 +msgstr "Options useful for debugging"
 +
 +#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
 +msgid "Options controlling the security"
 +msgstr "Options controlling the security"
 +
 +#: tools/gpgconf-comp.c:528
 +msgid "|N|expire SSH keys after N seconds"
 +msgstr "|N|expire SSH keys after N seconds"
 +
 +#: tools/gpgconf-comp.c:532
 +msgid "|N|set maximum PIN cache lifetime to N seconds"
 +msgstr "|N|set maximum PIN cache lifetime to N seconds"
 +
 +#: tools/gpgconf-comp.c:536
 +msgid "|N|set maximum SSH key lifetime to N seconds"
 +msgstr "|N|set maximum SSH key lifetime to N seconds"
 +
 +#: tools/gpgconf-comp.c:560
 +msgid "Options enforcing a passphrase policy"
 +msgstr "Options enforcing a passphrase policy"
 +
 +#: tools/gpgconf-comp.c:563
 +msgid "do not allow bypassing the passphrase policy"
 +msgstr "do not allow bypassing the passphrase policy"
 +
 +#: tools/gpgconf-comp.c:567
 +msgid "|N|set minimal required length for new passphrases to N"
 +msgstr "|N|set minimal required length for new passphrases to N"
 +
 +#: tools/gpgconf-comp.c:571
 +msgid "|N|require at least N non-alpha characters for a new passphrase"
 +msgstr "|N|require at least N non-alpha characters for a new passphrase"
 +
 +#: tools/gpgconf-comp.c:575
 +msgid "|FILE|check new passphrases against pattern in FILE"
 +msgstr "|FILE|check new passphrases against pattern in FILE"
 +
 +#: tools/gpgconf-comp.c:579
 +msgid "|N|expire the passphrase after N days"
 +msgstr "|N|expire the passphrase after N days"
 +
 +#: tools/gpgconf-comp.c:583
 +msgid "do not allow the reuse of old passphrases"
 +msgstr "do not allow the reuse of old passphrases"
 +
 +#: tools/gpgconf-comp.c:587
 +msgid "|N|set the Pinentry timeout to N seconds"
 +msgstr "|N|set the Pinentry timeout to N seconds"
 +
 +#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
 +msgid "|NAME|use NAME as default secret key"
 +msgstr "|NAME|use NAME as default secret key"
 +
 +#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
 +msgid "|NAME|encrypt to user ID NAME as well"
 +msgstr "|NAME|encrypt to user ID NAME as well"
 +
 +#: tools/gpgconf-comp.c:704
 +msgid "|SPEC|set up email aliases"
 +msgstr "|SPEC|set up email aliases"
 +
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
 +msgid "Configuration for Keyservers"
 +msgstr "Configuration for Keyservers"
 +
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
 +msgid "|URL|use keyserver at URL"
 +msgstr "|URL|use keyserver at URL"
 +
 +#: tools/gpgconf-comp.c:735
 +msgid "allow PKA lookups (DNS requests)"
 +msgstr "allow PKA lookups (DNS requests)"
 +
 +#: tools/gpgconf-comp.c:738
 +msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 +msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 +
 +#: tools/gpgconf-comp.c:787
 +msgid "disable all access to the dirmngr"
 +msgstr "disable all access to the dirmngr"
 +
 +#: tools/gpgconf-comp.c:790
 +msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 +msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 +
 +#: tools/gpgconf-comp.c:820
 +msgid "do not check CRLs for root certificates"
 +msgstr "do not check CRLs for root certificates"
 +
 +#: tools/gpgconf-comp.c:869
 +msgid "Options controlling the format of the output"
 +msgstr "Options controlling the format of the output"
 +
 +#: tools/gpgconf-comp.c:905
 +msgid "Options controlling the interactivity and enforcement"
 +msgstr "Options controlling the interactivity and enforcement"
 +
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
 +msgid "Options controlling the use of Tor"
 +msgstr "Options controlling the use of Tor"
 +
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
 +msgid "Configuration for HTTP servers"
 +msgstr "Configuration for HTTP servers"
 +
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
 +msgid "use system's HTTP proxy setting"
 +msgstr "use system's HTTP proxy setting"
 +
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
 +msgid "Configuration of LDAP servers to use"
 +msgstr "Configuration of LDAP servers to use"
 +
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
 +msgid "LDAP server list"
 +msgstr "LDAP server list"
 +
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
 +msgid "Configuration for OCSP"
 +msgstr "Configuration for OCSP"
 +
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
- msgstr "GPG for OpenPGP"
- 
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
- msgstr "GPG Agent"
- 
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
- msgstr "Smartcard Daemon"
- 
 +#: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
- msgstr "GPG for S/MIME"
++msgid "OpenPGP"
++msgstr "OpenPGP"
 +
 +#: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr "Key Acquirer"
++msgid "Private Keys"
++msgstr "Private Keys"
 +
 +#: tools/gpgconf-comp.c:1068
- msgid "PIN and Passphrase Entry"
- msgstr "PIN and Passphrase Entry"
++msgid "Smartcards"
++msgstr "Smartcards"
++
++#: tools/gpgconf-comp.c:1069
++msgid "S/MIME"
++msgstr "S/MIME"
++
++#: tools/gpgconf-comp.c:1070
++msgid "Network"
++msgstr "Network"
++
++#: tools/gpgconf-comp.c:1071
++msgid "Passphrase Entry"
++msgstr "Passphrase Entry"
 +
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
 +msgid "Component not suitable for launching"
 +msgstr "Component not suitable for launching"
 +
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
 +#, c-format
 +msgid "External verification of component %s failed"
 +msgstr "External verification of component %s failed"
 +
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
 +msgid "Note that group specifications are ignored\n"
 +msgstr "Note that group specifications are ignored\n"
 +
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
 +msgid "list all components"
 +msgstr "list all components"
 +
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
 +msgid "check all programs"
 +msgstr "check all programs"
 +
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
 +msgid "|COMPONENT|list options"
 +msgstr "|COMPONENT|list options"
 +
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
 +msgid "|COMPONENT|change options"
 +msgstr "|COMPONENT|change options"
 +
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
 +msgid "|COMPONENT|check options"
 +msgstr "|COMPONENT|check options"
 +
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
 +msgid "apply global default values"
 +msgstr "apply global default values"
 +
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
 +msgid "get the configuration directories for @GPGCONF@"
 +msgstr "get the configuration directories for @GPGCONF@"
 +
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
 +msgid "list global configuration file"
 +msgstr "list global configuration file"
 +
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
 +msgid "check global configuration file"
 +msgstr "check global configuration file"
 +
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
++msgid "query the software version database"
++msgstr "query the software version database"
++
++#: tools/gpgconf.c:86
 +msgid "reload all or a given component"
 +msgstr "reload all or a given component"
 +
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
 +msgid "launch a given component"
 +msgstr "launch a given component"
 +
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
 +msgid "kill a given component"
 +msgstr "kill a given component"
 +
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
 +msgid "use as output file"
 +msgstr "use as output file"
 +
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
 +msgid "activate changes at runtime, if possible"
 +msgstr "activate changes at runtime, if possible"
 +
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
 +msgid "Usage: @GPGCONF@ [options] (-h for help)"
 +msgstr "Usage: @GPGCONF@ [options] (-h for help)"
 +
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
 +msgid ""
 +"Syntax: @GPGCONF@ [options]\n"
 +"Manage configuration options for tools of the @GNUPG@ system\n"
 +msgstr ""
 +"Syntax: @GPGCONF@ [options]\n"
 +"Manage configuration options for tools of the @GNUPG@ system\n"
 +
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
 +msgid "Need one component argument"
 +msgstr "Need one component argument"
 +
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
 +msgid "Component not found"
 +msgstr "Component not found"
 +
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
 +msgid "No argument allowed"
 +msgstr "No argument allowed"
 +
 +#: tools/symcryptrun.c:154
 +msgid ""
 +"@\n"
 +"Commands:\n"
 +" "
 +msgstr ""
 +"@\n"
 +"Commands:\n"
 +" "
 +
 +#: tools/symcryptrun.c:156
 +msgid "decryption modus"
 +msgstr "decryption modus"
 +
 +#: tools/symcryptrun.c:157
 +msgid "encryption modus"
 +msgstr "encryption modus"
 +
 +#: tools/symcryptrun.c:161
 +msgid "tool class (confucius)"
 +msgstr "tool class (confucius)"
 +
 +#: tools/symcryptrun.c:162
 +msgid "program filename"
 +msgstr "program filename"
 +
 +#: tools/symcryptrun.c:164
 +msgid "secret key file (required)"
 +msgstr "secret key file (required)"
 +
 +#: tools/symcryptrun.c:165
 +msgid "input file name (default stdin)"
 +msgstr "input file name (default stdin)"
 +
 +#: tools/symcryptrun.c:209
 +msgid "Usage: symcryptrun [options] (-h for help)"
 +msgstr "Usage: symcryptrun [options] (-h for help)"
 +
 +#: tools/symcryptrun.c:212
 +msgid ""
 +"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 +"[options...] COMMAND [inputfile]\n"
 +"Call a simple symmetric encryption tool\n"
 +msgstr ""
 +"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
 +"[options...] COMMAND [inputfile]\n"
 +"Call a simple symmetric encryption tool\n"
 +
 +#: tools/symcryptrun.c:278
 +#, c-format
 +msgid "%s on %s aborted with status %i\n"
 +msgstr "%s on %s aborted with status %i\n"
 +
 +#: tools/symcryptrun.c:285
 +#, c-format
 +msgid "%s on %s failed with status %i\n"
 +msgstr "%s on %s failed with status %i\n"
 +
 +#: tools/symcryptrun.c:317
 +#, c-format
 +msgid "can't create temporary directory '%s': %s\n"
 +msgstr "can't create temporary directory '%s': %s\n"
 +
 +#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
 +#, c-format
 +msgid "could not open %s for writing: %s\n"
 +msgstr "could not open %s for writing: %s\n"
 +
 +#: tools/symcryptrun.c:385
 +#, c-format
 +msgid "error writing to %s: %s\n"
 +msgstr "error writing to %s: %s\n"
 +
 +#: tools/symcryptrun.c:392
 +#, c-format
 +msgid "error reading from %s: %s\n"
 +msgstr "error reading from %s: %s\n"
 +
 +#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
 +#, c-format
 +msgid "error closing %s: %s\n"
 +msgstr "error closing %s: %s\n"
 +
 +#: tools/symcryptrun.c:490
 +msgid "no --program option provided\n"
 +msgstr "no --program option provided\n"
 +
 +#: tools/symcryptrun.c:496
 +msgid "only --decrypt and --encrypt are supported\n"
 +msgstr "only --decrypt and --encrypt are supported\n"
 +
 +#: tools/symcryptrun.c:502
 +msgid "no --keyfile option provided\n"
 +msgstr "no --keyfile option provided\n"
 +
 +#: tools/symcryptrun.c:513
 +msgid "cannot allocate args vector\n"
 +msgstr "cannot allocate args vector\n"
 +
 +#: tools/symcryptrun.c:531
 +#, c-format
 +msgid "could not create pipe: %s\n"
 +msgstr "could not create pipe: %s\n"
 +
 +#: tools/symcryptrun.c:538
 +#, c-format
 +msgid "could not create pty: %s\n"
 +msgstr "could not create pty: %s\n"
 +
 +#: tools/symcryptrun.c:554
 +#, c-format
 +msgid "could not fork: %s\n"
 +msgstr "could not fork: %s\n"
 +
 +#: tools/symcryptrun.c:582
 +#, c-format
 +msgid "execv failed: %s\n"
 +msgstr "execv failed: %s\n"
 +
 +#: tools/symcryptrun.c:611
 +#, c-format
 +msgid "select failed: %s\n"
 +msgstr "select failed: %s\n"
 +
 +#: tools/symcryptrun.c:628
 +#, c-format
 +msgid "read failed: %s\n"
 +msgstr "read failed: %s\n"
 +
 +#: tools/symcryptrun.c:680
 +#, c-format
 +msgid "pty read failed: %s\n"
 +msgstr "pty read failed: %s\n"
 +
 +#: tools/symcryptrun.c:732
 +#, c-format
 +msgid "waitpid failed: %s\n"
 +msgstr "waitpid failed: %s\n"
 +
 +#: tools/symcryptrun.c:746
 +#, c-format
 +msgid "child aborted with status %i\n"
 +msgstr "child aborted with status %i\n"
 +
 +#: tools/symcryptrun.c:801
 +#, c-format
 +msgid "cannot allocate infile string: %s\n"
 +msgstr "cannot allocate infile string: %s\n"
 +
 +#: tools/symcryptrun.c:814
 +#, c-format
 +msgid "cannot allocate outfile string: %s\n"
 +msgstr "cannot allocate outfile string: %s\n"
 +
 +#: tools/symcryptrun.c:987
 +#, c-format
 +msgid "either %s or %s must be given\n"
 +msgstr "either %s or %s must be given\n"
 +
 +#: tools/symcryptrun.c:1009
 +msgid "no class provided\n"
 +msgstr "no class provided\n"
 +
 +#: tools/symcryptrun.c:1018
 +#, c-format
 +msgid "class %s is not supported\n"
 +msgstr "class %s is not supported\n"
 +
 +#: tools/gpg-check-pattern.c:144
 +msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 +msgstr "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 +
 +#: tools/gpg-check-pattern.c:147
 +msgid ""
 +"Syntax: gpg-check-pattern [options] patternfile\n"
 +"Check a passphrase given on stdin against the patternfile\n"
 +msgstr ""
 +"Syntax: gpg-check-pattern [options] patternfile\n"
 +"Check a passphrase given on stdin against the patternfile\n"
diff --cc po/eo.po
index 64178b6,20b047a..5bc5246
--- a/po/eo.po
+++ b/po/eo.po
@@@ -8,16 -8,14 +8,16 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.0.6d\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2002-04-14 14:33+0100\n"
  "Last-Translator: Edmund GRIMLEY EVANS <edmundo at rano.org>\n"
  "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
  "Language: eo\n"
  "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-3\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@@ -28,41 -26,32 +28,41 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  #| msgid "Do you really want to create a sign and encrypt key? "
  msgid "Do you really want to make your passphrase visible on the screen?"
- msgstr "�u vi vere volas krei subskriban kaj �ifran �losilon? "
+ msgstr "Ĉu vi vere volas krei subskriban kaj ĉifran ŝlosilon? "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "nevalida pasfrazo
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr ""
  
@@@ -80,75 -68,59 +80,75 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, 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:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "malbona pasfrazo"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
  msgstr "pasfrazo estas tro longa\n"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "pasfrazo estas tro longa\n"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Nevalida signo en nomo\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
  msgstr "malbona MPI"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "malbona pasfrazo"
@@@ -158,25 -129,11 +158,25 @@@
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "protekto-metodo %d%s ne estas realigita\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "ne povas krei '%s': %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -192,68 -147,47 +192,58 @@@ msgstr "eraro dum kreado de pasfrazo: %
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
 +#: agent/command-ssh.c:2424
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
- msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
  
 +#: agent/command-ssh.c:2444
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
- msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
+ msgstr "neniu skribebla sekreta ŝlosilaro trovita: %s\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "eraro dum skribado de �losilaro '%s': %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: malsukcesis krei haktabelon: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -292,22 -219,18 +282,22 @@@ msgstr "Ripetu pasfrazon: 
  msgid "Repeat this PIN"
  msgstr "Ripetu pasfrazon: "
  
 +#: agent/divert-scd.c:299
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
- msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
+ msgstr "la pasfrazo ne estis ĝuste ripetita; provu denove"
  
 +#: agent/divert-scd.c:301
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
- msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
+ msgstr "la pasfrazo ne estis ĝuste ripetita; provu denove"
  
 +#: agent/divert-scd.c:302
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
- msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
+ msgstr "la pasfrazo ne estis ĝuste ripetita; provu denove"
  
 +#: agent/divert-scd.c:314
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
@@@ -327,12 -247,10 +317,12 @@@ msgstr "skribas al '%s'\n
  msgid "Enter new passphrase"
  msgstr "Donu pasfrazon\n"
  
 +#: agent/genkey.c:172
  #, fuzzy
  msgid "Take this one anyway"
- msgstr "�u tamen uzi �i tiun �losilon? "
+ msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
  
 +#: agent/genkey.c:202
  #, c-format
  msgid ""
  "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@@ -354,10 -269,9 +344,10 @@@ msgstr "
  #| msgid "Name must be at least 5 characters long\n"
  msgid "A passphrase should be at least %u character long."
  msgid_plural "A passphrase should be at least %u characters long."
- msgstr[0] "Nomo devas havi almena� 5 signojn\n"
- msgstr[1] "Nomo devas havi almena� 5 signojn\n"
+ msgstr[0] "Nomo devas havi almenaŭ 5 signojn\n"
+ msgstr[1] "Nomo devas havi almenaŭ 5 signojn\n"
  
 +#: agent/genkey.c:252
  #, c-format
  msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
  msgid_plural ""
@@@ -378,16 -289,13 +368,16 @@@ msgstr "
  #, fuzzy, c-format
  msgid "Please enter the passphrase to%0Aprotect your new key"
  msgstr ""
- "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
+ "Vi bezonas pasfrazon por protekti vian sekretan ŝlosilon.\n"
  "\n"
  
 +#: agent/genkey.c:606
  #, fuzzy
  msgid "Please enter the new passphrase"
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
@@@ -397,118 -305,92 +387,124 @@@ msgstr "
  "Opcioj:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "Ŝlosilo estas anstataŭigita."
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "detala eligo"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "iom malpli da informoj"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
- msgstr "ser�i �losilojn �e �losilservilo"
+ msgstr "serĉi ŝlosilojn ĉe ŝlosilservilo"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
  msgstr "aktualigi la fido-datenaron"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
  msgstr "ne realigita"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -517,165 -399,122 +513,165 @@@ msgstr "ne realigita
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Bonvolu raporti cimojn al <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "opcio-dosiero '%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "legas opciojn el '%s'\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "ne povas krei %s: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, fuzzy, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "Valida atestilrevoko"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, 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"
+ msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
- msgstr "skribas sekretan �losilon al '%s'\n"
+ msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "%s: ne povas krei dosierujon: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: dosierujo kreita\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: ne povas krei dosierujon: %s\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "aktualigo de sekreto malsukcesis: %s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
- msgstr "\t%lu �losiloj ignoritaj\n"
+ msgstr "\t%lu ŝlosiloj ignoritaj\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
- msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
+ msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
  
 +#: agent/preset-passphrase.c:99
  #, fuzzy
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
@@@ -686,8 -524,6 +682,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -695,9 -531,6 +691,9 @@@ msgstr "
  "@Komandoj:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -751,27 -576,22 +747,28 @@@ msgstr "nuligita de uzanto\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
 +#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
  #, fuzzy, c-format
  msgid "file '%s', line %d: %s\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
 +#: agent/trustlist.c:192 agent/trustlist.c:200
  #, fuzzy, c-format
  msgid "statement \"%s\" ignored in '%s', line %d\n"
  msgstr "kiraso: %s\n"
  
 +#: agent/trustlist.c:206
  #, fuzzy, c-format
  msgid "system trustlist '%s' not available\n"
- msgstr "sekretaj �losilpartoj ne estas disponataj\n"
+ msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
  
 +#: agent/trustlist.c:250
  #, fuzzy, c-format
  msgid "bad fingerprint in '%s', line %d\n"
  msgstr "kiraso: %s\n"
@@@ -810,8 -625,6 +807,8 @@@ msgstr "
  msgid "Yes"
  msgstr "jes"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -841,40 -651,33 +838,40 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
- msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
+ msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  msgid "Delete key"
- msgstr "�alti �losilon"
+ msgstr "ŝalti ŝlosilon"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -889,21 -690,17 +886,21 @@@ msgstr "
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
  
 +#: agent/cvt-openpgp.c:338
  msgid "secret key parts are not available\n"
- msgstr "sekretaj �losilpartoj ne estas disponataj\n"
+ msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
  
 +#: agent/cvt-openpgp.c:344
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "public key algorithm %d (%s) is not supported\n"
@@@ -921,84 -716,72 +918,95 @@@ msgstr "protekto-metodo %d%s ne estas r
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "protekto-metodo %d%s ne estas realigita\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "aktualigo malsukcesis: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
  #, fuzzy, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "aktualigo malsukcesis: %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
+ #, fuzzy, c-format
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
- msgstr "ne povas konekti�i al '%s': %s\n"
+ msgstr "ne povas konektiĝi al '%s': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  #, fuzzy
  msgid "problem setting the gpg-agent options\n"
  msgstr "problemo kun agento: agento redonas 0x%lx\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
- msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
+ msgstr "ne povas malŝalti kreadon de core-dosieroj: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "aktualigo malsukcesis: %s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "enkirasigo malsukcesis: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  #, fuzzy
  msgid "yes"
  msgstr "jes"
@@@ -1054,12 -826,10 +1062,12 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
- msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+ msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
 +#: common/miscellaneous.c:143
  #, c-format
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
  msgstr ""
@@@ -1074,36 -842,29 +1082,36 @@@ msgstr "AVERTO: '%s' estas malplena dos
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  msgid "connection to agent is in restricted mode\n"
- msgstr "ne povas fari tion en neinteraga re�imo\n"
+ msgstr "ne povas fari tion en neinteraga reĝimo\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1176,30 -923,24 +1184,30 @@@ msgstr "
  msgid "Data available"
  msgstr "Nenia helpo disponata"
  
 +#: common/audit.c:767
  #, fuzzy
  msgid "Session key created"
- msgstr "%s: �losilaro kreita\n"
+ msgstr "%s: ŝlosilaro kreita\n"
  
 +#: common/audit.c:772 common/audit.c:912 common/audit.c:919
  #, fuzzy, c-format
  msgid "algorithm: %s"
  msgstr "kiraso: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
  "\n"
  "Realigitaj metodoj:\n"
  
 +#: common/audit.c:778 common/audit.c:925
  #, fuzzy
  msgid "seems to be not encrypted"
- msgstr "ne �ifrita"
+ msgstr "ne ĉifrita"
  
 +#: common/audit.c:784 common/audit.c:933
  msgid "Number of recipients"
  msgstr ""
  
@@@ -1217,12 -955,10 +1225,12 @@@ msgstr "
  msgid "data hash algorithm: %s"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
 +#: common/audit.c:862
  #, fuzzy, c-format
  msgid "Signer %d"
- msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+ msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
 +#: common/audit.c:866 common/audit.c:1065
  #, fuzzy, c-format
  msgid "attr hash algorithm: %s"
  msgstr "nevalida kompendi-metodo '%s'\n"
@@@ -1236,17 -970,14 +1244,17 @@@ msgstr "
  msgid "Encryption algorithm supported"
  msgstr "protekto-metodo %d%s ne estas realigita\n"
  
 +#: common/audit.c:993
  #, fuzzy
  msgid "Data verification succeeded"
- msgstr "kontrolo de subskribo estas mal�altita\n"
+ msgstr "kontrolo de subskribo estas malŝaltita\n"
  
 +#: common/audit.c:1002
  #, fuzzy
  msgid "Signature available"
- msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+ msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
 +#: common/audit.c:1024
  #, fuzzy
  msgid "Parsing data succeeded"
  msgstr "Bona subskribo de \""
@@@ -1256,12 -986,10 +1264,12 @@@
  msgid "bad data hash algorithm: %s"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
 +#: common/audit.c:1051
  #, fuzzy, c-format
  msgid "Signature %d"
- msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+ msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
 +#: common/audit.c:1079
  #, fuzzy
  msgid "Certificate chain valid"
  msgstr "Valida atestilrevoko"
@@@ -1273,12 -1000,10 +1281,12 @@@ msgstr "
  "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
  "\n"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
  msgstr "Bona atestilo"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
  msgstr "Nenia helpo disponata"
@@@ -1320,22 -1037,18 +1328,22 @@@ msgstr "Nenia helpo disponata por '%s'
  msgid "ignoring garbage line"
  msgstr "eraro en vostolinio\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
  msgstr "nekonata versio"
  
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
- msgstr "skribas sekretan �losilon al '%s'\n"
+ msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
 +#: common/argparse.c:367
  #, fuzzy
  msgid "read error"
- msgstr "legeraro �e dosiero"
+ msgstr "legeraro ĉe dosiero"
  
 +#: common/argparse.c:369
  #, fuzzy
  msgid "keyword too long"
  msgstr "pasfrazo estas tro longa\n"
@@@ -1401,7 -1102,6 +1409,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
  msgstr "ne traktita"
@@@ -1431,37 -1126,29 +1439,37 @@@ msgstr "enkirasigo malsukcesis: %s\n
  msgid "failed to create temporary file '%s': %s\n"
  msgstr "%s: ne povas krei dosierujon: %s\n"
  
 +#: common/dotlock.c:771
  #, fuzzy, c-format
  msgid "error writing to '%s': %s\n"
- msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
  
 +#: common/dotlock.c:1116
  #, c-format
  msgid "removing stale lockfile (created by %d)\n"
  msgstr ""
  
 +#: common/dotlock.c:1152
  #, fuzzy, c-format
  msgid "waiting for lock (held by %d%s) %s...\n"
- msgstr "skribas sekretan �losilon al '%s'\n"
+ msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
 +#: common/dotlock.c:1153
  msgid "(deadlock?) "
  msgstr ""
  
 +#: common/dotlock.c:1192
  #, fuzzy, c-format
  msgid "lock '%s' not made: %s\n"
- msgstr "publika �losilo %08lX ne trovita: %s\n"
+ msgstr "publika ŝlosilo %08lX ne trovita: %s\n"
  
 +#: common/dotlock.c:1219
  #, fuzzy, c-format
  msgid "waiting for lock %s...\n"
- msgstr "skribas sekretan �losilon al '%s'\n"
+ msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1471,24 -1157,19 +1479,24 @@@
  msgid "armor: %s\n"
  msgstr "kiraso: %s\n"
  
 +#: g10/armor.c:463
  msgid "invalid armor header: "
- msgstr "nevalida kiraso�apo: "
+ msgstr "nevalida kirasoĉapo: "
  
 +#: g10/armor.c:474
  msgid "armor header: "
- msgstr "kiraso�apo: "
+ msgstr "kirasoĉapo: "
  
 +#: g10/armor.c:487
  msgid "invalid clearsig header\n"
- msgstr "nevalida �apo de klarteksta subskribo\n"
+ msgstr "nevalida ĉapo de klarteksta subskribo\n"
  
 +#: g10/armor.c:500
  #, fuzzy
  msgid "unknown armor header: "
- msgstr "kiraso�apo: "
+ msgstr "kirasoĉapo: "
  
 +#: g10/armor.c:553
  msgid "nested clear text signatures\n"
  msgstr "ingitaj klartekstaj subskriboj\n"
  
@@@ -1545,111 -1214,87 +1553,110 @@@ msgstr "nevalida kiraso: linio pli long
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
- "quoted-printable-signo en kiraso - ver�ajne cima po�totransendilo estis "
+ "quoted-printable-signo en kiraso - verŝajne cima poŝtotransendilo estis "
  "uzata\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "ne homlegebla"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  #, fuzzy
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr ""
- "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
+ "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aŭ substrekojn "
  "kaj fini per '='\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  #, fuzzy
  msgid "a user notation name must contain the '@' character\n"
  msgstr "notacia valoro ne povas enhavi stirsignojn\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  #, fuzzy
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "notacia valoro ne povas enhavi stirsignojn\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "notacia valoro ne povas enhavi stirsignojn\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  msgid "a notation name may not contain an '=' character\n"
  msgstr "notacia valoro ne povas enhavi stirsignojn\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr ""
- "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
+ "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aŭ substrekojn "
  "kaj fini per '='\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "AVERTO: nevalida notacia dateno trovita\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, fuzzy, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Donu pasfrazon: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
- msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+ msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
  msgstr "AVERTO: %s nuligas %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, fuzzy, c-format
  msgid "OpenPGP card not available: %s\n"
- msgstr "sekreta �losilo ne havebla"
+ msgstr "sekreta ŝlosilo ne havebla"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  #, fuzzy
  msgid "can't do this in batch mode\n"
- msgstr "ne povas fari tion en neinteraga re�imo\n"
+ msgstr "ne povas fari tion en neinteraga reĝimo\n"
  
 +#: g10/card-util.c:107
  #, fuzzy
  msgid "This command is only available for version 2 cards\n"
- msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
- msgstr "sekretaj �losilpartoj ne estas disponataj\n"
+ msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Via elekto? "
  
@@@ -1681,184 -1320,142 +1688,184 @@@ msgstr "ne traktita
  msgid "forced"
  msgstr ""
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr ""
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr ""
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr ""
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  #, fuzzy
  msgid "URL to retrieve public key: "
- msgstr "skribas publikan �losilon al '%s'\n"
+ msgstr "skribas publikan ŝlosilon al '%s'\n"
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
- msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr ""
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr ""
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  #, fuzzy
  msgid "Language preferences: "
  msgstr "aktualigitaj preferoj"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  #, fuzzy
  msgid "Error: invalid length of preference string.\n"
- msgstr "nevalida signo en signo�eno\n"
+ msgstr "nevalida signo en signoĉeno\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  #, fuzzy
  msgid "Error: invalid characters in preference string.\n"
- msgstr "nevalida signo en signo�eno\n"
+ msgstr "nevalida signo en signoĉeno\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr ""
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  #, fuzzy
  msgid "Error: invalid response.\n"
  msgstr "%s: nevalida dosiero-versio %d\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  #, fuzzy
  msgid "CA fingerprint: "
  msgstr "Fingrospuro:"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  #, fuzzy
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "%s: nevalida dosiero-versio %d\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, fuzzy, c-format
  msgid "key operation not possible: %s\n"
- msgstr "Kreado de �losiloj malsukcesis: %s\n"
+ msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  #, fuzzy
  msgid "not an OpenPGP card"
  msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
- msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
- msgstr "Kiun �losilgrandon vi deziras? (1024) "
+ msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
- msgstr "Kiun �losilgrandon vi deziras? (1024) "
+ msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
- msgstr "Kiun �losilgrandon vi deziras? (1024) "
+ msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
- msgstr "rondigita �is %u bitoj\n"
+ msgstr "rondigita ĝis %u bitoj\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
- msgstr "ignorita: sekreta �losilo jam �eestas\n"
+ msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1866,240 -1463,183 +1873,240 @@@
  "You should change them using the command --change-pin\n"
  msgstr ""
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  #, fuzzy
  msgid "Please select the type of key to generate:\n"
- msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
+ msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  #, fuzzy
  msgid "   (1) Signature key\n"
- msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+ msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  #, fuzzy
  msgid "   (2) Encryption key\n"
- msgstr "   (%d) RSA (nur �ifri)\n"
+ msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Nevalida elekto.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  #, fuzzy
  msgid "Please select where to store the key:\n"
  msgstr "Kialo por revoko: "
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
- msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
- msgstr "ignorita: sekreta �losilo jam �eestas\n"
+ msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  msgid "Continue? (y/N) "
- msgstr "�u vere subskribi? "
+ msgstr "Ĉu vere subskribi? "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
- msgstr "forlasi �i tiun menuon"
+ msgstr "forlasi ĉi tiun menuon"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  #, fuzzy
  msgid "show admin commands"
  msgstr "malkongruaj komandoj\n"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
- msgstr "montri �i tiun helpon"
+ msgstr "montri ĉi tiun helpon"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  #, fuzzy
  msgid "list all available data"
  msgstr "Nenia helpo disponata"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr ""
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr ""
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr ""
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  #, fuzzy
  msgid "change the login name"
- msgstr "�an�i la daton de eksvalidi�o"
+ msgstr "ŝanĝi la daton de eksvalidiĝo"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  #, fuzzy
  msgid "change the language preferences"
- msgstr "�an�i la posedantofidon"
+ msgstr "ŝanĝi la posedantofidon"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr ""
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  #, fuzzy
  msgid "change a CA fingerprint"
  msgstr "montri fingrospuron"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr ""
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  #, fuzzy
  msgid "generate new keys"
- msgstr "krei novan �losilparon"
+ msgstr "krei novan ŝlosilparon"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr ""
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr ""
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  #, fuzzy
  msgid "Admin-only command\n"
  msgstr "malkongruaj komandoj\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  #, fuzzy
  msgid "Admin commands are allowed\n"
  msgstr "malkongruaj komandoj\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  #, fuzzy
  msgid "Admin commands are not allowed\n"
- msgstr "skribas sekretan �losilon al '%s'\n"
+ msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Nevalida komando (provu per \"helpo\")\n"
  
 +#: g10/decrypt.c:191 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
- msgstr "--output ne funkcias por �i tiu komando\n"
+ msgstr "--output ne funkcias por ĉi tiu komando\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "ne povas malfermi '%s'\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
- msgstr "eraro dum legado de �losilbloko: %s\n"
+ msgstr "eraro dum legado de ŝlosilbloko: %s\n"
  
 +#: g10/delkey.c:118 g10/getkey.c:579
  #, fuzzy, c-format
  msgid "key \"%s\" not found\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
 +#: g10/delkey.c:129 g10/delkey.c:136
  msgid "(unless you specify the key by fingerprint)\n"
  msgstr ""
  
 +#: g10/delkey.c:135
  #, fuzzy
  msgid "can't do this in batch mode without \"--yes\"\n"
- msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
+ msgstr "ne povas fari tion en neinteraga reĝimo sen \"--yes\"\n"
  
 +#: g10/delkey.c:148
  #, fuzzy
  msgid "Delete this key from the keyring? (y/N) "
- msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
+ msgstr "Ĉu forviŝi ĉi tiun ŝlosilon de la ŝlosilaro? "
  
 +#: g10/delkey.c:158
  #, fuzzy
  msgid "This is a secret key! - really delete? (y/N) "
- msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
+ msgstr "Tio estas sekreta ŝlosilo! Ĉu vere forviŝi ĝin? "
  
 +#: g10/delkey.c:201
  #, fuzzy, c-format
  msgid "deleting secret %s failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: g10/delkey.c:203
  msgid "key"
- msgstr "�losilo"
+ msgstr "ŝlosilo"
  
 +#: g10/delkey.c:203
  #, fuzzy
  msgid "subkey"
  msgstr "al"
  
 +#: g10/delkey.c:226
  #, c-format
  msgid "deleting keyblock failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: g10/delkey.c:239
  msgid "ownertrust information cleared\n"
  msgstr ""
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
- msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
+ msgstr "estas sekreta ŝlosilo por la publika ŝlosilo \"%s\"!\n"
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
- msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
+ msgstr "uzu la opcion \"--delete-secret-key\" por forviŝi ĝin unue.\n"
  
 +#: g10/encrypt.c:232 g10/sign.c:1292
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -2135,51 -1669,42 +2142,51 @@@ msgstr "legas el '%s'\n
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
- msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
+ msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
  
 +#: g10/encrypt.c:707 g10/sign.c:984
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
  "preferences\n"
- msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
+ msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
  
 +#: g10/encrypt.c:817
  #, c-format
  msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
  
 +#: g10/encrypt.c:903
  #, fuzzy, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
- msgstr "%s/%s-�ifrita por: %s\n"
+ msgstr "%s/%s-ĉifrita por: %s\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, fuzzy, c-format
  msgid "you may not use %s while in %s mode\n"
- msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
  #, c-format
  msgid "%s encrypted data\n"
- msgstr "%s-�ifritaj datenoj\n"
+ msgstr "%s-ĉifritaj datenoj\n"
  
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
  #, c-format
  msgid "encrypted with unknown algorithm %d\n"
- msgstr "�ifrita per nekonata metodo %d\n"
+ msgstr "ĉifrita per nekonata metodo %d\n"
  
 +#: g10/decrypt-data.c:164 sm/decrypt.c:127
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
- "AVERTO: mesa�o estis �ifrita per malforta �losilo en la simetria �ifro.\n"
+ "AVERTO: mesaĝo estis ĉifrita per malforta ŝlosilo en la simetria ĉifro.\n"
  
 +#: g10/decrypt-data.c:176
  msgid "problem handling encrypted packet\n"
- msgstr "problemo �e traktado de �ifrita paketo\n"
+ msgstr "problemo ĉe traktado de ĉifrita paketo\n"
  
 +#: g10/exec.c:60
  msgid "no remote program execution supported\n"
  msgstr ""
  
@@@ -2231,64 -1746,50 +2238,64 @@@ msgstr "Averto: malsekura posedeco sur 
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  #, fuzzy
  msgid "export signatures that are marked as local-only"
  msgstr ""
  "\n"
  "La subskribo estos markita kiel nerevokebla.\n"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr ""
  
- #: g10/export.c:108
++#: g10/export.c:112
  #, fuzzy
  msgid "remove unusable parts from key during export"
- msgstr "neuzebla sekreta �losilo"
+ msgstr "neuzebla sekreta ŝlosilo"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: ignorita: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "skribas al '%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
- msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
+ msgstr "ŝlosilo %08lX: revokatestilo en malĝusta loko - ignorita\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
- msgstr "skribas sekretan �losilon al '%s'\n"
+ msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
- msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
+ msgstr "ŝlosilo %08lX: PGP-2.x-stila ŝlosilo - ignorita\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "AVERTO: nenio estis eksportita\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2299,8 -1799,6 +2306,8 @@@ msgstr "eraro dum kreado de '%s': %s\n
  msgid "[User ID not found]"
  msgstr "[Uzantidentigilo ne trovita]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
  msgstr "nevalida kiraso"
@@@ -2319,276 -1814,216 +2326,276 @@@ msgstr "eraro dum legado de '%s': %s\n
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "Warning: %s appears in the keyring %d times\n"
- msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+ msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "eraro dum kreado de '%s': %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "eraro dum kreado de '%s': %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
  msgstr "Fingrospuro:"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
- msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
+ msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
- msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
+ msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, fuzzy, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
- msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
+ msgstr "Nevalida ŝlosilo %08lX validigita per --always-trust\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, fuzzy, c-format
  msgid "using subkey %s instead of primary key %s\n"
- msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
+ msgstr "uzas flankan ŝlosilon %08lX anstataŭ la ĉefa ŝlosilo %08lX\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "fari apartan subskribon"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[dosiero]|fari klartekstan subskribon"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "fari apartan subskribon"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
- msgstr "�ifri datenojn"
+ msgstr "ĉifri datenojn"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
- msgstr "�ifri nur kun simetria �ifro"
+ msgstr "ĉifri nur kun simetria ĉifro"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
- msgstr "mal�ifri datenojn (implicita elekto)"
+ msgstr "malĉifri datenojn (implicita elekto)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "kontroli subskribon"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
- msgstr "listigi �losilojn"
+ msgstr "listigi ŝlosilojn"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
- msgstr "listigi �losilojn kaj subskribojn"
+ msgstr "listigi ŝlosilojn kaj subskribojn"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  #, fuzzy
  msgid "list and check key signatures"
- msgstr "kontroli �losilsubskribojn"
+ msgstr "kontroli ŝlosilsubskribojn"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
- msgstr "listigi �losilojn kaj fingro�purojn"
+ msgstr "listigi ŝlosilojn kaj fingroŝpurojn"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
- msgstr "listigi sekretajn �losilojn"
+ msgstr "listigi sekretajn ŝlosilojn"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
- msgstr "krei novan �losilparon"
+ msgstr "krei novan ŝlosilparon"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
- msgstr "krei novan �losilparon"
+ msgstr "krei novan ŝlosilparon"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
- msgstr "krei novan �losilparon"
+ msgstr "krei novan ŝlosilparon"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
- msgstr "krei novan �losilparon"
+ msgstr "krei novan ŝlosilparon"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "krei revokatestilon"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
- msgstr "forigi �losilojn de la publika �losilaro"
+ msgstr "forigi ŝlosilojn de la publika ŝlosilaro"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
- msgstr "forigi �losilojn de la sekreta �losilaro"
+ msgstr "forigi ŝlosilojn de la sekreta ŝlosilaro"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
- msgstr "subskribi �losilon"
+ msgstr "subskribi ŝlosilon"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
- msgstr "subskribi �losilon loke"
+ msgstr "subskribi ŝlosilon loke"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
- msgstr "subskribi �losilon"
+ msgstr "subskribi ŝlosilon"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
- msgstr "subskribi �losilon loke"
+ msgstr "subskribi ŝlosilon loke"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
- msgstr "subskribi a� redakti �losilon"
+ msgstr "subskribi aŭ redakti ŝlosilon"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
- msgstr "eksporti �losilojn"
+ msgstr "eksporti ŝlosilojn"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
- msgstr "eksporti �losilojn al �losilservilo"
+ msgstr "eksporti ŝlosilojn al ŝlosilservilo"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
- msgstr "importi �losilojn de �losilservilo"
+ msgstr "importi ŝlosilojn de ŝlosilservilo"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
- msgstr "ser�i �losilojn �e �losilservilo"
+ msgstr "serĉi ŝlosilojn ĉe ŝlosilservilo"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
- msgstr "aktualigi �iujn �losilojn de �losilservilo"
+ msgstr "aktualigi ĉiujn ŝlosilojn de ŝlosilservilo"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
- msgstr "importi/kunfandi �losilojn"
+ msgstr "importi/kunfandi ŝlosilojn"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "aktualigi la fido-datenaron"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
- msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
+ msgstr "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "krei eligon en askia kiraso"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
- msgstr "|NOMO|�ifri por NOMO"
+ msgstr "|NOMO|ĉifri por NOMO"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
- msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
+ msgstr "uzi ĉi tiun uzantidentigilon por subskribi aŭ malĉifri"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|difini densig-nivelon N (0=nenia)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
- msgstr "uzi tekstan re�imon"
+ msgstr "uzi tekstan reĝimon"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
- msgstr "fari neniajn �an�ojn"
+ msgstr "fari neniajn ŝanĝojn"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr ""
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
  msgstr ""
  "@\n"
- "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
+ "(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2602,19 -2037,17 +2609,19 @@@ msgstr "
  "@\n"
  "Ekzemploj:\n"
  "\n"
- " -se -r Bob [dosiero]       subskribi kaj �ifri por uzanto Bob\n"
+ " -se -r Bob [dosiero]       subskribi kaj ĉifri por uzanto Bob\n"
  " --clearsign [dosiero]      fari klartekstan subskribon\n"
  " --detach-sign [dosiero]    fari apartan subskribon\n"
- " --list-keys [nomoj]        montri �losilojn\n"
- " --fingerprint [nomoj]      montri fingro�purojn\n"
+ " --list-keys [nomoj]        montri ŝlosilojn\n"
+ " --fingerprint [nomoj]      montri fingroŝpurojn\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2626,10 -2059,9 +2633,10 @@@ msgid "
  "Default operation depends on the input data\n"
  msgstr ""
  "Sintakso: gpg [opcioj] [dosieroj]\n"
- "subskribi, kontroli, �ifri a� mal�ifri\n"
+ "subskribi, kontroli, ĉifri aŭ malĉifri\n"
  "implicita operacio dependas de la enigataj datenoj\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2637,635 -2069,504 +2644,640 @@@ msgstr "
  "\n"
  "Realigitaj metodoj:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr ""
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr ""
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr ""
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  #, fuzzy
  msgid "Compression: "
  msgstr "Komento: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "uzado: gpg [opcioj] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "malkongruaj komandoj\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr ""
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, 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:1559
++#: g10/gpg.c:1567
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, 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:1571
++#: g10/gpg.c:1579
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "%s: nova opcio-dosiero kreita\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  msgid "show key usage information during key listings"
- msgstr "Mankas responda subskribo en sekreta �losilaro\n"
+ msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  #, fuzzy
  msgid "show all notations during signature listings"
- msgstr "Mankas responda subskribo en sekreta �losilaro\n"
+ msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  #, fuzzy
  msgid "show the keyring name in key listings"
- msgstr "montri, en kiu �losilaro estas listigita �losilo"
+ msgstr "montri, en kiu ŝlosilaro estas listigita ŝlosilo"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  #, fuzzy
  msgid "show expiration dates during signature listings"
- msgstr "Mankas responda subskribo en sekreta �losilaro\n"
+ msgstr "Mankas responda subskribo en sekreta ŝlosilaro\n"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "mal�alti �losilon"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "nevalida kiraso"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "nekonata implicita ricevonto '%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "nevalida kiraso"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
  msgstr "NOTO: %s ne estas por normala uzado!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Nevalida retadreso\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  #, fuzzy
  msgid "could not parse keyserver URL\n"
- msgstr "ne povis analizi URI de �losilservilo\n"
+ msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  #, fuzzy
  msgid "invalid keyserver options\n"
- msgstr "nevalida �losilaro"
+ msgstr "nevalida ŝlosilaro"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, fuzzy, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  #, fuzzy
  msgid "invalid import options\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, fuzzy, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  #, fuzzy
  msgid "invalid export options\n"
- msgstr "nevalida �losilaro"
+ msgstr "nevalida ŝlosilaro"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "nevalida kiraso"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s ne estas valida signaro\n"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  #, fuzzy
  msgid "invalid verify options\n"
- msgstr "nevalida �losilaro"
+ msgstr "nevalida ŝlosilaro"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr ""
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "AVERTO: programo povas krei core-dosieron!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVERTO: %s nuligas %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ne eblas kun %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s ne havas sencon kun %s!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
- msgstr "skribas sekretan �losilon al '%s'\n"
+ msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
- msgstr "elektita �ifrad-metodo ne validas\n"
+ msgstr "elektita ĉifrad-metodo ne validas\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "elektita kompendi-metodo ne validas\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
- msgstr "elektita �ifrad-metodo ne validas\n"
+ msgstr "elektita ĉifrad-metodo ne validas\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  #, fuzzy
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "elektita kompendi-metodo ne validas\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed devas esti pli granda ol 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed devas esti pli granda ol 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  #, 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:3588
++#: g10/gpg.c:3686
  #, 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"
+ msgstr "nevalida default-check-level; devas esti 0, 1, 2 aŭ 3\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  #, 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"
+ msgstr "nevalida default-check-level; devas esti 0, 1, 2 aŭ 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
- msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
+ msgstr "NOTO: simpla S2K-reĝimo (0) estas forte malrekomendata\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
- msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
+ msgstr "nevalida S2K-reĝimo; devas esti 0, 1 aŭ 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  #, fuzzy
  msgid "invalid default preferences\n"
  msgstr "nevalidaj preferoj\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  #, fuzzy
  msgid "invalid personal cipher preferences\n"
  msgstr "nevalidaj preferoj\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  #, fuzzy
  msgid "invalid personal digest preferences\n"
  msgstr "nevalidaj preferoj\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  #, fuzzy
  msgid "invalid personal compress preferences\n"
  msgstr "nevalidaj preferoj\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, fuzzy, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ne havas sencon kun %s!\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, 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"
+ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, 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"
+ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, 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"
+ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [dosiero]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [dosiero]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
- msgstr "mal�ifrado malsukcesis: %s\n"
+ msgstr "malĉifrado malsukcesis: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [dosiero]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  #, fuzzy
  msgid "--symmetric --encrypt [filename]"
  msgstr "--sign --encrypt [dosiero]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, 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"
+ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [dosiero]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [dosiero]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  #, fuzzy
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--sign --encrypt [dosiero]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, 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"
+ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [dosiero]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [dosiero]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [dosiero]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key uzantidentigilo"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key uzantidentigilo"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key uzantidentigilo [komandoj]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
  msgstr "--sign-key uzantidentigilo"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, fuzzy, c-format
  msgid "keyserver send failed: %s\n"
- msgstr "Kreado de �losiloj malsukcesis: %s\n"
+ msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, fuzzy, c-format
  msgid "keyserver receive failed: %s\n"
- msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
+ msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, fuzzy, c-format
  msgid "key export failed: %s\n"
- msgstr "Kreado de �losiloj malsukcesis: %s\n"
+ msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  msgid "export as ssh key failed: %s\n"
- msgstr "Kreado de �losiloj malsukcesis: %s\n"
+ msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, fuzzy, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "get_dir_record: search_record malsukcesis: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, fuzzy, c-format
  msgid "keyserver refresh failed: %s\n"
- msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
+ msgstr "listigo de sekretaj ŝlosiloj malsukcesis: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "elkirasigo malsukcesis: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "enkirasigo malsukcesis: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[dosiero]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
- msgstr "Ektajpu vian mesa�on ...\n"
+ msgstr "Ektajpu vian mesaĝon ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "la donita gvidlinia URL por atestado ne validas\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
- msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
+ msgstr "Ĉu forviŝi ĉi tiun ŝlosilon de la ŝlosilaro? "
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  #, fuzzy
  msgid "make timestamp conflicts only a warning"
  msgstr "malkongruo de tempostampoj"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  #, fuzzy
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3281,331 -2580,265 +3293,331 @@@ msgstr "Nenia helpo disponata
  msgid "No help available for '%s'"
  msgstr "Nenia helpo disponata por '%s'"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "aktualigi la fido-datenaron"
  
- #: g10/import.c:147
++#: g10/import.c:160
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "aktualigi la fido-datenaron"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  msgid "show key during import"
  msgstr "montri fingrospuron"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  #, fuzzy
  msgid "remove unusable parts from key after import"
- msgstr "neuzebla sekreta �losilo"
+ msgstr "neuzebla sekreta ŝlosilo"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "ignoras blokon de speco %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
- msgstr "%lu �losiloj jam traktitaj\n"
+ msgstr "%lu ŝlosiloj jam traktitaj\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "      Nombro traktita entute: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
- msgstr "    ignoritaj novaj �losiloj: %lu\n"
+ msgstr "    ignoritaj novaj ŝlosiloj: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
- msgstr "    ignoritaj novaj �losiloj: %lu\n"
+ msgstr "    ignoritaj novaj ŝlosiloj: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "         sen uzantidentigilo: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                  importitaj: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
- msgstr "                  ne�an�itaj: %lu\n"
+ msgstr "                  neŝanĝitaj: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "      novaj uzantidentigiloj: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
- msgstr "           novaj sub�losiloj: %lu\n"
+ msgstr "           novaj subŝlosiloj: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "            novaj subskriboj: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
- msgstr "         novaj �losilrevokoj: %lu\n"
+ msgstr "         novaj ŝlosilrevokoj: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
- msgstr "   sekretaj �losiloj legitaj: %lu\n"
+ msgstr "   sekretaj ŝlosiloj legitaj: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
- msgstr "sekretaj �losiloj importitaj: %lu\n"
+ msgstr "sekretaj ŝlosiloj importitaj: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
- msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
+ msgstr "sekretaj ŝlosiloj neŝanĝitaj: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, fuzzy, c-format
  msgid "          not imported: %lu\n"
  msgstr "                  importitaj: %lu"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "            novaj subskriboj: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
- msgstr "   sekretaj �losiloj legitaj: %lu\n"
+ msgstr "   sekretaj ŝlosiloj legitaj: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "%s-subskribo de: %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
- msgstr "�losilo %08lX: mankas uzantidentigilo\n"
+ msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "ignoris '%s': %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
- msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
+ msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
- msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
+ msgstr "ŝlosilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
- msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
+ msgstr "ŝlosilo %08lX: mankas valida uzantidentigilo\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
- msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
+ msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
- msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
+ msgstr "ŝlosilo %08lX: publika ŝlosilo ne trovita: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
- msgstr "�losilo %08lX: nova �losilo - ignorita\n"
+ msgstr "ŝlosilo %08lX: nova ŝlosilo - ignorita\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
- msgstr "neniu skribebla �losilaro trovita: %s\n"
+ msgstr "neniu skribebla ŝlosilaro trovita: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
- msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
- msgstr "�losilo %08lX: publika �losilo importita\n"
+ msgstr "ŝlosilo %08lX: publika ŝlosilo importita\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
- msgstr "�losilo %08lX: diferencas de nia kopio\n"
+ msgstr "ŝlosilo %08lX: diferencas de nia kopio\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
- msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
+ msgstr "ŝlosilo %08lX: ne povas trovi originalan ŝlosilblokon: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
- msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
+ msgstr "ŝlosilo %08lX: ne povas legi originalan ŝlosilblokon: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
- msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
+ msgstr "ŝlosilo %08lX: 1 nova uzantidentigilo\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
- msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
+ msgstr "ŝlosilo %08lX: %d novaj uzantidentigiloj\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
- msgstr "�losilo %08lX: 1 nova subskribo\n"
+ msgstr "ŝlosilo %08lX: 1 nova subskribo\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
- msgstr "�losilo %08lX: %d novaj subskriboj\n"
+ msgstr "ŝlosilo %08lX: %d novaj subskriboj\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
- msgstr "�losilo %08lX: 1 nova sub�losilo\n"
+ msgstr "ŝlosilo %08lX: 1 nova subŝlosilo\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
- msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
+ msgstr "ŝlosilo %08lX: %d novaj subŝlosiloj\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
- msgstr "�losilo %08lX: %d novaj subskriboj\n"
+ msgstr "ŝlosilo %08lX: %d novaj subskriboj\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
- msgstr "�losilo %08lX: %d novaj subskriboj\n"
+ msgstr "ŝlosilo %08lX: %d novaj subskriboj\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
- msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
+ msgstr "ŝlosilo %08lX: %d novaj uzantidentigiloj\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
- msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
+ msgstr "ŝlosilo %08lX: %d novaj uzantidentigiloj\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
- msgstr "�losilo %08lX: ne �an�ita\n"
+ msgstr "ŝlosilo %08lX: ne ŝanĝita\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
- msgstr "�losilo %08lX: sekreta �losilo importita\n"
+ msgstr "ŝlosilo %08lX: sekreta ŝlosilo importita\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
- msgstr "ignorita: sekreta �losilo jam �eestas\n"
+ msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  #, fuzzy
  msgid "importing secret keys not allowed\n"
- msgstr "skribas sekretan �losilon al '%s'\n"
+ msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
- msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
+ msgstr "ŝlosilo %08lX: sekreta ŝlosilo sen publika ŝlosilo - ignorita\n"
  
  #. TRANSLATORS: For smartcard, each private key on
  #. host has a reference (stub) to a smartcard and
@@@ -3617,180 -2850,145 +3629,180 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
- "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
+ "ŝlosilo %08lX: publika ŝlosilo mankas - ne povas apliki revokatestilon\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
- msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
+ msgstr "ŝlosilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
- msgstr "�losilo %08lX: revokatestilo importita\n"
+ msgstr "ŝlosilo %08lX: revokatestilo importita\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
- msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
+ msgstr "ŝlosilo %08lX: mankas uzantidentigilo por subskribo\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
- msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
+ msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
- msgstr "�losilo %08lX: nevalida mem-subskribo\n"
+ msgstr "ŝlosilo %08lX: nevalida mem-subskribo\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
- msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
+ msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
- msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
+ msgstr "ŝlosilo %08lX: rekta ŝlosilsubskribo aldonita\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
- msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
+ msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
- msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
+ msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
- msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
+ msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
- msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
+ msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
- msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
+ msgstr "ŝlosilo %08lX.%lu: Valida subŝlosilrevoko\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
- msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
+ msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
- msgstr "�losilo %08lX: ignoris uzantidentigilon '"
+ msgstr "ŝlosilo %08lX: ignoris uzantidentigilon '"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
- msgstr "�losilo %08lX: ignoris sub�losilon\n"
+ msgstr "ŝlosilo %08lX: ignoris subŝlosilon\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
- msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
+ msgstr "ŝlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
- msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
+ msgstr "ŝlosilo %08lX: revokatestilo en malĝusta loko - ignorita\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
- msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
+ msgstr "ŝlosilo %08lX: nevalida revokatestilo: %s - ignorita\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
- msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
+ msgstr "ŝlosilo %08lX: revokatestilo en malĝusta loko - ignorita\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
- msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
+ msgstr "ŝlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
- msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
+ msgstr "ŝlosilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
- msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
+ msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
- msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
+ msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
- msgstr "�losilo %08lX: revokatestilo aldonita\n"
+ msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
- msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
+ msgstr "ŝlosilo %08lX: rekta ŝlosilsubskribo aldonita\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
- msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+ msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
- msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+ msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
- msgstr "�losilaro '%s' kreita\n"
+ msgstr "ŝlosilaro '%s' kreita\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
- msgstr "�losilaro '%s' kreita\n"
+ msgstr "ŝlosilaro '%s' kreita\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "eraro dum kreado de '%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
- msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
+ msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
  
 +#: g10/keyedit.c:264
  msgid "[revocation]"
  msgstr "[revoko]"
  
@@@ -3798,43 -2995,40 +3810,49 @@@
  msgid "[self-signature]"
  msgstr "[mem-subskribo]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
+ msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "%s-subskribo de: %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Bona subskribo de \""
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "ignoris '%s': %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
  msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 subskribo ne kontrolita pro manko de �losilo\n"
- msgstr[1] "1 subskribo ne kontrolita pro manko de �losilo\n"
+ msgstr[0] "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
+ msgstr[1] "1 subskribo ne kontrolita pro manko de ŝlosilo\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3842,21 -3036,18 +3860,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d malbonaj subskriboj\n"
  msgstr[1] "%d malbonaj subskriboj\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Bona subskribo de \""
  msgstr[1] "Bona subskribo de \""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3869,69 -3060,54 +3887,69 @@@ msgstr "
  "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
  "\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Mi fidas iomete\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Mi plene fidas\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, fuzzy, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  #, fuzzy
  msgid "Are you sure you still want to sign it? (y/N) "
- msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
+ msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr ""
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, fuzzy, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, fuzzy, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "AVERTO: '%s' estas malplena dosiero\n"
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  #, fuzzy
  msgid "Sign it? (y/N) "
- msgstr "�u vere subskribi? "
+ msgstr "Ĉu vere subskribi? "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, fuzzy, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3940,18 -3116,16 +3958,18 @@@ msgstr "
  "Via aktuala subskribo sur \"%s\"\n"
  "estas loka subskribo.\n"
  "\n"
- "�u vi volas igi �in plena eksportebla subskribo?\n"
+ "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  #, fuzzy
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr ""
  "Via aktuala subskribo sur \"%s\"\n"
  "estas loka subskribo.\n"
  "\n"
- "�u vi volas igi �in plena eksportebla subskribo?\n"
+ "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, fuzzy, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3960,14 -3134,12 +3978,14 @@@ msgstr "
  "Via aktuala subskribo sur \"%s\"\n"
  "estas loka subskribo.\n"
  "\n"
- "�u vi volas igi �in plena eksportebla subskribo?\n"
+ "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  #, fuzzy
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
- msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
+ msgstr "Ĉu vi volas, ke via subskribo eksvalidiĝu je la sama tempo? (j/n) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, fuzzy, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3976,352 -3148,283 +3994,352 @@@ msgstr "
  "Via aktuala subskribo sur \"%s\"\n"
  "estas loka subskribo.\n"
  "\n"
- "�u vi volas igi �in plena eksportebla subskribo?\n"
+ "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  #, fuzzy
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Via aktuala subskribo sur \"%s\"\n"
  "estas loka subskribo.\n"
  "\n"
- "�u vi volas igi �in plena eksportebla subskribo?\n"
+ "Ĉu vi volas igi ĝin plena eksportebla subskribo?\n"
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
- msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
+ msgstr "\"%s\" jam estis %ssubskribita per ŝlosilo %08lX\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
- msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
+ msgstr "\"%s\" jam estis %ssubskribita per ŝlosilo %08lX\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  #, fuzzy
  msgid "Do you want to sign it again anyway? (y/N) "
- msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
+ msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
- msgstr "Nenio por subskribi per �losilo %08lX\n"
+ msgstr "Nenio por subskribi per ŝlosilo %08lX\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
- msgstr "�i tiu �losilo eksvalidi�is!"
+ msgstr "Ĉi tiu ŝlosilo eksvalidiĝis!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
- msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+ msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  #, fuzzy
  msgid "Do you want your signature to expire at the same time? (Y/n) "
- msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
+ msgstr "Ĉu vi volas, ke via subskribo eksvalidiĝu je la sama tempo? (j/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
  "to the person named above?  If you don't know what to answer, enter \"0\".\n"
  msgstr ""
- "Kiom zorge vi kontrolis, ke la �losilo, kiun vi subskribos, vere apartenas\n"
+ "Kiom zorge vi kontrolis, ke la ŝlosilo, kiun vi subskribos, vere apartenas\n"
  "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Mi ne respondas.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Mi tute ne kontrolis.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Mi malzorge kontrolis.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Mi tre zorge kontrolis.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr " i = bonvolu montri pli da informoj\n"
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr ""
- "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
- "per via �losilo: \""
+ "Ĉu vi estas tute certa, ke vi volas subskribi ĉi tiun ŝlosilon\n"
+ "per via ŝlosilo: \""
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  #, fuzzy
  msgid "This will be a self-signature.\n"
- msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
+ msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "La subskribo estos markita kiel neeksportebla.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "La subskribo estos markita kiel nerevokebla.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "La subskribo estos markita kiel neeksportebla.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "La subskribo estos markita kiel nerevokebla.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
- "Mi tute ne kontrolis �i tiun �losilon.\n"
+ "Mi tute ne kontrolis ĉi tiun ŝlosilon.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
- "Mi malzorge kontrolis �i tiun �losilon.\n"
+ "Mi malzorge kontrolis ĉi tiun ŝlosilon.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
- "Mi tre zorge kontrolis �i tiun �losilon.\n"
+ "Mi tre zorge kontrolis ĉi tiun ŝlosilon.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  #, fuzzy
  msgid "Really sign? (y/N) "
- msgstr "�u vere subskribi? "
+ msgstr "Ĉu vere subskribi? "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "subskribado malsukcesis: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "skribi kaj fini"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "montri fingrospuron"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Subskribo-notacio: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
- msgstr "listigi �losilojn kaj uzantidentigilojn"
+ msgstr "listigi ŝlosilojn kaj uzantidentigilojn"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "elekti uzantidentigilon N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  #, fuzzy
  msgid "select subkey N"
  msgstr "elekti uzantidentigilon N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "check signatures"
  msgstr "revoki subskribojn"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  #, fuzzy
  msgid "sign selected user IDs locally"
- msgstr "subskribi la �losilon loke"
+ msgstr "subskribi la ŝlosilon loke"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "aldoni uzantidentigilon"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "aldoni foto-identigilon"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  #, fuzzy
  msgid "delete selected user IDs"
- msgstr "forvi�i uzantidentigilon"
+ msgstr "forviŝi uzantidentigilon"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  #, fuzzy
  msgid "add a subkey"
  msgstr "al"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  #, fuzzy
  msgid "delete selected subkeys"
- msgstr "forvi�i flankan �losilon"
+ msgstr "forviŝi flankan ŝlosilon"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  #, fuzzy
  msgid "add a revocation key"
- msgstr "aldoni flankan �losilon"
+ msgstr "aldoni flankan ŝlosilon"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
- msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
+ msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
- msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
+ msgstr "Vi ne povas ŝanĝi la daton de eksvalidiĝo de v3-ŝlosilo\n"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  #, fuzzy
  msgid "flag the selected user ID as primary"
- msgstr "marku uzantidentigilon kiel �efan"
+ msgstr "marku uzantidentigilon kiel ĉefan"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "listigi preferojn (spertula)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "listigi preferojn (detale)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  #, fuzzy
  msgid "set preference list for the selected user IDs"
- msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
+ msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
- msgstr "ne povis analizi URI de �losilservilo\n"
+ msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  #, fuzzy
  msgid "set a notation for the selected user IDs"
- msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
+ msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
- msgstr "�an�i la posedantofidon"
+ msgstr "ŝanĝi la posedantofidon"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
- msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
+ msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "aldoni uzantidentigilon"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  #, fuzzy
  msgid "revoke key or selected subkeys"
- msgstr "revoki flankan �losilon"
+ msgstr "revoki flankan ŝlosilon"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  #, fuzzy
  msgid "enable key"
- msgstr "�alti �losilon"
+ msgstr "ŝalti ŝlosilon"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "disable key"
- msgstr "mal�alti �losilon"
+ msgstr "malŝalti ŝlosilon"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "montri foto-identigilon"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
- msgstr "Sekreta �losilo estas havebla.\n"
+ msgstr "Sekreta ŝlosilo estas havebla.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
- msgstr "Bezonas la sekretan �losilon por fari tion.\n"
+ msgstr "Bezonas la sekretan ŝlosilon por fari tion.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4329,676 -3432,535 +4347,677 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  #, fuzzy
  msgid "Key is revoked."
- msgstr "�losilo estas revokita.\n"
+ msgstr "Ŝlosilo estas revokita.\n"
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
- msgstr "�u vere subskribi �iujn uzantidentigilojn? "
+ msgstr "Ĉu vere subskribi ĉiujn uzantidentigilojn? "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
- msgstr "�u vere subskribi �iujn uzantidentigilojn? "
+ msgstr "Ĉu vere subskribi ĉiujn uzantidentigilojn? "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "nekonata klaso de subskribo"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
- msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
- msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
+ msgstr "Vi devas elekti almenaŭ unu uzantidentigilon.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
- msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
+ msgstr "Vi ne povas forviŝi la lastan uzantidentigilon!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
- msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
+ msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
- msgstr "�u vere forigi �i tiun uzantidentigilon? "
+ msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
- msgstr "�u vere forigi �i tiun uzantidentigilon? "
+ msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  #, fuzzy
  msgid "You must select exactly one key.\n"
- msgstr "Vi devas elekti almena� unu �losilon.\n"
+ msgstr "Vi devas elekti almenaŭ unu ŝlosilon.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "ne povas malfermi '%s': %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
- msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+ msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
- msgstr "Vi devas elekti almena� unu �losilon.\n"
+ msgstr "Vi devas elekti almenaŭ unu ŝlosilon.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
- msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
+ msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
- msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
+ msgstr "Ĉu vi vere volas forviŝi ĉi tiun ŝlosilon? "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
- msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
+ msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
- msgstr "�u vere forigi �i tiun uzantidentigilon? "
+ msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
- msgstr "�u vi vere volas revoki �i tiun �losilon? "
+ msgstr "Ĉu vi vere volas revoki ĉi tiun ŝlosilon? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
+ msgstr "Ĉu vi vere volas revoki la elektitajn ŝlosilojn? "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
- msgstr "�u vi vere volas revoki �i tiun �losilon? "
+ msgstr "Ĉu vi vere volas revoki ĉi tiun ŝlosilon? "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "agordi liston de preferoj"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
- msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
+ msgstr "Ĉu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
- msgstr "�u vere aktualigi la preferojn? "
+ msgstr "Ĉu vere aktualigi la preferojn? "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  #, fuzzy
  msgid "Save changes? (y/N) "
- msgstr "�u skribi �an�ojn? "
+ msgstr "Ĉu skribi ŝanĝojn? "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  #, fuzzy
  msgid "Quit without saving? (y/N) "
- msgstr "�u fini sen skribi �an�ojn? "
+ msgstr "Ĉu fini sen skribi ŝanĝojn? "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
- msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
+ msgstr "Ŝlosilo ne ŝanĝita, do aktualigo ne necesas.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
- msgstr "Kreado de �losiloj malsukcesis: %s\n"
+ msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "%s: nevalida dosiero-versio %d\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "nevalida valoro\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Uzantidentigilo ne ekzistas.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  msgid "Nothing to sign.\n"
- msgstr "Nenio por subskribi per �losilo %08lX\n"
+ msgstr "Nenio por subskribi per ŝlosilo %08lX\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr ""
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr ""
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  #, fuzzy
  msgid "Notations: "
  msgstr "Notacio: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
- msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
+ msgstr "Ĉi tiu ŝlosilo estas revokebla per %s ŝlosilo %s%s\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, 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"
+ msgstr "Ĉi tiu ŝlosilo estas revokebla per %s ŝlosilo %s%s\n"
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (sentema)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "ne povas krei %s: %s\n"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "rev"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
- msgstr " [eksvalidi�os: %s]"
+ msgstr " [eksvalidiĝos: %s]"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
- msgstr " [eksvalidi�os: %s]"
+ msgstr " [eksvalidiĝos: %s]"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " fido: %c/%c"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " fido: %c/%c"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
- msgstr "�i tiu �losilo estas mal�altita"
+ msgstr "Ĉi tiu ŝlosilo estas malŝaltita"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  msgstr ""
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "rev"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  #, fuzzy
  msgid "expired"
  msgstr "eksval"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
- msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
+ msgstr "Vi ne povas ŝanĝi la daton de eksvalidiĝo de v3-ŝlosilo\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  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 ""
- "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
- "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
+ "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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  #, 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) "
+ msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas aldoni ĝin? (j/n) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  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"
+ msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila ŝlosilo.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
- msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
+ msgstr "Ĉu forviŝi ĉi tiun bonan subskribon? (j/N/f)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
- msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
+ msgstr "Ĉu forviŝi ĉi tiun nevalidan subskribon? (j/N/f)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
- msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
+ msgstr "Ĉu forviŝi ĉi tiun nekonatan subskribon? (j/N/f)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
- msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
+ msgstr "Ĉu vere forviŝi ĉi tiun mem-subskribon? (j/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
- msgstr[0] "Forvi�is %d subskribon.\n"
- msgstr[1] "Forvi�is %d subskribon.\n"
+ msgstr[0] "Forviŝis %d subskribon.\n"
+ msgstr[1] "Forviŝis %d subskribon.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
- msgstr "Nenio estis forvi�ita.\n"
+ msgstr "Nenio estis forviŝita.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "nevalida"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
  msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
  msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  #, fuzzy
  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 ""
- "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
- "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
+ "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:4585
++#: g10/keyedit.c:4601
  #, 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"
+ msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila ŝlosilo.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  #, fuzzy
  msgid "Enter the user ID of the designated revoker: "
- msgstr "Donu la �losilgrandon"
+ msgstr "Donu la ŝlosilgrandon"
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr ""
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr ""
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  #, fuzzy
  msgid "this key has already been designated as a revoker\n"
- msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
+ msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr ""
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  #, 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"
+ msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
- msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
+ msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
- msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
+ msgstr "Ŝanĝas la daton de eksvalidiĝo de flanka ŝlosilo.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
- msgstr "�an�as la daton de eksvalidi�o de la �efa �losilo.\n"
+ msgstr "Ŝanĝas la daton de eksvalidiĝo de la ĉefa ŝlosilo.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  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"
+ msgstr "Vi ne povas ŝanĝi la daton de eksvalidiĝo de v3-ŝlosilo\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, fuzzy, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
- msgstr "�losilo %08lX: nevalida mem-subskribo\n"
+ msgstr "ŝlosilo %08lX: nevalida mem-subskribo\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
- msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
+ msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
- msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
+ msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Subskribo-notacio: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  #, fuzzy
  msgid "Proceed? (y/N) "
- msgstr "�u surskribi (j/N)? "
+ msgstr "Ĉu surskribi (j/N)? "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Mankas uzantidentigilo kun indekso %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Mankas uzantidentigilo kun indekso %d\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Mankas uzantidentigilo kun indekso %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Mankas uzantidentigilo kun indekso %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "uzantidentigilo: \""
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr ""
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, fuzzy, c-format
  msgid "This signature expired on %s.\n"
- msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+ msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  #, 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) "
+ msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas aldoni ĝin? (j/n) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  #, fuzzy
  msgid "Create a revocation certificate for this signature? (y/N) "
- msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
+ msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   subskribita per %08lX je %s%s\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, fuzzy, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  #, fuzzy
  msgid " (non-revocable)"
- msgstr "subskribi �losilon nerevokeble"
+ msgstr "subskribi ŝlosilon nerevokeble"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   revokita de %08lX je %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Vi revokos la sekvajn subskribojn:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  #, fuzzy
  msgid "Really create the revocation certificates? (y/N) "
- msgstr "�u vere krei la revokatestilojn? (j/N)"
+ msgstr "Ĉu vere krei la revokatestilojn? (j/N)"
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
- msgstr "mankas sekreta �losilo\n"
+ msgstr "mankas sekreta ŝlosilo\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, fuzzy, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr ""
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "prefero %c%lu ripetita\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "tro da '%c'-preferoj\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "tro da '%c'-preferoj\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "tro da '%c'-preferoj\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
- msgstr "nevalida signo en signo�eno\n"
+ msgstr "nevalida signo en signoĉeno\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  #, fuzzy
  msgid "writing direct signature\n"
  msgstr "skribas mem-subskribon\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "skribas mem-subskribon\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
- msgstr "skribas �losilbindan subskribon\n"
+ msgstr "skribas ŝlosilbindan subskribon\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
- msgstr "�losilgrando nevalida; uzas %u bitojn\n"
+ msgstr "ŝlosilgrando nevalida; uzas %u bitojn\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
- msgstr "�losilgrando rondigita �is %u bitoj\n"
+ msgstr "ŝlosilgrando rondigita ĝis %u bitoj\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  #, fuzzy
  msgid "Sign"
  msgstr "subskribi"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  #, fuzzy
  msgid "Encrypt"
- msgstr "�ifri datenojn"
+ msgstr "ĉifri datenojn"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr ""
  
@@@ -5012,157 -3974,126 +5031,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
- msgstr "   (%d) ElGamal (nur �ifri)\n"
+ msgstr "   (%d) ElGamal (nur ĉifri)\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
- msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
+ msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (nur subskribi)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (nur subskribi)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
- msgstr "   (%d) ElGamal (nur �ifri)\n"
+ msgstr "   (%d) ElGamal (nur ĉifri)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
- msgstr "   (%d) RSA (nur �ifri)\n"
+ msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (nur �ifri)\n"
+ msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (nur �ifri)\n"
+ msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (nur subskribi)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
- msgstr "   (%d) RSA (nur �ifri)\n"
+ msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
- msgstr "   (%d) RSA (nur �ifri)\n"
+ msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
- msgstr "   (%d) RSA (nur �ifri)\n"
+ msgstr "   (%d) RSA (nur ĉifri)\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Subskribo-notacio: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Mankas uzantidentigilo kun indekso %d\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
- msgstr "rondigita �is %u bitoj\n"
+ msgstr "rondigita ĝis %u bitoj\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
- msgstr "Kiun �losilgrandon vi deziras? (1024) "
+ msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
- msgstr "Kiun �losilgrandon vi deziras? (1024) "
+ msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
- msgstr "Petita �losilgrando estas %u bitoj\n"
+ msgstr "Petita ŝlosilgrando estas %u bitoj\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
- msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
+ msgstr "Bonvolu elekti, kian ŝlosilon vi deziras:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5171,14 -4102,13 +5190,14 @@@
  "      <n>m = key expires in n months\n"
  "      <n>y = key expires in n years\n"
  msgstr ""
- "Bonvolu specifi, kiom longe la �losilo validu.\n"
- "         0 = �losilo neniam eksvalidi�os\n"
- "      <n>  = �losilo eksvalidi�os post n tagoj\n"
- "      <n>w = �losilo eksvalidi�os post n semajnoj\n"
- "      <n>m = �losilo eksvalidi�os post n monatoj\n"
- "      <n>y = �losilo eksvalidi�os post n jaroj\n"
+ "Bonvolu specifi, kiom longe la ŝlosilo validu.\n"
+ "         0 = ŝlosilo neniam eksvalidiĝos\n"
+ "      <n>  = ŝlosilo eksvalidiĝos post n tagoj\n"
+ "      <n>w = ŝlosilo eksvalidiĝos post n semajnoj\n"
+ "      <n>m = ŝlosilo eksvalidiĝos post n monatoj\n"
+ "      <n>y = ŝlosilo eksvalidiĝos post n jaroj\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5187,60 -4117,50 +5206,60 @@@
  "      <n>m = signature expires in n months\n"
  "      <n>y = signature expires in n years\n"
  msgstr ""
- "Bonvolu specifi, kiom longe la �losilo validu.\n"
- "         0 = �losilo neniam eksvalidi�os\n"
- "      <n>  = �losilo eksvalidi�os post n tagoj\n"
- "      <n>w = �losilo eksvalidi�os post n semajnoj\n"
- "      <n>m = �losilo eksvalidi�os post n monatoj\n"
- "      <n>y = �losilo eksvalidi�os post n jaroj\n"
+ "Bonvolu specifi, kiom longe la ŝlosilo validu.\n"
+ "         0 = ŝlosilo neniam eksvalidiĝos\n"
+ "      <n>  = ŝlosilo eksvalidiĝos post n tagoj\n"
+ "      <n>w = ŝlosilo eksvalidiĝos post n semajnoj\n"
+ "      <n>m = ŝlosilo eksvalidiĝos post n monatoj\n"
+ "      <n>y = ŝlosilo eksvalidiĝos post n jaroj\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
- msgstr "�losilo validu ...? (0) "
+ msgstr "Ŝlosilo validu ...? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
- msgstr "�losilo validu por ...? (0) "
+ msgstr "Ŝlosilo validu por ...? (0) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "nevalida valoro\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  #, fuzzy
  msgid "Key does not expire at all\n"
- msgstr "%s neniam eksvalidi�os\n"
+ msgstr "%s neniam eksvalidiĝos\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  #, fuzzy
  msgid "Signature does not expire at all\n"
- msgstr "%s neniam eksvalidi�os\n"
+ msgstr "%s neniam eksvalidiĝos\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
- msgstr "%s eksvalidi�os je %s\n"
+ msgstr "%s eksvalidiĝos je %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
- msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+ msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
  "Via sistemo ne povas montri datojn post 2038.\n"
- "Tamen, �i estos �uste traktata �is 2106.\n"
+ "Tamen, ĝi estos ĝuste traktata ĝis 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  #, fuzzy
  msgid "Is this correct? (y/N) "
- msgstr "�u tio estas �usta (j/n)? "
+ msgstr "Ĉu tio estas ĝusta (j/n)? "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5251,7 -4171,6 +5270,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  #, fuzzy
  msgid ""
  "\n"
@@@ -5267,50 -4186,39 +5286,50 @@@ msgstr "
  "    \"Heinrich Heine (la poeto) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Vera nomo: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Nevalida signo en nomo\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
- msgstr "Nomo ne povas komenci�i per cifero\n"
+ msgstr "Nomo ne povas komenciĝi per cifero\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
- msgstr "Nomo devas havi almena� 5 signojn\n"
+ msgstr "Nomo devas havi almenaŭ 5 signojn\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "Retadreso: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "Nevalida retadreso\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Komento: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Nevalida signo en komento\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Vi uzas la signaron '%s'.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5321,9 -4229,8 +5340,9 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
- msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
+ msgstr "Bonvolu ne meti la retadreson en la veran nomon aŭ la komenton\n"
  
  #. TRANSLATORS: These are the allowed answers in
  #. lower and uppercase.  Below you will find the matching
@@@ -5336,35 -4243,28 +5355,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnKkAaBbFf"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
- msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
+ msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (F)ini? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
- msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
+ msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (B)one/(F)ini? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
- msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
+ msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (F)ini? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
- msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
+ msgstr "Ŝanĝu (N)omon, (K)omenton, (A)adreson, aŭ (B)one/(F)ini? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Bonvolu korekti la eraron unue\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5372,17 -4272,14 +5391,17 @@@
  "generator a better chance to gain enough entropy.\n"
  msgstr ""
  "Ne devas krei multe da stokastaj datenoj. Estas konsilinde fari ion\n"
- "alian (tajpi �e la klavaro, movi la muson, uzi la diskojn) dum la\n"
- "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
- "akiri sufi�e da entropio.\n"
+ "alian (tajpi ĉe la klavaro, movi la muson, uzi la diskojn) dum la\n"
+ "kreado de la primoj; tio donas al la stokastilo pli bonan ŝancon\n"
+ "akiri sufiĉe da entropio.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
- msgstr "Kreado de �losiloj malsukcesis: %s\n"
+ msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5390,111 -4287,91 +5409,111 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "'%s' jam densigita\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  msgid "Create anyway? (y/N) "
- msgstr "�u tamen uzi �i tiun �losilon? "
+ msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  msgid "creating anyway\n"
- msgstr "�u tamen uzi �i tiun �losilon? "
+ msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
- msgstr "Kreado de �losiloj nuligita.\n"
+ msgstr "Kreado de ŝlosiloj nuligita.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "ne povas krei '%s': %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
- msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
+ msgstr "NOTO: sekreta ŝlosilo %08lX eksvalidiĝis je %s\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
- msgstr "skribas publikan �losilon al '%s'\n"
+ msgstr "skribas publikan ŝlosilon al '%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
- msgstr "neniu skribebla publika �losilaro trovita: %s\n"
+ msgstr "neniu skribebla publika ŝlosilaro trovita: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
- msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de publika ŝlosilaro '%s': %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
- msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
+ msgstr "publika kaj sekreta ŝlosiloj kreitaj kaj subskribitaj.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
  msgstr ""
- "Notu, ke �i tiu �losilo ne estas uzebla por �ifrado. Vi eble volos\n"
- "uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
+ "Notu, ke ĉi tiu ŝlosilo ne estas uzebla por ĉifrado. Vi eble volos\n"
+ "uzi la komandon \"--edit-key\" por krei flankan ŝlosilon por tiu celo.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr ""
- "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
- "horlo�eraro)\n"
+ "ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
+ "horloĝeraro)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr ""
- "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
- "horlo�eraro)\n"
+ "ŝlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aŭ "
+ "horloĝeraro)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
- msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
+ msgstr "NOTO: krei subŝlosilojn por v3-ŝlosiloj ne estas OpenPGP-kongrue\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
- msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
+ msgstr "Sekretaj partoj de ĉefa ŝlosilo ne estas disponataj.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
- msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
+ msgstr "Sekretaj partoj de ĉefa ŝlosilo ne estas disponataj.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  #, fuzzy
  msgid "Really create? (y/N) "
- msgstr "�u vere krei? "
+ msgstr "Ĉu vere krei? "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr ""
  
@@@ -5543,62 -4412,51 +5562,62 @@@ msgid_plural "Warning: %lu keys skippe
  msgstr[0] ""
  msgstr[1] ""
  
 +#: g10/keylist.c:589
  msgid "Keyring"
- msgstr "�losilaro"
+ msgstr "Ŝlosilaro"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  #, fuzzy
  msgid "Primary key fingerprint:"
- msgstr "listigi �losilojn kaj fingro�purojn"
+ msgstr "listigi ŝlosilojn kaj fingroŝpurojn"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  #, fuzzy
  msgid "     Subkey fingerprint:"
- msgstr "     �losilo-fingrospuro ="
+ msgstr "     Ŝlosilo-fingrospuro ="
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  #, fuzzy
  msgid " Primary key fingerprint:"
- msgstr "     �losilo-fingrospuro ="
+ msgstr "     Ŝlosilo-fingrospuro ="
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  #, fuzzy
  msgid "      Subkey fingerprint:"
- msgstr "     �losilo-fingrospuro ="
+ msgstr "     Ŝlosilo-fingrospuro ="
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  #, fuzzy
  msgid "      Key fingerprint ="
- msgstr "     �losilo-fingrospuro ="
+ msgstr "     Ŝlosilo-fingrospuro ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr ""
  
 +#: g10/keyring.c:1498
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
- msgstr "kontrolas �losilaron '%s'\n"
+ msgstr "kontrolas ŝlosilaron '%s'\n"
  
 +#: g10/keyring.c:1572
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
- msgstr[0] "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
- msgstr[1] "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
+ msgstr[0] "%lu ŝlosiloj kontrolitaj (%lu subskriboj)\n"
+ msgstr[1] "%lu ŝlosiloj kontrolitaj (%lu subskriboj)\n"
  
 +#: g10/keyring.c:1588
  #, fuzzy, c-format
  #| msgid "\t%lu keys updated\n"
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
- msgstr[0] "\t%lu �losiloj aktualigitaj\n"
- msgstr[1] "\t%lu �losiloj aktualigitaj\n"
+ msgstr[0] "\t%lu ŝlosiloj aktualigitaj\n"
+ msgstr[1] "\t%lu ŝlosiloj aktualigitaj\n"
  
 +#: g10/keyring.c:1590
  #, fuzzy, c-format
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
@@@ -5606,118 -4464,94 +5625,118 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 malbona subskribo\n"
  msgstr[1] "1 malbona subskribo\n"
  
 +#: g10/keyring.c:1665
  #, c-format
  msgid "%s: keyring created\n"
- msgstr "%s: �losilaro kreita\n"
+ msgstr "%s: ŝlosilaro kreita\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  #, fuzzy
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  #, fuzzy
  msgid "disabled"
  msgstr "el"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr ""
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, fuzzy, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
- msgstr "nevalida �losilaro"
+ msgstr "nevalida ŝlosilaro"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, fuzzy, c-format
  msgid "\"%s\" not a key ID: skipping\n"
- msgstr "%s: ne valida �losilidentigilo\n"
+ msgstr "%s: ne valida ŝlosilidentigilo\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
- msgstr[0] "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
- msgstr[1] "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
+ msgstr[0] "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
+ msgstr[1] "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, fuzzy, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, fuzzy, c-format
  msgid "key \"%s\" not found on keyserver\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  #, fuzzy
  msgid "key not found on keyserver\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
- msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
+ msgstr "neniu ŝlosilservilo konata (uzu la opcion --keyserver)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, fuzzy, c-format
  msgid "requesting key %s from %s server %s\n"
- msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
+ msgstr "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, fuzzy, c-format
  msgid "requesting key %s from %s\n"
- msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
+ msgstr "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  msgid "no keyserver known\n"
- msgstr "nevalida �losilaro"
+ msgstr "nevalida ŝlosilaro"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, fuzzy, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "ignoris '%s': %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, fuzzy, c-format
  msgid "sending key %s to %s\n"
  msgstr ""
  "\"\n"
- "subskribita per via �losilo %08lX je %s\n"
+ "subskribita per via ŝlosilo %08lX je %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  msgid "requesting key from '%s'\n"
- msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
+ msgstr "petas la ŝlosilon %08lX de HKP-ŝlosilservilo %s ...\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, fuzzy, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
@@@ -5727,46 -4560,37 +5746,46 @@@
  msgid "weird size for an encrypted session key (%d)\n"
  msgstr ""
  
 +#: g10/mainproc.c:302
  #, fuzzy, c-format
  msgid "%s encrypted session key\n"
- msgstr "%s-�ifritaj datenoj\n"
+ msgstr "%s-ĉifritaj datenoj\n"
  
 +#: g10/mainproc.c:312
  #, fuzzy, c-format
  msgid "passphrase generated with unknown digest algorithm %d\n"
- msgstr "�ifrita per nekonata metodo %d\n"
+ msgstr "ĉifrita per nekonata metodo %d\n"
  
 +#: g10/mainproc.c:378
  #, fuzzy, c-format
  msgid "public key is %s\n"
- msgstr "publika �losilo estas %08lX\n"
+ msgstr "publika ŝlosilo estas %08lX\n"
  
 +#: g10/mainproc.c:456
  msgid "public key encrypted data: good DEK\n"
- msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
+ msgstr "publikŝlosile ĉifritaj datenoj: bona DEK\n"
  
 +#: g10/mainproc.c:489
  #, fuzzy, c-format
  msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
- msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
+ msgstr "ĉifrita per %u-bita %s-ŝlosilo, %08lX, kreita je %s\n"
  
 +#: g10/mainproc.c:493 g10/pkclist.c:228
  #, fuzzy, c-format
  msgid "      \"%s\"\n"
  msgstr "            alinome \""
  
 +#: g10/mainproc.c:497
  #, fuzzy, c-format
  msgid "encrypted with %s key, ID %s\n"
- msgstr "�ifrita per %s-�losilo, %08lX\n"
+ msgstr "ĉifrita per %s-ŝlosilo, %08lX\n"
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
- msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
+ msgstr "publikŝlosila malĉifrado malsukcesis: %s\n"
  
 +#: g10/mainproc.c:530
  #, fuzzy, c-format
  msgid "encrypted with %lu passphrases\n"
  msgstr "Ripetu pasfrazon\n"
@@@ -5776,35 -4599,28 +5795,35 @@@
  msgid "encrypted with 1 passphrase\n"
  msgstr "Ripetu pasfrazon\n"
  
 +#: g10/mainproc.c:566 g10/mainproc.c:587
  #, c-format
  msgid "assuming %s encrypted data\n"
- msgstr "supozas %s �ifritajn datenojn\n"
+ msgstr "supozas %s ĉifritajn datenojn\n"
  
 +#: g10/mainproc.c:573
  #, c-format
  msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
- msgstr "�ifro IDEA ne disponata, optimisme provas uzi %s anstata�e\n"
+ msgstr "Ĉifro IDEA ne disponata, optimisme provas uzi %s anstataŭe\n"
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  #, fuzzy
  msgid "WARNING: message was not integrity protected\n"
  msgstr "AVERTO: nenio estis eksportita\n"
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
- msgstr "mal�ifrado sukcesis\n"
+ msgstr "malĉifrado sukcesis\n"
  
 +#: g10/mainproc.c:637
  msgid "WARNING: encrypted message has been manipulated!\n"
- msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
+ msgstr "AVERTO: ĉifrita mesaĝo estis manipulita!\n"
  
 +#: g10/mainproc.c:653
  #, c-format
  msgid "decryption failed: %s\n"
- msgstr "mal�ifrado malsukcesis: %s\n"
+ msgstr "malĉifrado malsukcesis: %s\n"
  
 +#: g10/mainproc.c:676
  #, fuzzy
  #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
  msgid "Note: sender requested \"for-your-eyes-only\"\n"
@@@ -5819,133 -4633,106 +5838,133 @@@ msgstr "originala dosiernomo='%.*s'\n
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
- msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
+ msgstr "memstara revoko - uzu \"gpg --import\" por apliki ĝin\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Bona subskribo de \""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "MALBONA subskribo de \""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
- msgstr "Eksvalidi�inta subskribo de \""
+ msgstr "Eksvalidiĝinta subskribo de \""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Bona subskribo de \""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
- msgstr "kontrolo de subskribo estas mal�altita\n"
+ msgstr "kontrolo de subskribo estas malŝaltita\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
- msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
+ msgstr "ne povas trakti ĉi tiujn pluroblajn subskribojn\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, fuzzy, c-format
  msgid "Signature made %s\n"
- msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+ msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "            alinome \""
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
- msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
+ msgstr "Subskribo farita je %.*s per %s, ŝlosilo %08lX\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "            alinome \""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  #, fuzzy
  msgid "Key available at: "
  msgstr "Nenia helpo disponata"
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[malcerta]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "            alinome \""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, fuzzy, c-format
  msgid "Signature expired %s\n"
- msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+ msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, fuzzy, c-format
  msgid "Signature expires %s\n"
- msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+ msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s-subskribo de: %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  #, fuzzy
  msgid "binary"
- msgstr "�efa"
+ msgstr "ĉefa"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr ""
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  #, fuzzy
  msgid "unknown"
  msgstr "nekonata versio"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
- msgstr "nekonata publik�losila metodo"
+ msgstr "nekonata publikŝlosila metodo"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Ne povas kontroli subskribon: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "ne aparta subskribo\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "memstara subskribo de klaso 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "malnovstila subskribo (PGP 2.x)\n"
  
@@@ -5959,32 -4744,26 +5978,32 @@@ msgstr "aktualigo de fido-datenaro mals
  msgid "fstat(%d) failed in %s: %s\n"
  msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
  
 +#: g10/misc.c:279
  #, fuzzy, c-format
  msgid "WARNING: using experimental public key algorithm %s\n"
- msgstr "ne povas trakti publik�losilan metodon %d\n"
+ msgstr "ne povas trakti publikŝlosilan metodon %d\n"
  
 +#: g10/misc.c:286
  #, fuzzy
  msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
- msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
+ msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
  
 +#: g10/misc.c:300
  #, fuzzy, c-format
  msgid "WARNING: using experimental cipher algorithm %s\n"
- msgstr "nerealigita �ifrad-metodo"
+ msgstr "nerealigita ĉifrad-metodo"
  
 +#: g10/misc.c:319
  #, fuzzy, c-format
  msgid "WARNING: using experimental digest algorithm %s\n"
  msgstr "%s-subskribo de: %s\n"
  
 +#: g10/misc.c:328
  #, fuzzy, c-format
  msgid "WARNING: digest algorithm %s is deprecated\n"
- msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
+ msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
  
 +#: g10/misc.c:353
  #, fuzzy, c-format
  msgid "Note: signatures using the %s algorithm are rejected\n"
  msgstr "%s-subskribo de: %s\n"
@@@ -6045,26 -4813,21 +6064,26 @@@ msgstr "ne traktita
  msgid "uncompressed|none"
  msgstr "ne traktita"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, fuzzy, c-format
  msgid "this message may not be usable by %s\n"
- msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
+ msgstr "ĉi tiu mesaĝo povas ne esti uzebla de PGP 2.x\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "legas opciojn el '%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  msgid "unknown option '%s'\n"
  msgstr "nekonata implicita ricevonto '%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "nekonata klaso de subskribo"
@@@ -6075,12 -4837,10 +6094,12 @@@
  msgid "File '%s' exists. "
  msgstr "Dosiero '%s' ekzistas. "
  
 +#: g10/openfile.c:88
  #, fuzzy
  msgid "Overwrite? (y/N) "
- msgstr "�u surskribi (j/N)? "
+ msgstr "Ĉu surskribi (j/N)? "
  
 +#: g10/openfile.c:123
  #, c-format
  msgid "%s: unknown suffix\n"
  msgstr "%s: nekonata sufikso\n"
@@@ -6109,21 -4864,17 +6128,21 @@@ msgstr "%s: nova opcio-dosiero kreita\n
  msgid "WARNING: options in '%s' are not yet active during this run\n"
  msgstr ""
  
 +#: g10/parse-packet.c:257
  #, c-format
  msgid "can't handle public key algorithm %d\n"
- msgstr "ne povas trakti publik�losilan metodon %d\n"
+ msgstr "ne povas trakti publikŝlosilan metodon %d\n"
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
  msgstr ""
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
- msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
+ msgstr "subpaketo de speco %d havas ŝaltitan \"critical bit\"\n"
  
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problemo kun agento: agento redonas 0x%lx\n"
@@@ -6136,12 -4885,10 +6155,12 @@@ msgstr "Donu pasfrazon\n
  msgid "cancelled by user\n"
  msgstr "nuligita de uzanto\n"
  
 +#: g10/passphrase.c:489
  #, fuzzy, c-format
  msgid " (main key ID %s)"
- msgstr " (�ef�losilo %08lX)"
+ msgstr " (ĉefŝlosilo %08lX)"
  
 +#: g10/passphrase.c:496
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
@@@ -6161,17 -4905,14 +6180,17 @@@ msgstr "Bonvolu doni la pasfrazon; tio 
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
  
 +#: g10/passphrase.c:513
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
- msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
+ msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
  
 +#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
- msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
+ msgstr "Ĉu vi vere volas forviŝi la elektitajn ŝlosilojn? "
  
 +#: g10/passphrase.c:525
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6179,9 -4920,8 +6198,9 @@@
  "%u-bit %s key, ID %s,\n"
  "created %s%s.\n"
  "%s"
- msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
+ msgstr "%u-bita %s-ŝlosilo, %08lX, kreita je %s"
  
 +#: g10/photoid.c:77
  msgid ""
  "\n"
  "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@@ -6204,22 -4941,18 +6223,22 @@@ msgstr "ne povas malfermi %s: %s\n
  msgid "This JPEG is really large (%d bytes) !\n"
  msgstr ""
  
 +#: g10/photoid.c:133
  #, fuzzy
  msgid "Are you sure you want to use it? (y/N) "
- msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
+ msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi ĝin?\n"
  
 +#: g10/photoid.c:149
  #, fuzzy, c-format
  msgid "'%s' is not a JPEG file\n"
  msgstr "%s: ne estas fido-datenaro\n"
  
 +#: g10/photoid.c:168
  #, fuzzy
  msgid "Is this photo correct (y/N/q)? "
- msgstr "�u tio estas �usta (j/n)? "
+ msgstr "Ĉu tio estas ĝusta (j/n)? "
  
 +#: g10/photoid.c:380
  #, fuzzy
  msgid "unable to display photo ID!\n"
  msgstr "ne povas malfermi %s: %s\n"
@@@ -6228,19 -4960,15 +6247,19 @@@
  msgid "No reason specified"
  msgstr "Nenia kialo specifita"
  
 +#: g10/pkclist.c:74 g10/revoke.c:759
  msgid "Key is superseded"
- msgstr "�losilo estas anstata�igita."
+ msgstr "Ŝlosilo estas anstataŭigita."
  
 +#: g10/pkclist.c:76 g10/revoke.c:758
  msgid "Key has been compromised"
- msgstr "�losilo estas kompromitita"
+ msgstr "Ŝlosilo estas kompromitita"
  
 +#: g10/pkclist.c:78 g10/revoke.c:760
  msgid "Key is no longer used"
- msgstr "�losilo estas ne plu uzata"
+ msgstr "Ŝlosilo estas ne plu uzata"
  
 +#: g10/pkclist.c:80 g10/revoke.c:761
  msgid "User ID is no longer valid"
  msgstr "Uzantidentigilo ne plu validas"
  
@@@ -6284,34 -5006,28 +6303,34 @@@ msgstr "            alinome \"
  #, fuzzy
  msgid ""
  "How much do you trust that this key actually belongs to the named user?\n"
- msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
+ msgstr "Ĉi tiu ŝlosilo verŝajne apartenas al la posedanto\n"
  
 +#: g10/pkclist.c:282
  #, fuzzy, c-format
  msgid "  %d = I don't know or won't say\n"
  msgstr " %d = Ne scias\n"
  
 +#: g10/pkclist.c:284
  #, fuzzy, c-format
  msgid "  %d = I do NOT trust\n"
- msgstr " %d = Ni NE fidas �i tiun �losilon\n"
+ msgstr " %d = Ni NE fidas ĉi tiun ŝlosilon\n"
  
 +#: g10/pkclist.c:290
  #, fuzzy, c-format
  msgid "  %d = I trust ultimately\n"
  msgstr " %d = Mi fidas absolute\n"
  
 +#: g10/pkclist.c:296
  #, fuzzy
  msgid "  m = back to the main menu\n"
- msgstr " m = reen al la �efmenuo\n"
+ msgstr " m = reen al la ĉefmenuo\n"
  
 +#: g10/pkclist.c:299
  #, fuzzy
  msgid "  s = skip this key\n"
- msgstr " s = supersalti �i tiun �losilon\n"
+ msgstr " s = supersalti ĉi tiun ŝlosilon\n"
  
 +#: g10/pkclist.c:300
  #, fuzzy
  msgid "  q = quit\n"
  msgstr " f = fini\n"
@@@ -6327,37 -5041,47 +6346,56 @@@ msgstr "
  msgid "Your decision? "
  msgstr "Via decido? "
  
 +#: g10/pkclist.c:331
  #, fuzzy
  msgid "Do you really want to set this key to ultimate trust? (y/N) "
- msgstr "�u vi vere volas �an�i �i tiun �losilon al absoluta fido? "
+ msgstr "Ĉu vi vere volas ŝanĝi ĉi tiun ŝlosilon al absoluta fido? "
  
 +#: g10/pkclist.c:345
  msgid "Certificates leading to an ultimately trusted key:\n"
- msgstr "Atestiloj, kiuj kondukas al absolute fidata �losilo:\n"
+ msgstr "Atestiloj, kiuj kondukas al absolute fidata ŝlosilo:\n"
  
 +#: g10/pkclist.c:434
  #, fuzzy, c-format
  msgid "%s: There is no assurance this key belongs to the named user\n"
  msgstr ""
- "%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
+ "%08lX: Estas nenia indiko, ke ĉi tiu ŝlosilo vere apartenas al la posedanto\n"
  
 +#: g10/pkclist.c:439
  #, fuzzy, c-format
  msgid "%s: There is limited assurance this key belongs to the named user\n"
  msgstr ""
- "%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
+ "%08lX: Estas nenia indiko, ke ĉi tiu ŝlosilo vere apartenas al la posedanto\n"
  
 +#: g10/pkclist.c:445
  #, fuzzy
  msgid "This key probably belongs to the named user\n"
- msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
+ msgstr "Ĉi tiu ŝlosilo verŝajne apartenas al la posedanto\n"
  
 +#: g10/pkclist.c:450
  msgid "This key belongs to us\n"
- msgstr "�i tiu �losilo apartenas al ni\n"
+ msgstr "Ĉi tiu ŝlosilo apartenas al ni\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
+ "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
+ "\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "NE estas certe, ke la ŝlosilo apartenas al sia posedanto.\n"
+ "Se vi *vere* scias, kion vi faras, vi povas respondi al\n"
+ "la sekva demando per \"jes\"\n"
+ "\n"
+ 
++#: g10/pkclist.c:489
  #, fuzzy
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
@@@ -6369,132 -5093,104 +6407,132 @@@ msgstr "
  "la sekva demando per \"jes\"\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  #, fuzzy
  msgid "Use this key anyway? (y/N) "
- msgstr "�u tamen uzi �i tiun �losilon? "
+ msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
- msgstr "AVERTO: Uzas nefidatan �losilon!\n"
+ msgstr "AVERTO: Uzas nefidatan ŝlosilon!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  #, fuzzy
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
- msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
+ msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  #, fuzzy
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
- msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
+ msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
- msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
+ msgstr "AVERTO: Ĉi tiu ŝlosilo estas revokita de sia posedanto!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  #, fuzzy
  msgid "         This could mean that the signature is forged.\n"
  msgstr "         Tio povas signifi, ke la subskribo estas falsa.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
- msgstr "AVERTO: �i tiu sub�losilo estas revokita de sia posedanto!\n"
+ msgstr "AVERTO: Ĉi tiu subŝlosilo estas revokita de sia posedanto!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
- msgstr "Noto: �i tiu �losilo estas mal�altita.\n"
+ msgstr "Noto: Ĉi tiu ŝlosilo estas malŝaltita.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
- msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
+ msgstr "Noto: Ĉi tiu ŝlosilo eksvalidiĝis!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
- msgstr "AVERTO: �i tiu �losilo ne estas atestita kun fidata subskribo!\n"
+ msgstr "AVERTO: Ĉi tiu ŝlosilo ne estas atestita kun fidata subskribo!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
  "         Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
- msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
+ msgstr "AVERTO: Ni NE fidas ĉi tiun ŝlosilon!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
- msgstr "         La subskribo ver�ajne estas FALSA.\n"
+ msgstr "         La subskribo verŝajne estas FALSA.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
- "AVERTO: �i tiu �losilo ne estas atestita kun sufi�e fidataj subskriboj!\n"
+ "AVERTO: Ĉi tiu ŝlosilo ne estas atestita kun sufiĉe fidataj subskriboj!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: ignorita: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
- msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
+ msgstr "%s: ignorita: publika ŝlosilo estas malŝaltita\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
- msgstr "%s: ignorita: publika �losilo jam �eestas\n"
+ msgstr "%s: ignorita: publika ŝlosilo jam ĉeestas\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
- msgstr "ne povas konekti�i al '%s': %s\n"
+ msgstr "ne povas konektiĝi al '%s': %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr ""
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6502,42 -5198,33 +6540,42 @@@ msgstr "
  "\n"
  "Donu la uzantidentigilon. Finu per malplena linio: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Uzantidentigilo ne ekzistas.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
- msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
+ msgstr "ignorita: publika ŝlosilo jam difinita kiel implicita ricevonto\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
- msgstr "Publika �losilo estas mal�altita.\n"
+ msgstr "Publika ŝlosilo estas malŝaltita.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
- msgstr "ignorita: publika �losilo jam agordita\n"
+ msgstr "ignorita: publika ŝlosilo jam agordita\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "nekonata implicita ricevonto '%s'\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "mankas validaj adresitoj\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
- msgstr "�losilo %08lX: mankas uzantidentigilo\n"
+ msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
- msgstr "�losilo %08lX: mankas uzantidentigilo\n"
+ msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
  
 +#: g10/plaintext.c:84
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
  
@@@ -6568,12 -5249,10 +6606,12 @@@ msgstr "ne povas malfermi subskribitan 
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
  
 +#: g10/pubkey-enc.c:116
  #, fuzzy, c-format
  msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr "nenomita ricevonto; provas per sekreta �losilo %08lX ...\n"
+ msgstr "nenomita ricevonto; provas per sekreta ŝlosilo %08lX ...\n"
  
 +#: g10/pubkey-enc.c:123
  msgid "okay, we are the anonymous recipient.\n"
  msgstr "bone; ni estas la nenomita ricevonto.\n"
  
@@@ -6581,38 -5259,30 +6619,38 @@@
  msgid "old encoding of the DEK is not supported\n"
  msgstr "malnova kodado de DEK ne estas realigita\n"
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
- msgstr "�ifrad-metodo %d%s estas nekonata a� mal�altita\n"
+ msgstr "ĉifrad-metodo %d%s estas nekonata aŭ malŝaltita\n"
  
 +#: g10/pubkey-enc.c:352
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
- msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
+ msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
  
 +#: g10/pubkey-enc.c:377
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
- msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
+ msgstr "NOTO: sekreta ŝlosilo %08lX eksvalidiĝis je %s\n"
  
 +#: g10/pubkey-enc.c:384
  #, fuzzy
  msgid "Note: key has been revoked"
- msgstr "�losilo %08lX: �losilo estas revokita!\n"
+ msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, fuzzy, c-format
  msgid "build_packet failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
  
 +#: g10/revoke.c:144
  #, fuzzy, c-format
  msgid "key %s has no user IDs\n"
- msgstr "�losilo %08lX: mankas uzantidentigilo\n"
+ msgstr "ŝlosilo %08lX: mankas uzantidentigilo\n"
  
 +#: g10/revoke.c:312
  msgid "To be revoked by:\n"
  msgstr ""
  
@@@ -6624,38 -5292,31 +6662,38 @@@ msgstr "
  #, fuzzy
  #| msgid "Secret key is available.\n"
  msgid "Secret key is not available.\n"
- msgstr "Sekreta �losilo estas havebla.\n"
+ msgstr "Sekreta ŝlosilo estas havebla.\n"
  
 +#: g10/revoke.c:327
  #, fuzzy
  msgid "Create a designated revocation certificate for this key? (y/N) "
- msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
+ msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
  
 +#: g10/revoke.c:336 g10/revoke.c:727
  msgid "ASCII armored output forced.\n"
  msgstr ""
  
 +#: g10/revoke.c:352 g10/revoke.c:479
  #, fuzzy, c-format
  msgid "make_keysig_packet failed: %s\n"
- msgstr "listigo de �losilblokoj malsukcesis: %s\n"
+ msgstr "listigo de ŝlosilblokoj malsukcesis: %s\n"
  
 +#: g10/revoke.c:415
  #, fuzzy
  msgid "Revocation certificate created.\n"
- msgstr "�losilo %08lX: revokatestilo aldonita\n"
+ msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
  
 +#: g10/revoke.c:421
  #, c-format
  msgid "no revocation keys found for \"%s\"\n"
  msgstr ""
  
 +#: g10/revoke.c:551
  #, fuzzy
  msgid "This is a revocation certificate for the OpenPGP key:"
- msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
+ msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
  
 +#: g10/revoke.c:567
  msgid ""
  "A revocation certificate is a kind of \"kill switch\" to publicly\n"
  "declare that a key shall not anymore be used.  It is not possible\n"
@@@ -6678,15 -5337,13 +6716,15 @@@ msgid "
  "before importing and publishing this revocation certificate."
  msgstr ""
  
 +#: g10/revoke.c:590
  #, fuzzy, c-format
  msgid "revocation certificate stored as '%s.rev'\n"
- msgstr "�losilo %08lX: revokatestilo aldonita\n"
+ msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
  
 +#: g10/revoke.c:634
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
@@@ -6700,14 -5355,12 +6738,14 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
- msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+ msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
 +#: g10/revoke.c:711
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
- msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
+ msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
  
 +#: g10/revoke.c:735
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6748,22 -5395,18 +6786,22 @@@ msgstr "Kialo por revoko: 
  msgid "(No description given)\n"
  msgstr ""
  
 +#: g10/revoke.c:857
  #, fuzzy
  msgid "Is this okay? (y/N) "
- msgstr "�u tamen uzi �i tiun �losilon? "
+ msgstr "Ĉu tamen uzi ĉi tiun ŝlosilon? "
  
 +#: g10/seskey.c:62 sm/encrypt.c:123
  msgid "weak key created - retrying\n"
- msgstr "malforta �losilo kreita - provas denove\n"
+ msgstr "malforta ŝlosilo kreita - provas denove\n"
  
 +#: g10/seskey.c:66
  #, c-format
  msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
  msgstr ""
- "ne povas eviti malfortajn �losilojn por simetria �ifro; provis %d fojojn!\n"
+ "ne povas eviti malfortajn ŝlosilojn por simetria ĉifro; provis %d fojojn!\n"
  
 +#: g10/seskey.c:306
  #, c-format
  msgid "%s key %s uses an unsafe (%zu bit) hash\n"
  msgstr ""
@@@ -6773,90 -5415,76 +6811,90 @@@
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr ""
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr ""
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, fuzzy, c-format
  msgid "please see %s for more information\n"
  msgstr " i = bonvolu montri pli da informoj\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
- msgstr[0] "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
- msgstr[1] "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
+ msgstr[0] "la publika ŝlosilo estas %lu sekundon pli nova ol la subskribo\n"
+ msgstr[1] "la publika ŝlosilo estas %lu sekundon pli nova ol la subskribo\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
- msgstr[0] "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
- msgstr[1] "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
+ msgstr[0] "la publika ŝlosilo estas %lu sekundon pli nova ol la subskribo\n"
+ msgstr[1] "la publika ŝlosilo estas %lu sekundon pli nova ol la subskribo\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu seconds in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
- "horlo�eraro)\n"
+ "ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
+ "horloĝeraro)\n"
  msgstr[1] ""
- "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
- "horlo�eraro)\n"
+ "ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
+ "horloĝeraro)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu days in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
- "horlo�eraro)\n"
+ "ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
+ "horloĝeraro)\n"
  msgstr[1] ""
- "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
- "horlo�eraro)\n"
+ "ŝlosilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
+ "horloĝeraro)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  msgid "Note: signature key %s expired %s\n"
- msgstr "NOTO: subskribo-�losilo %08lX eksvalidi�is je %s\n"
+ msgstr "NOTO: subskribo-ŝlosilo %08lX eksvalidiĝis je %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
- msgstr "�losilo %08lX: �losilo estas revokita!\n"
+ msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, fuzzy, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
- msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
+ msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
- msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
+ msgstr "ŝlosilo %08lX: mankas subŝlosilo por ŝlosilbindado\n"
  
 +#: g10/sign.c:88
  #, fuzzy, c-format
  msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
  msgstr ""
@@@ -6889,40 -5513,33 +6927,40 @@@ msgstr "%s-subskribo de: %s\n
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
- msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
+ msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
  
 +#: g10/sign.c:1009
  msgid "signing:"
  msgstr "subskribas:"
  
 +#: g10/sign.c:1286
  #, c-format
  msgid "%s encryption will be used\n"
- msgstr "%s �ifrado estos aplikata\n"
+ msgstr "%s ĉifrado estos aplikata\n"
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
  msgstr ""
- "�losilo ne estas markita kiel malsekura - ne povas uzi �in kun falsa "
+ "ŝlosilo ne estas markita kiel malsekura - ne povas uzi ĝin kun falsa "
  "stokastilo!\n"
  
 +#: g10/skclist.c:187
  #, fuzzy, c-format
  msgid "skipped \"%s\": duplicated\n"
  msgstr "ignoris '%s': ripetita\n"
  
 +#: g10/skclist.c:206
  msgid "skipped: secret key already present\n"
- msgstr "ignorita: sekreta �losilo jam �eestas\n"
+ msgstr "ignorita: sekreta ŝlosilo jam ĉeestas\n"
  
 +#: g10/skclist.c:225
  #, fuzzy
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr ""
- "ignoris '%s': �i tio estas PGP-kreita ElGamal-�losilo, kiu ne estas sekura "
+ "ignoris '%s': ĉi tio estas PGP-kreita ElGamal-ŝlosilo, kiu ne estas sekura "
  "por subskribado!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@@ -6968,12 -5577,10 +7006,12 @@@ msgstr "eraro dum legado de dosieruja r
  msgid "read error in '%s': %s\n"
  msgstr "kiraso: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "fido-datenaro: sync malsukcesis: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "ne povas krei '%s': %s\n"
@@@ -7002,7 -5604,6 +7040,7 @@@ msgstr "fido-datenaro-transakcio tro gr
  msgid "%s: directory does not exist!\n"
  msgstr "%s: dosierujo ne ekzistas!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "ne povas fermi '%s': %s\n"
@@@ -7022,12 -5620,10 +7060,12 @@@ msgstr "%s: nevalida fido-datenaro krei
  msgid "%s: trustdb created\n"
  msgstr "%s: fido-datenaro kreita\n"
  
 +#: g10/tdbio.c:788
  #, fuzzy
  msgid "Note: trustdb not writable\n"
- msgstr "sekretaj �losilpartoj ne estas disponataj\n"
+ msgstr "sekretaj ŝlosilpartoj ne estas disponataj\n"
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
  msgstr "%s: nevalida fido-datenaro\n"
@@@ -7113,265 -5692,246 +7151,300 @@@ msgstr "ne povas trakti tekstliniojn pl
  msgid "input line longer than %d characters\n"
  msgstr "enigata linio pli longa ol %d signojn\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Realigitaj metodoj:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
- msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr ""
+ 
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "listigi ŝlosilojn kaj uzantidentigilojn"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Gvidlinio: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
- msgstr "listigi �losilojn"
+ msgstr "listigi ŝlosilojn"
  
- #: g10/tofu.c:1342
++#: g10/tofu.c:1715
+ #, fuzzy, c-format
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+ msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+ 
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1351
- #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "|metodo [dosieroj]|presi mesa�o-kompendiojn"
- msgstr[1] "|metodo [dosieroj]|presi mesa�o-kompendiojn"
- 
- #: g10/tofu.c:1357
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Forviŝis %d subskribojn.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+ msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld messages"
+ msgstr "Ripetu pasfrazon\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+ msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7385,128 -5945,112 +7458,140 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "eraro dum skribado de publika ŝlosilaro '%s': %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
- msgstr "'%s' ne estas valida longa �losilidentigilo\n"
+ msgstr "'%s' ne estas valida longa ŝlosilidentigilo\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, fuzzy, c-format
  msgid "key %s: accepted as trusted key\n"
- msgstr "�losilo %08lX: akceptita kiel fidata �losilo\n"
+ msgstr "ŝlosilo %08lX: akceptita kiel fidata ŝlosilo\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, fuzzy, c-format
  msgid "key %s occurs more than once in the trustdb\n"
- msgstr "�losilo %08lX aperas pli ol unufoje en la fido-datenaro\n"
+ msgstr "ŝlosilo %08lX aperas pli ol unufoje en la fido-datenaro\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, fuzzy, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
- msgstr "�losilo %08lX: mankas publika �losilo por fidata �losilo - ignorita\n"
+ msgstr "ŝlosilo %08lX: mankas publika ŝlosilo por fidata ŝlosilo - ignorita\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, fuzzy, c-format
  msgid "key %s marked as ultimately trusted\n"
- msgstr "�losilo markita kiel absolute fidata.\n"
+ msgstr "ŝlosilo markita kiel absolute fidata.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "fido-registro %lu ne havas petitan specon %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "sekva kontrolo de fido-datenaro je %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
- msgstr "publika �losilo %08lX ne trovita: %s\n"
+ msgstr "publika ŝlosilo %08lX ne trovita: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr ""
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "kontrolas la fido-datenaron\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
- msgstr[0] "%lu �losiloj jam traktitaj\n"
- msgstr[1] "%lu �losiloj jam traktitaj\n"
+ msgstr[0] "%lu ŝlosiloj jam traktitaj\n"
+ msgstr[1] "%lu ŝlosiloj jam traktitaj\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  #, fuzzy
  msgid "no ultimately trusted keys found\n"
- msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
+ msgstr "publika ŝlosilo de absolute fidata ŝlosilo %08lX ne trovita\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
- msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
+ msgstr "publika ŝlosilo de absolute fidata ŝlosilo %08lX ne trovita\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@@ -7585,15 -6114,13 +7670,15 @@@ msgid "
  "should be the first file given on the command line.\n"
  msgstr ""
  "ne eblis kontroli la subskribon.\n"
- "Bonvolu memori, ke la subskribodosiero (.sig a� .asc)\n"
+ "Bonvolu memori, ke la subskribodosiero (.sig aŭ .asc)\n"
  "devas esti la unua dosiero donita en la komandlinio.\n"
  
 +#: g10/verify.c:204
  #, c-format
  msgid "input line %u too long or missing LF\n"
- msgstr "enigata linio %u tro longa, a� mankas linifino\n"
+ msgstr "enigata linio %u tro longa, aŭ mankas linifino\n"
  
 +#: g10/verify.c:253
  #, fuzzy, c-format
  msgid "can't open fd %d: %s\n"
  msgstr "ne povas malfermi '%s': %s\n"
@@@ -7618,143 -6141,113 +7703,145 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "Kialo por revoko: "
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "Kialo por revoko: "
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
- msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
- 
- #: scd/app-openpgp.c:1286
- #, fuzzy, c-format
- msgid "reading public key failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr ""
+ msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
  
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "remove keys from the public keyring"
+ msgid "response does not contain the EC public key\n"
+ msgstr "forigi ŝlosilojn de la publika ŝlosilaro"
+ 
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1551
+ #, fuzzy, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
- msgstr "Kreado de �losiloj malsukcesis: %s\n"
+ msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7764,26 -6257,21 +7851,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Kialo por revoko: "
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7791,125 -6279,100 +7878,125 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  #, fuzzy
  msgid "error reading application data\n"
- msgstr "eraro dum legado de �losilbloko: %s\n"
+ msgstr "eraro dum legado de ŝlosilbloko: %s\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: eraro dum legado de libera registro: %s\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  #, fuzzy
  msgid "key already exists\n"
  msgstr "'%s' jam densigita\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  #, fuzzy
  msgid "generating new key\n"
- msgstr "krei novan �losilparon"
+ msgstr "krei novan ŝlosilparon"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
- msgstr "krei novan �losilparon"
+ msgstr "krei novan ŝlosilparon"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "nerealigita URI"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  #, fuzzy
  msgid "generating key failed\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
- msgstr[0] "Kreado de �losiloj malsukcesis: %s\n"
- msgstr[1] "Kreado de �losiloj malsukcesis: %s\n"
+ msgstr[0] "Kreado de ŝlosiloj malsukcesis: %s\n"
+ msgstr[1] "Kreado de ŝlosiloj malsukcesis: %s\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%s-subskribo de: %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
  
 +#: scd/app-dinsig.c:299
  #, fuzzy
  msgid "||Please enter your PIN at the reader's pinpad"
- msgstr "�an�i la pasfrazon"
+ msgstr "ŝanĝi la pasfrazon"
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
@@@ -7923,7 -6384,6 +8010,7 @@@ msgstr "Donu la uzantidentigilon: 
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -7979,16 -6428,13 +8066,16 @@@ msgid "
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -7998,21 -6443,17 +8085,21 @@@
  msgid "invalid radix64 character %02x skipped\n"
  msgstr "nevalida signo %02x en bazo 64 ignorita\n"
  
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
- msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
+ msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
  
 +#: sm/certchain.c:194
  #, c-format
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  #, fuzzy
  msgid "shell"
  msgstr "helpo"
@@@ -8035,231 -6472,182 +8122,231 @@@ msgstr "
  msgid "failed to open '%s': %s\n"
  msgstr "ne povas malfermi '%s': %s\n"
  
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
- msgstr "skribas sekretan �losilon al '%s'\n"
+ msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
 +#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
  #, fuzzy
  msgid "certificate policy not allowed"
- msgstr "skribas sekretan �losilon al '%s'\n"
+ msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
- msgstr "�losilo %08lX: �losilo estas revokita!\n"
+ msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, fuzzy, c-format
  msgid "certificate with invalid validity: %s"
- msgstr "problemo �e legado de atestilo: %s\n"
+ msgstr "problemo ĉe legado de atestilo: %s\n"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  #, fuzzy
  msgid "certificate not yet valid"
  msgstr "Valida atestilrevoko"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
  msgstr "Valida atestilrevoko"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  #, fuzzy
  msgid "intermediate certificate not yet valid"
  msgstr "Valida atestilrevoko"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
- msgstr "problemo �e legado de atestilo: %s\n"
+ msgstr "problemo ĉe legado de atestilo: %s\n"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
- msgstr "problemo �e legado de atestilo: %s\n"
+ msgstr "problemo ĉe legado de atestilo: %s\n"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
- msgstr "problemo �e legado de atestilo: %s\n"
+ msgstr "problemo ĉe legado de atestilo: %s\n"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
- msgstr "problemo �e legado de atestilo: %s\n"
+ msgstr "problemo ĉe legado de atestilo: %s\n"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
  msgstr "            novaj subskriboj: %lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
- msgstr "�losilo %08lX: revokatestilo aldonita\n"
+ msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
  msgstr "Valida atestilrevoko"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "Fingrospuro:"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  #, fuzzy
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
  "\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
  msgstr "Bona atestilo"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  #, fuzzy
  msgid "root certificate is not marked trusted"
  msgstr ""
  "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
  "\n"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  #, fuzzy
  msgid "certificate chain too long\n"
  msgstr "Valida atestilrevoko"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  #, fuzzy
  msgid "issuer certificate not found"
  msgstr "Valida atestilrevoko"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "kontroli subskribon"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "Valida atestilrevoko"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
- msgstr "ripetita atestilo - forvi�ita"
+ msgstr "ripetita atestilo - forviŝita"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
  msgstr ""
  "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
  "\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8305,20 -6685,17 +8392,20 @@@ msgid "
  "S/N %s, ID 0x%08lX,\n"
  "created %s, expires %s.\n"
  msgstr ""
- "Vi bezonas pasfrazon por mal�losi la sekretan �losilon por la uzanto:\n"
+ "Vi bezonas pasfrazon por malŝlosi la sekretan ŝlosilon por la uzanto:\n"
  "\"%.*s\"\n"
- "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
+ "%u-bita %s ŝlosilo, ID %08lX, kreita je %s%s\n"
  
 +#: sm/certlist.c:122 dirmngr/validate.c:1075
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
 +#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
- msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
  
 +#: sm/certlist.c:142 dirmngr/validate.c:1095
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
@@@ -8392,12 -6754,10 +8479,12 @@@ msgstr "
  msgid "line %d: invalid date given\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
 +#: sm/certreqgen.c:599
  #, fuzzy, c-format
  msgid "line %d: error getting signing key by keygrip '%s': %s\n"
- msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+ msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
 +#: sm/certreqgen.c:618
  #, fuzzy, c-format
  msgid "line %d: invalid hash algorithm given\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
@@@ -8407,32 -6766,26 +8494,32 @@@
  msgid "line %d: invalid authority-key-id\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
 +#: sm/certreqgen.c:648
  #, fuzzy, c-format
  msgid "line %d: invalid subject-key-id\n"
- msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
+ msgstr "ŝlosilo %08lX: nevalida subŝlosila bindado\n"
  
 +#: sm/certreqgen.c:686
  #, fuzzy, c-format
  msgid "line %d: invalid extension syntax\n"
  msgstr "nevalida kompendi-metodo '%s'\n"
  
 +#: sm/certreqgen.c:699
  #, fuzzy, c-format
  msgid "line %d: error reading key '%s' from card: %s\n"
- msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+ msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
 +#: sm/certreqgen.c:712
  #, fuzzy, c-format
  msgid "line %d: error getting key by keygrip '%s': %s\n"
- msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+ msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
 +#: sm/certreqgen.c:729
  #, fuzzy, c-format
  msgid "line %d: key generation failed: %s <%s>\n"
- msgstr "Kreado de �losiloj malsukcesis: %s\n"
+ msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
  
 +#: sm/certreqgen.c:1324
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8443,12 -6795,10 +8530,12 @@@ msgstr "
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (nur subskribi)\n"
  
 +#: sm/certreqgen-ui.c:163
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
- msgstr "   (%d) RSA (nur �ifri)\n"
+ msgstr "   (%d) RSA (nur ĉifri)\n"
  
 +#: sm/certreqgen-ui.c:164
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
@@@ -8463,32 -6811,26 +8550,32 @@@ msgstr "%s: eraro dum legado de libera 
  msgid "Serial number of the card: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
 +#: sm/certreqgen-ui.c:249
  #, fuzzy
  msgid "Available keys:\n"
- msgstr "mal�alti �losilon"
+ msgstr "malŝalti ŝlosilon"
  
 +#: sm/certreqgen-ui.c:280
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:281
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
- msgstr "   (%d) RSA (subskribi kaj �ifri)\n"
+ msgstr "   (%d) RSA (subskribi kaj ĉifri)\n"
  
 +#: sm/certreqgen-ui.c:282
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (nur subskribi)\n"
  
 +#: sm/certreqgen-ui.c:283
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
- msgstr "   (%d) RSA (nur �ifri)\n"
+ msgstr "   (%d) RSA (nur ĉifri)\n"
  
 +#: sm/certreqgen-ui.c:307
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
@@@ -8544,12 -6877,10 +8631,12 @@@ msgstr "
  msgid "Enter URIs"
  msgstr "Donu la uzantidentigilon: "
  
 +#: sm/certreqgen-ui.c:355
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
- msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
+ msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
  
 +#: sm/certreqgen-ui.c:382
  msgid "These parameters are used:\n"
  msgstr ""
  
@@@ -8557,12 -6887,10 +8644,12 @@@
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
 +#: sm/certreqgen-ui.c:402
  #, fuzzy
  msgid "Now creating certificate request.  "
- msgstr "�losilo %08lX: revokatestilo aldonita\n"
+ msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
  
 +#: sm/certreqgen-ui.c:403
  msgid "This may take a while ...\n"
  msgstr ""
  
@@@ -8586,164 -6909,128 +8673,164 @@@ msgstr "
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
 +#: sm/delete.c:51 sm/delete.c:112
  #, fuzzy, c-format
  msgid "certificate '%s' not found: %s\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
- msgstr "eraro dum legado de �losilbloko: %s\n"
+ msgstr "eraro dum legado de ŝlosilbloko: %s\n"
  
 +#: sm/delete.c:143
  #, fuzzy, c-format
  msgid "duplicated certificate '%s' deleted\n"
- msgstr "ripetita atestilo - forvi�ita"
+ msgstr "ripetita atestilo - forviŝita"
  
 +#: sm/delete.c:145
  #, fuzzy, c-format
  msgid "certificate '%s' deleted\n"
- msgstr "ripetita atestilo - forvi�ita"
+ msgstr "ripetita atestilo - forviŝita"
  
 +#: sm/delete.c:175
  #, fuzzy, c-format
  msgid "deleting certificate \"%s\" failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: sm/encrypt.c:328
  #, fuzzy
  msgid "no valid recipients given\n"
  msgstr "nevalida respondo de agento\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
- msgstr "listigi sekretajn �losilojn"
+ msgstr "listigi sekretajn ŝlosilojn"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
  msgstr "Valida atestilrevoko"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
  msgstr "Bona atestilo"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
  msgstr "Bona atestilo"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "krei eligon en askia kiraso"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "tute ne uzi la terminalon"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
- msgstr "neinteraga re�imo: neniam demandi"
+ msgstr "neinteraga reĝimo: neniam demandi"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
- msgstr "supozi \"jes\" �e la plej multaj demandoj"
+ msgstr "supozi \"jes\" ĉe la plej multaj demandoj"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
- msgstr "supozi \"ne\" �e la plej multaj demandoj"
+ msgstr "supozi \"ne\" ĉe la plej multaj demandoj"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
- msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
+ msgstr "aldoni ĉi tiun ŝlosilaron al la listo de ŝlosilaroj"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
- msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
+ msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
- msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
+ msgstr "|SERVILO|uzi ĉi tiun ŝlosilservilon por serĉi ŝlosilojn"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
- msgstr "|NOMO|uzi �ifrad-metodon NOMO"
+ msgstr "|NOMO|uzi ĉifrad-metodon NOMO"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOMO|uzi kompendi-metodon NOMO"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8751,50 -7038,41 +8838,50 @@@
  "Default operation depends on the input data\n"
  msgstr ""
  "Sintakso: gpg [opcioj] [dosieroj]\n"
- "subskribi, kontroli, �ifri a� mal�ifri\n"
+ "subskribi, kontroli, ĉifri aŭ malĉifri\n"
  "implicita operacio dependas de la enigataj datenoj\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
- msgstr "ne povas konekti�i al '%s': %s\n"
+ msgstr "ne povas konektiĝi al '%s': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "nekonata implicita ricevonto '%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr ""
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
- msgstr " s = supersalti �i tiun �losilon\n"
+ msgstr " s = supersalti ĉi tiun ŝlosilon\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, fuzzy
  msgid "could not parse keyserver\n"
- msgstr "ne povis analizi URI de �losilservilo\n"
+ msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "skribas al '%s'\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "ne povas fermi '%s': %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -8812,7 -7087,6 +8899,7 @@@ msgstr "Bona atestilo
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -8827,32 -7099,26 +8914,32 @@@ msgstr "eraro dum kreado de pasfrazo: %
  msgid "error reading input: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, fuzzy, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "rev? problemo en kontrolo de revoko: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -8915,12 -7171,10 +9002,12 @@@ msgstr "
  msgid "checking for qualified certificate failed: %s\n"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
  
 +#: sm/verify.c:450
  #, fuzzy
  msgid "Signature made "
- msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+ msgstr "Ĉi tiu ŝlosilo eksvalidiĝos je %s.\n"
  
 +#: sm/verify.c:454
  msgid "[date not given]"
  msgstr ""
  
@@@ -8944,12 -7194,10 +9031,12 @@@ msgstr "Bona subskribo de \"
  msgid "                aka"
  msgstr "            alinome \""
  
 +#: sm/verify.c:614
  #, fuzzy
  msgid "This is a qualified signature\n"
- msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
+ msgstr "tio povas esti kaŭzata de mankanta mem-subskribo\n"
  
 +#: dirmngr/certcache.c:106
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
@@@ -8980,22 -7223,18 +9067,22 @@@ msgstr "
  msgid "can't parse certificate '%s': %s\n"
  msgstr "ne povas krei '%s': %s\n"
  
 +#: dirmngr/certcache.c:395
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
- msgstr "ripetita atestilo - forvi�ita"
+ msgstr "ripetita atestilo - forviŝita"
  
 +#: dirmngr/certcache.c:399
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
- msgstr "ripetita atestilo - forvi�ita"
+ msgstr "ripetita atestilo - forviŝita"
  
 +#: dirmngr/certcache.c:401
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
- msgstr "ripetita atestilo - forvi�ita"
+ msgstr "ripetita atestilo - forviŝita"
  
 +#: dirmngr/certcache.c:405
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "Fingrospuro:"
@@@ -9023,12 -7257,10 +9110,12 @@@ msgstr "Nevalida atestilo
  msgid "    runtime cached certificates: %u\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
  
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
- msgstr "�losilo %08lX: revokatestilo aldonita\n"
+ msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
  
 +#: dirmngr/certcache.c:508
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "Valida atestilrevoko"
@@@ -9069,12 -7293,10 +9156,12 @@@ msgstr "eraro dum kreado de pasfrazo: %
  msgid "creating directory '%s'\n"
  msgstr "%s: ne povas krei dosierujon: %s\n"
  
 +#: dirmngr/crlcache.c:217
  #, fuzzy, c-format
  msgid "error creating directory '%s': %s\n"
- msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+ msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
  
 +#: dirmngr/crlcache.c:245
  #, fuzzy, c-format
  msgid "ignoring database dir '%s'\n"
  msgstr "eraro en vostolinio\n"
@@@ -9084,12 -7305,10 +9171,12 @@@
  msgid "error reading directory '%s': %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
 +#: dirmngr/crlcache.c:275
  #, fuzzy, c-format
  msgid "removing cache file '%s'\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: dirmngr/crlcache.c:284
  #, fuzzy, c-format
  #| msgid "enarmoring failed: %s\n"
  msgid "not removing file '%s'\n"
@@@ -9114,9 -7329,8 +9201,9 @@@ msgstr "eraro dum kreado de pasfrazo: %
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing new cache dir file '%s': %s\n"
- msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
  
 +#: dirmngr/crlcache.c:435
  #, fuzzy, c-format
  msgid "error closing new cache dir file '%s': %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -9154,12 -7361,10 +9241,12 @@@ msgstr "
  msgid "invalid line detected in '%s' line %u\n"
  msgstr "%s: nevalida dosiero-versio %d\n"
  
 +#: dirmngr/crlcache.c:632
  #, fuzzy, c-format
  msgid "duplicate entry detected in '%s' line %u\n"
- msgstr "ripetita atestilo - forvi�ita"
+ msgstr "ripetita atestilo - forviŝita"
  
 +#: dirmngr/crlcache.c:647
  #, c-format
  msgid "unsupported record type in '%s' line %u skipped\n"
  msgstr ""
@@@ -9337,15 -7507,13 +9424,15 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "converting S-expression failed: %s\n"
- msgstr "�an�o de permesoj de '%s' malsukcesis: %s\n"
+ msgstr "ŝanĝo de permesoj de '%s' malsukcesis: %s\n"
  
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "creating S-expression failed: %s\n"
- msgstr "�an�o de permesoj de '%s' malsukcesis: %s\n"
+ msgstr "ŝanĝo de permesoj de '%s' malsukcesis: %s\n"
  
 +#: dirmngr/crlcache.c:1699
  #, fuzzy, c-format
  msgid "ksba_crl_parse failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
@@@ -9387,19 -7547,16 +9474,19 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "signature verification suppressed\n"
  msgid "CRL signature verification failed: %s\n"
- msgstr "kontrolo de subskribo estas mal�altita\n"
+ msgstr "kontrolo de subskribo estas malŝaltita\n"
  
 +#: dirmngr/crlcache.c:1858
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
  msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
  
 +#: dirmngr/crlcache.c:2001
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: dirmngr/crlcache.c:2008
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
@@@ -9423,9 -7576,8 +9510,9 @@@ msgstr "eraro dum kreado de pasfrazo: %
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
- msgstr "lid ?: en�ovo malsukcesis: %s\n"
+ msgstr "lid ?: enŝovo malsukcesis: %s\n"
  
 +#: dirmngr/crlcache.c:2076
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "skribas al '%s'\n"
@@@ -9528,14 -7660,12 +9615,14 @@@ msgstr "aktualigo malsukcesis: %s\n
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_cache_insert via DP failed: %s\n"
- msgstr "lid ?: en�ovo malsukcesis: %s\n"
+ msgstr "lid ?: enŝovo malsukcesis: %s\n"
  
 +#: dirmngr/crlcache.c:2570
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: dirmngr/crlfetch.c:74
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
@@@ -9576,18 -7697,14 +9663,18 @@@ msgstr "eraro dum kreado de '%s': %s\n
  msgid "error retrieving '%s': http status %u\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
 +#: dirmngr/crlfetch.c:386
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
 +#: dirmngr/dirmngr-client.c:71
  msgid "use OCSP instead of CRLs"
  msgstr ""
  
@@@ -9595,12 -7711,10 +9682,12 @@@
  msgid "check whether a dirmngr is running"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:73
  #, fuzzy
  msgid "add a certificate to the cache"
- msgstr "�losilo %08lX: revokatestilo aldonita\n"
+ msgstr "ŝlosilo %08lX: revokatestilo aldonita\n"
  
 +#: dirmngr/dirmngr-client.c:74
  #, fuzzy
  #| msgid "bad certificate"
  msgid "validate a certificate"
@@@ -9634,12 -7742,10 +9721,12 @@@ msgstr "
  msgid "expect certificates in PEM format"
  msgstr "Bona atestilo"
  
 +#: dirmngr/dirmngr-client.c:82
  #, fuzzy
  msgid "force the use of the default OCSP responder"
- msgstr "Donu la �losilgrandon"
+ msgstr "Donu la ŝlosilgrandon"
  
 +#: dirmngr/dirmngr-client.c:169
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
@@@ -9671,9 -7772,8 +9758,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to the dirmngr: %s\n"
- msgstr "ne povas konekti�i al '%s': %s\n"
+ msgstr "ne povas konektiĝi al '%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:332
  #, fuzzy, c-format
  #| msgid "update failed: %s\n"
  msgid "lookup failed: %s\n"
@@@ -9688,27 -7786,22 +9775,27 @@@ msgstr "enkirasigo malsukcesis: %s\n
  msgid "a dirmngr daemon is up and running\n"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:397
  #, fuzzy, c-format
  msgid "validation of certificate failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
  #, fuzzy
  msgid "certificate is valid\n"
  msgstr "Valida atestilrevoko"
  
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
  #, fuzzy
  msgid "certificate has been revoked\n"
- msgstr "�losilo %08lX: �losilo estas revokita!\n"
+ msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
  
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
  #, fuzzy, c-format
  msgid "certificate check failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: dirmngr/dirmngr-client.c:428
  #, fuzzy, c-format
  #| msgid "can't stat `%s': %s\n"
  msgid "got status: '%s'\n"
@@@ -9718,9 -7810,8 +9805,9 @@@ msgstr "ne povas stat-i '%s': %s\n
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing base64 encoding: %s\n"
- msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:701
  #, fuzzy, c-format
  msgid "unsupported inquiry '%s'\n"
  msgstr ""
@@@ -9736,112 -7825,88 +9823,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  msgid "run without asking a user"
- msgstr "�u fini sen skribi �an�ojn? "
+ msgstr "Ĉu fini sen skribi ŝanĝojn? "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
- msgstr "ne povis analizi URI de �losilservilo\n"
+ msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9852,93 -7917,74 +9943,93 @@@ msgid "
  "options)\n"
  msgstr ""
  "@\n"
- "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
+ "(Vidu la manpaĝon por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "uzado: gpg [opcioj] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "%s ne eblas kun %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "enkirasigo malsukcesis: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "enkirasigo malsukcesis: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "pasfrazo estas tro longa\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s: nevalida dosiero-versio %d\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "kiraso: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "ne traktita"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10010,14 -8042,10 +10101,14 @@@ msgstr "nevalida kiraso
  msgid "scanning result for attribute '%s'\n"
  msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
 +#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
 +#: dirmngr/dirmngr_ldap.c:677
  #, fuzzy, c-format
  msgid "error writing to stdout: %s\n"
- msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:437
  #, c-format
  msgid "          available attribute '%s'\n"
  msgstr ""
@@@ -10116,18 -8126,10 +10207,12 @@@ msgstr "%s: ne estas fido-datenaro\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "eraro dum kreado de �losilaro '%s': %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
- msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
  
 +#: dirmngr/ldap-wrapper.c:236
  #, fuzzy, c-format
  msgid "error reading log from ldap wrapper %d: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -10167,27 -8162,22 +10252,27 @@@ msgstr "
  msgid "error spawning ldap wrapper reaper thread: %s\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
  #, fuzzy, c-format
  msgid "reading from ldap wrapper %d failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: dirmngr/ldap.c:91
  #, c-format
  msgid "invalid char 0x%02x in host name - not added\n"
  msgstr ""
  
 +#: dirmngr/ldap.c:95
  #, fuzzy, c-format
  msgid "adding '%s:%d' to the ldap server list\n"
- msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
+ msgstr "serĉas pri \"%s\" ĉe HKP-servilo %s\n"
  
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: dirmngr/ldap.c:627
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
@@@ -10227,12 -8210,10 +10312,12 @@@ msgstr "eraro dum legado de '%s': %s\n
  msgid "response from server too large; limit is %d bytes\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:139
  #, fuzzy
  msgid "OCSP request not possible due to Tor mode\n"
- msgstr "�losilo '%s' ne trovita: %s\n"
+ msgstr "ŝlosilo '%s' ne trovita: %s\n"
  
 +#: dirmngr/ocsp.c:145
  msgid "OCSP request not possible due to disabled HTTP\n"
  msgstr ""
  
@@@ -10246,12 -8225,10 +10331,12 @@@ msgstr "eraro dum legado de '%s': %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
  
 +#: dirmngr/ocsp.c:181
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
- msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
  
 +#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -10275,9 -8248,8 +10360,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "hashing the OCSP response for '%s' failed: %s\n"
- msgstr "�an�o de permesoj de '%s' malsukcesis: %s\n"
+ msgstr "ŝanĝo de permesoj de '%s' malsukcesis: %s\n"
  
 +#: dirmngr/ocsp.c:328
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
@@@ -10285,12 -8256,10 +10370,12 @@@
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:464
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: dirmngr/ocsp.c:479
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -10332,9 -8293,8 +10417,9 @@@ msgstr "
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
- msgstr "mankas implicita sekreta �losilaro: %s\n"
+ msgstr "mankas implicita sekreta ŝlosilaro: %s\n"
  
 +#: dirmngr/ocsp.c:634
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
@@@ -10363,12 -8318,10 +10448,12 @@@ msgstr "
  msgid "good"
  msgstr ""
  
 +#: dirmngr/ocsp.c:708
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
- msgstr "�losilo %08lX: �losilo estas revokita!\n"
+ msgstr "ŝlosilo %08lX: ŝlosilo estas revokita!\n"
  
 +#: dirmngr/ocsp.c:743
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
@@@ -10380,77 -8331,61 +10465,77 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "subskribado malsukcesis: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "subskribado malsukcesis: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "eraro dum sendo al '%s': %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "ne povas krei '%s': %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: malsukcesis krei haktabelon: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
- msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
+ msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10498,7 -8424,6 +10583,7 @@@ msgstr "
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "fini"
@@@ -10562,12 -8473,10 +10647,12 @@@ msgstr "
  msgid "option \"%s\" ignored due to \"%s\"\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
  #, fuzzy, c-format
  msgid "receiving line failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: tools/gpg-connect-agent.c:1458
  #, fuzzy
  msgid "line too long - skipped\n"
  msgstr "pasfrazo estas tro longa\n"
@@@ -10642,12 -8532,10 +10727,12 @@@ msgstr "
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:579
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
- msgstr "|N|uzi pasfraz-re�imon N"
+ msgstr "|N|uzi pasfraz-reĝimon N"
  
 +#: tools/gpgconf-comp.c:583
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
  msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -10656,29 -8543,23 +10741,29 @@@
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
  msgid "|NAME|use NAME as default secret key"
- msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
+ msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan ŝlosilon"
  
 +#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
- msgstr "|NOMO|�ifri por NOMO"
+ msgstr "|NOMO|ĉifri por NOMO"
  
 +#: tools/gpgconf-comp.c:704
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
- msgstr "ne povis analizi URI de �losilservilo\n"
+ msgstr "ne povis analizi URI de ŝlosilservilo\n"
  
 +#: tools/gpgconf-comp.c:735
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
@@@ -10690,12 -8569,10 +10775,12 @@@ msgstr "
  msgid "disable all access to the dirmngr"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:790
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
- msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
+ msgstr "|NOMO|uzi ĉifrad-metodon NOMO por pasfrazoj"
  
 +#: tools/gpgconf-comp.c:820
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
@@@ -10707,153 -8582,125 +10792,161 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "reteraro"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "malbona pasfrazo"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
- msgstr "publika �losilo ne trovita"
+ msgstr "publika ŝlosilo ne trovita"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
  msgstr "%s: nova opcio-dosiero kreita\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
  msgstr "%s: nova opcio-dosiero kreita\n"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "aktualigi la fido-datenaron"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "uzi dosieron por eligo"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
- msgstr "publika �losilo ne trovita"
+ msgstr "publika ŝlosilo ne trovita"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  #, fuzzy
  msgid "No argument allowed"
- msgstr "skribas sekretan �losilon al '%s'\n"
+ msgstr "skribas sekretan ŝlosilon al '%s'\n"
  
 +#: tools/symcryptrun.c:154
  #, fuzzy
  msgid ""
  "@\n"
@@@ -10863,17 -8710,14 +10956,17 @@@ msgstr "
  "@Komandoj:\n"
  " "
  
 +#: tools/symcryptrun.c:156
  #, fuzzy
  msgid "decryption modus"
- msgstr "mal�ifrado sukcesis\n"
+ msgstr "malĉifrado sukcesis\n"
  
 +#: tools/symcryptrun.c:157
  #, fuzzy
  msgid "encryption modus"
- msgstr "mal�ifrado sukcesis\n"
+ msgstr "malĉifrado sukcesis\n"
  
 +#: tools/symcryptrun.c:161
  msgid "tool class (confucius)"
  msgstr ""
  
@@@ -10922,12 -8757,10 +11015,12 @@@ msgstr "%s: ne povas krei dosierujon: %
  msgid "could not open %s for writing: %s\n"
  msgstr "ne povas malfermi %s: %s\n"
  
 +#: tools/symcryptrun.c:385
  #, fuzzy, c-format
  msgid "error writing to %s: %s\n"
- msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+ msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
  
 +#: tools/symcryptrun.c:392
  #, fuzzy, c-format
  msgid "error reading from %s: %s\n"
  msgstr "eraro dum legado de '%s': %s\n"
@@@ -10973,12 -8797,10 +11066,12 @@@ msgstr "%s: uzanto ne trovita: %s\n
  msgid "execv failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
  
 +#: tools/symcryptrun.c:611
  #, fuzzy, c-format
  msgid "select failed: %s\n"
- msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
  
 +#: tools/symcryptrun.c:628
  #, fuzzy, c-format
  msgid "read failed: %s\n"
  msgstr "aktualigo malsukcesis: %s\n"
diff --cc po/es.po
index 3fd94ac,510dedf..6a96874
--- a/po/es.po
+++ b/po/es.po
@@@ -9,9 -9,8 +9,9 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 2.0.9\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2015-10-09 17:10+0200\n"
- "Last-Translator: Jaime Su�rez <jaime.suma at gmail.com>\n"
+ "Last-Translator: Jaime Suárez <jaime.suma at gmail.com>\n"
  "Language-Team: Spanish <es at li.org>\n"
  "Language: es\n"
  "MIME-Version: 1.0\n"
@@@ -19,7 -18,6 +19,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "plural: Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "no pude conseguir el bloqueo de entrada de pin: %s\n"
@@@ -30,47 -28,38 +30,47 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr "|entrada de pin-etiqueta|_OK"
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr "|entrada de pin-etiqueta|_Cancelar"
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_Yes"
  msgstr "|entrada de pin-etiqueta|_OK"
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_No"
  msgstr "|entrada de pin-etiqueta|_OK"
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr "|entrada de pin-etiqueta|PIN:"
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  #, fuzzy
  #| msgid "|pinentry-label|_Cancel"
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|entrada de pin-etiqueta|_Cancelar"
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  #| msgid "Do you really want to create a sign and encrypt key? "
  msgid "Do you really want to make your passphrase visible on the screen?"
- msgstr "�De verdad quiere crear una clave de firma y cifrado? "
+ msgstr "¿De verdad quiere crear una clave de firma y cifrado? "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -78,7 -67,6 +78,7 @@@ msgstr "frase contraseña incorrecta
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr "Calidad:"
  
@@@ -88,128 -76,95 +88,128 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr "barra de calidad, entrada de pin"
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  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"
+ "Por favor introduzca su PIN para desbloquear la clave secreta de esta sesión"
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr ""
- "Por favor introduzca la frase contrase�a para desbloquear la clave secreta "
- "de esta sesi�n"
+ "Por favor introduzca la frase contraseña para desbloquear la clave secreta "
+ "de esta sesión"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- # �Por qu� no frase de paso?
- # Porque todo el mundo sabe lo que es una contrase�a
+ # ¿Por qué no frase de paso?
+ # Porque todo el mundo sabe lo que es una contraseña
  # y una "frase de paso" no. Soy consciente de que se
  # traduce igual password y passphrase pero el contexto
- # permite saber de lo que se est� hablando.
- # No s�, no s�.
- # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
- # �Es que son m�s listos? :-)
+ # permite saber de lo que se está hablando.
+ # No sé, no sé.
+ # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
+ # ¿Es que son más listos? :-)
  #
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
- msgstr "Frase contrase�a:"
+ msgstr "Frase contraseña:"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
- msgstr "no coincide - reint�ntelo"
+ msgstr "no coincide - reinténtelo"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (intento %d de %d)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
  msgstr "PIN demasiado largo"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
- msgstr "Frase contrase�a demasiado larga"
+ msgstr "Frase contraseña demasiado larga"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
- msgstr "Caracteres inv�lidos en el PIN"
+ msgstr "Caracteres inválidos en el PIN"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr "PIN demasiado corto"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "PIN incorrecto"
  
- # �Por qu� no frase de paso?
- # Porque todo el mundo sabe lo que es una contrase�a
+ # ¿Por qué no frase de paso?
+ # Porque todo el mundo sabe lo que es una contraseña
  # y una "frase de paso" no. Soy consciente de que se
  # traduce igual password y passphrase pero el contexto
- # permite saber de lo que se est� hablando.
- # No s�, no s�.
- # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
- # �Es que son m�s listos? :-)
+ # permite saber de lo que se está hablando.
+ # No sé, no sé.
+ # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
+ # ¿Es que son más listos? :-)
  #
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
- msgstr "Frase contrase�a err�nea"
+ msgstr "Frase contraseña errónea"
  
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
  #, c-format
  msgid "ssh keys greater than %d bits are not supported\n"
- msgstr "no pueden usarse claves ssh de m�s de %d bits\n"
+ msgstr "no pueden usarse claves ssh de más de %d bits\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "no se puede crear %s: %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "no se puede abrir `%s': %s\n"
  
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
  #, c-format
  msgid "error getting serial number of card: %s\n"
- msgstr "error obteniendo el n�mero de serie de la tarjeta: %s\n"
+ msgstr "error obteniendo el número de serie de la tarjeta: %s\n"
  
 +#: agent/command-ssh.c:2419
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr "detectada tarjeta con S/N: %s\n"
@@@ -227,42 -180,26 +227,32 @@@ msgstr "
  msgid "no suitable card key found: %s\n"
  msgstr "no se encuentra una clave de tarjeta adecuada: %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "el sombreado de la clave fall�: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "error escribiendo clave: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  #| msgid "Please enter the passphrase for the ssh key%0A  %c"
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
- msgstr "Por favor introduzca la frase contrase�a para la clave ssh%0A %c"
+ msgstr "Por favor introduzca la frase contraseña para la clave ssh%0A %c"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
- msgstr "Por favor vuelva a introducir frase contrase�a"
+ msgstr "Por favor vuelva a introducir frase contraseña"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  #| msgid ""
  #| "Please enter a passphrase to protect the received secret key%%0A   %s"
@@@ -271,23 -208,19 +261,23 @@@ msgid "
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr ""
- "Por favor introduzca una frase contrase�a para proteger la clave "
+ "Por favor introduzca una frase contraseña para proteger la clave "
  "secretarecibida%%0A  %s%%0Aen el almacen de claves del agente gpg"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "fallo al crear un flujo desde el socket: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
- msgstr "Por favor inserte la tarjeta con n�mero de serie"
+ msgstr "Por favor inserte la tarjeta con número de serie"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
- msgstr "Por favor retire tarjeta actual e inserte la que tiene n�mero de serie"
+ msgstr "Por favor retire tarjeta actual e inserte la que tiene número de serie"
  
 +#: agent/divert-scd.c:204
  msgid "Admin PIN"
  msgstr "PIN del Administrador"
  
@@@ -297,21 -229,17 +287,21 @@@
  msgid "PUK"
  msgstr "PUK"
  
 +#: agent/divert-scd.c:216
  msgid "Reset Code"
- msgstr "C�digo de Reinicio"
+ msgstr "Código de Reinicio"
  
 +#: agent/divert-scd.c:242
  #, fuzzy, c-format
  #| msgid "%s%%0A%%0AUse the reader's keypad for input."
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr "%s%%0A%%0AUse el teclado del lector como entrada."
  
 +#: agent/divert-scd.c:291
  msgid "Repeat this Reset Code"
- msgstr "Repita este C�digo de Reinicio"
+ msgstr "Repita este Código de Reinicio"
  
 +#: agent/divert-scd.c:293
  msgid "Repeat this PUK"
  msgstr "Repita este PUK"
  
@@@ -319,19 -246,15 +309,19 @@@
  msgid "Repeat this PIN"
  msgstr "Repita este PIN"
  
 +#: agent/divert-scd.c:299
  msgid "Reset Code not correctly repeated; try again"
- msgstr "C�digo de Reinicio repetido incorrectamente; int�ntelo de nuevo"
+ msgstr "Código de Reinicio repetido incorrectamente; inténtelo de nuevo"
  
 +#: agent/divert-scd.c:301
  msgid "PUK not correctly repeated; try again"
- msgstr "PUK repetido incorrectamente; int�ntelo de nuevo"
+ msgstr "PUK repetido incorrectamente; inténtelo de nuevo"
  
 +#: agent/divert-scd.c:302
  msgid "PIN not correctly repeated; try again"
- msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
+ msgstr "PIN repetido incorrectamente; inténtelo de nuevo"
  
 +#: agent/divert-scd.c:314
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr "Por favor introduzca el PIN%s%s%s para desbloquear la tarjeta"
@@@ -346,11 -267,9 +336,11 @@@ msgstr "error creando fichero temporal
  msgid "error writing to temporary file: %s\n"
  msgstr "error escribiendo en el fichero temporal: %s\n"
  
 +#: agent/genkey.c:158 agent/genkey.c:164
  msgid "Enter new passphrase"
- msgstr "Introduzca nueva frase contrase�a"
+ msgstr "Introduzca nueva frase contraseña"
  
 +#: agent/genkey.c:172
  msgid "Take this one anyway"
  msgstr "Tomar esta de todas formas"
  
@@@ -359,23 -277,20 +349,23 @@@
  msgid ""
  "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
  msgstr ""
- "�No ha introducido una frase contrase�a!%0AnNo se permiten frases contrase�a "
+ "¡No ha introducido una frase contraseña!%0AnNo se permiten frases contraseña "
  "en blanco."
  
 +#: agent/genkey.c:204
  #, c-format
  msgid ""
  "You have not entered a passphrase - this is in general a bad idea!%0APlease "
  "confirm that you do not want to have any protection on your key."
  msgstr ""
- "No ha introducido una frase contrase�a -�esto es en general una mala idea!"
- "%0Apor favor confirme que no quiere ninguna protecci�n para su clave."
+ "No ha introducido una frase contraseña -¡esto es en general una mala idea!"
+ "%0Apor favor confirme que no quiere ninguna protección para su clave."
  
 +#: agent/genkey.c:216
  msgid "Yes, protection is not needed"
- msgstr "S�, no se necesita protecci�n"
+ msgstr "Sí, no se necesita protección"
  
 +#: agent/genkey.c:233
  #, fuzzy, c-format
  #| msgid "Name must be at least 5 characters long\n"
  msgid "A passphrase should be at least %u character long."
@@@ -395,23 -309,21 +385,23 @@@ msgid "A passphrase should contain at l
  msgid_plural ""
  "A passphrase should contain at least %u digits or%%0Aspecial characters."
  msgstr[0] ""
- "Aviso: Ha introducido una frase contrase�a insegura.%%0AUna frasecontrase�a "
- "debe tener al menos %u digito o%%0Acar�cter especial."
+ "Aviso: Ha introducido una frase contraseña insegura.%%0AUna frasecontraseña "
+ "debe tener al menos %u digito o%%0Acarácter especial."
  msgstr[1] ""
- "Aviso: Ha introducido una frase contrase�a insegura.%%0AUna frasecontrase�a "
+ "Aviso: Ha introducido una frase contraseña insegura.%%0AUna frasecontraseña "
  "debe tener al menos %u digitos o%%0Acaracteres especiales."
  
 +#: agent/genkey.c:278
  #, fuzzy, c-format
  #| msgid ""
  #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
  #| "be a known term or match%%0Acertain pattern."
  msgid "A passphrase may not be a known term or match%%0Acertain pattern."
  msgstr ""
- "Aviso: ha introducido una frase contrase�a insegura.%%0AUna frase contrase�a "
- "no puede ser un t�rmino conocido%%0Ao ajustarse a cierto patr�n."
+ "Aviso: ha introducido una frase contraseña insegura.%%0AUna frase contraseña "
+ "no puede ser un término conocido%%0Ao ajustarse a cierto patrón."
  
 +#: agent/genkey.c:293
  #, fuzzy
  #| msgid ""
  #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@@ -421,21 -333,17 +411,21 @@@
  #| "be at least %u characters long."
  msgid "Warning: You have entered an insecure passphrase."
  msgstr ""
- "Aviso: ha introducido una frase contrase�a insegura.%%0AUna frase contrase�a "
- "debe tener al menos %u car�cter."
+ "Aviso: ha introducido una frase contraseña insegura.%%0AUna frase contraseña "
+ "debe tener al menos %u carácter."
  
 +#: agent/genkey.c:480
  #, fuzzy, c-format
  #| msgid "Please enter the passphrase to%0Ato protect your new key"
  msgid "Please enter the passphrase to%0Aprotect your new key"
- msgstr "Por favor introduzca frase contrase�a para%0Aproteger su nueva clave"
+ msgstr "Por favor introduzca frase contraseña para%0Aproteger su nueva clave"
  
 +#: agent/genkey.c:606
  msgid "Please enter the new passphrase"
- msgstr "Por favor escriba la nueva frase contrase�a"
+ msgstr "Por favor escriba la nueva frase contraseña"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -443,117 -351,91 +433,123 @@@ msgstr "
  "@Opciones:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "ejecutar en modo demonio (segundo plano)"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "ejecutar en modo servidor (primer plano)"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "run in server mode"
+ msgid "run in supervised mode"
+ msgstr "ejecutar en modo servidor"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "prolijo"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
- msgstr "algo m�s discreto"
+ msgstr "algo más discreto"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr "salida de datos estilo sh"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr "salida de datos estilo csh"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FICHERO|lee opciones desde FICHERO"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "no independizarse de la consola"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
- msgstr "no acaparar teclado y rat�n"
+ msgstr "no acaparar teclado y ratón"
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
  msgstr "usar un fichero log para el servidor"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr "|PGM|usar PGM como el programa para entrada de PIN"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr "|PGM|usar PCM como programa SCdaemon"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
  msgstr "no usar SCdaemon"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|connect to Assuan socket NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NOMBRE|conectar al socket Assuan NOMBRE"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr "ignorar peticiones de cambiar el TTY"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr "ignorar peticiones de cambiar el display X"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
- msgstr "|N|los PINs en la cach� expiran en N segundos"
+ msgstr "|N|los PINs en la caché expiran en N segundos"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
- msgstr "no usar el cach� de PINs al firmar"
+ msgstr "no usar el caché de PINs al firmar"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  #| msgid "do not allow the reuse of old passphrases"
  msgid "disallow the use of an external password cache"
- msgstr "no permite reusar antiguas frases contrase�a"
+ msgstr "no permite reusar antiguas frases contraseña"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  #, fuzzy
  #| msgid "allow clients to mark keys as \"trusted\""
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "permitir que los clientes marquen claves como \"fiables\""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
- msgstr "permitir preestablecer frase contrase�a"
+ msgstr "permitir preestablecer frase contraseña"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "enable ssh-agent emulation"
  msgid "enable ssh support"
- msgstr "permitir emulaci�n de ssh-agent"
+ msgstr "permitir emulación de ssh-agent"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -562,21 -444,14 +558,21 @@@ msgstr "no disponible
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Por favor, informe de posibles \"bugs\" a <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -588,154 -463,118 +584,154 @@@ msgstr "
  "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
  "Manejo de claves privadas por GnuPG\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "invalid debug-level '%s' given\n"
- msgstr "el nivel de depuraci�n `%s` no es v�lido\n"
+ msgstr "el nivel de depuración `%s` no es válido\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "fichero de opciones `%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "leyendo opciones desde `%s'\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
- msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta\n"
+ msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "no se puede crear el socket: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, fuzzy, c-format
  #| msgid "socket name `%s' is too long\n"
  msgid "socket name '%s' is too long\n"
  msgstr "el nombre de socket `%s' es demasiado largo\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  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"
+ msgstr "ya hay un agente gpg ejecutándose - no se inicia otro\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
- msgstr "error obteniendo valor �nico para el socket\n"
+ msgstr "error obteniendo valor único para el socket\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error binding socket to '%s': %s\n"
  msgstr "error enlazando el socket con `%s': %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
- msgstr "listen() fall�: %s\n"
+ msgstr "listen() falló: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
  msgstr "escuchando el socket `%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "no se puede crear el directorio `%s': %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "directorio `%s' creado\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  #| msgid "stat() failed for `%s': %s\n"
  msgid "stat() failed for '%s': %s\n"
- msgstr "stat() fall� para `%s': %s\n"
+ msgstr "stat() falló para `%s': %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  #| msgid "can't use `%s' as home directory\n"
  msgid "can't use '%s' as home directory\n"
  msgstr "no puede usar `%s' como directorio personal\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
- msgstr "error leyendo valor �nico en el descriptor %d: %s\n"
+ msgstr "error leyendo valor único en el descriptor %d: %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "manejador 0x%lx para descriptor %d iniciado\n"
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, 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:2392
++#: agent/gpg-agent.c:2683
  #, 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:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  #| msgid "pth_select failed: %s - waiting 1s\n"
  msgid "npth_pselect failed: %s - waiting 1s\n"
- msgstr "pth_select fall�: %s - espero 1s\n"
+ msgstr "pth_select falló: %s - espero 1s\n"
  
  # msgstr "clave %08lX: %d nuevas subclaves\n"
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s detenido\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
- msgstr "no hay un agente gpg ejecut�ndose en esta sesi�n\n"
+ msgstr "no hay un agente gpg ejecutándose en esta sesión\n"
  
 +#: agent/preset-passphrase.c:99
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
  msgstr "Uso: gpg-preset-passphrase [opciones] KEYGRIP (-h para ayuda)\n"
  
@@@ -745,24 -583,19 +741,24 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  "Sintaxis: gpg-preset-passphrase [opciones] KEYGRIP\n"
- "Mantenimiento de la cach� de contrase�as\n"
- 
- # �rdenes, please...
- # 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:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
+ "Mantenimiento de la caché de contraseñas\n"
+ 
+ # Órdenes, please...
+ # 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:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
  msgstr ""
- "@�rdenes:\n"
+ "@Órdenes:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -784,39 -615,32 +780,40 @@@ msgstr "
  "Sintaxis: gpg-protect-tool [opciones] [args]\n"
  "Herramienta para el mantenimiento de claves secretas\n"
  
 +#: agent/protect-tool.c:693
  msgid "Please enter the passphrase to unprotect the PKCS#12 object."
- msgstr "Introduzca frase contrase�a para desproteger el objeto PKCS#12."
+ msgstr "Introduzca frase contraseña para desproteger el objeto PKCS#12."
  
 +#: agent/protect-tool.c:698
  msgid "Please enter the passphrase to protect the new PKCS#12 object."
- msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
+ msgstr "Introduzca frase contraseña para proteger el nuevo objeto PKCS#12."
  
 +#: agent/protect-tool.c:704
  msgid ""
  "Please enter the passphrase to protect the imported object within the GnuPG "
  "system."
  msgstr ""
- "Introduzca la frase contrase�a para proteger el objeto importado en GnuPG"
+ "Introduzca la frase contraseña para proteger el objeto importado en GnuPG"
  
 +#: agent/protect-tool.c:709
  msgid ""
  "Please enter the passphrase or the PIN\n"
  "needed to complete this operation."
  msgstr ""
- "Por favor introduzca la frase contrase�a o PIN\n"
- "necesarios para completar esta operaci�n."
+ "Por favor introduzca la frase contraseña o PIN\n"
+ "necesarios para completar esta operación."
  
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
  msgid "cancelled\n"
  msgstr "cancelado\n"
  
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
  #, c-format
  msgid "error while asking for the passphrase: %s\n"
- msgstr "error pidiendo la frase contrase�a: %s\n"
+ msgstr "error pidiendo la frase contraseña: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -826,41 -649,35 +823,41 @@@ msgstr "error abriendo `%s': %s\n
  #, fuzzy, c-format
  #| msgid "file `%s', line %d: %s\n"
  msgid "file '%s', line %d: %s\n"
- msgstr "fichero `%s', l�nea %d: %s\n"
+ msgstr "fichero `%s', línea %d: %s\n"
  
 +#: agent/trustlist.c:192 agent/trustlist.c:200
  #, fuzzy, c-format
  #| msgid "statement \"%s\" ignored in `%s', line %d\n"
  msgid "statement \"%s\" ignored in '%s', line %d\n"
- msgstr "declaraci�n \"%s\" ignorada en `%s', l�nea %d\n"
+ msgstr "declaración \"%s\" ignorada en `%s', línea %d\n"
  
 +#: agent/trustlist.c:206
  #, fuzzy, c-format
  #| msgid "system trustlist `%s' not available\n"
  msgid "system trustlist '%s' not available\n"
- msgstr "la lista de confianza `%s' del sistema no est� disponible\n"
+ msgstr "la lista de confianza `%s' del sistema no está disponible\n"
  
 +#: agent/trustlist.c:250
  #, fuzzy, c-format
  #| msgid "bad fingerprint in `%s', line %d\n"
  msgid "bad fingerprint in '%s', line %d\n"
- msgstr "huella digital incorrecta en `%s', l�nea %d\n"
+ msgstr "huella digital incorrecta en `%s', línea %d\n"
  
 +#: agent/trustlist.c:275 agent/trustlist.c:282
  #, fuzzy, c-format
  #| msgid "invalid keyflag in `%s', line %d\n"
  msgid "invalid keyflag in '%s', line %d\n"
- msgstr "opci�n de clave inv�lida en `%s', l�nea %d\n"
+ msgstr "opción de clave inválida en `%s', línea %d\n"
  
 +#: agent/trustlist.c:316 common/helpfile.c:136
  #, fuzzy, c-format
  #| msgid "error reading `%s', line %d: %s\n"
  msgid "error reading '%s', line %d: %s\n"
- msgstr "error leyendo `%s', l�nea %d: %s\n"
+ msgstr "error leyendo `%s', línea %d: %s\n"
  
 +#: agent/trustlist.c:434 agent/trustlist.c:503
  msgid "error reading list of trusted root certificates\n"
- msgstr "error leyendo la lista de certificados ra�z fiables\n"
+ msgstr "error leyendo la lista de certificados raíz fiables\n"
  
  #. TRANSLATORS: This prompt is shown by the Pinentry
  #. and has one special property: A "%%0A" is used by
@@@ -876,15 -692,12 +873,15 @@@ msgid "
  "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
  "certificates?"
  msgstr ""
- "�Conf�a absolutamente en%%0A  \"%s\"%%0A para certificar correctamentelos "
+ "¿Confía absolutamente en%%0A  \"%s\"%%0A para certificar correctamentelos "
  "certificados de otros usuarios?"
  
 +#: agent/trustlist.c:673 common/audit.c:467
  msgid "Yes"
- msgstr "S�"
+ msgstr "Sí"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "No"
  
@@@ -916,177 -726,151 +913,190 @@@ msgstr "Correcto
  msgid "Wrong"
  msgstr "Incorrecto"
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
- "Nota: Esta frase contrase�a nunca ha sido cambiada.%0APor favor h�galo ahora."
+ "Nota: Esta frase contraseña nunca ha sido cambiada.%0APor favor hágalo ahora."
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
- "Esta frase contrase�a no se ha cambiado%%0Adesde %.4s-%.2s-%.2s.Por favor "
- "c�mbiela ahora."
+ "Esta frase contraseña no se ha cambiado%%0Adesde %.4s-%.2s-%.2s.Por favor "
+ "cámbiela ahora."
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
- msgstr "Cambia la frase contrase�a"
+ msgstr "Cambia la frase contraseña"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
- msgstr "La cambiar� m�s tarde"
+ msgstr "La cambiaré más tarde"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
- msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
+ msgstr "¿De verdad quiere borrar las claves seleccionadas? (s/N) "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
  msgstr "habilita clave"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
  msgstr ""
  
 +#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
  msgid "DSA requires the hash length to be a multiple of 8 bits\n"
- msgstr "DSA necesita un resumen cuya longitud sea m�ltiplo de 8 bits\n"
+ msgstr "DSA necesita un resumen cuya longitud sea múltiplo de 8 bits\n"
  
 +#: agent/pksign.c:187 sm/certcheck.c:97
  #, c-format
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "la clave %s usa un hash inseguro (de %u bits)\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, fuzzy, c-format
  #| msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "un hash de %u bits no vale para %u bits de la clave %s\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
- msgstr "la comprobaci�n de la firma creada fall�: %s\n"
+ msgstr "la comprobación de la firma creada falló: %s\n"
  
 +#: agent/cvt-openpgp.c:338
  msgid "secret key parts are not available\n"
- msgstr "las partes de la clave privada no est�n disponibles\n"
+ msgstr "las partes de la clave privada no están disponibles\n"
  
 +#: agent/cvt-openpgp.c:344
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "public key algorithm %d (%s) is not supported\n"
- msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
+ msgstr "el algoritmo de protección %d%s no puede ser utilizado\n"
  
 +#: agent/cvt-openpgp.c:448
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection algorithm %d (%s) is not supported\n"
- msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
+ msgstr "el algoritmo de protección %d%s no puede ser utilizado\n"
  
 +#: agent/cvt-openpgp.c:455
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection hash algorithm %d (%s) is not supported\n"
- msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
+ msgstr "el algoritmo de protección %d%s no puede ser utilizado\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
- msgstr "error creando tuber�a: %s\n"
+ msgstr "error creando tubería: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error creating a stream for a pipe: %s\n"
- msgstr "error creando tuber�a: %s\n"
+ msgstr "error creando tubería: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "error bifurcando procesos: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- #| msgid "waiting for process %d to terminate failed: %s\n"
- msgid "waiting for processes to terminate failed: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
  msgstr "fallo esperando que el proceso %d terminara: %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  #| msgid "error running `%s': probably not installed\n"
  msgid "error running '%s': probably not installed\n"
- msgstr "error ejecutando `%s': probablemente no est� instalado\n"
+ msgstr "error ejecutando `%s': probablemente no está instalado\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error running '%s': exit status %d\n"
- msgstr "error ejecutando `%s': c�digo de finalizaci�n %d\n"
+ msgstr "error ejecutando `%s': código de finalización %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  #| msgid "error running `%s': terminated\n"
  msgid "error running '%s': terminated\n"
  msgstr "error ejecutando `%s': terminado\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
- #, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "error obteniendo c�digo de finalizaci�n del proceso: %d %s\n"
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "fallo esperando que el proceso %d terminara: %s\n"
  
- #: common/exechelp-w32ce.c:767
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "fallo esperando que el proceso %d terminara: %s\n"
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "error obteniendo código de finalización del proceso: %d %s\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
  msgstr "no se puede conectar con `%s': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "problema estableciendo opciones de gpg-agent\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "no se pueden desactivar los volcados de core: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Aviso: propiedad insegura de %s \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ #| msgid "waiting %d seconds for the agent to come up\n"
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "esperando %d segundos para que el agente arranque\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ #| msgid "renaming `%s' to `%s' failed: %s\n"
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "renombrando `%s' en `%s' fallo: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
- msgstr "s�|si"
+ msgstr "sí|si"
  
 +#: common/yesno.c:46 common/yesno.c:87
  msgid "yY"
  msgstr "sS"
  
@@@ -1136,62 -910,51 +1146,62 @@@ msgstr "agotado nucleo de memoria segur
  msgid "out of core while allocating %lu bytes"
  msgstr "error de memoria reservando %lu bytes"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "error reservando memoria: %s\n"
  
 +#: common/miscellaneous.c:143
  #, c-format
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
- msgstr "%s:%u: opci�n obsoleta \"%s\" - no tiene efecto\n"
+ msgstr "%s:%u: opción obsoleta \"%s\" - no tiene efecto\n"
  
 +#: common/miscellaneous.c:146
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
- msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta - no tiene efecto\n"
+ msgstr "ATENCIÓN: \"%s\" es una opción obsoleta - no tiene efecto\n"
  
 +#: common/miscellaneous.c:554
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, fuzzy, c-format
  #| msgid "no running gpg-agent - starting one\n"
  msgid "no running gpg-agent - starting '%s'\n"
- msgstr "no hay gpg-agent en ejecuci�n - inicando uno\n"
+ msgstr "no hay gpg-agent en ejecución - inicando uno\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, fuzzy, c-format
  #| msgid "waiting %d seconds for the agent to come up\n"
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr "esperando %d segundos para que el agente arranque\n"
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  #| msgid "can't connect to the dirmngr - trying fall back\n"
  msgid "connection to agent is in restricted mode\n"
  msgstr "no puedo conectar con el dirmngr - intentando retirada\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, fuzzy, c-format
  #| msgid "no running dirmngr - starting `%s'\n"
  msgid "no running Dirmngr - starting '%s'\n"
- msgstr "no hay dirmngr en ejecuci�n - iniciando `%s'\n"
+ msgstr "no hay dirmngr en ejecución - iniciando `%s'\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, fuzzy, c-format
  #| msgid "waiting %d seconds for the agent to come up\n"
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr "esperando %d segundos para que el agente arranque\n"
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  #, fuzzy
  #| msgid "can't connect to the dirmngr - trying fall back\n"
  msgid "connection to the dirmngr established\n"
@@@ -1235,19 -989,15 +1245,19 @@@ msgstr "|audit-log-result|Correcto
  msgid "|audit-log-result|Skipped"
  msgstr "|audit-log-result|Omitido"
  
 +#: common/audit.c:493
  msgid "|audit-log-result|Some"
- msgstr "|audit-log-result|Alg�n"
+ msgstr "|audit-log-result|Algún"
  
 +#: common/audit.c:726
  msgid "Certificate chain available"
  msgstr "Cadena de certificados disponible"
  
 +#: common/audit.c:733
  msgid "root certificate missing"
- msgstr "falta el certificado ra�z"
+ msgstr "falta el certificado raíz"
  
 +#: common/audit.c:759
  msgid "Data encryption succeeded"
  msgstr "Datos cifrados correctamente"
  
@@@ -1255,30 -1004,23 +1265,30 @@@
  msgid "Data available"
  msgstr "Hay datos disponibles"
  
 +#: common/audit.c:767
  msgid "Session key created"
- msgstr "Creada clave de sesi�n"
+ msgstr "Creada clave de sesión"
  
 +#: common/audit.c:772 common/audit.c:912 common/audit.c:919
  #, c-format
  msgid "algorithm: %s"
  msgstr "algoritmo: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "algoritmo no disponible: %s"
  
 +#: common/audit.c:778 common/audit.c:925
  msgid "seems to be not encrypted"
- msgstr "no parece que est� cifrado"
+ msgstr "no parece que esté cifrado"
  
 +#: common/audit.c:784 common/audit.c:933
  msgid "Number of recipients"
- msgstr "N�mero de destinatarios"
+ msgstr "Número de destinatarios"
  
 +#: common/audit.c:792 common/audit.c:956
  #, c-format
  msgid "Recipient %d"
  msgstr "Destinatario %d"
@@@ -1318,41 -1052,32 +1328,41 @@@ msgstr "Datos verificados correctamente
  msgid "Signature available"
  msgstr "Firma disponible"
  
 +#: common/audit.c:1024
  msgid "Parsing data succeeded"
- msgstr "Interpretaci�n de datos correcta"
+ msgstr "Interpretación de datos correcta"
  
 +#: common/audit.c:1036
  #, c-format
  msgid "bad data hash algorithm: %s"
- msgstr "algoritmo de resumen de datos err�neo: %s"
+ msgstr "algoritmo de resumen de datos erróneo: %s"
  
 +#: common/audit.c:1051
  #, c-format
  msgid "Signature %d"
  msgstr "Firma %d"
  
 +#: common/audit.c:1079
  msgid "Certificate chain valid"
- msgstr "Cadena de certificados v�lida"
+ msgstr "Cadena de certificados válida"
  
 +#: common/audit.c:1090
  msgid "Root certificate trustworthy"
- msgstr "Certificado ra�z fiable"
+ msgstr "Certificado raíz fiable"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "no se encuentra CRL para el certificado"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
  msgstr "el CRL disponible es demasiado antiguo"
  
 +#: common/audit.c:1119
  msgid "CRL/OCSP check of certificates"
- msgstr "Comprobaci�n CRL/OCSP de certificados"
+ msgstr "Comprobación CRL/OCSP de certificados"
  
 +#: common/audit.c:1139
  msgid "Included certificates"
  msgstr "Certificados incluidos"
  
@@@ -1360,11 -1084,9 +1370,11 @@@
  msgid "No audit log entries."
  msgstr "No auditar entradas de los logs"
  
 +#: common/audit.c:1243
  msgid "Unknown operation"
- msgstr "Operaci�n desconocida"
+ msgstr "Operación desconocida"
  
 +#: common/audit.c:1261
  msgid "Gpg-Agent usable"
  msgstr "Gpg-Agent utilizable"
  
@@@ -1378,19 -1098,15 +1388,19 @@@ msgstr "Dirmngr utilizable
  msgid "No help available for '%s'."
  msgstr "No hay ayuda disponible para `%s'."
  
 +#: common/helpfile.c:90
  msgid "ignoring garbage line"
- msgstr "ignorando l�nea con basura"
+ msgstr "ignorando línea con basura"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[ninguno]"
  
 +#: common/argparse.c:365
  msgid "argument not expected"
- msgstr "par�metro inesperado"
+ msgstr "parámetro inesperado"
  
 +#: common/argparse.c:367
  msgid "read error"
  msgstr "error de lectura"
  
@@@ -1398,90 -1113,72 +1408,90 @@@
  msgid "keyword too long"
  msgstr "palabra clave demasiado larga"
  
 +#: common/argparse.c:371
  msgid "missing argument"
- msgstr "falta el par�metro"
+ msgstr "falta el parámetro"
  
 +#: common/argparse.c:373
  #, fuzzy
  #| msgid "invalid armor"
  msgid "invalid argument"
- msgstr "armadura inv�lida"
+ msgstr "armadura inválida"
  
 +#: common/argparse.c:375
  msgid "invalid command"
- msgstr "orden inv�lida"
+ msgstr "orden inválida"
  
 +#: common/argparse.c:377
  msgid "invalid alias definition"
- msgstr "definici�n de alias inv�lida"
+ msgstr "definición de alias inválida"
  
 +#: common/argparse.c:379
  msgid "out of core"
  msgstr "memoria desbordada"
  
 +#: common/argparse.c:381
  msgid "invalid option"
- msgstr "opci�n inv�lida"
+ msgstr "opción inválida"
  
 +#: common/argparse.c:389
  #, c-format
  msgid "missing argument for option \"%.50s\"\n"
- msgstr "falta par�metro para la opci�n \"%.50s\"\n"
+ msgstr "falta parámetro para la opción \"%.50s\"\n"
  
 +#: common/argparse.c:391
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "invalid argument for option \"%.50s\"\n"
- msgstr "falta par�metro para la opci�n \"%.50s\"\n"
+ msgstr "falta parámetro para la opción \"%.50s\"\n"
  
 +#: common/argparse.c:393
  #, c-format
  msgid "option \"%.50s\" does not expect an argument\n"
- msgstr "la opci�n \"%.50s\" no necesita par�metros\n"
+ msgstr "la opción \"%.50s\" no necesita parámetros\n"
  
 +#: common/argparse.c:395
  #, c-format
  msgid "invalid command \"%.50s\"\n"
- msgstr "orden inv�lida \"%.50s\"\n"
+ msgstr "orden inválida \"%.50s\"\n"
  
 +#: common/argparse.c:397
  #, c-format
  msgid "option \"%.50s\" is ambiguous\n"
- msgstr "la opci�n \"%.50s\" es ambigua\n"
+ msgstr "la opción \"%.50s\" es ambigua\n"
  
 +#: common/argparse.c:399
  #, c-format
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "la orden \"%.50s\" es ambigua\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
  msgstr "memoria desbordada\n"
  
 +#: common/argparse.c:403
  #, c-format
  msgid "invalid option \"%.50s\"\n"
- msgstr "opci�n inv�lida \"%.50s\"\n"
+ msgstr "opción inválida \"%.50s\"\n"
  
 +#: common/utf8conv.c:123
  #, fuzzy, c-format
  #| msgid "conversion from `%s' to `%s' not available\n"
  msgid "conversion from '%s' to '%s' not available\n"
- msgstr "la conversi�n de `%s' en `%s' no est� disponible\n"
+ msgstr "la conversión de `%s' en `%s' no está disponible\n"
  
 +#: common/utf8conv.c:131
  #, c-format
  msgid "iconv_open failed: %s\n"
- msgstr "iconv_open fall�: %s\n"
+ msgstr "iconv_open falló: %s\n"
  
 +#: common/utf8conv.c:385 common/utf8conv.c:651
  #, fuzzy, c-format
  #| msgid "conversion from `%s' to `%s' failed: %s\n"
  msgid "conversion from '%s' to '%s' failed: %s\n"
- msgstr "la conversi�n de `%s' en `%s' fall�: %s\n"
+ msgstr "la conversión de `%s' en `%s' falló: %s\n"
  
 +#: common/dotlock.c:707
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "failed to create temporary file '%s': %s\n"
@@@ -1503,11 -1197,9 +1513,11 @@@ msgstr "borrando fichero de bloqueo res
  msgid "waiting for lock (held by %d%s) %s...\n"
  msgstr "esperando al bloqueo (que mantiene %d%s) %s...\n"
  
 +#: common/dotlock.c:1153
  msgid "(deadlock?) "
- msgstr "(�bloqueo mutuo?)"
+ msgstr "(¿bloqueo mutuo?)"
  
 +#: common/dotlock.c:1192
  #, fuzzy, c-format
  #| msgid "lock `%s' not made: %s\n"
  msgid "lock '%s' not made: %s\n"
@@@ -1518,8 -1209,6 +1528,8 @@@ msgstr "bloqueo `%s' no hecho: %s\n
  msgid "waiting for lock %s...\n"
  msgstr "esperando al bloqueo %s...\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
@@@ -1529,19 -1217,15 +1539,19 @@@
  msgid "armor: %s\n"
  msgstr "armadura: %s\n"
  
 +#: g10/armor.c:463
  msgid "invalid armor header: "
- msgstr "cabecera de armadura inv�lida: "
+ msgstr "cabecera de armadura inválida: "
  
 +#: g10/armor.c:474
  msgid "armor header: "
  msgstr "cabecera de armadura: "
  
 +#: g10/armor.c:487
  msgid "invalid clearsig header\n"
- msgstr "cabecera de firma clara inv�lida\n"
+ msgstr "cabecera de firma clara inválida\n"
  
 +#: g10/armor.c:500
  msgid "unknown armor header: "
  msgstr "cabecera de armadura desconocida: "
  
@@@ -1553,160 -1235,124 +1563,159 @@@ msgstr "firmas en texto claro anidadas\
  msgid "unexpected armor: "
  msgstr "armadura inesperada: "
  
 +#: g10/armor.c:701
  msgid "invalid dash escaped line: "
- msgstr "L�nea con guiones inv�lida: "
+ msgstr "Línea con guiones inválida: "
  
 +#: g10/armor.c:873 g10/armor.c:1490
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
- msgstr "caracter inv�lido radix64 %02X omitido\n"
+ msgstr "caracter inválido radix64 %02X omitido\n"
  
 +#: g10/armor.c:916
  msgid "premature eof (no CRC)\n"
- msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
+ msgstr "Fin de fichero prematuro (falta suma de comprobación)\n"
  
 +#: g10/armor.c:950
  msgid "premature eof (in CRC)\n"
- msgstr "Fin de suma de comprobaci�n prematuro\n"
+ msgstr "Fin de suma de comprobación prematuro\n"
  
 +#: g10/armor.c:958
  msgid "malformed CRC\n"
- msgstr "Suma de comprobaci�n mal creada\n"
+ msgstr "Suma de comprobación mal creada\n"
  
 +#: g10/armor.c:962 g10/armor.c:1527
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
- msgstr "Error en suma de comprobaci�n: %06lX - %06lX\n"
+ msgstr "Error en suma de comprobación: %06lX - %06lX\n"
  
 +#: g10/armor.c:982
  msgid "premature eof (in trailer)\n"
  msgstr "fin de fichero prematuro (en el cierre)\n"
  
 +#: g10/armor.c:986
  msgid "error in trailer line\n"
- msgstr "error en la l�nea de cierre\n"
+ msgstr "error en la línea de cierre\n"
  
 +#: g10/armor.c:1303
  msgid "no valid OpenPGP data found.\n"
- msgstr "no se han encontrados datos OpenPGP v�lidos\n"
+ msgstr "no se han encontrados datos OpenPGP válidos\n"
  
 +#: g10/armor.c:1308
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
- msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
+ msgstr "armadura incorrecta: línea más larga de %d caracteres\n"
  
 +#: g10/armor.c:1312
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
- "caracter \"quoted printable\" en la armadura - probablemente se us�\n"
+ "caracter \"quoted printable\" en la armadura - probablemente se usó\n"
  "un MTA defectuoso\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "ilegible"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr ""
- "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
+ "un nombre de notación debe tener sólo caracteres imprimibles o espacios, y "
  "acabar con un '='\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
- msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
+ msgstr "un nombre de notación de usuario debe contener el caracter '@'\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
- msgstr "un nombre de notaci�n no debe contener m�s de un caracter '@'\n"
+ msgstr "un nombre de notación no debe contener más de un caracter '@'\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
- msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
+ msgstr "un valor de notación no debe usar ningún caracter de control\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  #| msgid "a notation name must not contain more than one '@' character\n"
  msgid "a notation name may not contain an '=' character\n"
- msgstr "un nombre de notaci�n no debe contener m�s de un caracter '@'\n"
+ msgstr "un nombre de notación no debe contener más de un caracter '@'\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
  #| "with an '='\n"
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr ""
- "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
+ "un nombre de notación debe tener sólo caracteres imprimibles o espacios, y "
  "acabar con un '='\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
- msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
+ msgstr "ATENCIÓN: encontrados datos de notación inválidos\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
- msgstr "fallo al hacer la petici�n proxy %s al cliente\n"
+ msgstr "fallo al hacer la petición proxy %s al cliente\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
- msgstr "Introduzca frase contrase�a: "
+ msgstr "Introduzca frase contraseña: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "error escribiendo anillo `%s': %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: "
  msgid "WARNING: %s\n"
  msgstr "ATENCION: "
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "tarjeta OpenPGP no disponible: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "tarjeta OpenPGP num. %s detectada\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "imposible hacer esto en modo de proceso por lotes\n"
  
 +#: g10/card-util.c:107
  msgid "This command is only available for version 2 cards\n"
- msgstr "Esta orden solo est� disponible en tarjetas versi�n 2\n"
+ msgstr "Esta orden solo está disponible en tarjetas versión 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
- msgstr "No hay C�digo de Reinicio o ya no est� disponible\n"
+ msgstr "No hay Código de Reinicio o ya no está disponible\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
- msgstr "Su elecci�n: "
+ msgstr "Su elección: "
  
 +#: g10/card-util.c:279 g10/card-util.c:330
  msgid "[not set]"
  msgstr "[no establecido]"
  
@@@ -1730,122 -1371,92 +1739,122 @@@ msgstr "no forzado
  msgid "forced"
  msgstr "forzado"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
- msgstr "Error: s�lo se permite ASCII sin formato actualmente.\n"
+ msgstr "Error: sólo se permite ASCII sin formato actualmente.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "Error: El caracter \"<\" no puede usarse.\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "Error: no se permiten dobles espacios.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "Apellido del titular de la tarjeta: "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "Nombre del titular de la tarjeta: "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
- msgstr "Error: nombre combinado demasiado largo (m�ximo %d caracteres).\n"
+ msgstr "Error: nombre combinado demasiado largo (máximo %d caracteres).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
- msgstr "URL de donde recuperar la clave p�blica: "
+ msgstr "URL de donde recuperar la clave pública: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
+ msgstr "Error: URL demasiado larga (el máximo son %d caracteres).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "error leyendo `%s': %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  #| msgid "error writing `%s': %s\n"
  msgid "error writing '%s': %s\n"
  msgstr "error escribiendo `%s': %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "Datos de login (nombre de la cuenta): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "Error: el login es demasiado largo (l�mite de %d caracteres).\n"
+ msgstr "Error: el login es demasiado largo (límite de %d caracteres).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "Datos privados: "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
- "Error: los datos privados son demasiado largos (l�mite de %d caracteres).\n"
+ "Error: los datos privados son demasiado largos (límite de %d caracteres).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "Preferencias de idioma: "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
- msgstr "Error: longitud de la cadena de preferencias inv�lida.\n"
+ msgstr "Error: longitud de la cadena de preferencias inválida.\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
- msgstr "Error: caracteres inv�lidos en cadena de preferencias.\n"
+ msgstr "Error: caracteres inválidos en cadena de preferencias.\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
- msgstr "Error: respuesta no v�lida.\n"
+ msgstr "Error: respuesta no válida.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "Huella dactilar CA:"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
- msgstr "Error: formato inv�lido de huella dactilar.\n"
+ msgstr "Error: formato inválido de huella dactilar.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
- msgstr "la operaci�n con la clave no es posible: %s\n"
+ msgstr "la operación con la clave no es posible: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "no es una tarjeta OpenPGP"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
- msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
+ msgstr "error obteniendo la información actual de la clave: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
- msgstr "�Reemplazar la clave existente? (s/N) "
+ msgstr "¿Reemplazar la clave existente? (s/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  #, fuzzy
  #| msgid ""
  #| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1856,62 -1467,50 +1865,62 @@@ msgid "
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
- "NOTA: No hay garant�a de que la tarjeta permita el uso del tama�o\n"
- "      requerido. Si la generaci�n de clave fracasa, por favor compruebe\n"
- "      la documentaci�n de su tarjeta para ver los tama�os posibles.\n"
+ "NOTA: No hay garantía de que la tarjeta permita el uso del tamaño\n"
+ "      requerido. Si la generación de clave fracasa, por favor compruebe\n"
+ "      la documentación de su tarjeta para ver los tamaños posibles.\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
- msgstr "�De qu� tama�o quiere la clave de Firmado? (%u) "
+ msgstr "¿De qué tamaño quiere la clave de Firmado? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
- msgstr "�De qu� tama�o quiere la clave de Cifrado? (%u) "
+ msgstr "¿De qué tamaño quiere la clave de Cifrado? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
- msgstr "�De qu� tama�o quiere la clave de Autenticaci�n? (%u) "
+ msgstr "¿De qué tamaño quiere la clave de Autenticación? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "redondeados a %u bits\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
- msgstr "los tama�os de claves %s deben estar en el rango %u-%u\n"
+ msgstr "los tamaños de claves %s deben estar en el rango %u-%u\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
- msgstr "Ahora la tarjeta se reconfigurar� para generar una clave de %u bits\n"
+ msgstr "Ahora la tarjeta se reconfigurará para generar una clave de %u bits\n"
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
- msgstr "error cambiando el tama�o de la clave %d a %u bits: %s\n"
+ msgstr "error cambiando el tamaño de la clave %d a %u bits: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
- "�Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)"
+ "¿Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)"
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  #| msgid "NOTE: keys are already stored on the card!\n"
  msgid "Note: keys are already stored on the card!\n"
- msgstr "NOTA: �claves ya almacenadas en la tarjeta!\n"
+ msgstr "NOTA: ¡claves ya almacenadas en la tarjeta!\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
- msgstr "�Reemplazar las claves existentes? (s/N) "
+ msgstr "¿Reemplazar las claves existentes? (s/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, fuzzy, c-format
  #| msgid ""
  #| "Please note that the factory settings of the PINs are\n"
@@@ -1922,173 -1521,129 +1931,173 @@@ msgid "
  "   PIN = '%s'     Admin PIN = '%s'\n"
  "You should change them using the command --change-pin\n"
  msgstr ""
- "Por favor observe que los valores de f�brica del PIN son\n"
+ "Por favor observe que los valores de fábrica del PIN son\n"
  "   PIN = `%s'     PIN Administrador = `%s'\n"
- "Deber�a cambiarlos usando la orden --change-pin\n"
+ "Debería cambiarlos usando la orden --change-pin\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "Por favor seleccione tipo de clave que generar:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "    (1) Clave de firmado\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) Clave de cifrado\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
- msgstr "   (3) Clave de autentificaci�n\n"
+ msgstr "   (3) Clave de autentificación\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
- msgstr "Elecci�n inv�lida.\n"
+ msgstr "Elección inválida.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "Por favor elija donde guardar la clave:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "KEYTOCARD failed: %s\n"
  msgstr "lectura fallida: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
  msgstr "Esta orden no se permite en modo %s.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  #| msgid "NOTE: keys are already stored on the card!\n"
  msgid "Note: This command destroys all keys stored on the card!\n"
- msgstr "NOTA: �claves ya almacenadas en la tarjeta!\n"
+ msgstr "NOTA: ¡claves ya almacenadas en la tarjeta!\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  #| msgid "Sign it? (y/N) "
  msgid "Continue? (y/N) "
- msgstr "�Firmarlo? (s/N) "
+ msgstr "¿Firmarlo? (s/N) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
- msgstr "sale de este men�"
+ msgstr "sale de este menú"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
- msgstr "ver �rdenes de administrador"
+ msgstr "ver órdenes de administrador"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "muestra esta ayuda"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "listar todos los datos disponibles"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "cambiar el nombre del titular de la tarjeta"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "cambiar URL de donde obtener la clave"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "recuperar la clave especificada en la URL de la tarjeta"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "cambiar nombre de usuario"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "cambiar preferencias de idioma"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "cambiar sexo del titular de la tarjeta"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "cambiar huella dactilar de una CA"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
- msgstr "cambiar estado de la opci�n forzar firma del PIN"
+ msgstr "cambiar estado de la opción forzar firma del PIN"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "generar nuevas claves"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
- msgstr "men� para cambiar o desbloquear el PIN"
+ msgstr "menú para cambiar o desbloquear el PIN"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "verificar PIN y listar todos los datos"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
- msgstr "desbloquear PIN usando C�digo de Reinicio"
+ msgstr "desbloquear PIN usando Código de Reinicio"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr "gpg/tarjeta> "
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
- msgstr "�rdenes s�lo de administrador\n"
+ msgstr "Órdenes sólo de administrador\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
- msgstr "Se permiten �rdenes de administrador\n"
+ msgstr "Se permiten órdenes de administrador\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
- msgstr "No se permiten �rdenes de administrador\n"
+ msgstr "No se permiten órdenes de administrador\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
- msgstr "Orden inv�lida (pruebe \"help\")\n"
+ msgstr "Orden inválida (pruebe \"help\")\n"
  
 +#: g10/decrypt.c:191 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
  msgstr "--output no funciona con esta orden\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "no se puede abrir `%s'\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "clave \"%s\" no encontrada: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "error leyendo bloque de claves: %s\n"
@@@ -2107,15 -1659,12 +2116,15 @@@ msgstr "(excepto si especifica la clav
  msgid "can't do this in batch mode without \"--yes\"\n"
  msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
  
 +#: g10/delkey.c:148
  msgid "Delete this key from the keyring? (y/N) "
- msgstr "�Eliminar esta clave del anillo? (s/N) "
+ msgstr "¿Eliminar esta clave del anillo? (s/N) "
  
 +#: g10/delkey.c:158
  msgid "This is a secret key! - really delete? (y/N) "
- msgstr "�Es una clave secreta! �Eliminar realmente? (s/N) "
+ msgstr "¡Es una clave secreta! ¿Eliminar realmente? (s/N) "
  
 +#: g10/delkey.c:201
  #, fuzzy, c-format
  #| msgid "deleting certificate \"%s\" failed: %s\n"
  msgid "deleting secret %s failed: %s\n"
@@@ -2129,36 -1676,29 +2138,36 @@@ msgstr "clave
  #, fuzzy
  #| msgid "Pubkey: "
  msgid "subkey"
- msgstr "Clave p�blica: "
+ msgstr "Clave pública: "
  
 +#: g10/delkey.c:226
  #, c-format
  msgid "deleting keyblock failed: %s\n"
  msgstr "borrado de bloque de anillo de claves fallido: %s\n"
  
 +#: g10/delkey.c:239
  msgid "ownertrust information cleared\n"
- msgstr "borrada informaci�n de propietarios\n"
+ msgstr "borrada información de propietarios\n"
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
- msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
+ msgstr "¡hay una clave secreta para esta clave pública! \"%s\"!\n"
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
- msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
+ msgstr "use antes la opción \"--delete-secret-key\" para borrarla.\n"
  
 +#: g10/encrypt.c:232 g10/sign.c:1292
  #, c-format
  msgid "error creating passphrase: %s\n"
- msgstr "error creando frase contrase�a: %s\n"
+ msgstr "error creando frase contraseña: %s\n"
  
 +#: g10/encrypt.c:239
  msgid "can't use a symmetric ESK packet due to the S2K mode\n"
- msgstr "no puede usar un paquete sim�trico ESK debido al modo S2K\n"
+ msgstr "no puede usar un paquete simétrico ESK debido al modo S2K\n"
  
 +#: g10/encrypt.c:253
  #, c-format
  msgid "using cipher %s\n"
  msgstr "usando cifrado %s\n"
@@@ -2167,15 -1706,13 +2176,15 @@@
  #, fuzzy, c-format
  #| msgid "`%s' already compressed\n"
  msgid "'%s' already compressed\n"
- msgstr "`%s' ya est� comprimido\n"
+ msgstr "`%s' ya está comprimido\n"
  
 +#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
- msgstr "ATENCI�N `%s' es un fichero vac�o\n"
+ msgstr "ATENCIÓN `%s' es un fichero vacío\n"
  
 +#: g10/encrypt.c:557
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "reading from '%s'\n"
@@@ -2186,31 -1722,27 +2195,31 @@@ msgstr "leyendo desde `%s'\n
  msgid ""
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
- "AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
+ "AVISO: forzar el cifrado simétrico %s (%d) viola las preferencias\n"
  "del destinatario\n"
  
 +#: g10/encrypt.c:707 g10/sign.c:984
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
  "preferences\n"
  msgstr ""
- "AVISO: forzar el algoritmo de compresi�n %s (%d) va en contra\n"
+ "AVISO: forzar el algoritmo de compresión %s (%d) va en contra\n"
  "de las preferencias del receptor\n"
  
 +#: g10/encrypt.c:817
  #, c-format
  msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
- "forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
+ "forzar el cifrado simétrico %s (%d) viola las preferencias\n"
  "del destinatario\n"
  
 +#: g10/encrypt.c:903
  #, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s cifrado para: \"%s\"\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "no puede usar %s en modo %s\n"
@@@ -2229,9 -1758,8 +2238,9 @@@ msgstr "cifrado con algoritmo desconoci
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
- "ATENCI�N: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
+ "ATENCIÓN: mensaje cifrado con una clave débil en el cifrado simétrico.\n"
  
 +#: g10/decrypt-data.c:176
  msgid "problem handling encrypted packet\n"
  msgstr "problema trabajando con un paquete cifrado\n"
  
@@@ -2262,18 -1785,15 +2271,18 @@@ msgstr "no se puede ejecutar el program
  #, fuzzy, c-format
  #| msgid "unable to execute shell `%s': %s\n"
  msgid "unable to execute shell '%s': %s\n"
- msgstr "no se puede ejecutar el int�rprete de �rdenes `%s': %s\n"
+ msgstr "no se puede ejecutar el intérprete de órdenes `%s': %s\n"
  
 +#: g10/exec.c:521
  #, c-format
  msgid "system error while calling external program: %s\n"
  msgstr "error del sistema llamando al programa externo: %s\n"
  
 +#: g10/exec.c:532 g10/exec.c:599
  msgid "unnatural exit of external program\n"
- msgstr "el programa externo finaliz� anormalmente\n"
+ msgstr "el programa externo finalizó anormalmente\n"
  
 +#: g10/exec.c:547
  msgid "unable to execute external program\n"
  msgstr "no se puede ejecutar el programa externo\n"
  
@@@ -2294,59 -1811,45 +2303,59 @@@ msgstr "AVISO: no se puede borrar fiche
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "AVISO: no se puede borrar el fichero temporal `%s': %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
- msgstr "exportar firmas marcadas como s�lo locales"
+ msgstr "exportar firmas marcadas como sólo locales"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
- msgstr "exportar el atributo ID de usuario (generalmente fotogr�fico)"
+ msgstr "exportar el atributo ID de usuario (generalmente fotográfico)"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
- msgstr "exportar claves de revocaci�n marcadas como \"confidenciales\""
+ msgstr "exportar claves de revocación marcadas como \"confidenciales\""
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "borrar partes inutilizables de la clave al exportar"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "borrar tanto como sea posible de la clave al exportar"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: omitido: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "escribiendo en `%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "clave %s: material de la clave en la tarjeta - omitida\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "no se permite exportar claves secretas\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
- msgstr "ATENCI�N: no se ha exportado nada\n"
+ msgstr "ATENCIÓN: no se ha exportado nada\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2356,14 -1858,11 +2365,14 @@@ msgstr "error creando `%s': %s\n
  msgid "[User ID not found]"
  msgstr "[ID de usuario no encontrado]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "(check argument of option '%s')\n"
- msgstr "falta par�metro para la opci�n \"%.50s\"\n"
+ msgstr "falta parámetro para la opción \"%.50s\"\n"
  
 +#: g10/getkey.c:516
  #, c-format
  msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
  msgstr ""
@@@ -2380,270 -1877,210 +2389,270 @@@ msgstr "error cerrando %s: %s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "error escribiendo anillo `%s': %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  #| msgid "automatically retrieved `%s' via %s\n"
  msgid "automatically retrieved '%s' via %s\n"
- msgstr "recuperado autom�ticamente `%s' v�a %s\n"
+ msgstr "recuperado automáticamente `%s' vía %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  #| msgid "error retrieving `%s' via %s: %s\n"
  msgid "error retrieving '%s' via %s: %s\n"
- msgstr "error recuperando `%s' v�a %s: %s\n"
+ msgstr "error recuperando `%s' vía %s: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "No hay huella dactilar"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "clave secreta \"%s\" no encontrada: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
- msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
+ msgstr "Clave %s inválida hecha válida mediante --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "usando subclave %s en vez de clave primaria %s\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "crea una firma"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
  msgstr "crea una firma en texto claro"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "crea una firma separada"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "cifra datos"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
- msgstr "cifra s�lo con un cifrado sim�trico"
+ msgstr "cifra sólo con un cifrado simétrico"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "descifra datos (predefinido)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verifica una firma"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "lista claves"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "lista claves y firmas"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "lista y comprueba firmas de las claves"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "lista claves y huellas dactilares"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "lista claves secretas"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "genera un nuevo par de claves"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "genera un nuevo par de claves"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "genera un nuevo par de claves"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "genera un nuevo par de claves"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
- msgstr "genera un certificado de revocaci�n"
+ msgstr "genera un certificado de revocación"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
- msgstr "elimina claves del anillo p�blico"
+ msgstr "elimina claves del anillo público"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "elimina claves del anillo privado"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "firma la clave"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "firma la clave localmente"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "firma la clave"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "firma la clave localmente"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "firma o modifica una clave"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
- msgstr "cambia una frase contrase�a"
+ msgstr "cambia una frase contraseña"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "exporta claves"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "exporta claves a un servidor de claves"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "importa claves desde un servidor de claves"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "busca claves en un servidor de claves"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "actualiza todas las claves desde un servidor de claves"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "importa/fusiona claves"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "escribir estado de la tarjeta"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "cambiar datos en la tarjeta"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "cambiar el PIN de la tarjeta"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "actualiza la base de datos de confianza"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
- msgstr "imprime res�menes de mensaje"
+ msgstr "imprime resúmenes de mensaje"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "ejecutar en modo servidor"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "crea una salida ascii con armadura"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|ID-USUARIO|cifra para ID-USUARIO"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|ID-USUARIO|usa este identificador para firmar o descifrar"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  msgid "|N|set compress level to N (0 disables)"
- msgstr "|N|nivel de compresi�n N (0 desactiva)"
+ msgstr "|N|nivel de compresión N (0 desactiva)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
- msgstr "usa modo de texto can�nico"
+ msgstr "usa modo de texto canónico"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
  msgstr "|FICHERO|volcar salida en FICHERO"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
- msgstr "no hace ning�n cambio"
+ msgstr "no hace ningún cambio"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "preguntar antes de sobreescribir"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr "usar estilo OpenPGP estricto"
  
- # ordenes -> �rdenes
- # 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:649 sm/gpgsm.c:353
+ # ordenes -> órdenes
+ # 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:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
  msgstr ""
  "@\n"
- "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
+ "(Véase en la página del manual la lista completo de órdenes y opciones)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2663,13 -2100,11 +2672,13 @@@ msgstr "
  " --list-keys [nombres]      muestra las claves\n"
  " --fingerprint [nombres]    muestra las huellas dactilares\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2682,9 -2117,8 +2691,9 @@@ msgid "
  msgstr ""
  "Sintaxis: gpg [opciones] [ficheros]\n"
  "firma, comprueba, cifra o descifra\n"
- "la operaci�n por defecto depende de los datos de entrada\n"
+ "la operación por defecto depende de los datos de entrada\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2692,81 -2126,66 +2701,81 @@@ msgstr "
  "\n"
  "Algoritmos disponibles:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
- msgstr "Clave p�blica: "
+ msgstr "Clave pública: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Cifrado: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Resumen: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
- msgstr "Compresi�n: "
+ msgstr "Compresión: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] %s\n"
  msgstr "uso: gpgsm [opciones] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
- msgstr "�rdenes incompatibles\n"
+ msgstr "órdenes incompatibles\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  #| msgid "no = sign found in group definition `%s'\n"
  msgid "no = sign found in group definition '%s'\n"
- msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
+ msgstr "no se encontró el signo = en la definición de grupo `%s'\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
- msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
+ msgstr "AVISO: propiedad insegura del fichero de configuración `%s'\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on extension `%s'\n"
  msgid "WARNING: unsafe ownership on extension '%s'\n"
- msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
+ msgstr "AVISO: propiedad insegura de la extensión `%s'\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
- msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
+ msgstr "AVISO: permisos inseguros del fichero de configuración `%s'\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on extension `%s'\n"
  msgid "WARNING: unsafe permissions on extension '%s'\n"
- msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
+ msgstr "AVISO: permisos inseguros de la extensión `%s'\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2774,22 -2193,19 +2783,22 @@@ msgid "
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr ""
  "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
- "configuraci�n `%s'\n"
+ "configuración `%s'\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr ""
- "AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
+ "AVISO: propiedad insegura del directorio contenedor de la extensión `%s'\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2798,541 -2214,429 +2807,547 @@@ msgid "
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
  msgstr ""
  "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
- "configuraci�n `%s'\n"
+ "configuración `%s'\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr ""
- "AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
+ "AVISO: permisos inseguros del directorio contenedor de la extensión `%s'\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
- msgstr "art�culo de configuraci�n desconocido `%s'\n"
+ msgstr "artículo de configuración desconocido `%s'\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "mostrar foto IDs al listar claves"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  #| msgid "show user ID validity during key listings"
  msgid "show key usage information during key listings"
  msgstr "mostrar validez de la ID de usuario al listar claves"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
- msgstr "mostrar URLS de pol�tica al listar firmas"
+ msgstr "mostrar URLS de política al listar firmas"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "mostrar todas las notaciones al listar firmas"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
- msgstr "mostrar notaciones est�ndar IETF al listar firmas"
+ msgstr "mostrar notaciones estándar IETF al listar firmas"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr "mostrar notaciones personalizadas al listar firmas"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "mostrar URL del servidor de claves preferido al listar firmas"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr "mostrar validez de la ID de usuario al listar claves"
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr "mostrar subclaves revocadas y expiradas al listar claves"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "mostrar nombre de los anillos de claves al listar claves"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "mostrar fechas de caducidad al listar firmas"
  
- #: g10/gpg.c:2011
- #, fuzzy
- #| msgid "Available keys:\n"
- msgid "available TOFU policies:\n"
- msgstr "Claves disponibles:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "valid values for option '%s':\n"
+ msgstr "falta parámetro para la opción \"%.50s\"\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
- msgstr "opci�n desconocida `%s'\n"
+ msgstr "opción desconocida `%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "invalid value for option '%s'\n"
+ msgstr "falta parámetro para la opción \"%.50s\"\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
- msgstr "NOTA: �%s no es para uso normal!\n"
+ msgstr "NOTA: ¡%s no es para uso normal!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid signature expiration\n"
  msgid "'%s' is not a valid signature expiration\n"
- msgstr "`%s' no es una fecha de caducidad v�lida\n"
+ msgstr "`%s' no es una fecha de caducidad válida\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
- msgstr "l�nea %d: no es una direcci�n de email v�lida\n"
+ msgstr "línea %d: no es una dirección de email válida\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "invalid pinentry mode '%s'\n"
- msgstr "c�digo de pa�s inv�lido en `%s', l�nea %d\n"
+ msgstr "código de país inválido en `%s', línea %d\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid character set\n"
  msgid "'%s' is not a valid character set\n"
- msgstr "`%s' no es un juego de caracteres v�lido\n"
+ msgstr "`%s' no es un juego de caracteres válido\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "no se puede interpretar la URL del servidor de claves\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
- msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
+ msgstr "%s:%d: opciones del servidor de claves inválidas\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
- msgstr "opciones del servidor de claves inv�lidas\n"
+ msgstr "opciones del servidor de claves inválidas\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
- msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
+ msgstr "%s:%d: opciones de importación inválidas\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
- msgstr "opciones de importaci�n inv�lidas\n"
+ msgstr "opciones de importación inválidas\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
- msgstr "lista de opciones inv�lida\n"
+ msgstr "lista de opciones inválida\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
- msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
+ msgstr "%s:%d: opciones de exportación inválidas\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
- msgstr "opciones de exportaci�n inv�lidas\n"
+ msgstr "opciones de exportación inválidas\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
- msgstr "%s:%d: lista de opciones inv�lida\n"
+ msgstr "%s:%d: lista de opciones inválida\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
- msgstr "lista de opciones inv�lida\n"
+ msgstr "lista de opciones inválida\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "mostrar foto IDs al verificar firmas"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
- msgstr "mostrar URLs de pol�tica al verificar firmas"
+ msgstr "mostrar URLs de política al verificar firmas"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "mostrar todas las notaciones al verificar firmas"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
- msgstr "mostrar notaciones est�ndar IETF al verificar firmas"
+ msgstr "mostrar notaciones estándar IETF al verificar firmas"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr "mostrar notaciones personalizadas al verificar firmas"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
  msgstr "mostrar validez del ID de usuario al verificar firmas"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  msgid "show only the primary user ID in signature verification"
  msgstr "mostrar solo ID primario de usuario al verificar firmas"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "validar firmas con datos PKA"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
- msgstr "aumentar confianza en las firmas con datos v�lidos PKA"
+ msgstr "aumentar confianza en las firmas con datos válidos PKA"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
- msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
+ msgstr "%s:%d: opciones de verificación inválidas\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
- msgstr "opciones de verificaci�n inv�lidas\n"
+ msgstr "opciones de verificación inválidas\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "imposible establecer camino de ejecutables %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
- msgstr "%s:%d: lista de auto-localizaci�n de claves inv�lida\n"
+ msgstr "%s:%d: lista de auto-localización de claves inválida\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
- msgstr "lista de auto-localizaci�n de claves inv�lida\n"
+ msgstr "lista de auto-localización de claves inválida\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
- msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
+ msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVISO: %s sustituye a %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
- msgstr "�%s no permitido con %s!\n"
+ msgstr "¡%s no permitido con %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
- msgstr "�%s no tiene sentido con %s!\n"
+ msgstr "¡%s no tiene sentido con %s!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
- msgstr "AVISO: ejecut�ndose con hora del sistema falsificada"
+ msgstr "AVISO: ejecutándose con hora del sistema falsificada"
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
- msgstr "no se ejecutar� en memoria insegura por %s\n"
+ msgstr "no se ejecutará en memoria insegura por %s\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
- msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
+ msgstr "el algoritmo de cifrado seleccionado es inválido\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
- msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
+ msgstr "el algoritmo de resumen seleccionado no inválido\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
- msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
+ msgstr "el algoritmo de compresión seleccionado es inválido\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
- msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
+ msgstr "el algoritmo de certificación por resumen elegido es inválido\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed debe ser mayor que 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed debe ser mayor que 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  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:3588
++#: g10/gpg.c:3686
  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"
+ msgstr "default-cert-level inválido; debe ser 0, 1, 2, ó 3\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  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"
+ msgstr "min-cert-level inválido; debe ser 0, 1, 2, ó 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  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:3597
++#: g10/gpg.c:3695
  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:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
- msgstr "preferencias por defecto inv�lidas\n"
+ msgstr "preferencias por defecto inválidas\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
- msgstr "preferencias personales de cifrado inv�lidas\n"
+ msgstr "preferencias personales de cifrado inválidas\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
- msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
+ msgstr "preferencias personales de algoritmo de resumen inválidas\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
- msgstr "preferencias personales de compresi�n inv�lidas\n"
+ msgstr "preferencias personales de compresión inválidas\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
- msgstr "%s a�n no funciona con %s\n"
+ msgstr "%s aún no funciona con %s\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  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:3704
++#: g10/gpg.c:3802
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  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:3709
++#: g10/gpg.c:3807
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  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"
+ msgstr "no puede usar la compresión `%s' en modo %s\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
- msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
+ msgstr "inicialización de la base de datos de confianza fallida: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
- msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
+ msgstr "AVISO: se indicaron receptores (-r) sin clave pública de cifrado\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [nombre_fichero]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [nombre_fichero]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  #| msgid "symmetric encryption of `%s' failed: %s\n"
  msgid "symmetric encryption of '%s' failed: %s\n"
- msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
+ msgstr "el cifrado simétrico de `%s' falló: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [nombre_fichero]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [nombre_fichero]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  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:3918
++#: g10/gpg.c:4021
  #, 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:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [nombre_fichero]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [nombre_fichero]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [nombre_fichero]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  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:3978
++#: g10/gpg.c:4081
  #, 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:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [nombre_fichero]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [nombre_fichero]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [nombre_fichero]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key id-usuario"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key id-usuario"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
- msgstr "--edit-key id-usuario [�rdenes]"
+ msgstr "--edit-key id-usuario [órdenes]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
  msgstr "--passwd <id-usuario>"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
- msgstr "env�o al servidor de claves fallido: %s\n"
+ msgstr "envío al servidor de claves fallido: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
- msgstr "recepci�n del servidor de claves fallida: %s\n"
+ msgstr "recepción del servidor de claves fallida: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
- msgstr "exportaci�n de clave fallida: %s\n"
+ msgstr "exportación de clave fallida: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
- msgstr "exportaci�n de clave fallida: %s\n"
+ msgstr "exportación de clave fallida: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
- msgstr "b�squeda del servidor de claves fallida: %s\n"
+ msgstr "búsqueda del servidor de claves fallida: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
- msgstr "renovaci�n al servidor de claves fallida: %s\n"
+ msgstr "renovación al servidor de claves fallida: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
- msgstr "eliminaci�n de armadura fallida: %s\n"
+ msgstr "eliminación de armadura fallida: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
- msgstr "creaci�n de armadura fallida: %s\n"
+ msgstr "creación de armadura fallida: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
- msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
+ msgstr "algoritmo de distribución inválido `%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error parsing key specification '%s': %s\n"
  msgstr "error almacenando certificado: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[nombre_fichero]"
  
  # Falta un espacio.
- # En espa�ol no se deja espacio antes de los puntos suspensivos
+ # 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:4735
+ # Tomo nota :-). Este comentario déjalo siempre.
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Adelante, teclee su mensaje...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
- msgstr "URL de pol�tica de certificado inv�lida\n"
+ msgstr "URL de política de certificado inválida\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
- msgstr "URL de pol�tica inv�lida\n"
+ msgstr "URL de política inválida\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
- msgstr "la URL del servidor de claves preferido no es v�lida\n"
+ msgstr "la URL del servidor de claves preferido no es válida\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FICHERO|tomar las claves del anillo FILE"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
- msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
+ msgstr "hacer que los conflictos de fecha-hora sean sólo un aviso"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
- msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
+ msgstr "|DF|escribe información de estado en este descriptor de fichero"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3350,138 -2652,110 +3365,138 @@@ msgstr "Ayuda no disponible
  msgid "No help available for '%s'"
  msgstr "No hay ayuda disponible para `%s'"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
- msgstr "importar firmas marcadas como s�lo locales"
+ msgstr "importar firmas marcadas como sólo locales"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
- msgstr "reparar da�o del servidor de claves p�blicas al importar"
+ msgstr "reparar daño del servidor de claves públicas al importar"
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
- msgstr "no actualiza la base de datos de confianza despu�s de importar"
+ msgstr "no actualiza la base de datos de confianza después de importar"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
- msgstr "no actualiza la base de datos de confianza despu�s de importar"
+ msgstr "no actualiza la base de datos de confianza después de importar"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "muestra huella dactilar de la clave"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
- msgstr "s�lo aceptar actualizaciones de claves ya existentes"
+ msgstr "sólo aceptar actualizaciones de claves ya existentes"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
- msgstr "borrar partes in�tiles de la clave despu�s de importar"
+ msgstr "borrar partes inútiles de la clave después de importar"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "borrar tanto como sea posible de la clave tras importar"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "omitiendo bloque de tipo %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu claves procesadas hasta ahora\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Cantidad total procesada: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "      omitidas nuevas claves: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "      omitidas nuevas claves: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          sin identificador: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "              importadas: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "             sin cambios: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "     nuevos identificativos: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "           nuevas subclaves: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "              nuevas firmas: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "        nuevas revocaciones de claves: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
- msgstr "     claves secretas le�das: %lu\n"
+ msgstr "     claves secretas leídas: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr " claves secretas importadas: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "claves secretas sin cambios: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "          no importadas: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "    firmas limpiadas: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "      IDs de usuario limpiados: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3490,198 -2764,160 +3505,198 @@@ msgstr "
  "AVISO: la clave %s contiene preferencias para algoritmos\n"
  "no disponibles en estos IDs de usuario:\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": algoritmo de cifrado preferido %s\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": algoritmo de resumen preferido %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
- msgstr "         \"%s\": algoritmo de compresi�n preferido %s\n"
+ msgstr "         \"%s\": algoritmo de compresión preferido %s\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "re-dustribuya esta clave para evitar potenciales problemas de\n"
  "diferencias en los algoritmos.\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "clave %s: sin identificador de usuario\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
  msgstr "omitido \"%s\": %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "clave %s: reparada la subclave PKS corrompida\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
- msgstr "clave %s: sin identificadores de usuario v�lidos\n"
+ msgstr "clave %s: sin identificadores de usuario válidos\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "esto puede ser debido a la ausencia de autofirma\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
- msgstr "clave %s: clave p�blica no encontrada: %s\n"
+ msgstr "clave %s: clave pública no encontrada: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "clave %s: clave nueva - omitida\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "anillo de claves no escribible encontrado: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "error escribiendo anillo `%s': %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
- msgstr "clave %s: clave p�blica \"%s\" importada\n"
+ msgstr "clave %s: clave pública \"%s\" importada\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "clave %s: no coincide con nuestra copia\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "clave %s: \"%s\" 1 firma nueva\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "clave %s: \"%s\" %d firmas nuevas\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "clave %s: \"%s\" 1 subclave nueva\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "clave %s: \"%s\" %d identificador de usuario limpiado\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "clave %s: \"%s\" %d identificadores de usuario limpiados\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "clave %s: \"%s\" sin cambios\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "clave %s: clave secreta importada\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "omitido: clave secreta ya presente\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "key %s: error sending to agent: %s\n"
  msgstr "error enviando orden %s: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
  msgstr "clave secreta \"%s\" no encontrada: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "no se permite importar claves secretas\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
- msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
+ msgstr "clave %s: clave secreta con cifrado inválido %d - omitida\n"
  
  #. TRANSLATORS: For smartcard, each private key on
  #. host has a reference (stub) to a smartcard and
@@@ -3693,220 -2929,184 +3708,227 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
- "clave %s: falta la clave p�blica - imposible emplear el\n"
- "certificado de revocaci�n\n"
+ "clave %s: falta la clave pública - imposible emplear el\n"
+ "certificado de revocación\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
- msgstr "clave %s: certificado de revocaci�n inv�lido: %s - rechazado\n"
+ msgstr "clave %s: certificado de revocación inválido: %s - rechazado\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
- msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
+ msgstr "clave %s: \"%s\" certificado de revocación importado\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "clave %s: no hay identificador de usuario para la firma\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
- msgstr "clave %s: algoritmo de clave p�blica no disponible para ID \"%s\"\n"
+ msgstr "clave %s: algoritmo de clave pública no disponible para ID \"%s\"\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
- msgstr "clave %s: autofirma inv�lida para el id \"%s\"\n"
+ msgstr "clave %s: autofirma inválida para el id \"%s\"\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
- msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
+ msgstr "clave %s: algoritmo de clave pública no disponible\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
- msgstr "clave %s: firma directa de clave inv�lida\n"
+ msgstr "clave %s: firma directa de clave inválida\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "clave %s: no hay subclave que unir a la clave\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
- msgstr "clave %s: uni�n de subclave inv�lida\n"
+ msgstr "clave %s: unión de subclave inválida\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
- msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
+ msgstr "clave %s: borrado enlace de subclaves múltiples\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
- msgstr "clave %s: no hay subclave para la revocaci�n de clave\n"
+ msgstr "clave %s: no hay subclave para la revocación de clave\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
- msgstr "clave %s: revocaci�n de subclave inv�lida\n"
+ msgstr "clave %s: revocación de subclave inválida\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
- msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
+ msgstr "clave %s: borrada revocación de subclave múltiple\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "clave %s: omitido ID de usuario \"%s\"\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "clave %s: subclave omitida\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
- msgstr "clave %s: certificado de revocaci�n en lugar equivocado - omitido\n"
+ msgstr "clave %s: certificado de revocación en lugar equivocado - omitido\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
- msgstr "clave %s: certificado de revocaci�n no valido: %s - omitido\n"
+ msgstr "clave %s: certificado de revocación no valido: %s - omitido\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "clave %s: detectado usuario duplicado - fusionada\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
- "AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
+ "AVISO: la clave %s puede estar revocada: recuperando clave de revocación %s\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
- "AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
+ "AVISO: la clave %s puede estar revocada: falta clave de revocación %s.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
- msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
+ msgstr "clave %s: \"%s\" certificado de revocación añadido\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
- msgstr "clave %s: firma directa de clave a�adida\n"
+ msgstr "clave %s: firma directa de clave añadida\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  #| msgid "error creating keybox `%s': %s\n"
  msgid "error creating keybox '%s': %s\n"
  msgstr "error creando caja de claves `%s': %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
  msgstr "error escribiendo anillo `%s': %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  #| msgid "keybox `%s' created\n"
  msgid "keybox '%s' created\n"
  msgstr "caja de claves `%s' creada\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
  msgstr "anillo `%s' creado\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  #| msgid "keyblock resource `%s': %s\n"
  msgid "keyblock resource '%s': %s\n"
  msgstr "recurso de bloque de claves: `%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening key DB: %s\n"
  msgstr "error abriendo `%s': %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
- msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
+ msgstr "fallo reconstruyendo caché del anillo de claves: %s\n"
  
 +#: g10/keyedit.c:264
  msgid "[revocation]"
- msgstr "[revocaci�n]"
+ msgstr "[revocación]"
  
 +#: g10/keyedit.c:264
  msgid "[self-signature]"
  msgstr "[autofirma]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ #| msgid "error allocating enough memory: %s\n"
+ msgid "error allocating memory: %s\n"
+ msgstr "error reservando memoria: %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
+ msgstr "clave %s: algoritmo de clave pública no disponible\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  #| msgid "revoke signatures"
  msgid " (reordered signatures follow)"
  msgstr "revoca firmas"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
  msgstr "omitido \"%s\": %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3914,7 -3114,6 +3936,7 @@@ msgid_plural "%d duplicate signatures r
  msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
  msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3922,7 -3121,6 +3944,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 firma no comprobada por falta de clave\n"
  msgstr[1] "1 firma no comprobada por falta de clave\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3930,7 -3128,6 +3952,7 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d firmas incorrectas\n"
  msgstr[1] "%d firmas incorrectas\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3938,14 -3135,12 +3960,14 @@@ msgid_plural "%d signatures reordered\n
  msgstr[0] "Firma correcta de"
  msgstr[1] "Firma correcta de"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3957,70 -3152,55 +3979,70 @@@ msgstr "
  "pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
  "\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
- msgstr " %d = Conf�o un poco\n"
+ msgstr " %d = Confío un poco\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
- msgstr " %d = Conf�o totalmente\n"
+ msgstr " %d = Confío totalmente\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  "Por favor, introduzca el nivel de esta firma de confianza.\n"
- "Un nivel mayor que 1 permite que la clave que est� firmando pueda\n"
+ "Un nivel mayor que 1 permite que la clave que está firmando pueda\n"
  "hacer firmas de confianza en su nombre.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "ID de usuario \"%s\" revocado."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
- msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
+ msgstr "¿Seguro que todavía quiere firmarlo? (s/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  Imposible firmar.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "ID de usuario \"%s\" expirado."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "ID de usuario \"%s\" no tiene autofirma."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "ID de usuario \"%s\" puede firmarse."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
- msgstr "�Firmarlo? (s/N) "
+ msgstr "¿Firmarlo? (s/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -4029,11 -3209,9 +4051,11 @@@ msgstr "
  "La autofirma en \"%s\"\n"
  "es una firma de tipo PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4042,11 -3220,9 +4064,11 @@@ msgstr "
  "Su firma actual en \"%s\"\n"
  "ha expirado.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
- msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
+ msgstr "¿Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4055,43 -3231,34 +4077,43 @@@ msgstr "
  "Su firma actual en \"%s\"\n"
  "es una firma local.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" ya estaba firmada por la clave %s\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
- msgstr "�Quiere firmarlo a�n as�? (s/N) "
+ msgstr "¿Quiere firmarlo aún así? (s/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nada que firmar con la clave %s\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
- msgstr "�Esta clave ha caducado!"
+ msgstr "¡Esta clave ha caducado!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
- msgstr "Esta clave expirar� el %s.\n"
+ msgstr "Esta clave expirará el %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
- msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
+ msgstr "¿Quiere que su firma caduque al mismo tiempo? (S/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4101,258 -3268,198 +4123,258 @@@ msgstr "
  "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
  "contestar, introduzca \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) No contesto.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) No lo he comprobado en absoluto.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
- msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
+ msgstr "   (2) He hecho una comprobación informal.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
- msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
+ msgstr "¿Su elección? (escriba '?' si desea más información): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr ""
- "�Est� realmente seguro de querer firmar esta clave\n"
+ "¿Está realmente seguro de querer firmar esta clave\n"
  "con su clave: \"%s\" (%s)?\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
- msgstr "Esto ser� una autofirma.\n"
+ msgstr "Esto será una autofirma.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
- msgstr "ATENCION: la firma no se marcar� como no exportable.\n"
+ msgstr "ATENCION: la firma no se marcará como no exportable.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
- msgstr "AVISO: la firma no se marcar� como no revocable.\n"
+ msgstr "AVISO: la firma no se marcará como no revocable.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
- msgstr "La firma se marcar� como no exportable.\n"
+ msgstr "La firma se marcará como no exportable.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
- msgstr "La firma se marcar� como no revocable.\n"
+ msgstr "La firma se marcará como no revocable.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "No he comprobado esta clave en absoluto.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "He comprobado esta clave informalmente.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "He comprobado esta clave meticulosamente.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
- msgstr "�Firmar de verdad? (s/N) "
+ msgstr "¿Firmar de verdad? (s/N) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "firma fallida: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
- "La clave tiene s�lo un apuntador u objetos de clave en la propia tarjeta\n"
- "- no hay frase contrase�a que cambiar.\n"
+ "La clave tiene sólo un apuntador u objetos de clave en la propia tarjeta\n"
+ "- no hay frase contraseña que cambiar.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
- msgstr "error creando frase contrase�a: %s\n"
+ msgstr "error creando frase contraseña: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "graba y sale"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "muestra huella dactilar de la clave"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  #| msgid "Enter the keygrip: "
  msgid "show the keygrip"
  msgstr "Introduzca keygrip: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "lista clave e identificadores de usuario"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "selecciona identificador de usuario N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "selecciona subclave N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "comprueba firmas"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
- msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
+ msgstr "firmar IDs seleccionadas [* ver debajo órdenes relacionadas]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "firma localmente los IDs de usuarios elegidos"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "firmar IDs seleccionados con firma de confianza"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "firmar IDs seleccionados con firma no revocable"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
- msgstr "a�adir un identificador de usuario"
+ msgstr "añadir un identificador de usuario"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
- msgstr "a�adir un ID fotogr�fico"
+ msgstr "añadir un ID fotográfico"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "borrar identificadores de usuario seleccionados"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
- msgstr "a�adir una subclave"
+ msgstr "añadir una subclave"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
- msgstr "a�adir clave a tarjeta"
+ msgstr "añadir clave a tarjeta"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "mover una clave a la tarjeta"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "mover una clave de respaldo a la tarjeta"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "borrar clave secundaria"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
- msgstr "a�adir una clave de revocaci�n"
+ msgstr "añadir una clave de revocación"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "borrar firmas de los ID seleccionados"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "marcar ID de usuario seleccionado como primario"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "mostrar preferencias (experto)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "mostrar preferencias (prolijo)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "establecer preferencias para todos los ID seleccionados"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "establecer URL del servidor de claves preferido por los IDs elegidos"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
- msgstr "establecer notaci�n para los IDs de usuario seleccionados"
+ msgstr "establecer notación para los IDs de usuario seleccionados"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
- msgstr "cambia la frase contrase�a"
+ msgstr "cambia la frase contraseña"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "cambia valores de confianza"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "revocar firmas de los identificadores seleccionados"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "revocar los identificadores seleccionados"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "revoca clave o subclaves seleccionadas"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "habilita clave"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "deshabilita clave"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "mostrar fotos de los ID seleccionados"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr "compactar IDs inutilizables y borrar firmas inutilizables de la clave"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr "compactar IDs inutilizables y borrar todas las firmas de la clave"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "Clave secreta disponible.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Se necesita la clave secreta para hacer esto.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4368,272 -3475,213 +4390,272 @@@ msgid "
  msgstr ""
  "* La orden `sign' (firmar) puede estar precedida por una 'l' para firmas\n"
  "locales (lsign), una 't' para firmas fiables (tsign), `nr' para firmas no\n"
- "revocables (nrsign) o cualquier combinaci�n de ellas (ltsign, tnrsign, etc)\n"
+ "revocables (nrsign) o cualquier combinación de ellas (ltsign, tnrsign, etc)\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
- msgstr "La clave est� revocada."
+ msgstr "La clave está revocada."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
- msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
+ msgstr "¿Firmar realmente todos los IDs de usuario? (s/N) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
- msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
+ msgstr "¿Firmar realmente todos los IDs de usuario? (s/N) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "Clase de firma desconocida `%s'\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Esta orden no se permite en modo %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
- msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
+ msgstr "¡No puede borrar el último identificador de usuario!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
- msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
+ msgstr "¿Borrar realmente todos los identificadores seleccionados? (s/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
- msgstr "�Borrar realmente este identificador de usuario? (s/N) "
+ msgstr "¿Borrar realmente este identificador de usuario? (s/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
- msgstr "�Realmente cambiar de sitio la clave primaria? (s/N)"
+ msgstr "¿Realmente cambiar de sitio la clave primaria? (s/N)"
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "Debe seleccionar exactamente una clave.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "La orden espera un nombre de fichero como argumento\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "No se puede abrir `%s': %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Debe seleccionar por lo menos una clave.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
- msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
+ msgstr "¿De verdad quiere borrar las claves seleccionadas? (s/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
- msgstr "�De verdad quiere borrar esta clave? (s/N) "
+ msgstr "¿De verdad quiere borrar esta clave? (s/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
- msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
+ msgstr "¿Revocar realmente todos los identificadores seleccionados? (s/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
- msgstr "�Revocar realmente este identificador de usuario? (s/N) "
+ msgstr "¿Revocar realmente este identificador de usuario? (s/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
- msgstr "�De verdad quiere revocar la clave completa? (s/N) "
+ msgstr "¿De verdad quiere revocar la clave completa? (s/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgstr "�De verdad quiere revocar las subclaves seleccionadas? (s/N)"
+ msgstr "¿De verdad quiere revocar las subclaves seleccionadas? (s/N)"
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
- msgstr "�De verdad quiere revocar esta subclave? (s/N) "
+ msgstr "¿De verdad quiere revocar esta subclave? (s/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
- "La confianza del propietario no puede establecerse si se est� usando\n"
+ "La confianza del propietario no puede establecerse si se está usando\n"
  "una base de datos de confianza propocionada por el usuario\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "Establecer lista de preferencias a:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
- "�Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
+ "¿Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
- msgstr "�Actualizar realmente las preferencias? (s/N) "
+ msgstr "¿Actualizar realmente las preferencias? (s/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
- msgstr "�Grabar cambios? (s/N) "
+ msgstr "¿Grabar cambios? (s/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
- msgstr "�Salir sin grabar? (s/N) "
+ msgstr "¿Salir sin grabar? (s/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
- msgstr "actualizaci�n fallida: %s\n"
+ msgstr "actualización fallida: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
- msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
+ msgstr "Clave sin cambios, no se necesita actualización.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
- msgstr "Creaci�n de la clave fallida: %s\n"
+ msgstr "Creación de la clave fallida: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
- msgstr "huella dactilar no v�lida"
+ msgstr "huella dactilar no válida"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  #| msgid "failed to get the fingerprint\n"
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "fallo obteniendo huella digital\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
- msgstr "valor inv�lido\n"
+ msgstr "valor inválido\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "ID de usuario inexistente.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "Nothing to sign with key %s\n"
  msgid "Nothing to sign.\n"
  msgstr "Nada que firmar con la clave %s\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Resumen: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
- msgstr "Caracter�sticas: "
+ msgstr "Características: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "Sevidor de claves no-modificar"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Servidor de claves preferido: "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "Notaciones: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "La siguiente clave fue revocada en %s por %s clave %s\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, 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:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(confidencial)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "creado: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "revocada: %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
- msgstr "caduc�: %s"
+ msgstr "caducó: %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "caduca: %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "uso: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "num. tarjeta: "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "confianza: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "validez: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
- msgstr "Esta clave est� deshabilitada"
+ msgstr "Esta clave está deshabilitada"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4641,72 -3689,56 +4663,73 @@@ 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:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "revocada"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "caducada"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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 ""
- "AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
+ "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:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
  msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  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 ""
- "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
+ "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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
- msgstr "�Est� seguro de querer a�adirla? (s/N) "
+ msgstr "¿Está seguro de querer añadirla? (s/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  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"
+ msgstr "No puede añadir un ID fotográfico a una clave tipo PGP2.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
- msgstr "�Ese ID de usuario ya existe en esta clave!\n"
+ msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
- msgstr "�Borrar esta firma correcta? (s/N/q)"
+ msgstr "¿Borrar esta firma correcta? (s/N/q)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
- msgstr "�Borrar esta firma inv�lida? (s/N/q)"
+ msgstr "¿Borrar esta firma inválida? (s/N/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
- msgstr "�Borrar esta firma desconocida? (s/N/q)"
+ msgstr "¿Borrar esta firma desconocida? (s/N/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
- msgstr "�Borrar realmente esta autofirma? (s/N)"
+ msgstr "¿Borrar realmente esta autofirma? (s/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4714,20 -3746,16 +4737,20 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "%d firmas borradas.\n"
  msgstr[1] "%d firmas borradas.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
- msgstr "No se borr� nada\n"
+ msgstr "No se borró nada\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
- msgstr "inv�lida"
+ msgstr "inválida"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "ID de usuario \"%s\" compactado: %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4735,57 -3763,46 +4758,57 @@@ msgid_plural "User ID \"%s\": %d signat
  msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
  msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "ID de usuario \"%s\": ya minimizado\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "ID de usuario \"%s\" ya limpiado\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  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 ""
- "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
+ "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:4585
++#: g10/keyedit.c:4601
  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"
+ msgstr "No puede añadir un revocador designado a una clave tipo PGP2.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Introduzca el ID de usuario del revocador designado: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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:4642
++#: g10/keyedit.c:4658
  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:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
  msgstr "esta clave ya ha sido designada como revocadora\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  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"
+ "¡AVISO: no podrá deshacer la elección de clave como revocador designado!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  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) "
+ "¿Está seguro de querer elegir esta clave como revocador designado? (s/N) "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4793,237 -3810,186 +4816,237 @@@ msgid "
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
  msgstr ""
- "�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
+ "¿Está seguro de querer elegir esta clave como revocador designado? (s/N) "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Cambiando fecha de caducidad de subclave.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Cambiando caducidad de clave primaria.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  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:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
- msgstr "la subclave de firmado %s ya est� certificada en cruz\n"
+ msgstr "la subclave de firmado %s ya está certificada en cruz\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, 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"
+ msgstr "la subclave %s no firma y así no necesita ser certificada en cruz\n"
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "Introduzca la URL de su servidor de claves preferido: "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  msgid "Are you sure you want to replace it? (y/N) "
- msgstr "�Seguro que quiere reemplazarlo? (s/N) "
+ msgstr "¿Seguro que quiere reemplazarlo? (s/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
- msgstr "�Seguro que quiere borrarlo? (s/N) "
+ msgstr "¿Seguro que quiere borrarlo? (s/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
- msgstr "Introduzca la notaci�n: "
+ msgstr "Introduzca la notación: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
- msgstr "�Continuar? (s/N) "
+ msgstr "¿Continuar? (s/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
- msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
+ msgstr "No hay ningún identificador de usuario con el índice %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "No hay ID de usuario con hash %s\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
- msgstr "No existe una subclave con �ndice %d\n"
+ msgstr "No existe una subclave con índice %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
- msgstr "No existe una subclave con �ndice %d\n"
+ msgstr "No existe una subclave con índice %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID de usuario: \"%s\"\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (no exportable)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
- msgstr "Esta firma caduc� el %s.\n"
+ msgstr "Esta firma caducó el %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
- msgstr "�De verdad quiere revocarla? (s/N) "
+ msgstr "¿De verdad quiere revocarla? (s/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
- msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
+ msgstr "¿Crear un certificado de revocación para esta clave? (s/N)"
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
- msgstr "No est� firmado por usted.\n"
+ msgstr "No está firmado por usted.\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, 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:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (no revocable)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "revocada por la clave %s el %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Va a revocar las siguientes firmas:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
- msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
+ msgstr "¿Crear los certificados de revocación realmente? (s/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "no hay clave secreta\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, fuzzy, c-format
  #| msgid "revoke a user ID"
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr "revocar un identificador de usuario"
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "La clave %s ya ha sido revocada.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "La subclave %s ya ha sido revocada.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, 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"
+ msgstr "Mostrando ID fotográfico %s de tamaño %ld para la clave %s (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "preferencia `%s' duplicada\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "demasiadas preferencias de cifrado\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "demasiadas preferencias de resumen\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
- msgstr "demasiadas preferencias de compresi�n\n"
+ msgstr "demasiadas preferencias de compresión\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
- msgstr "caracter inv�lido `%s' en cadena de preferencias\n"
+ msgstr "caracter inválido `%s' en cadena de preferencias\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "escribiendo firma directa\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "escribiendo autofirma\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
- msgstr "escribiendo la firma de comprobaci�n de clave\n"
+ msgstr "escribiendo la firma de comprobación de clave\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
- msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
+ msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
- msgstr "tama�o de clave redondeado a %u bits\n"
+ msgstr "tamaño de clave redondeado a %u bits\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
- "AVISO: ciertos programas OpenPGP no usan claves DSAcon res�menes de este "
- "tama�o\n"
+ "AVISO: ciertos programas OpenPGP no usan claves DSAcon resúmenes de este "
+ "tamaño\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "Firma"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "Certificar"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "Cifrado"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
- msgstr "Autentificaci�n"
+ msgstr "Autentificación"
  
  #. TRANSLATORS: Please use only plain ASCII characters for the
  #. translation.  If this is not possible use single digits.  The
@@@ -5035,158 -4001,127 +5058,158 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "FfCcAaSs"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Posibles accriones para una %s clave: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "Acciones permitidas actualmente: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Conmutar la capacidad de firmar\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Conmutar la capacidad de cifrado\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
- msgstr "   (%c) Conmutar la capacidad de autenticaci�n\n"
+ msgstr "   (%c) Conmutar la capacidad de autenticación\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Acabado\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Por favor seleccione tipo de clave deseado:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA y RSA (por defecto)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA y ElGamal\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
- msgstr "   (%d) DSA (s�lo firmar)\n"
+ msgstr "   (%d) DSA (sólo firmar)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
- msgstr "   (%d) RSA (s�lo firmar)\n"
+ msgstr "   (%d) RSA (sólo firmar)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
- msgstr "   (%d) ElGamal (s�lo cifrar)\n"
+ msgstr "   (%d) ElGamal (sólo cifrar)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
- msgstr "   (%d) RSA (s�lo cifrar)\n"
+ msgstr "   (%d) RSA (sólo cifrar)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (permite elegir capacidades)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (permite elegir capacidades)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  #| msgid "   (%d) DSA and Elgamal\n"
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA y ElGamal\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
- msgstr "   (%d) DSA (s�lo firmar)\n"
+ msgstr "   (%d) DSA (sólo firmar)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (permite elegir capacidades)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
- msgstr "   (%d) RSA (s�lo cifrar)\n"
+ msgstr "   (%d) RSA (sólo cifrar)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Clave existente\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Introduzca keygrip: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
- msgstr "No es un keygrip v�lido (se esperaban 40 d�gitos hex)\n"
+ msgstr "No es un keygrip válido (se esperaban 40 dígitos hex)\n"
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "No hay claves con ese keygrip\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "redondeados a %u bits\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
- msgstr "�De qu� tama�o quiere la subclave? (%u) "
+ msgstr "¿De qué tamaño quiere la subclave? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
- msgstr "�De qu� tama�o quiere la clave? (%u) "
+ msgstr "¿De qué tamaño quiere la clave? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
- msgstr "El tama�o requerido es de %u bits\n"
+ msgstr "El tamaño requerido es de %u bits\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Por favor seleccione tipo de clave deseado:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5195,14 -4130,13 +5218,14 @@@
  "      <n>m = key expires in n months\n"
  "      <n>y = key expires in n years\n"
  msgstr ""
- "Por favor, especifique el per�odo de validez de la clave.\n"
+ "Por favor, especifique el período de validez de la clave.\n"
  "         0 = la clave nunca caduca\n"
- "      <n>  = la clave caduca en n d�as\n"
+ "      <n>  = la clave caduca en n días\n"
  "      <n>w = la clave caduca en n semanas\n"
  "      <n>m = la clave caduca en n meses\n"
- "      <n>y = la clave caduca en n a�os\n"
+ "      <n>y = la clave caduca en n años\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5211,57 -4145,47 +5234,57 @@@
  "      <n>m = signature expires in n months\n"
  "      <n>y = signature expires in n years\n"
  msgstr ""
- "Por favor, especifique el per�odo de validez de la clave.\n"
+ "Por favor, especifique el período de validez de la clave.\n"
  "         0 = la clave nunca caduca\n"
- "      <n>  = la clave caduca en n d�as\n"
+ "      <n>  = la clave caduca en n días\n"
  "      <n>w = la clave caduca en n semanas\n"
  "      <n>m = la clave caduca en n meses\n"
- "      <n>y = la clave caduca en n a�os\n"
+ "      <n>y = la clave caduca en n años\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
- msgstr "�Validez de la clave (0)? "
+ msgstr "¿Validez de la clave (0)? "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
- msgstr "Clave v�lida �durante? (%s) "
+ msgstr "Clave válida ¿durante? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
- msgstr "valor inv�lido\n"
+ msgstr "valor inválido\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "La clave nunca caduca\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "La firma nunca caduca\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "La clave caduca %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "La firma caduca el %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
- "Su sistema no puede mostrar fechas m�s all� del 2038.\n"
- "Sin embargo funcionar� correctamente hasta el 2106.\n"
+ "Su sistema no puede mostrar fechas más allá del 2038.\n"
+ "Sin embargo funcionará correctamente hasta el 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
- msgstr "�Es correcto? (s/n) "
+ msgstr "¿Es correcto? (s/n) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5275,7 -4199,6 +5298,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5291,50 -4214,39 +5314,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Nombre y apellidos: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
- msgstr "Caracter inv�lido en el nombre\n"
+ msgstr "Caracter inválido en el nombre\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
- msgstr "El nombre no puede empezar con un n�mero\n"
+ msgstr "El nombre no puede empezar con un número\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "El nombre debe tener al menos 5 caracteres\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
- msgstr "Direcci�n de correo electr�nico: "
+ msgstr "Dirección de correo electrónico: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
- msgstr "Direcci�n inv�lida\n"
+ msgstr "Dirección inválida\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Comentario: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
- msgstr "Caracter inv�lido en el comentario\n"
+ msgstr "Caracter inválido en el comentario\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
- msgstr "Est� usando el juego de caracteres `%s'.\n"
+ msgstr "Está usando el juego de caracteres `%s'.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5345,10 -4257,9 +5368,10 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
- "Por favor no ponga la direcci�n de correo-e en el nombre real o en el "
+ "Por favor no ponga la dirección de correo-e en el nombre real o en el "
  "comentario\n"
  
  #. TRANSLATORS: These are the allowed answers in
@@@ -5362,31 -4273,24 +5385,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcDdVvSs"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
- msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (S)alir? "
+ msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (S)alir? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
- msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
+ msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (V)ale/(S)alir? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
- msgstr "�Cambia (N)ombre, (D)irecci�n o (S)alir? "
+ msgstr "¿Cambia (N)ombre, (D)irección o (S)alir? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
- msgstr "�Cambia (N)ombre, (D)irecci�n o (V)ale/(S)alir? "
+ msgstr "¿Cambia (N)ombre, (D)irección o (V)ale/(S)alir? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Por favor corrija primero el error.\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5394,18 -4298,15 +5417,18 @@@
  "generator a better chance to gain enough entropy.\n"
  msgstr ""
  "Es necesario generar muchos bytes aleatorios. Es una buena idea realizar\n"
- "alguna otra tarea (trabajar en otra ventana/consola, mover el rat�n, usar\n"
- "la red y los discos) durante la generaci�n de n�meros primos. Esto da al\n"
- "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
- "entrop�a.\n"
+ "alguna otra tarea (trabajar en otra ventana/consola, mover el ratón, usar\n"
+ "la red y los discos) durante la generación de números primos. Esto da al\n"
+ "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
+ "entropía.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
- msgstr "Creaci�n de la clave fallida: %s\n"
+ msgstr "Creación de la clave fallida: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5413,137 -4314,111 +5436,137 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "la clave ya existe\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
- msgstr "�Crear de todas formas?"
+ msgstr "¿Crear de todas formas?"
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
- msgstr "�Crear de todas formas?"
+ msgstr "¿Crear de todas formas?"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
- msgstr "Creaci�n de claves cancelada.\n"
+ msgstr "Creación de claves cancelada.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
  msgstr "no se puede crear fichero de respaldo `%s': %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
- msgstr "escribiendo clave p�blica en `%s'\n"
+ msgstr "escribiendo clave pública en `%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
- msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
+ msgstr "anillo público de claves no escribible encontrado: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
- msgstr "error escribiendo anillo p�blico `%s': %s\n"
+ msgstr "error escribiendo anillo público `%s': %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
- msgstr "claves p�blica y secreta creadas y firmadas.\n"
+ msgstr "claves pública y secreta creadas y firmadas.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
  msgstr ""
  "Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
- "la orden \"--edit-key\" para crear una subclave con este prop�sito.\n"
+ "la orden \"--edit-key\" para crear una subclave con este propósito.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr ""
- "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
+ "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
  "problemas con el reloj)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr ""
- "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
+ "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
  "problemas con el reloj)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
- msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
+ msgstr "NOTA: crear subclaves para claves V3 no sigue el estándar OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
- msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
+ msgstr "Las partes secretas de la clave primaria no están disponibles.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
- msgstr "�Crear de verdad? (s/N) "
+ msgstr "¿Crear de verdad? (s/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "nunca     "
  
 +#: g10/keylist.c:331
  msgid "Critical signature policy: "
- msgstr "Pol�tica de firmas cr�ticas: "
+ msgstr "Política de firmas críticas: "
  
 +#: g10/keylist.c:333
  msgid "Signature policy: "
- msgstr "Pol�tica de firmas: "
+ msgstr "Política de firmas: "
  
 +#: g10/keylist.c:375
  msgid "Critical preferred keyserver: "
- msgstr "Servidor de claves cr�tico preferido: "
+ msgstr "Servidor de claves crítico preferido: "
  
 +#: g10/keylist.c:428
  msgid "Critical signature notation: "
- msgstr "Notaci�n de firmas cr�ticas: "
+ msgstr "Notación de firmas críticas: "
  
 +#: g10/keylist.c:430
  msgid "Signature notation: "
- msgstr "Notaci�n de firma: "
+ msgstr "Notación de firma: "
  
 +#: g10/keylist.c:472
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d good signature\n"
@@@ -5570,33 -4442,26 +5593,33 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "Anillo de claves"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Huellas dactilares de la clave primaria:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "     Huella de subclave:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr " Huella clave primaria:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "      Huella de subclave:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "      Huella de clave ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
- msgstr "      N�mero de serie de la tarjeta ="
+ msgstr "      Número de serie de la tarjeta ="
  
 +#: g10/keyring.c:1498
  #, fuzzy, c-format
  #| msgid "caching keyring `%s'\n"
  msgid "caching keyring '%s'\n"
@@@ -5631,53 -4492,41 +5654,53 @@@ msgstr[1] "1 firma incorrecta\n
  msgid "%s: keyring created\n"
  msgstr "%s: anillo creado\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
- msgstr "incluir claves revocadas en resultados de la b�squeda"
+ msgstr "incluir claves revocadas en resultados de la búsqueda"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr "incluir subclaves al buscar por ID de clave"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
- msgstr "recuperar autom�ticamente claves al verificar firmas"
+ msgstr "recuperar automáticamente claves al verificar firmas"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "usar la URL de servidor de claves preferido presente en la clave"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr "usar el registro PKA presente en una clave al recuperar claves"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "deshabilitado"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
- msgstr "Introduzca n�mero(s), O)tro, o F)in >"
+ msgstr "Introduzca número(s), O)tro, o F)in >"
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
- msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
+ msgstr "protocolo del servidor de claves inválido (us %d!=handler %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
- msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
+ msgstr "\"%s\" no es un identificador de clave válido: omitido\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  #| msgid "refreshing %d keys from %s\n"
  msgid "refreshing %d key from %s\n"
@@@ -5685,86 -4534,69 +5708,86 @@@ msgid_plural "refreshing %d keys from %
  msgstr[0] "renovando %d claves desde %s\n"
  msgstr[1] "renovando %d claves desde %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "clave \"%s\" no encontrada en el servidor\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "clave no encontrada en el servidor\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
- msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
+ msgstr "no hay servidores de claves conocidos (use opción --keyserver)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "solicitando clave %s de %s servidor %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "solicitando clave %s de %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  #| msgid "no keyserver action!\n"
  msgid "no keyserver known\n"
- msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
+ msgstr "¡no se solicita ninguna acción al servidor de claves!\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "omitido \"%s\": %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "enviando clave %s a %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  #| msgid "requesting key %s from %s\n"
  msgid "requesting key from '%s'\n"
  msgstr "solicitando clave %s de %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "AVISO: imposible recuperar URI %s: %s\n"
  
 +#: g10/mainproc.c:254
  #, c-format
  msgid "weird size for an encrypted session key (%d)\n"
- msgstr "tama�o anormal para una clave de sesi�n cifrada (%d)\n"
+ msgstr "tamaño anormal para una clave de sesión cifrada (%d)\n"
  
 +#: g10/mainproc.c:302
  #, c-format
  msgid "%s encrypted session key\n"
- msgstr "%s clave de sesi�n cifrada\n"
+ msgstr "%s clave de sesión cifrada\n"
  
 +#: g10/mainproc.c:312
  #, c-format
  msgid "passphrase generated with unknown digest algorithm %d\n"
- msgstr "frase contrase�a generada con algoritmo de resumen desconocido %d\n"
+ msgstr "frase contraseña generada con algoritmo de resumen desconocido %d\n"
  
 +#: g10/mainproc.c:378
  #, c-format
  msgid "public key is %s\n"
- msgstr "la clave p�blica es %s\n"
+ msgstr "la clave pública es %s\n"
  
 +#: g10/mainproc.c:456
  msgid "public key encrypted data: good DEK\n"
- msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
+ msgstr "datos cifrados con la clave pública: DEK correcta\n"
  
 +#: g10/mainproc.c:489
  #, c-format
  msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
  msgstr "cifrado con clave %2$s de %1$u bits, ID %3$s, creada el %4$s\n"
@@@ -5779,21 -4609,17 +5802,21 @@@ msgstr "      \"%s\"\n
  msgid "encrypted with %s key, ID %s\n"
  msgstr "cifrado con clave %s, ID %s\n"
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
- msgstr "descifrado de la clave p�blica fallido: %s\n"
+ msgstr "descifrado de la clave pública fallido: %s\n"
  
 +#: g10/mainproc.c:530
  #, c-format
  msgid "encrypted with %lu passphrases\n"
- msgstr "cifrado con %lu frases contrase�a\n"
+ msgstr "cifrado con %lu frases contraseña\n"
  
 +#: g10/mainproc.c:532
  msgid "encrypted with 1 passphrase\n"
- msgstr "cifrado con 1 frase contrase�a\n"
+ msgstr "cifrado con 1 frase contraseña\n"
  
 +#: g10/mainproc.c:566 g10/mainproc.c:587
  #, c-format
  msgid "assuming %s encrypted data\n"
  msgstr "suponiendo %s datos cifrados\n"
@@@ -5804,19 -4629,15 +5827,19 @@@ msgid "IDEA cipher unavailable, optimis
  msgstr ""
  "cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  msgid "WARNING: message was not integrity protected\n"
- msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
+ msgstr "ATENCIÓN: la intgridad del mensaje no está protegida\n"
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
  msgstr "descifrado correcto\n"
  
 +#: g10/mainproc.c:637
  msgid "WARNING: encrypted message has been manipulated!\n"
- msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
+ msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
  
 +#: g10/mainproc.c:653
  #, c-format
  msgid "decryption failed: %s\n"
  msgstr "descifrado fallido: %s\n"
@@@ -5825,9 -4645,8 +5848,9 @@@
  #, fuzzy
  #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
  msgid "Note: sender requested \"for-your-eyes-only\"\n"
- msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
+ msgstr "NOTA: el remitente solicitó \"sólo-para-tus-ojos\"\n"
  
 +#: g10/mainproc.c:678
  #, c-format
  msgid "original file name='%.*s'\n"
  msgstr "nombre fichero original='%.*s'\n"
@@@ -5836,130 -4654,103 +5859,130 @@@
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr "AVISO: se observan varios textos en claro\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
- msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
+ msgstr "revocación independiente - use \"gpg --import\" para aplicarla\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
- msgstr "no se encontr� firma\n"
+ msgstr "no se encontró firma\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "Firma INCORRECTA de \"%s\""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Firma caducada de \"%s\""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Firma correcta de \"%s\""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
- msgstr "suprimida la verificaci�n de la firma\n"
+ msgstr "suprimida la verificación de la firma\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "no puedo manejar estos datos ambiguos en la firma\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Firmado el %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               usando %s clave %s\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Firmado el %s usando clave %s ID %s\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                alias \"%s\""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Clave disponible en: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[incierto]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                alias \"%s\""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Firma caducada en %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "La firma caduca el %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "firma %s, algoritmo de resumen %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binaria"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "modotexto"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "desconocido"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
- msgstr "Algoritmo de clave p�blica desconocido"
+ msgstr "Algoritmo de clave pública desconocido"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Imposible comprobar la firma: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "no es una firma separada\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
- msgstr "AVISO: detectadas m�ltiples firmas. S�lo la primera se comprueba.\n"
+ msgstr "AVISO: detectadas múltiples firmas. Sólo la primera se comprueba.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "firma independiente de clase 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "firma al viejo estilo (PGP 2.x)\n"
  
@@@ -5967,23 -4757,19 +5990,23 @@@
  #, fuzzy, c-format
  #| msgid "fstat of `%s' failed in %s: %s\n"
  msgid "fstat of '%s' failed in %s: %s\n"
- msgstr "fstat de `%s' fall� en %s: %s\n"
+ msgstr "fstat de `%s' falló en %s: %s\n"
  
 +#: g10/misc.c:170
  #, c-format
  msgid "fstat(%d) failed in %s: %s\n"
- msgstr "fstat(%d) fall� en %s: %s\n"
+ msgstr "fstat(%d) falló en %s: %s\n"
  
 +#: g10/misc.c:279
  #, c-format
  msgid "WARNING: using experimental public key algorithm %s\n"
- msgstr "AVISO: usando un algoritmo de clave p�blica experimental %s\n"
+ msgstr "AVISO: usando un algoritmo de clave pública experimental %s\n"
  
 +#: g10/misc.c:286
  msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
- msgstr "AVISO: las firmas Elgamal para firmar y cifrar est�n obsoletas\n"
+ msgstr "AVISO: las firmas Elgamal para firmar y cifrar están obsoletas\n"
  
 +#: g10/misc.c:300
  #, c-format
  msgid "WARNING: using experimental cipher algorithm %s\n"
  msgstr "AVISO: usando algoritmo de cifrado experimental %s\n"
@@@ -5993,12 -4778,10 +6016,12 @@@
  msgid "WARNING: using experimental digest algorithm %s\n"
  msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
  
 +#: g10/misc.c:328
  #, c-format
  msgid "WARNING: digest algorithm %s is deprecated\n"
- msgstr "AVISO: el algoritmo de resumen %s est� obsoleto\n"
+ msgstr "AVISO: el algoritmo de resumen %s está obsoleto\n"
  
 +#: g10/misc.c:353
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "Note: signatures using the %s algorithm are rejected\n"
@@@ -6020,40 -4800,33 +6043,40 @@@ msgstr "error de lectura `%s': %s\n
  msgid "(further info: "
  msgstr ""
  
 +#: g10/misc.c:1056
  #, c-format
  msgid "%s:%d: deprecated option \"%s\"\n"
- msgstr "%s:%d: opci�n obsoleta \"%s\"\n"
+ msgstr "%s:%d: opción obsoleta \"%s\"\n"
  
 +#: g10/misc.c:1060
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated option\n"
- msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta\n"
+ msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
  
 +#: g10/misc.c:1062
  #, c-format
  msgid "please use \"%s%s\" instead\n"
  msgstr "por favor use \"%s%s\" en su lugar\n"
  
 +#: g10/misc.c:1069
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
- msgstr "ATENCI�N: \"%s\" es una orden obsoleta - no la use\n"
+ msgstr "ATENCIÓN: \"%s\" es una orden obsoleta - no la use\n"
  
 +#: g10/misc.c:1079
  #, fuzzy, c-format
  #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
  msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
- msgstr "%s:%u: opci�n obsoleta \"%s\" - no tiene efecto\n"
+ msgstr "%s:%u: opción obsoleta \"%s\" - no tiene efecto\n"
  
 +#: g10/misc.c:1083
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
  msgid ""
  "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
- msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta - no tiene efecto\n"
+ msgstr "ATENCIÓN: \"%s\" es una opción obsoleta - no tiene efecto\n"
  
 +#: g10/misc.c:1147
  msgid "Uncompressed"
  msgstr "Sin comprimir"
  
@@@ -6062,30 -4834,25 +6085,30 @@@
  msgid "uncompressed|none"
  msgstr "sin_comprimir|ninguno"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
- msgstr "este mensaje podr�a no ser utilizable por %s\n"
+ msgstr "este mensaje podría no ser utilizable por %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  #| msgid "ambiguous option `%s'\n"
  msgid "ambiguous option '%s'\n"
- msgstr "opci�n ambigua `%s'\n"
+ msgstr "opción ambigua `%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown option '%s'\n"
- msgstr "opci�n desconocida `%s'\n"
+ msgstr "opción desconocida `%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  #, fuzzy
  #| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
- msgstr "DSA necesita un resumen cuya longitud sea m�ltiplo de 8 bits\n"
+ msgstr "DSA necesita un resumen cuya longitud sea múltiplo de 8 bits\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "unknown weak digest '%s'\n"
@@@ -6097,11 -4863,9 +6120,11 @@@ msgstr "Clase de firma desconocida `%s'
  msgid "File '%s' exists. "
  msgstr "El fichero `%s' ya existe. "
  
 +#: g10/openfile.c:88
  msgid "Overwrite? (y/N) "
- msgstr "�Sobreescribir? (s/N) "
+ msgstr "¿Sobreescribir? (s/N) "
  
 +#: g10/openfile.c:123
  #, c-format
  msgid "%s: unknown suffix\n"
  msgstr "%s: sufijo desconocido\n"
@@@ -6124,39 -4884,32 +6147,39 @@@ msgstr "asumiendo que hay datos firmado
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new configuration file '%s' created\n"
- msgstr "creado un nuevo fichero de configuraci�n `%s'\n"
+ msgstr "creado un nuevo fichero de configuración `%s'\n"
  
 +#: g10/openfile.c:498
  #, fuzzy, c-format
  #| msgid "WARNING: options in `%s' are not yet active during this run\n"
  msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
+ msgstr "AVISO: las opciones en `%s' no están aún activas en esta ejecución\n"
  
 +#: g10/parse-packet.c:257
  #, c-format
  msgid "can't handle public key algorithm %d\n"
- msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
+ msgstr "no puedo manejar el algoritmo de clave pública %d\n"
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
  msgstr ""
- "AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
+ "AVISO: clave de sesión cifrada simétricamente potencialmente insegura\n"
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
- msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
+ msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n"
  
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
  #, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problema con el agente: %s\n"
  
 +#: g10/passphrase.c:241
  msgid "Enter passphrase\n"
- msgstr "Introduzca frase contrase�a\n"
+ msgstr "Introduzca frase contraseña\n"
  
 +#: g10/passphrase.c:252
  msgid "cancelled by user\n"
  msgstr "cancelado por el usuario\n"
  
@@@ -6169,39 -4920,33 +6192,39 @@@ msgstr "(ID de clave primaria %s)
  #, fuzzy
  #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
- msgstr "Introduzca frase contrase�a para desproteger el objeto PKCS#12."
+ msgstr "Introduzca frase contraseña para desproteger el objeto PKCS#12."
  
 +#: g10/passphrase.c:500
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
- msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
+ msgstr "Introduzca frase contraseña para proteger el nuevo objeto PKCS#12."
  
 +#: g10/passphrase.c:505
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
- msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
+ msgstr "Introduzca frase contraseña para proteger el nuevo objeto PKCS#12."
  
 +#: g10/passphrase.c:508
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
- msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
+ msgstr "Introduzca frase contraseña para proteger el nuevo objeto PKCS#12."
  
 +#: g10/passphrase.c:513
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
- msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
+ msgstr "¿De verdad quiere borrar las claves seleccionadas? (s/N) "
  
 +#: g10/passphrase.c:516
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
- msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
+ msgstr "¿De verdad quiere borrar las claves seleccionadas? (s/N) "
  
 +#: g10/passphrase.c:525
  #, fuzzy, c-format
  #| msgid "%u-bit %s key, ID %s, created %s"
  msgid ""
@@@ -6221,49 -4965,40 +6244,49 @@@ msgid "
  "Keeping the image close to 240x288 is a good size to use.\n"
  msgstr ""
  "\n"
- "Escoja una imagen para usar en su ID fotogr�fico. La imagen debe ser un\n"
- "fichero JPEG. Recuerde que la im�gen se almacena en su clave p�blica.\n"
- "Si usa una foto muy grande, �su clave ser� tambi�n muy grande!\n"
- "Una imagen cercana a 240x288 tiene un tama�o adecuado.\n"
+ "Escoja una imagen para usar en su ID fotográfico. La imagen debe ser un\n"
+ "fichero JPEG. Recuerde que la imágen se almacena en su clave pública.\n"
+ "Si usa una foto muy grande, ¡su clave será también muy grande!\n"
+ "Una imagen cercana a 240x288 tiene un tamaño adecuado.\n"
  
 +#: g10/photoid.c:99
  msgid "Enter JPEG filename for photo ID: "
- msgstr "Introduzca nombre del fichero JPEG para ID fotogr�fico: "
+ msgstr "Introduzca nombre del fichero JPEG para ID fotográfico: "
  
 +#: g10/photoid.c:120
  #, fuzzy, c-format
  #| msgid "unable to open JPEG file `%s': %s\n"
  msgid "unable to open JPEG file '%s': %s\n"
  msgstr "Imposible abrir fichero JPEG `%s': %s\n"
  
 +#: g10/photoid.c:131
  #, c-format
  msgid "This JPEG is really large (%d bytes) !\n"
- msgstr "�Este JPEG es realmente grande (%d bytes)!\n"
+ msgstr "¡Este JPEG es realmente grande (%d bytes)!\n"
  
 +#: g10/photoid.c:133
  msgid "Are you sure you want to use it? (y/N) "
- msgstr "�Seguro que quiere usarlo? (s/N) "
+ msgstr "¿Seguro que quiere usarlo? (s/N) "
  
 +#: g10/photoid.c:149
  #, fuzzy, c-format
  #| msgid "`%s' is not a JPEG file\n"
  msgid "'%s' is not a JPEG file\n"
  msgstr "`%s' no es un fichero JPEG\n"
  
 +#: g10/photoid.c:168
  msgid "Is this photo correct (y/N/q)? "
- msgstr "�Es correcta la foto? (s/n) "
+ msgstr "¿Es correcta la foto? (s/n) "
  
 +#: g10/photoid.c:380
  msgid "unable to display photo ID!\n"
- msgstr "�no puedo mostrar ID fotogr�fico!\n"
+ msgstr "¡no puedo mostrar ID fotográfico!\n"
  
 +#: g10/pkclist.c:72 g10/revoke.c:757
  msgid "No reason specified"
- msgstr "No se dio ninguna raz�n"
+ msgstr "No se dio ninguna razón"
  
 +#: g10/pkclist.c:74 g10/revoke.c:759
  msgid "Key is superseded"
  msgstr "La clave ha sido reemplazada."
  
@@@ -6271,21 -5005,17 +6294,21 @@@
  msgid "Key has been compromised"
  msgstr "La clave ha sido comprometida"
  
 +#: g10/pkclist.c:78 g10/revoke.c:760
  msgid "Key is no longer used"
- msgstr "La clave ya no est� en uso"
+ msgstr "La clave ya no está en uso"
  
 +#: g10/pkclist.c:80 g10/revoke.c:761
  msgid "User ID is no longer valid"
- msgstr "El identificador de usuario ya no es v�lido"
+ msgstr "El identificador de usuario ya no es válido"
  
 +#: g10/pkclist.c:84
  msgid "reason for revocation: "
- msgstr "raz�n para la revocaci�n: "
+ msgstr "razón para la revocación: "
  
 +#: g10/pkclist.c:100
  msgid "revocation comment: "
- msgstr "comentario a la revocaci�n: "
+ msgstr "comentario a la revocación: "
  
  #. TRANSLATORS: These are the allowed answers in lower and
  #. uppercase.  Below you will find the matching strings which
@@@ -6314,29 -5040,24 +6337,29 @@@ msgstr "  alias \"%s\"\n
  msgid ""
  "How much do you trust that this key actually belongs to the named user?\n"
  msgstr ""
- "�Qu� seguridad tiene de que esta clave pertenece realmente al usuario\n"
+ "¿Qué seguridad tiene de que esta clave pertenece realmente al usuario\n"
  "que se nombra?\n"
  
 +#: g10/pkclist.c:282
  #, c-format
  msgid "  %d = I don't know or won't say\n"
- msgstr " %d = No lo s� o prefiero no decirlo\n"
+ msgstr " %d = No lo sé o prefiero no decirlo\n"
  
 +#: g10/pkclist.c:284
  #, c-format
  msgid "  %d = I do NOT trust\n"
  msgstr " %d = NO tengo confianza\n"
  
 +#: g10/pkclist.c:290
  #, c-format
  msgid "  %d = I trust ultimately\n"
- msgstr " %d = conf�o absolutamente\n"
+ msgstr " %d = confío absolutamente\n"
  
 +#: g10/pkclist.c:296
  msgid "  m = back to the main menu\n"
- msgstr "  m = volver al men� principal\n"
+ msgstr "  m = volver al menú principal\n"
  
 +#: g10/pkclist.c:299
  msgid "  s = skip this key\n"
  msgstr "  s = saltar esta clave\n"
  
@@@ -6350,18 -5069,15 +6373,18 @@@ msgid "
  "The minimum trust level for this key is: %s\n"
  "\n"
  msgstr ""
- "El m�nimo nivel de confianza para esta clave es: %s\n"
+ "El mínimo nivel de confianza para esta clave es: %s\n"
  "\n"
  
 +#: g10/pkclist.c:310 g10/revoke.c:786
  msgid "Your decision? "
- msgstr "�Su decisi�n? "
+ msgstr "¿Su decisión? "
  
 +#: g10/pkclist.c:331
  msgid "Do you really want to set this key to ultimate trust? (y/N) "
- msgstr "�De verdad quiere asignar absoluta confianza a esta clave? (s/N) "
+ msgstr "¿De verdad quiere asignar absoluta confianza a esta clave? (s/N) "
  
 +#: g10/pkclist.c:345
  msgid "Certificates leading to an ultimately trusted key:\n"
  msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
  
@@@ -6387,192 -5099,172 +6410,213 @@@ msgstr "Esta clave probablemente perten
  msgid "This key belongs to us\n"
  msgstr "Esta clave nos pertenece\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ #| msgid "root certificate has now been marked as trusted\n"
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "certificado raíz marcado ahora como fiable\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "No es seguro que la clave pertenezca a la persona que se nombra en el\n"
+ "identificador de usuario. Si *realmente* sabe lo que está haciendo,\n"
+ "puede contestar sí a la siguiente pregunta.\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
  "you may answer the next question with yes.\n"
  msgstr ""
  "No es seguro que la clave pertenezca a la persona que se nombra en el\n"
- "identificador de usuario. Si *realmente* sabe lo que est� haciendo,\n"
- "puede contestar s� a la siguiente pregunta.\n"
+ "identificador de usuario. Si *realmente* sabe lo que está haciendo,\n"
+ "puede contestar sí a la siguiente pregunta.\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
- msgstr "�Usar esta clave de todas formas? (s/N) "
+ msgstr "¿Usar esta clave de todas formas? (s/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
- msgstr "ATENCI�N: �Usando una clave no fiable!\n"
+ msgstr "ATENCIÓN: ¡Usando una clave no fiable!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
- msgstr "AVISO: la clave puede estar revocada (falta clave de revocaci�n)\n"
+ msgstr "AVISO: la clave puede estar revocada (falta clave de revocación)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr ""
- "ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
+ "ATENCIÓN: ¡Esta clave ha sido revocada por la persona designada\n"
  "como revocador!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
- msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
+ msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
- msgstr "         Esto puede significar que la firma est� falsificada.\n"
+ msgstr "         Esto puede significar que la firma está falsificada.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
- msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
+ msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
- msgstr "Nota: Esta clave est� deshabilitada.\n"
+ msgstr "Nota: Esta clave está deshabilitada.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, fuzzy, c-format
  #| msgid "Note: Verified signer's address is `%s'\n"
  msgid "Note: Verified signer's address is '%s'\n"
- msgstr "Nota: la direcci�n del firmante verificado es `%s'\n"
+ msgstr "Nota: la dirección del firmante verificado es `%s'\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, fuzzy, c-format
  #| msgid "Note: Signer's address `%s' does not match DNS entry\n"
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
- msgstr "Nota: la direcci�n del firmante `%s' no coincide con la entrada DNS\n"
+ msgstr "Nota: la dirección del firmante `%s' no coincide con la entrada DNS\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
- msgstr "nivel de confianza puesto a TOTAL (informaci�n PKA v�lida)\n"
+ msgstr "nivel de confianza puesto a TOTAL (información PKA válida)\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
- msgstr "nivel de confianza puesto a NUNCA (informaci�n PKA inv�lida)\n"
+ msgstr "nivel de confianza puesto a NUNCA (información PKA inválida)\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
- msgstr "Nota: �Esta clave ha caducado!\n"
+ msgstr "Nota: ¡Esta clave ha caducado!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr ""
- "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
+ "ATENCIÓN: ¡Esta clave no está certificada por una firma de confianza!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr "          No hay indicios de que la firma pertenezca al propietario.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
- msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
+ msgstr "ATENCIÓN: ¡Esta clave NO es de confianza!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
- msgstr "          La firma es probablemente una FALSIFICACI�N.\n"
+ msgstr "          La firma es probablemente una FALSIFICACIÓN.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
- "ATENCI�N: �Esta clave no est� certificada con firmas de suficiente "
+ "ATENCIÓN: ¡Esta clave no está certificada con firmas de suficiente "
  "confianza!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "          No es seguro que la firma pertenezca al propietario.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: omitido: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
- msgstr "%s: omitida: clave p�blica deshabilitada\n"
+ msgstr "%s: omitida: clave pública deshabilitada\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
- msgstr "%s: omitida: clave p�blica ya presente\n"
+ msgstr "%s: omitida: clave pública ya presente\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "no se puede conectar con `%s': %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "option '%s' given, but no valid default keys given\n"
- msgstr "l�nea %d: algoritmo inv�lido\n"
+ msgstr "línea %d: algoritmo inválido\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "option '%s' given, but option '%s' not given\n"
- msgstr "l�nea %d: algoritmo inv�lido\n"
+ msgstr "línea %d: algoritmo inválido\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "Destinatarios actuales:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
  msgstr ""
  "\n"
- "Introduzca ID de usuario. Acabe con una l�nea vac�a: "
+ "Introduzca ID de usuario. Acabe con una línea vacía: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "ID de usuario inexistente.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
- msgstr "omitida: clave p�blica ya designada como destinataria por defecto\n"
+ msgstr "omitida: clave pública ya designada como destinataria por defecto\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
- msgstr "Clave p�blica deshabilitada.\n"
+ msgstr "Clave pública deshabilitada.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
- msgstr "omitida: clave p�blica ya establecida\n"
+ msgstr "omitida: clave pública ya establecida\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "desconocido el destinatario predefinido \"%s\"\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
- msgstr "no hay direcciones v�lidas\n"
+ msgstr "no hay direcciones válidas\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Nota: la clave %s no usa %s\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Nota: clave %s no tiene preferencias para %s\n"
  
 +#: g10/plaintext.c:84
  msgid "data not saved; use option \"--output\" to save it\n"
- msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
+ msgstr "datos no grabados; use la opción \"--output\" para grabarlos\n"
  
 +#: g10/plaintext.c:598
  msgid "Detached signature.\n"
  msgstr "Firma separada.\n"
  
@@@ -6599,20 -5286,16 +6643,20 @@@ msgstr "imposible abrir datos firmados 
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "imposible abrir datos firmados fd=%d: %s\n"
  
 +#: g10/pubkey-enc.c:116
  #, c-format
  msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr "destinatario an�nimo; probando clave secreta %s ...\n"
+ msgstr "destinatario anónimo; probando clave secreta %s ...\n"
  
 +#: g10/pubkey-enc.c:123
  msgid "okay, we are the anonymous recipient.\n"
- msgstr "de acuerdo, somos el destinatario an�nimo.\n"
+ msgstr "de acuerdo, somos el destinatario anónimo.\n"
  
 +#: g10/pubkey-enc.c:282
  msgid "old encoding of the DEK is not supported\n"
- msgstr "la antigua codificaci�n de la DEK no puede usarse\n"
+ msgstr "la antigua codificación de la DEK no puede usarse\n"
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "algoritmo de cifrado %d%s desconocido o desactivado\n"
@@@ -6626,68 -5307,54 +6670,68 @@@ msgstr "NOTA: el cifrado %s no aparece 
  #, fuzzy, c-format
  #| msgid "NOTE: secret key %s expired at %s\n"
  msgid "Note: secret key %s expired at %s\n"
- msgstr "NOTA: clave secreta %s caduc� el %s\n"
+ msgstr "NOTA: clave secreta %s caducó el %s\n"
  
 +#: g10/pubkey-enc.c:384
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
  msgstr "NOTA: la clave ha sido revocada"
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, c-format
  msgid "build_packet failed: %s\n"
- msgstr "construcci�n del paquete fallida: %s\n"
+ msgstr "construcción del paquete fallida: %s\n"
  
 +#: g10/revoke.c:144
  #, c-format
  msgid "key %s has no user IDs\n"
  msgstr "clave %s: sin identificador de usuario\n"
  
 +#: g10/revoke.c:312
  msgid "To be revoked by:\n"
- msgstr "Ser� revocado por:\n"
+ msgstr "Será revocado por:\n"
  
 +#: g10/revoke.c:316
  msgid "(This is a sensitive revocation key)\n"
- msgstr "(Este es una clave de revocaci�n confidencial)\n"
+ msgstr "(Este es una clave de revocación confidencial)\n"
  
 +#: g10/revoke.c:322
  #, fuzzy
  #| msgid "Secret key is available.\n"
  msgid "Secret key is not available.\n"
  msgstr "Clave secreta disponible.\n"
  
 +#: g10/revoke.c:327
  msgid "Create a designated revocation certificate for this key? (y/N) "
- msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
+ msgstr "¿Crear un certificado de revocación para esta clave? (s/N)"
  
 +#: g10/revoke.c:336 g10/revoke.c:727
  msgid "ASCII armored output forced.\n"
  msgstr "se fuerza salida con armadura ASCII.\n"
  
 +#: g10/revoke.c:352 g10/revoke.c:479
  #, c-format
  msgid "make_keysig_packet failed: %s\n"
- msgstr "make_keysig_packet fall�: %s\n"
+ msgstr "make_keysig_packet falló: %s\n"
  
 +#: g10/revoke.c:415
  msgid "Revocation certificate created.\n"
- msgstr "Certificado de revocaci�n creado.\n"
+ msgstr "Certificado de revocación creado.\n"
  
 +#: g10/revoke.c:421
  #, c-format
  msgid "no revocation keys found for \"%s\"\n"
- msgstr "no se encuetran claves de revocaci�n para \"%s\"\n"
+ msgstr "no se encuetran claves de revocación para \"%s\"\n"
  
 +#: g10/revoke.c:551
  #, fuzzy
  #| msgid "Create a revocation certificate for this key? (y/N) "
  msgid "This is a revocation certificate for the OpenPGP key:"
- msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N) "
+ msgstr "¿Crear un certificado de revocación para esta clave? (s/N) "
  
 +#: g10/revoke.c:567
  msgid ""
  "A revocation certificate is a kind of \"kill switch\" to publicly\n"
  "declare that a key shall not anymore be used.  It is not possible\n"
@@@ -6714,9 -5378,8 +6758,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
- msgstr "Certificado de revocaci�n creado.\n"
+ msgstr "Certificado de revocación creado.\n"
  
 +#: g10/revoke.c:634
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key \"%s\" not found\n"
@@@ -6736,11 -5397,9 +6780,11 @@@ msgstr "
  msgid "error searching the keyring: %s\n"
  msgstr "error escribiendo anillo `%s': %s\n"
  
 +#: g10/revoke.c:711
  msgid "Create a revocation certificate for this key? (y/N) "
- msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N) "
+ msgstr "¿Crear un certificado de revocación para esta clave? (s/N) "
  
 +#: g10/revoke.c:735
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6750,57 -5409,47 +6794,57 @@@
  "your media become unreadable.  But have some caution:  The print system of\n"
  "your machine might store the data and make it available to others!\n"
  msgstr ""
- "Certificado de revocaci�n creado.\n"
+ "Certificado de revocación creado.\n"
  "\n"
- "Por favor cons�rvelo en un medio que pueda esconder; si alguien consigue\n"
+ "Por favor consérvelo en un medio que pueda esconder; si alguien consigue\n"
  "acceso a este certificado puede usarlo para inutilizar su clave.\n"
  "Es inteligente imprimir este certificado y guardarlo en otro lugar, por\n"
- "si acaso su medio resulta imposible de leer. Pero precauci�n: �el sistema\n"
- "de impresi�n de su m�quina podr�a almacenar los datos y hacerlos accesibles\n"
+ "si acaso su medio resulta imposible de leer. Pero precaución: ¡el sistema\n"
+ "de impresión de su máquina podría almacenar los datos y hacerlos accesibles\n"
  "a otras personas!\n"
  
 +#: g10/revoke.c:769
  msgid "Please select the reason for the revocation:\n"
- msgstr "Por favor elija una raz�n para la revocaci�n:\n"
+ msgstr "Por favor elija una razón para la revocación:\n"
  
 +#: g10/revoke.c:779
  msgid "Cancel"
  msgstr "Cancelar"
  
 +#: g10/revoke.c:781
  #, c-format
  msgid "(Probably you want to select %d here)\n"
- msgstr "(Probablemente quer�a seleccionar %d aqu�)\n"
+ msgstr "(Probablemente quería seleccionar %d aquí)\n"
  
 +#: g10/revoke.c:822
  msgid "Enter an optional description; end it with an empty line:\n"
- msgstr "Introduzca una descripci�n opcional; ac�bela con una l�nea vac�a:\n"
+ msgstr "Introduzca una descripción opcional; acábela con una línea vacía:\n"
  
 +#: g10/revoke.c:850
  #, c-format
  msgid "Reason for revocation: %s\n"
- msgstr "Raz�n para la revocaci�n: %s\n"
+ msgstr "Razón para la revocación: %s\n"
  
 +#: g10/revoke.c:852
  msgid "(No description given)\n"
- msgstr "(No se di� descripci�n)\n"
+ msgstr "(No se dió descripción)\n"
  
 +#: g10/revoke.c:857
  msgid "Is this okay? (y/N) "
- msgstr "�Es correcto? (s/N) "
+ msgstr "¿Es correcto? (s/N) "
  
 +#: g10/seskey.c:62 sm/encrypt.c:123
  msgid "weak key created - retrying\n"
- msgstr "creada clave d�bil - reintentando\n"
+ msgstr "creada clave débil - reintentando\n"
  
 +#: g10/seskey.c:66
  #, c-format
  msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
  msgstr ""
- "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
+ "¡imposible evitar clave débil para cifrado simétrico después de %d "
  "intentos!\n"
  
 +#: g10/seskey.c:306
  #, fuzzy, c-format
  #| msgid "%s key uses an unsafe (%u bit) hash\n"
  msgid "%s key %s uses an unsafe (%zu bit) hash\n"
@@@ -6812,43 -5460,36 +6856,43 @@@ msgstr "la clave %s usa un hash insegur
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr "la clave DSA %s requiere un resumen de %u bits al menos\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "AVISO: conflicto con el resumen de la firma del mensaje\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
- msgstr "por favor vea %s para m�s informaci�n\n"
+ msgstr "por favor vea %s para más información\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
- "AVISO: la subclave de cifrado %s tiene un certificado cruzado inv�lido\n"
+ "AVISO: la subclave de cifrado %s tiene un certificado cruzado inválido\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
- msgstr[0] "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
- msgstr[1] "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
+ msgstr[0] "la clave pública %s es %lu segundos más nueva que la firma\n"
+ msgstr[1] "la clave pública %s es %lu segundos más nueva que la firma\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
- msgstr[0] "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
- msgstr[1] "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
+ msgstr[0] "la clave pública %s es %lu segundos más nueva que la firma\n"
+ msgstr[1] "la clave pública %s es %lu segundos más nueva que la firma\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6863,7 -5504,6 +6907,7 @@@ msgstr[1] "
  "la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
  "o problemas con el reloj)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6877,30 -5517,25 +6921,30 @@@ msgstr[1] "
  "la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
  "o problemas con el reloj)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  #| msgid "NOTE: signature key %s expired %s\n"
  msgid "Note: signature key %s expired %s\n"
  msgstr "NOTA: clave de la firma %s caducada el %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  #| msgid "NOTE: signature key %s has been revoked\n"
  msgid "Note: signature key %s has been revoked\n"
  msgstr "NOTA: la clave de firmado %s ha sido revocada\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
- "asumiendo firma incorrecta de la clave %s por un bit cr�tico desconocido\n"
+ "asumiendo firma incorrecta de la clave %s por un bit crítico desconocido\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
- msgstr "clave %s: no hay subclave para la firma de revocaci�n de subclave\n"
+ msgstr "clave %s: no hay subclave para la firma de revocación de subclave\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
@@@ -6909,17 -5543,15 +6953,17 @@@
  #, c-format
  msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
  msgstr ""
- "AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
+ "AVISO: no puedo expandir el %% de la url de política . Se usa sin expandir.\n"
  
 +#: g10/sign.c:114
  #, c-format
  msgid ""
  "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
  msgstr ""
- "AVISO: no puedo expandir el %% de la url de pol�tica (demasiado larga).\n"
+ "AVISO: no puedo expandir el %% de la url de política (demasiado larga).\n"
  "Se usa sin expandir.\n"
  
 +#: g10/sign.c:137
  #, c-format
  msgid ""
  "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@@ -6945,12 -5574,10 +6989,12 @@@ msgstr "
  msgid "signing:"
  msgstr "firmando:"
  
 +#: g10/sign.c:1286
  #, c-format
  msgid "%s encryption will be used\n"
- msgstr "se usar� un cifrado %s\n"
+ msgstr "se usará un cifrado %s\n"
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
  msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
  
@@@ -6963,12 -5588,10 +7007,12 @@@ msgstr "\"%s\" omitido: duplicado\n
  msgid "skipped: secret key already present\n"
  msgstr "omitido: clave secreta ya presente\n"
  
 +#: g10/skclist.c:225
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr ""
- "�esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
+ "¡esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
@@@ -6988,19 -5609,15 +7032,19 @@@ msgstr "
  msgid "error in '%s': %s\n"
  msgstr "error en `%s': %s\n"
  
 +#: g10/tdbdump.c:162
  msgid "line too long"
- msgstr "l�nea demasiado larga"
+ msgstr "línea demasiado larga"
  
 +#: g10/tdbdump.c:170
  msgid "colon missing"
  msgstr "falta una coma"
  
 +#: g10/tdbdump.c:176
  msgid "invalid fingerprint"
- msgstr "huella dactilar no v�lida"
+ msgstr "huella dactilar no válida"
  
 +#: g10/tdbdump.c:181
  msgid "ownertrust value missing"
  msgstr "falta el valor de confianza"
  
@@@ -7016,12 -5631,10 +7060,12 @@@ msgstr "error econtrando registro de co
  msgid "read error in '%s': %s\n"
  msgstr "error de lectura `%s': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
- msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
+ msgstr "base de datos de confianza: fallo sincronización: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  #| msgid "can't create lock for `%s'\n"
  msgid "can't create lock for '%s'\n"
@@@ -7044,32 -5654,26 +7088,32 @@@ msgid "trustdb rec %lu: write failed (n
  msgstr ""
  "registro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
  
 +#: g10/tdbio.c:352
  msgid "trustdb transaction too large\n"
- msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
+ msgstr "transacción en la base de datos de confianza demasiado grande\n"
  
 +#: g10/tdbio.c:682
  #, c-format
  msgid "%s: directory does not exist!\n"
- msgstr "%s: �el directorio no existe!\n"
+ msgstr "%s: ¡el directorio no existe!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
  msgstr "no se puede acceder a `%s': %s\n"
  
 +#: g10/tdbio.c:724
  #, c-format
  msgid "%s: failed to create version record: %s"
- msgstr "%s: fallo en la creaci�n del registro de versi�n: %s"
+ msgstr "%s: fallo en la creación del registro de versión: %s"
  
 +#: g10/tdbio.c:729
  #, c-format
  msgid "%s: invalid trustdb created\n"
- msgstr "%s: se ha creado base de datos de confianza inv�lida\n"
+ msgstr "%s: se ha creado base de datos de confianza inválida\n"
  
 +#: g10/tdbio.c:732
  #, c-format
  msgid "%s: trustdb created\n"
  msgstr "%s: se ha creado base de datos de confianza\n"
@@@ -7080,33 -5683,26 +7124,33 @@@
  msgid "Note: trustdb not writable\n"
  msgstr "NOTA: no se puede escribir base de datos de confianza\n"
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
- msgstr "%s: base de datos de confianza inv�lida\n"
+ msgstr "%s: base de datos de confianza inválida\n"
  
 +#: g10/tdbio.c:834
  #, c-format
  msgid "%s: failed to create hashtable: %s\n"
- msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
+ msgstr "%s: fallo en la creación de la tabla hash: %s\n"
  
 +#: g10/tdbio.c:842
  #, c-format
  msgid "%s: error updating version record: %s\n"
- msgstr "%s: error actualizando el registro de versi�n: %s\n"
+ msgstr "%s: error actualizando el registro de versión: %s\n"
  
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
  #, c-format
  msgid "%s: error reading version record: %s\n"
- msgstr "%s: error leyendo registro de versi�n: %s\n"
+ msgstr "%s: error leyendo registro de versión: %s\n"
  
 +#: g10/tdbio.c:938
  #, c-format
  msgid "%s: error writing version record: %s\n"
- msgstr "%s: error escribiendo registro de versi�n: %s\n"
+ msgstr "%s: error escribiendo registro de versión: %s\n"
  
 +#: g10/tdbio.c:1461
  #, c-format
  msgid "trustdb: lseek failed: %s\n"
  msgstr "base de datos de confianza: fallo lseek: %s\n"
@@@ -7121,17 -5715,14 +7165,17 @@@ msgstr "base de datos de confianza: err
  msgid "%s: not a trustdb file\n"
  msgstr "%s: no es una base de datos de confianza\n"
  
 +#: g10/tdbio.c:1522
  #, c-format
  msgid "%s: version record with recnum %lu\n"
- msgstr "%s: registro de versi�n con n�mero de registro %lu\n"
+ msgstr "%s: registro de versión con número de registro %lu\n"
  
 +#: g10/tdbio.c:1528
  #, c-format
  msgid "%s: invalid file version %d\n"
- msgstr "%s: versi�n del fichero %d inv�lida\n"
+ msgstr "%s: versión del fichero %d inválida\n"
  
 +#: g10/tdbio.c:1748
  #, c-format
  msgid "%s: error reading free record: %s\n"
  msgstr "%s: error leyendo registro libre: %s\n"
@@@ -7146,198 -5735,185 +7190,227 @@@ msgstr "%s: error escribiendo registro 
  msgid "%s: failed to zero a record: %s\n"
  msgstr "%s: fallo en poner a cero un registro: %s\n"
  
 +#: g10/tdbio.c:1804
  #, c-format
  msgid "%s: failed to append a record: %s\n"
- msgstr "%s: fallo al a�adir un registro: %s\n"
+ msgstr "%s: fallo al añadir un registro: %s\n"
  
 +#: g10/tdbio.c:1865
  msgid "Error: The trustdb is corrupted.\n"
  msgstr "Error: base de datos de confianza corrupta.\n"
  
 +#: g10/textfilter.c:146
  #, c-format
  msgid "can't handle text lines longer than %d characters\n"
- msgstr "no se pueden manejar l�neas de texto de m�s de %d caracteres\n"
+ msgstr "no se pueden manejar líneas de texto de más de %d caracteres\n"
  
 +#: g10/textfilter.c:241
  #, c-format
  msgid "input line longer than %d characters\n"
- msgstr "l�nea de longitud superior a %d caracteres\n"
+ msgstr "línea de longitud superior a %d caracteres\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
- msgstr "error enviando opciones est�ndar: %s\n"
+ msgstr "error enviando opciones estándar: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "algoritmo no disponible: %s"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "error enviando orden %s: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "error escribiendo anillo privado `%s': %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: error escribiendo registro de directorio: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "error abriendo `%s': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "error enviando orden %s: %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
+ msgstr ""
+ 
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "error obteniendo nuevo PIN: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "lista clave e identificadores de usuario"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
- msgstr "Pol�tica: "
+ msgstr "Política: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
- msgstr "error obteniendo par�metros almacenados: %s\n"
+ msgstr "error obteniendo parámetros almacenados: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "lista claves"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "imprime res�menes de mensaje"
- msgstr[1] "imprime res�menes de mensaje"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "imprime resúmenes de mensaje"
+ msgstr[1] "imprime resúmenes de mensaje"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
+ #, fuzzy, c-format
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] "el algoritmo de resumen seleccionado no es válido\n"
+ msgstr[1] "el algoritmo de resumen seleccionado no es válido\n"
+ 
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ #| msgid "error writing key: %s\n"
+ msgid "resetting keydb: %s\n"
+ msgstr "error escribiendo clave: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
  msgid "error setting TOFU binding's trust level to %s\n"
- msgstr "error almacenando par�metros: %s\n"
+ msgstr "error almacenando parámetros: %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
@@@ -7345,42 -5921,36 +7418,42 @@@ msgstr "error creando tubería: %s\n
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, fuzzy, c-format
  #| msgid "second"
  msgid "%d~second"
@@@ -7388,52 -5958,50 +7461,60 @@@ msgid_plural "%d~seconds
  msgstr[0] "segundo"
  msgstr[1] "segundo"
  
- #: g10/tofu.c:1947
- #, c-format
- msgid "Have never verified a message signed by key %s!\n"
- msgstr ""
++#: g10/tofu.c:2802
+ #, fuzzy, c-format
+ #| msgid "%s: okay\n"
+ msgid "%s: "
+ msgstr "%s: bien\n"
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "%d firmas borradas\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "imprime res�menes de mensaje"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "imprime resúmenes de mensaje"
+ msgstr[1] "imprime resúmenes de mensaje"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld messages"
+ msgstr "el algoritmo de resumen seleccionado no es válido\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "el algoritmo de resumen seleccionado no es válido\n"
+ msgstr[1] "el algoritmo de resumen seleccionado no es válido\n"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7447,85 -6015,78 +7528,97 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "error enviando orden %s: %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "error escribiendo anillo público `%s': %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
- msgstr "'%s' no es un identificador largo de clave v�lido\n"
+ msgstr "'%s' no es un identificador largo de clave válido\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "clave %s: aceptada como clave fiable\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
- msgstr "la clave %s aparece m�s de una vez en la base de datos de confianza\n"
+ msgstr "la clave %s aparece más de una vez en la base de datos de confianza\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
- msgstr "clave %s: clave fiable sin clave p�blica - omitida\n"
+ msgstr "clave %s: clave fiable sin clave pública - omitida\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "clave %s marcada como de confianza absoluta\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
- msgstr "registro de confianza %lu, petici�n tipo %d: fallo lectura: %s\n"
+ msgstr "registro de confianza %lu, petición tipo %d: fallo lectura: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "registro de confianza %lu no es del tipo requerido %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
- "Puede intentar recrear la base de datos de confianza usando las �rdenes:\n"
+ "Puede intentar recrear la base de datos de confianza usando las órdenes:\n"
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr "Si eso no funciona, por favor consulte el manual\n"
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr "imposible usar modelo de confianza (%d) - asumiendo el modelo %s\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "usando %s como modelo de confianza\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
- msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
+ msgstr "no es necesaria una comprobación de la base de datos de confianza\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
- msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
+ msgstr "siguiente comprobación de base de datos de confianza el: %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  #| msgid "no need for a trustdb check with `%s' trust model\n"
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr ""
- "no es necesaria una comprobaci�n de la base de datos de confianza\n"
+ "no es necesaria una comprobación de la base de datos de confianza\n"
  "con el modelo de confianza `%s'\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  #| msgid "no need for a trustdb update with `%s' trust model\n"
  msgid "no need for a trustdb update with '%s' trust model\n"
@@@ -7533,20 -6094,16 +7626,20 @@@ msgstr "
  "no es necesario comprobar la base de datos de confianza\n"
  "con el modelo `%s'\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
- msgstr "clave p�blica %s no encontrada: %s\n"
+ msgstr "clave pública %s no encontrada: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "por favor haga un --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "comprobando base de datos de confianza\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7554,7 -6111,6 +7647,7 @@@ msgid_plural "%d keys processed
  msgstr[0] "%lu claves procesadas hasta ahora\n"
  msgstr[1] "%lu claves procesadas hasta ahora\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7562,16 -6118,13 +7655,16 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d claves procesadas (%d validaciones superadas)\n"
  msgstr[1] "%d claves procesadas (%d validaciones superadas)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "no se encuentran claves absolutamente fiables\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
- msgstr "clave p�blica de la clave absolutamente fiable %s no encontrada\n"
+ msgstr "clave pública de la clave absolutamente fiable %s no encontrada\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7579,14 -6132,12 +7672,14 @@@ msgstr "
  "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, "
  "%du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
- "no se puede actualizar el registro de la versi�n de la base de datos\n"
+ "no se puede actualizar el registro de la versión de la base de datos\n"
  "de confianza: fallo de escritura: %s\n"
  
 +#: g10/trust.c:105
  msgid "undefined"
  msgstr "no definido"
  
@@@ -7662,27 -6199,22 +7755,27 @@@ msgid "
  msgstr ""
  "la firma no se pudo verificar.\n"
  "Por favor recuerde que el fichero de firma (.sig o .asc)\n"
- "deber�a ser el primero que se da en la l�nea de �rdenes.\n"
+ "debería ser el primero que se da en la línea de órdenes.\n"
  
 +#: g10/verify.c:204
  #, c-format
  msgid "input line %u too long or missing LF\n"
- msgstr "la l�nea %u es demasiado larga o no tiene avance de l�nea (LF)\n"
+ msgstr "la línea %u es demasiado larga o no tiene avance de línea (LF)\n"
  
 +#: g10/verify.c:253
  #, c-format
  msgid "can't open fd %d: %s\n"
  msgstr "no se puede abrir fd %d: %s\n"
  
 +#: kbx/kbxutil.c:92
  msgid "set debugging flags"
- msgstr "establece los par�metros de depuraci�n"
+ msgstr "establece los parámetros de depuración"
  
 +#: kbx/kbxutil.c:93
  msgid "enable full debugging"
- msgstr "habilita depuraci�n completa"
+ msgstr "habilita depuración completa"
  
 +#: kbx/kbxutil.c:117
  msgid "Usage: kbxutil [options] [files] (-h for help)"
  msgstr "Uso: kbxutil [opciones] [ficheros] (-h para ayuda)"
  
@@@ -7698,53 -6229,40 +7791,53 @@@ msgstr "
  "Sintaxis: kbxutil [opciones] [ficheros]\n"
  "listar, exportar, importar datos Keybox\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
- msgstr "falta el m�dulo RSA o no es de %d bits\n"
+ msgstr "falta el módulo RSA o no es de %d bits\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
- msgstr "falta el exponente p�blico RSA o es mayor de %d bits\n"
+ msgstr "falta el exponente público RSA o es mayor de %d bits\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
- msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
+ msgstr "la función de manejo del PIN devolvió un error: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr "el PIN-Nulo no ha sido cambiado\n"
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
- msgstr "|N|Por favor introduzca un nuevo PIN para las claves est�ndar."
+ msgstr "|N|Por favor introduzca un nuevo PIN para las claves estándar."
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
- msgstr "||Por favor, introduzca PIN para claves est�ndar."
+ msgstr "||Por favor, introduzca PIN para claves estándar."
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
- msgstr "|NP|Introduzca nuevo PIN Unblocking Code (PUK) para claves est�ndar."
+ msgstr "|NP|Introduzca nuevo PIN Unblocking Code (PUK) para claves estándar."
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr ""
- "|P|Por favor introduzca PIN Unblocking Code (PUK) para claves est�ndar."
+ "|P|Por favor introduzca PIN Unblocking Code (PUK) para claves estándar."
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr "|N|Entre un nuevo PIN para la clave que crea firmas cualificadas."
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr "||Introduzca un PIN para la clave que crea firmas cualificadas."
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7752,7 -6270,6 +7845,7 @@@ msgstr "
  "|NP|Por favor introduzca un nuevo PIN Unblocking Code (PUK) para la clave "
  "que crea firmas cualificadas."
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7760,83 -6277,65 +7853,83 @@@ msgstr "
  "|NP|Por favor introduzca el PIN Unblocking Code (PUK) para la clave que crea "
  "firmas cualificadas."
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "error obteniendo nuevo PIN: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "fallo al almacenar la huella digital: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
- msgstr "fallo guardando la fecha de creaci�n: %s\n"
- 
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "fallo leyendo clave p�blica: %s\n"
+ msgstr "fallo guardando la fecha de creación: %s\n"
  
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "la respuesta no incluye la clave p�blica\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
- msgstr "la respuesta no incluye el m�dulo RSA\n"
+ msgstr "la respuesta no incluye el módulo RSA\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
- msgstr "la respuesta no incluye el exponente p�blico RSA\n"
+ msgstr "la respuesta no incluye el exponente público RSA\n"
  
- #: scd/app-openpgp.c:1322
++#: scd/app-openpgp.c:1353
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
- msgid "response does not contain the EC public point\n"
- msgstr "la respuesta no incluye el exponente p�blico RSA\n"
+ msgid "response does not contain the EC public key\n"
+ msgstr "la respuesta no incluye el exponente público RSA\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "la respuesta no incluye la clave pública\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "fallo leyendo clave pública: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "usando PIN por defecto %s\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr "fallo al usar el PIN por defecto %s: %s - en adelante deshabilitado\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Por favor introduzca PIN%%0A[firmas hechas: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
  msgstr "||Por favor introduzca PIN"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
- msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
+ msgstr "El PIN para CHV%d es demasiado corto; longitud mínima %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
- msgstr "la verificaci�n CHV%d fall�: %s\n"
+ msgstr "la verificación CHV%d falló: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "error recuperando el estatus CHV de la tarjeta\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
- msgstr "�la tarjeta est� bloqueada permanentemente!\n"
+ msgstr "¡la tarjeta está bloqueada permanentemente!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7851,145 -6350,115 +7944,145 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Introduzca PIN de Administrador%%0A[intentos restantes: %d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Por favor introduzca PIN de Administrador"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
- msgstr "el acceso a �rdenes de administrador no est� configurado\n"
+ msgstr "el acceso a órdenes de administrador no está configurado\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
- msgstr "||Por favor introduzca C�digo de Reinicio de la tarjeta"
+ msgstr "||Por favor introduzca Código de Reinicio de la tarjeta"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
- msgstr "C�digo de Reinicio demasiado corto; longitud m�nima %d\n"
+ msgstr "Código de Reinicio demasiado corto; longitud mínima %d\n"
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
- msgstr "|CR|Nuevo C�digo de Reinicio"
+ msgstr "|CR|Nuevo Código de Reinicio"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Nuevo PIN Administrador"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|Nuevo PIN"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  #| msgid "|A|Please enter the Admin PIN"
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "|A|Por favor introduzca PIN de Administrador"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  #| msgid "||Please enter the PIN"
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Por favor introduzca PIN"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
- msgstr "error leyendo datos de la aplicaci�n\n"
+ msgstr "error leyendo datos de la aplicación\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "error leyendo huella digital DO\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "la clave ya existe\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
- msgstr "la clave existente ser� reemplazada\n"
+ msgstr "la clave existente será reemplazada\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "generando nueva clave\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
  msgstr "escribiendo clave nueva\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
- msgstr "falta fecha de creaci�n\n"
+ msgstr "falta fecha de creación\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "el primo RSA %s falta o no es de %d bits\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "fallo al almacenar la clave: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI no disponible"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "por favor, espere mientras se genera la clave ...\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
- msgstr "la generaci�n de la clave fall�\n"
+ msgstr "la generación de la clave falló\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
- msgstr[0] "generaci�n de clave completada (%d segundos)\n"
- msgstr[1] "generaci�n de clave completada (%d segundos)\n"
+ msgstr[0] "generación de clave completada (%d segundos)\n"
+ msgstr[1] "generación de clave completada (%d segundos)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
- msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
+ msgstr "estructura de la tarjeta OpenPGP inválida (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr "la huella digital en la tarjeta no coincide con la solicitada\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "firmas creadas hasta ahora: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "actualmente se prohibe verificar el PIN del Administrador con esta orden\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
- msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
+ msgstr "no se puede acceder a %s - ¿tarjeta OpenPGP inválida?\n"
  
 +#: scd/app-dinsig.c:299
  #, fuzzy
  #| msgid "||Please enter your PIN at the reader's keypad"
  msgid "||Please enter your PIN at the reader's pinpad"
@@@ -8006,7 -6473,6 +8099,7 @@@ msgstr "|N|Nuevo PIN Inicial
  msgid "run in multi server mode (foreground)"
  msgstr "ejecutar en modo multi servidor (primer plano)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
  
@@@ -8030,21 -6491,17 +8123,21 @@@ msgstr "|NOMBRE|usa NOMBRE como driver 
  msgid "do not use the internal CCID driver"
  msgstr "no usa el driverd del CCID interno"
  
 +#: scd/scdaemon.c:147
  msgid "|N|disconnect the card after N seconds of inactivity"
- msgstr "|N|desconectar la tarjeta despu�s de N segundos de inactividad"
+ msgstr "|N|desconectar la tarjeta después de N segundos de inactividad"
  
 +#: scd/scdaemon.c:150
  #, fuzzy
  #| msgid "do not use a reader's keypad"
  msgid "do not use a reader's pinpad"
  msgstr "no usa el teclado del lector"
  
 +#: scd/scdaemon.c:155
  msgid "deny the use of admin card commands"
- msgstr "denegar �rdenes de administraci�n de la tarjeta"
+ msgstr "denegar órdenes de administración de la tarjeta"
  
 +#: scd/scdaemon.c:158
  msgid "use variable length input for pinpad"
  msgstr ""
  
@@@ -8066,61 -6521,49 +8159,61 @@@ msgstr "
  "Sintaxis: scdaemon [opciones] [orden [args]]\n"
  "Demonio de la tarjeta inteligente para GnuPG\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  #, fuzzy
  #| msgid ""
  #| "please use the option `--daemon' to run the program in the background\n"
  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"
+ msgstr "use la opción `--daemon' para ejectuar el programa en segundo plano\n"
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "manejador del descriptor %d iniciado\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "manejador del descriptor %d terminado\n"
  
 +#: sm/base64.c:327
  #, c-format
  msgid "invalid radix64 character %02x skipped\n"
- msgstr "caracter inv�lido radix64 %02x omitido\n"
+ msgstr "caracter inválido radix64 %02x omitido\n"
  
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  #| msgid "no gpg-agent running in this session\n"
  msgid "no dirmngr running in this session\n"
- msgstr "no hay un agente gpg ejecut�ndose en esta sesi�n\n"
+ msgstr "no hay un agente gpg ejecutándose en esta sesión\n"
  
 +#: sm/certchain.c:194
  #, c-format
  msgid "validation model requested by certificate: %s"
- msgstr "el certificado: %s requiere un modelo de validaci�n"
+ msgstr "el certificado: %s requiere un modelo de validación"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr "cadena"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr "shell"
  
 +#: sm/certchain.c:256 dirmngr/validate.c:107
  #, c-format
  msgid "critical certificate extension %s is not supported"
- msgstr "la extensi�n cr�tica de certificado %s no puede usarse"
+ msgstr "la extensión crítica de certificado %s no puede usarse"
  
 +#: sm/certchain.c:295 dirmngr/validate.c:205
  msgid "issuer certificate is not marked as a CA"
- msgstr "el certificado del emisor no est� marcado como CA"
+ msgstr "el certificado del emisor no está marcado como CA"
  
 +#: sm/certchain.c:333
  msgid "critical marked policy without configured policies"
- msgstr "pol�tica marcada como cr�tica sin pol�ticas configuradas"
+ msgstr "política marcada como crítica sin políticas configuradas"
  
 +#: sm/certchain.c:343
  #, fuzzy, c-format
  #| msgid "failed to open `%s': %s\n"
  msgid "failed to open '%s': %s\n"
@@@ -8130,206 -6572,157 +8223,206 @@@ msgstr "fallo abriendo `%s': %s\n
  #, fuzzy
  #| msgid "note: non-critical certificate policy not allowed"
  msgid "Note: non-critical certificate policy not allowed"
- msgstr "nota: no se permiten pol�ticas no cr�ticas de certificados"
+ msgstr "nota: no se permiten políticas no críticas de certificados"
  
 +#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
  msgid "certificate policy not allowed"
- msgstr "no se permite pol�tica de certificado"
+ msgstr "no se permite política de certificado"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
- msgstr "buscando al emisor en una localizaci�n externa\n"
+ msgstr "buscando al emisor en una localización externa\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr "numero de emisores coincidentes: %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
- msgstr "buscando emisor en el cach� de Dirmngr\n"
+ msgstr "buscando emisor en el caché de Dirmngr\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
- msgstr "n�mero de certificados coincidentes: %d\n"
+ msgstr "número de certificados coincidentes: %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
- msgstr "fallo buscando la clave s�lo cach� de dirmngr: %s\n"
+ msgstr "fallo buscando la clave sólo caché de dirmngr: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "fallo al reservar handle de keyDB\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
  msgstr "el certificado ha sido revocado"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "el estado del certificado es desconocido"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
- msgstr "por favor aseg�rese de que \"dirmngr\" est� bien instalado\n"
+ msgstr "por favor asegúrese de que \"dirmngr\" está bien instalado\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
- msgstr "la comprobaci�n de CRL fall�: %s"
+ msgstr "la comprobación de CRL falló: %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "validez del certificado incorrecta: %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
- msgstr "el certificado a�n no es v�lido"
+ msgstr "el certificado aún no es válido"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
- msgstr "el certificado ra�z no es v�lido a�n"
+ msgstr "el certificado raíz no es válido aún"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
- msgstr "el certificado intermedio a�n no es v�lido"
+ msgstr "el certificado intermedio aún no es válido"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
  msgstr "certificado caducado"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
- msgstr "el certificado ra�z ha caducado"
+ msgstr "el certificado raíz ha caducado"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
  msgstr "el certificado intermedio ha caducado"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr "faltan los atributos requeridos del certificado: %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
  msgstr "el certificado tiene una validez incorrecta"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr "la firma no se creo durante el tiempo de validez del certificado"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr "el certificado no se creo durante el tiempo de validez el emisor"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  "certificado intermedio no creado durante el tiempo de validez del emisor"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  ( firmas creadas en "
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "  (certificado creado en "
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
- msgstr "  (certificado v�lido desde "
+ msgstr "  (certificado válido desde "
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
- msgstr "  (     emisor v�lido desde "
+ msgstr "  (     emisor válido desde "
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "huella dactilar=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
- msgstr "certificado ra�z marcado ahora como fiable\n"
+ msgstr "certificado raíz marcado ahora como fiable\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
- msgstr "marcar interactivamente como fiable no est� activado en gpg-agent\n"
+ msgstr "marcar interactivamente como fiable no está activado en gpg-agent\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
- msgstr "marcar interactivamente como f�able desactivado en esta sesi�n\n"
+ msgstr "marcar interactivamente como fíable desactivado en esta sesión\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
- msgstr "AVISO: fecha de creaci�n de firma desconocida - asumo momento actual"
+ msgstr "AVISO: fecha de creación de firma desconocida - asumo momento actual"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "no se encuentra el emisor de este certificado"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr "certificado auto firmado con firma INCORRECTA"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
- msgstr "el certificado ra�z no est� marcado como fiable"
+ msgstr "el certificado raíz no está marcado como fiable"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
- msgstr "la comprobaci�n de la lista de confianza fall�: %s\n"
+ msgstr "la comprobación de la lista de confianza falló: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr "cadena de certificados demasiado larga\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "no se encuentra emisor del certificado"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
  msgstr "el certificado tiene una firma INCORRECTA"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr "encontrado otro posible certificado de CA coincidente - reintentando"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
- msgstr "cadena de certificados m�s larga de lo que permite la CA (%d)"
+ msgstr "cadena de certificados más larga de lo que permite la CA (%d)"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "certificado correcto\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
  msgstr "certificado intermedio correcto\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
- msgstr "certificado ra�z correcto\n"
+ msgstr "certificado raíz correcto\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr "cambiando al modelo en cadena"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
- msgstr "modelo de validaci�n usado: %s"
+ msgstr "modelo de validación usado: %s"
  
 +#: sm/certcheck.c:107
  #, c-format
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgstr "un hash de %u bits no vale para %u bits de la clave %s\n"
@@@ -8342,11 -6733,9 +8435,11 @@@ msgstr "(es el algoritmo MD2)\n
  msgid "none"
  msgstr "ninguno"
  
 +#: sm/certdump.c:552 sm/certdump.c:617
  msgid "[Error - invalid encoding]"
- msgstr "[Error - codificaci�n inv�lida]"
+ msgstr "[Error - codificación inválida]"
  
 +#: sm/certdump.c:560
  msgid "[Error - out of core]"
  msgstr "[Error - core]"
  
@@@ -8354,11 -6742,9 +8447,11 @@@
  msgid "[Error - No name]"
  msgstr "[Error - Sin nombre]"
  
 +#: sm/certdump.c:623
  msgid "[Error - invalid DN]"
- msgstr "[Error - DN inv�lido]"
+ msgstr "[Error - DN inválido]"
  
 +#: sm/certdump.c:833
  #, c-format
  msgid ""
  "Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -8377,36 -6762,30 +8470,36 @@@ msgstr "
  msgid "no key usage specified - assuming all usages\n"
  msgstr "no se especifica uso de la clave - asumiendo todos los usos\n"
  
 +#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
  #, c-format
  msgid "error getting key usage information: %s\n"
- msgstr "error obteniendo informaci�n sobre uso de la clave: %s\n"
+ msgstr "error obteniendo información sobre uso de la clave: %s\n"
  
 +#: sm/certlist.c:142 dirmngr/validate.c:1095
  #, fuzzy
  #| msgid "certificate should have not been used for certification\n"
  msgid "certificate should not have been used for certification\n"
- msgstr "el certificado no deber�a haberse usado para certificar\n"
+ msgstr "el certificado no debería haberse usado para certificar\n"
  
 +#: sm/certlist.c:154 dirmngr/validate.c:1107
  #, fuzzy
  #| msgid "certificate should have not been used for OCSP response signing\n"
  msgid "certificate should not have been used for OCSP response signing\n"
- msgstr "el certificado no deber�a haberse usado para firma en respuesta OCSP\n"
+ msgstr "el certificado no debería haberse usado para firma en respuesta OCSP\n"
  
 +#: sm/certlist.c:165 dirmngr/validate.c:1127
  #, fuzzy
  #| msgid "certificate should have not been used for encryption\n"
  msgid "certificate should not have been used for encryption\n"
- msgstr "el certificado no deber�a haberse usado para cifrar\n"
+ msgstr "el certificado no debería haberse usado para cifrar\n"
  
 +#: sm/certlist.c:166 dirmngr/validate.c:1129
  #, fuzzy
  #| msgid "certificate should have not been used for signing\n"
  msgid "certificate should not have been used for signing\n"
- msgstr "el certificado no deber�a haberse usado para firmar\n"
+ msgstr "el certificado no debería haberse usado para firmar\n"
  
 +#: sm/certlist.c:167 dirmngr/validate.c:1130
  msgid "certificate is not usable for encryption\n"
  msgstr "el certificado no es utilizable para cifrar\n"
  
@@@ -8414,118 -6792,98 +8507,118 @@@
  msgid "certificate is not usable for signing\n"
  msgstr "el certificado no es utilizable para firmar\n"
  
 +#: sm/certreqgen.c:464
  #, c-format
  msgid "line %d: invalid algorithm\n"
- msgstr "l�nea %d: algoritmo inv�lido\n"
+ msgstr "línea %d: algoritmo inválido\n"
  
 +#: sm/certreqgen.c:478
  #, c-format
  msgid "line %d: invalid key length %u (valid are %d to %d)\n"
- msgstr "l�nea %d: longitud de clave inv�lida %u (v�lidas de %d a %d)\n"
+ msgstr "línea %d: longitud de clave inválida %u (válidas de %d a %d)\n"
  
 +#: sm/certreqgen.c:496
  #, c-format
  msgid "line %d: no subject name given\n"
- msgstr "l�nea %d: falta nombre de entidad\n"
+ msgstr "línea %d: falta nombre de entidad\n"
  
 +#: sm/certreqgen.c:505
  #, fuzzy, c-format
  #| msgid "line %d: invalid subject name label `%.*s'\n"
  msgid "line %d: invalid subject name label '%.*s'\n"
- msgstr "l�nea %d: etiqueta con nombre de entidad inv�lida `%.*s'\n"
+ msgstr "línea %d: etiqueta con nombre de entidad inválida `%.*s'\n"
  
 +#: sm/certreqgen.c:508
  #, fuzzy, c-format
  #| msgid "line %d: invalid subject name `%s' at pos %d\n"
  msgid "line %d: invalid subject name '%s' at pos %d\n"
- msgstr "l�nea %d: nombre de entidad inv�lida `%s' posici�n %d\n"
+ msgstr "línea %d: nombre de entidad inválida `%s' posición %d\n"
  
 +#: sm/certreqgen.c:525
  #, c-format
  msgid "line %d: not a valid email address\n"
- msgstr "l�nea %d: no es una direcci�n de email v�lida\n"
+ msgstr "línea %d: no es una dirección de email válida\n"
  
 +#: sm/certreqgen.c:544
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "line %d: invalid serial number\n"
- msgstr "l�nea %d: algoritmo inv�lido\n"
+ msgstr "línea %d: algoritmo inválido\n"
  
 +#: sm/certreqgen.c:560
  #, fuzzy, c-format
  #| msgid "line %d: invalid subject name label `%.*s'\n"
  msgid "line %d: invalid issuer name label '%.*s'\n"
- msgstr "l�nea %d: etiqueta con nombre de entidad inv�lida `%.*s'\n"
+ msgstr "línea %d: etiqueta con nombre de entidad inválida `%.*s'\n"
  
 +#: sm/certreqgen.c:563
  #, fuzzy, c-format
  #| msgid "line %d: invalid subject name `%s' at pos %d\n"
  msgid "line %d: invalid issuer name '%s' at pos %d\n"
- msgstr "l�nea %d: nombre de entidad inv�lida `%s' posici�n %d\n"
+ msgstr "línea %d: nombre de entidad inválida `%s' posición %d\n"
  
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "line %d: invalid date given\n"
- msgstr "l�nea %d: algoritmo inv�lido\n"
+ msgstr "línea %d: algoritmo inválido\n"
  
 +#: sm/certreqgen.c:599
  #, fuzzy, c-format
  #| msgid "line %d: error getting key by keygrip `%s': %s\n"
  msgid "line %d: error getting signing key by keygrip '%s': %s\n"
- msgstr "l�nea %d: error obteniendo clave con keygrip `%s': %s\n"
+ msgstr "línea %d: error obteniendo clave con keygrip `%s': %s\n"
  
 +#: sm/certreqgen.c:618
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "line %d: invalid hash algorithm given\n"
- msgstr "l�nea %d: algoritmo inv�lido\n"
+ msgstr "línea %d: algoritmo inválido\n"
  
 +#: sm/certreqgen.c:633
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "line %d: invalid authority-key-id\n"
- msgstr "l�nea %d: algoritmo inv�lido\n"
+ msgstr "línea %d: algoritmo inválido\n"
  
 +#: sm/certreqgen.c:648
  #, fuzzy, c-format
  #| msgid "line %d: invalid subject name `%s' at pos %d\n"
  msgid "line %d: invalid subject-key-id\n"
- msgstr "l�nea %d: nombre de entidad inv�lida `%s' posici�n %d\n"
+ msgstr "línea %d: nombre de entidad inválida `%s' posición %d\n"
  
 +#: sm/certreqgen.c:686
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "line %d: invalid extension syntax\n"
- msgstr "l�nea %d: algoritmo inv�lido\n"
+ msgstr "línea %d: algoritmo inválido\n"
  
 +#: sm/certreqgen.c:699
  #, fuzzy, c-format
  #| msgid "line %d: error reading key `%s' from card: %s\n"
  msgid "line %d: error reading key '%s' from card: %s\n"
- msgstr "l�nea %d: error leyendo clave `%s' de la tarjeta: %s\n"
+ msgstr "línea %d: error leyendo clave `%s' de la tarjeta: %s\n"
  
 +#: sm/certreqgen.c:712
  #, fuzzy, c-format
  #| msgid "line %d: error getting key by keygrip `%s': %s\n"
  msgid "line %d: error getting key by keygrip '%s': %s\n"
- msgstr "l�nea %d: error obteniendo clave con keygrip `%s': %s\n"
+ msgstr "línea %d: error obteniendo clave con keygrip `%s': %s\n"
  
 +#: sm/certreqgen.c:729
  #, c-format
  msgid "line %d: key generation failed: %s <%s>\n"
- msgstr "l�nea %d: generaci�n de clave fallida: %s <%s>\n"
+ msgstr "línea %d: generación de clave fallida: %s <%s>\n"
  
 +#: sm/certreqgen.c:1324
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
- "Para completar este certificado introduzca por favor la frase contrase�apara "
- "la clave que acaba de crear una vez m�s.\n"
+ "Para completar este certificado introduzca por favor la frase contraseñapara "
+ "la clave que acaba de crear una vez más.\n"
  
 +#: sm/certreqgen-ui.c:162
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
@@@ -8545,12 -6900,10 +8638,12 @@@ msgstr "   (%d) Clave existente de la t
  msgid "error reading the card: %s\n"
  msgstr "error leyendo la tarjeta: %s\n"
  
 +#: sm/certreqgen-ui.c:237
  #, c-format
  msgid "Serial number of the card: %s\n"
- msgstr "N�mero de serie de la tarjeta: %s\n"
+ msgstr "Número de serie de la tarjeta: %s\n"
  
 +#: sm/certreqgen-ui.c:249
  msgid "Available keys:\n"
  msgstr "Claves disponibles:\n"
  
@@@ -8578,11 -6926,9 +8671,11 @@@ msgstr "   (%d) cifrar\n
  msgid "Enter the X.509 subject name: "
  msgstr "Introduzca nombre de entidad para X.509"
  
 +#: sm/certreqgen-ui.c:311
  msgid "No subject name given\n"
- msgstr "No se di� nombre de entidad\n"
+ msgstr "No se dió nombre de entidad\n"
  
 +#: sm/certreqgen-ui.c:315
  #, fuzzy, c-format
  #| msgid "Invalid subject name label `%.*s'\n"
  msgid "Invalid subject name label '%.*s'\n"
@@@ -8597,29 -6942,23 +8690,29 @@@ msgstr "Etiqueta de nombre de entidad i
  #, fuzzy, c-format
  #| msgid "Invalid subject name `%s'\n"
  msgid "Invalid subject name '%s'\n"
- msgstr "Nombre de entidad inv�lido `%s'\n"
+ msgstr "Nombre de entidad inválido `%s'\n"
  
 +#: sm/certreqgen-ui.c:326
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "28 visto por el traductor hasta la comilla inclusive"
  
 +#: sm/certreqgen-ui.c:338
  msgid "Enter email addresses"
- msgstr "Direcci�n de correo electr�nico: "
+ msgstr "Dirección de correo electrónico: "
  
 +#: sm/certreqgen-ui.c:339
  msgid " (end with an empty line):\n"
- msgstr " (termine con una l�nea en blanco):\n"
+ msgstr " (termine con una línea en blanco):\n"
  
 +#: sm/certreqgen-ui.c:343
  msgid "Enter DNS names"
  msgstr "Introduzca nombres de DNS"
  
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
  msgid " (optional; end with an empty line):\n"
- msgstr " (opcional; acabe con una l�nea en blanco):\n"
+ msgstr " (opcional; acabe con una línea en blanco):\n"
  
 +#: sm/certreqgen-ui.c:348
  msgid "Enter URIs"
  msgstr "Introduzca URIs"
  
@@@ -8627,9 -6965,8 +8720,9 @@@
  #, fuzzy
  #| msgid "Create a designated revocation certificate for this key? (y/N) "
  msgid "Create self-signed certificate? (y/N) "
- msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
+ msgstr "¿Crear un certificado de revocación para esta clave? (s/N)"
  
 +#: sm/certreqgen-ui.c:382
  msgid "These parameters are used:\n"
  msgstr ""
  
@@@ -8643,9 -6978,8 +8736,9 @@@ msgstr "certificado auto firmado con fi
  #, fuzzy
  #| msgid "Now creating certificate request.  This may take a while ...\n"
  msgid "Now creating certificate request.  "
- msgstr "Creando una petici�n de certificado.  Puede llevar un rato ...\n"
+ msgstr "Creando una petición de certificado.  Puede llevar un rato ...\n"
  
 +#: sm/certreqgen-ui.c:403
  msgid "This may take a while ...\n"
  msgstr ""
  
@@@ -8653,11 -6986,9 +8746,11 @@@
  msgid "Ready.\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:417
  msgid "Ready.  You should now send this request to your CA.\n"
- msgstr "Acabado. Deber�a mandar esta petici�n a su CA.\n"
+ msgstr "Acabado. Debería mandar esta petición a su CA.\n"
  
 +#: sm/certreqgen-ui.c:423
  msgid "resource problem: out of core\n"
  msgstr "problema de recursos: memoria desbordada\n"
  
@@@ -8675,7 -7003,6 +8768,7 @@@ msgstr "(no parece un mensaje cifrado)\
  msgid "certificate '%s' not found: %s\n"
  msgstr "certificado `%s' no encontrado: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
  msgstr "error bloqueando keybox: %s\n"
@@@ -8697,135 -7021,104 +8790,135 @@@ msgstr "certificado `%s' borrado\n
  msgid "deleting certificate \"%s\" failed: %s\n"
  msgstr "borrado del certificado \"%s\" fallido: %s\n"
  
 +#: sm/encrypt.c:328
  msgid "no valid recipients given\n"
- msgstr "no se dieron receptores v�lidos\n"
+ msgstr "no se dieron receptores válidos\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
  msgstr "lista claves externas"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
  msgstr "lista de cadenas de certificados"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
  msgstr "importa certificado"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
  msgstr "exporta certificado"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "registrar tarjeta inteligente"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "pasar una orden a dirmngr"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr "invocar gpg-protect-tool"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
  msgstr "crea una salida en base-64"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr "asumir entrada en formato PEM"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr "asumir entrada en formato base-64"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr "asumir entrada en formato binario"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr "nunca consultar una CRL"
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr "comprabar validez usando OCSP"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
- msgstr "|N|n�mero de certificados que incluir"
+ msgstr "|N|número de certificados que incluir"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
- msgstr "|FICHERO|tomar pol�tica de informaci�n de FICHERO"
+ msgstr "|FICHERO|tomar política de información de FICHERO"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
- msgstr "no comprobar pol�ticas de certificados"
+ msgstr "no comprobar políticas de certificados"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr "recuperar certificados de emisor perdidos"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "no usa la terminal en absoluto"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FICHERO|escribir un log en modo servidor en FICHERO"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
- msgstr "|FICHERO|escribir inform de auditor�a a FICHERO"
+ msgstr "|FICHERO|escribir inform de auditoría a FICHERO"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "proceso por lotes: nunca preguntar"
  
  # assume -> suponer, no asumir
- # No estoy seguro. El diccionario Collins en la acepci�n b) de asumir
+ # No estoy seguro. El diccionario Collins en la acepción b) de asumir
  # dice "b) (suponer) to assume, suppose..."
- # Adem�s una de las acepciones de asumir es "aceptar algo" y suponer
- # viene a ser asumir una idea como propia. Suponer "s�" en casi todas las
+ # Además una de las acepciones de asumir es "aceptar algo" y suponer
+ # viene a ser asumir una idea como propia. Suponer "sí" en casi todas las
  # preguntas no me acaba de gustar.
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
- msgstr "asume \"s�\" en casi todas las preguntas"
+ msgstr "asume \"sí\" en casi todas las preguntas"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "asume \"no\" en casi todas las preguntas"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
- msgstr "|FICHERO|a�ade este anillo a la lista de anillos"
+ msgstr "|FICHERO|añade este anillo a la lista de anillos"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|ID-USUARIO|usa ID-USUARIO como clave secreta por defecto"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|ESPEC|usa este servidor para buscar claves"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgsm [options] [files]\n"
@@@ -8838,56 -7131,46 +8931,56 @@@ msgid "
  msgstr ""
  "Sintaxis: gpgsm [opciones] [ficheros]\n"
  "firma, comprueba, cifra o descifra usando protocolo S/MIME\n"
- "la operaci�n por defecto depende de los datos de entrada\n"
+ "la operación por defecto depende de los datos de entrada\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  #| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
  msgid "Note: won't be able to encrypt to '%s': %s\n"
- msgstr "NOTA: no se podr� cifrar a `%s': %s\n"
+ msgstr "NOTA: no se podrá cifrar a `%s': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  #| msgid "unknown validation model `%s'\n"
  msgid "unknown validation model '%s'\n"
- msgstr "modelo de validaci�n desconocido `%s'\n"
+ msgstr "modelo de validación desconocido `%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: falta el nombre del host\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
- msgstr "%s:%u: se dio contrase�a sin usuario\n"
+ msgstr "%s:%u: se dio contraseña sin usuario\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
- msgstr "%s:%u: omitir esta l�nea\n"
+ msgstr "%s:%u: omitir esta línea\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
  msgstr "no se puede interpretar el servidor de claves\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  #| msgid "importing common certificates `%s'\n"
  msgid "importing common certificates '%s'\n"
  msgstr "importando certificados comunes `%s'\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  #| msgid "can't sign using `%s': %s\n"
  msgid "can't sign using '%s': %s\n"
  msgstr "no puedo firmar usando `%s': %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
- msgstr "orden inv�lida (no hay orden impl�cita)\n"
+ msgstr "orden inválida (no hay orden implícita)\n"
  
 +#: sm/import.c:127
  #, c-format
  msgid "total number processed: %lu\n"
  msgstr "cantidad total procesada: %lu\n"
@@@ -8896,16 -7178,13 +8989,16 @@@
  msgid "error storing certificate\n"
  msgstr "error almacenando certificado\n"
  
 +#: sm/import.c:254
  msgid "basic certificate checks failed - not imported\n"
- msgstr "fallaron comprobaciones b�sicas sobre el certificado - no importado\n"
+ msgstr "fallaron comprobaciones básicas sobre el certificado - no importado\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
- msgstr "error obteniendo par�metros almacenados: %s\n"
+ msgstr "error obteniendo parámetros almacenados: %s\n"
  
 +#: sm/import.c:526 sm/import.c:558
  #, c-format
  msgid "error importing certificate: %s\n"
  msgstr "error importando el certificado: %s\n"
@@@ -8915,56 -7193,45 +9008,56 @@@
  msgid "error reading input: %s\n"
  msgstr "error leyendo entrada: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
  msgstr "fallo obteniendo huella digital\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr "problema buscando el certificado existente: %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "error obteniendo keyDB para escribir: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
  msgstr "error almacenando certificado: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "problema re-buscando el certificado: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
- msgstr "error almacenando par�metros: %s\n"
+ msgstr "error almacenando parámetros: %s\n"
  
 +#: sm/keylist.c:657
  msgid "Error - "
  msgstr "Error - "
  
 +#: sm/misc.c:58
  msgid "GPG_TTY has not been set - using maybe bogus default\n"
- msgstr "GPG_TTY no tiene valor - usando valor por defecto quiz� absurdo\n"
+ msgstr "GPG_TTY no tiene valor - usando valor por defecto quizá absurdo\n"
  
 +#: sm/qualified.c:105
  #, fuzzy, c-format
  #| msgid "invalid formatted fingerprint in `%s', line %d\n"
  msgid "invalid formatted fingerprint in '%s', line %d\n"
- msgstr "formato inv�lido de huella dactilar en `%s', l�nea %d\n"
+ msgstr "formato inválido de huella dactilar en `%s', línea %d\n"
  
 +#: sm/qualified.c:123
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "invalid country code in '%s', line %d\n"
- msgstr "c�digo de pa�s inv�lido en `%s', l�nea %d\n"
+ msgstr "código de país inválido en `%s', línea %d\n"
  
 +#: sm/qualified.c:206
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
@@@ -8974,32 -7241,29 +9067,32 @@@
  "\n"
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
- "Est� a punto de crear una firma usando su certificado:\n"
+ "Está a punto de crear una firma usando su certificado:\n"
  "\"%s\"\n"
- "Esto crear� una firma v�lida ante la ley e igual a una firma manuscrita\n"
+ "Esto creará una firma válida ante la ley e igual a una firma manuscrita\n"
  "\n"
- "%s%sEst� realmente seguro de querer hacer esto?"
+ "%s%sEstá realmente seguro de querer hacer esto?"
  
 +#: sm/qualified.c:215 sm/verify.c:617
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
  msgstr ""
- "Observe que este programa no est� oficialmente aprobado para crear "
+ "Observe que este programa no está oficialmente aprobado para crear "
  "overificar tales firmas.\n"
  
 +#: sm/qualified.c:282
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
  "\"%s\"\n"
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
- "Est� a punto de crear una firma usando su certificado:\n"
+ "Está a punto de crear una firma usando su certificado:\n"
  "\"%s\"\n"
- "�Observe que este certificado NO crear� una firma cualificada!"
+ "¡Observe que este certificado NO creará una firma cualificada!"
  
 +#: sm/sign.c:451
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr "resumen %d (%s) para firmante %d no puede utilizarse; usando %s\n"
@@@ -9009,12 -7272,10 +9102,12 @@@
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr "algoritmo de hash usado para el firmante %d: %s (%s)\n"
  
 +#: sm/sign.c:517
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
- msgstr "la comprobaci�n de la firma cualificada fall�: %s\n"
+ msgstr "la comprobación de la firma cualificada falló: %s\n"
  
 +#: sm/verify.c:450
  msgid "Signature made "
  msgstr "Firmado el "
  
@@@ -9027,12 -7286,10 +9120,12 @@@ msgstr "[no hay fecha]
  msgid " using certificate ID 0x%08lX\n"
  msgstr "usando el certificado ID 0x%08lX\n"
  
 +#: sm/verify.c:474
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
- msgstr "firma inv�lida: el resumen del mensaje no coincide con el calculado\n"
+ msgstr "firma inválida: el resumen del mensaje no coincide con el calculado\n"
  
 +#: sm/verify.c:595
  msgid "Good signature from"
  msgstr "Firma correcta de"
  
@@@ -9070,9 -7320,8 +9163,9 @@@ msgstr "problema buscando el certificad
  #, fuzzy, c-format
  #| msgid "looking up issuer from the Dirmngr cache\n"
  msgid "dropping %u certificates from the cache\n"
- msgstr "buscando emisor en el cach� de Dirmngr\n"
+ msgstr "buscando emisor en el caché de Dirmngr\n"
  
 +#: dirmngr/certcache.c:387
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
@@@ -9126,9 -7366,8 +9219,9 @@@ msgstr "Certificados incluidos
  #, fuzzy, c-format
  #| msgid "number of matching certificates: %d\n"
  msgid "    runtime cached certificates: %u\n"
- msgstr "n�mero de certificados coincidentes: %d\n"
+ msgstr "número de certificados coincidentes: %d\n"
  
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
  #, fuzzy
  #| msgid "  (certificate created at "
  msgid "certificate already cached\n"
@@@ -9151,9 -7386,8 +9244,9 @@@ msgstr "error almacenando certificado: 
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "invalid SHA1 fingerprint string '%s'\n"
- msgstr "huella dactilar no v�lida"
+ msgstr "huella dactilar no válida"
  
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by S/N: %s\n"
@@@ -9175,9 -7406,8 +9268,9 @@@ msgstr "no se encuentra el emisor de es
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error getting authorityKeyIdentifier: %s\n"
- msgstr "error obteniendo par�metros almacenados: %s\n"
+ msgstr "error obteniendo parámetros almacenados: %s\n"
  
 +#: dirmngr/crlcache.c:213
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "creating directory '%s'\n"
@@@ -9193,9 -7421,8 +9286,9 @@@ msgstr "error creando caja de claves `%
  #, fuzzy, c-format
  #| msgid "ignoring garbage line"
  msgid "ignoring database dir '%s'\n"
- msgstr "ignorando l�nea con basura"
+ msgstr "ignorando línea con basura"
  
 +#: dirmngr/crlcache.c:254
  #, fuzzy, c-format
  #| msgid "error reading from %s: %s\n"
  msgid "error reading directory '%s': %s\n"
@@@ -9205,15 -7431,13 +9298,15 @@@ msgstr "error leyendo de %s: %s\n
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "removing cache file '%s'\n"
- msgstr "fallo recibiendo la l�nea: %s\n"
+ msgstr "fallo recibiendo la línea: %s\n"
  
 +#: dirmngr/crlcache.c:284
  #, fuzzy, c-format
  #| msgid "enarmoring failed: %s\n"
  msgid "not removing file '%s'\n"
- msgstr "creaci�n de armadura fallida: %s\n"
+ msgstr "creación de armadura fallida: %s\n"
  
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
  #, fuzzy, c-format
  #| msgid "error closing %s: %s\n"
  msgid "error closing cache file: %s\n"
@@@ -9247,9 -7466,8 +9340,9 @@@ msgstr "error cerrando %s: %s\n
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new cache dir file '%s' created\n"
- msgstr "creado un nuevo fichero de configuraci�n `%s'\n"
+ msgstr "creado un nuevo fichero de configuración `%s'\n"
  
 +#: dirmngr/crlcache.c:445
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "failed to re-open cache dir file '%s': %s\n"
@@@ -9277,15 -7490,13 +9370,15 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "invalid line detected in '%s' line %u\n"
- msgstr "c�digo de pa�s inv�lido en `%s', l�nea %d\n"
+ msgstr "código de país inválido en `%s', línea %d\n"
  
 +#: dirmngr/crlcache.c:632
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "duplicate entry detected in '%s' line %u\n"
- msgstr "c�digo de pa�s inv�lido en `%s', l�nea %d\n"
+ msgstr "código de país inválido en `%s', línea %d\n"
  
 +#: dirmngr/crlcache.c:647
  #, c-format
  msgid "unsupported record type in '%s' line %u skipped\n"
  msgstr ""
@@@ -9294,27 -7504,23 +9387,27 @@@
  #, fuzzy, c-format
  #| msgid "invalid keyflag in `%s', line %d\n"
  msgid "invalid issuer hash in '%s' line %u\n"
- msgstr "opci�n de clave inv�lida en `%s', l�nea %d\n"
+ msgstr "opción de clave inválida en `%s', línea %d\n"
  
 +#: dirmngr/crlcache.c:679
  #, fuzzy, c-format
  #| msgid "bad fingerprint in `%s', line %d\n"
  msgid "no issuer DN in '%s' line %u\n"
- msgstr "huella digital incorrecta en `%s', l�nea %d\n"
+ msgstr "huella digital incorrecta en `%s', línea %d\n"
  
 +#: dirmngr/crlcache.c:686
  #, fuzzy, c-format
  #| msgid "invalid keyflag in `%s', line %d\n"
  msgid "invalid timestamp in '%s' line %u\n"
- msgstr "opci�n de clave inv�lida en `%s', l�nea %d\n"
+ msgstr "opción de clave inválida en `%s', línea %d\n"
  
 +#: dirmngr/crlcache.c:692
  #, fuzzy, c-format
  #| msgid "invalid keyflag in `%s', line %d\n"
  msgid "WARNING: invalid cache file hash in '%s' line %u\n"
- msgstr "opci�n de clave inv�lida en `%s', l�nea %d\n"
+ msgstr "opción de clave inválida en `%s', línea %d\n"
  
 +#: dirmngr/crlcache.c:698
  msgid "detected errors in cache dir file\n"
  msgstr ""
  
@@@ -9362,9 -7560,8 +9455,9 @@@ msgstr "error en `%s': %s\n
  #, fuzzy, c-format
  #| msgid "invalid formatted fingerprint in `%s', line %d\n"
  msgid "invalid formatted checksum for '%s'\n"
- msgstr "formato inv�lido de huella dactilar en `%s', l�nea %d\n"
+ msgstr "formato inválido de huella dactilar en `%s', línea %d\n"
  
 +#: dirmngr/crlcache.c:1108
  msgid "too many open cache files; can't open anymore\n"
  msgstr ""
  
@@@ -9372,9 -7568,8 +9465,9 @@@
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "opening cache file '%s'\n"
- msgstr "fallo mandando la l�nea: %s\n"
+ msgstr "fallo mandando la línea: %s\n"
  
 +#: dirmngr/crlcache.c:1145
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening cache file '%s': %s\n"
@@@ -9456,15 -7636,13 +9549,15 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error getting data from cache file: %s\n"
- msgstr "error obteniendo par�metros almacenados: %s\n"
+ msgstr "error obteniendo parámetros almacenados: %s\n"
  
 +#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
- msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
+ msgstr "algoritmo de distribución inválido `%s'\n"
  
 +#: dirmngr/crlcache.c:1549
  #, c-format
  msgid "gcry_md_open for algorithm %d failed: %s\n"
  msgstr ""
@@@ -9473,33 -7650,28 +9566,33 @@@
  #, fuzzy
  #| msgid "invalid response from agent\n"
  msgid "got an invalid S-expression from libksba\n"
- msgstr "respuesta del agente inv�lida\n"
+ msgstr "respuesta del agente inválida\n"
  
 +#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "converting S-expression failed: %s\n"
- msgstr "al cambiar permisos de `%s' ocurri� el fallo: %s\n"
+ msgstr "al cambiar permisos de `%s' ocurrió el fallo: %s\n"
  
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "creating S-expression failed: %s\n"
- msgstr "al cambiar permisos de `%s' ocurri� el fallo: %s\n"
+ msgstr "al cambiar permisos de `%s' ocurrió el fallo: %s\n"
  
 +#: dirmngr/crlcache.c:1699
  #, fuzzy, c-format
  #| msgid "build_packet failed: %s\n"
  msgid "ksba_crl_parse failed: %s\n"
- msgstr "construcci�n del paquete fallida: %s\n"
+ msgstr "construcción del paquete fallida: %s\n"
  
 +#: dirmngr/crlcache.c:1714
  #, fuzzy, c-format
  #| msgid "error getting serial number of card: %s\n"
  msgid "error getting update times of CRL: %s\n"
- msgstr "error obteniendo el n�mero de serie de la tarjeta: %s\n"
+ msgstr "error obteniendo el número de serie de la tarjeta: %s\n"
  
 +#: dirmngr/crlcache.c:1721
  #, c-format
  msgid "update times of this CRL: this=%s next=%s\n"
  msgstr ""
@@@ -9534,15 -7700,13 +9627,15 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "signature verification suppressed\n"
  msgid "CRL signature verification failed: %s\n"
- msgstr "suprimida la verificaci�n de la firma\n"
+ msgstr "suprimida la verificación de la firma\n"
  
 +#: dirmngr/crlcache.c:1858
  #, fuzzy, c-format
  #| msgid "error reading list of trusted root certificates\n"
  msgid "error checking validity of CRL issuer certificate: %s\n"
- msgstr "error leyendo la lista de certificados ra�z fiables\n"
+ msgstr "error leyendo la lista de certificados raíz fiables\n"
  
 +#: dirmngr/crlcache.c:2001
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "ksba_crl_new failed: %s\n"
@@@ -9576,9 -7735,8 +9669,9 @@@ msgstr "error creando fichero temporal
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
- msgstr "lid ?: inserci�n fallida: %s\n"
+ msgstr "lid ?: inserción fallida: %s\n"
  
 +#: dirmngr/crlcache.c:2076
  #, fuzzy, c-format
  #| msgid "error writing to temporary file: %s\n"
  msgid "error finishing temporary cache file '%s': %s\n"
@@@ -9615,9 -7767,8 +9708,9 @@@ msgstr "error leyendo entrada: %s\n
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "creating cache file '%s'\n"
- msgstr "error creando tuber�a: %s\n"
+ msgstr "error creando tubería: %s\n"
  
 +#: dirmngr/crlcache.c:2221
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "problem renaming '%s' to '%s': %s\n"
@@@ -9658,9 -7802,8 +9751,9 @@@ msgstr "
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr ""
- "ATENCI�N: tama�o incorrecto del fichero de semillas aleatorias - no se usa\n"
+ "ATENCIÓN: tamaño incorrecto del fichero de semillas aleatorias - no se usa\n"
  
 +#: dirmngr/crlcache.c:2333
  #, fuzzy, c-format
  #| msgid "error reading the card: %s\n"
  msgid "problem reading cache record: %s\n"
@@@ -9676,9 -7817,8 +9769,9 @@@ msgstr "problema re-buscando el certifi
  #, fuzzy, c-format
  #| msgid "error reading nonce on fd %d: %s\n"
  msgid "error reading cache entry from db: %s\n"
- msgstr "error leyendo valor �nico en el descriptor %d: %s\n"
+ msgstr "error leyendo valor único en el descriptor %d: %s\n"
  
 +#: dirmngr/crlcache.c:2378
  msgid "End CRL dump\n"
  msgstr ""
  
@@@ -9692,15 -7830,13 +9785,15 @@@ msgstr "lectura fallida: %s\n
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_cache_insert via DP failed: %s\n"
- msgstr "lid ?: inserci�n fallida: %s\n"
+ msgstr "lid ?: inserción fallida: %s\n"
  
 +#: dirmngr/crlcache.c:2570
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "crl_cache_insert via issuer failed: %s\n"
- msgstr "fallo recibiendo la l�nea: %s\n"
+ msgstr "fallo recibiendo la línea: %s\n"
  
 +#: dirmngr/crlfetch.c:74
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
@@@ -9736,16 -7864,13 +9829,16 @@@ msgstr "demasiadas preferencias de cifr
  #, fuzzy, c-format
  #| msgid "error retrieving `%s' via %s: %s\n"
  msgid "error retrieving '%s': %s\n"
- msgstr "error recuperando `%s' v�a %s: %s\n"
+ msgstr "error recuperando `%s' vía %s: %s\n"
  
 +#: dirmngr/crlfetch.c:279
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error retrieving '%s': http status %u\n"
- msgstr "error ejecutando `%s': c�digo de finalizaci�n %d\n"
+ msgstr "error ejecutando `%s': código de finalización %d\n"
  
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
  #, fuzzy
  #| msgid "certificate `%s' not found: %s\n"
  msgid "CRL access not possible due to Tor mode\n"
@@@ -9855,9 -7961,8 +9948,9 @@@ msgstr "no se puede conectar con `%s': 
  #, fuzzy, c-format
  #| msgid "update failed: %s\n"
  msgid "lookup failed: %s\n"
- msgstr "actualizaci�n fallida: %s\n"
+ msgstr "actualización fallida: %s\n"
  
 +#: dirmngr/dirmngr-client.c:347
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "loading CRL '%s' failed: %s\n"
@@@ -9895,9 -7994,8 +9988,9 @@@ msgstr "borrado del certificado \"%s\" 
  #, fuzzy, c-format
  #| msgid "can't stat `%s': %s\n"
  msgid "got status: '%s'\n"
- msgstr "no se puede obtener informaci�n de `%s': %s\n"
+ msgstr "no se puede obtener información de `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:443
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing base64 encoding: %s\n"
@@@ -9918,126 -8013,102 +10011,130 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "|FILE|run commands from FILE on startup"
  msgid "|FILE|load CRL from FILE into cache"
- msgstr "|FICHERO|ejecuta �rdenes de FICHERO al empezar"
+ msgstr "|FICHERO|ejecuta órdenes de FICHERO al empezar"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "pasar una orden a dirmngr"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FICHERO|escribir logs en modo servidor en FICHERO"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
- msgstr "�Salir sin grabar? (s/N) "
+ msgstr "¿Salir sin grabar? (s/N) "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
- msgstr "permitir b�squedas PKA (peticiones DNS)"
+ msgstr "permitir búsquedas PKA (peticiones DNS)"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  #| msgid "|FILE|read options from FILE"
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FICHERO|lee opciones desde FICHERO"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set LDAP timeout to N seconds"
- msgstr "|N|establecer vida m�xima del cach� de PIN en N segundos"
+ msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  #| msgid "|URL|use keyserver at URL"
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|usar servidor de claves en URL"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- # ordenes -> �rdenes
- # 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.
- #: dirmngr/dirmngr.c:228
+ # ordenes -> órdenes
+ # 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.
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10048,15 -8119,13 +10145,15 @@@ msgid "
  "options)\n"
  msgstr ""
  "@\n"
- "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
+ "(Véase en la página del manual la lista completo de órdenes y opciones)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10068,88 -8137,71 +10165,88 @@@ msgstr "
  "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
  "Manejo de claves privadas por GnuPG\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "valid debug levels are: %s\n"
- msgstr "el nivel de depuraci�n `%s` no es v�lido\n"
+ msgstr "el nivel de depuración `%s` no es válido\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "uso: gpgsm [opciones] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
- msgstr "�%s no permitido con %s!\n"
+ msgstr "¡%s no permitido con %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "renombrando `%s' en `%s' fallo: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  #| msgid "conversion from `%s' to `%s' failed: %s\n"
  msgid "processing CRL from '%s' failed: %s\n"
- msgstr "la conversi�n de `%s' en `%s' fall�: %s\n"
+ msgstr "la conversión de `%s' en `%s' falló: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  #| msgid "line too long - skipped\n"
  msgid "%s:%u: line too long - skipped\n"
- msgstr "l�nea demasiado larga -omitida\n"
+ msgstr "línea demasiado larga -omitida\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
- msgstr "huella dactilar no v�lida"
+ msgstr "huella dactilar no válida"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "%s:%u: read error: %s\n"
  msgstr "error de lectura `%s': %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "no forzado"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10217,9 -8256,8 +10314,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "invalid import options\n"
  msgid "invalid port number %d\n"
- msgstr "opciones de importaci�n inv�lidas\n"
+ msgstr "opciones de importación inválidas\n"
  
 +#: dirmngr/dirmngr_ldap.c:413
  #, c-format
  msgid "scanning result for attribute '%s'\n"
  msgstr ""
@@@ -10310,9 -8331,8 +10407,9 @@@ msgstr "
  #, fuzzy
  #| msgid "WARNING: using insecure memory!\n"
  msgid "WARNING: using first attribute only\n"
- msgstr "ATENCI�N: �se est� usando memoria insegura!\n"
+ msgstr "ATENCIÓN: ¡se está usando memoria insegura!\n"
  
 +#: dirmngr/dirmngr_ldap.c:636
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "LDAP init to '%s:%d' failed: %s\n"
@@@ -10328,9 -8346,8 +10425,9 @@@ msgstr "renombrando `%s' en `%s' fallo
  #, fuzzy, c-format
  #| msgid "dearmoring failed: %s\n"
  msgid "searching '%s' failed: %s\n"
- msgstr "eliminaci�n de armadura fallida: %s\n"
+ msgstr "eliminación de armadura fallida: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:718
  #, fuzzy, c-format
  #| msgid "`%s' is not a JPEG file\n"
  msgid "'%s' is not an LDAP URL\n"
@@@ -10341,14 -8357,6 +10438,7 @@@ msgstr "`%s' no es un fichero JPEG\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- #| msgid "error allocating enough memory: %s\n"
- msgid "error allocating memory: %s\n"
- msgstr "error reservando memoria: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  #| msgid "error writing to %s: %s\n"
  msgid "error printing log line: %s\n"
@@@ -10364,9 -8370,8 +10454,9 @@@ msgstr "error leyendo de %s: %s\n
  #, fuzzy, c-format
  #| msgid "pth_select failed: %s - waiting 1s\n"
  msgid "npth_select failed: %s - waiting 1s\n"
- msgstr "pth_select fall�: %s - espero 1s\n"
+ msgstr "pth_select falló: %s - espero 1s\n"
  
 +#: dirmngr/ldap-wrapper.c:343
  #, c-format
  msgid "ldap wrapper %d ready"
  msgstr ""
@@@ -10401,9 -8400,8 +10491,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "reading public key failed: %s\n"
  msgid "reading from ldap wrapper %d failed: %s\n"
- msgstr "fallo leyendo clave p�blica: %s\n"
+ msgstr "fallo leyendo clave pública: %s\n"
  
 +#: dirmngr/ldap.c:91
  #, c-format
  msgid "invalid char 0x%02x in host name - not added\n"
  msgstr ""
@@@ -10433,21 -8426,18 +10523,21 @@@ msgstr "
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
- msgstr "%s: versi�n del fichero %d inv�lida\n"
+ msgstr "%s: versión del fichero %d inválida\n"
  
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
  #, fuzzy, c-format
  #| msgid "iconv_open failed: %s\n"
  msgid "gcry_md_open failed: %s\n"
- msgstr "iconv_open fall�: %s\n"
+ msgstr "iconv_open falló: %s\n"
  
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
- msgstr "actualizaci�n de la clave secreta fallida: %s\n"
+ msgstr "actualización de la clave secreta fallida: %s\n"
  
 +#: dirmngr/misc.c:518
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10462,9 -8450,8 +10552,9 @@@ msgstr "error leyendo de %s: %s\n
  #| msgid "Error: Private DO too long (limit is %d characters).\n"
  msgid "response from server too large; limit is %d bytes\n"
  msgstr ""
- "Error: los datos privados son demasiado largos (l�mite de %d caracteres).\n"
+ "Error: los datos privados son demasiado largos (límite de %d caracteres).\n"
  
 +#: dirmngr/ocsp.c:139
  #, fuzzy
  #| msgid "certificate `%s' not found: %s\n"
  msgid "OCSP request not possible due to Tor mode\n"
@@@ -10478,9 -8463,8 +10568,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
  msgid "error setting OCSP target: %s\n"
- msgstr "error almacenando par�metros: %s\n"
+ msgstr "error almacenando parámetros: %s\n"
  
 +#: dirmngr/ocsp.c:170
  #, fuzzy, c-format
  #| msgid "error loading `%s': %s\n"
  msgid "error building OCSP request: %s\n"
@@@ -10502,9 -8483,8 +10592,9 @@@ msgstr "error leyendo de %s: %s\n
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error accessing '%s': http status %u\n"
- msgstr "error ejecutando `%s': c�digo de finalizaci�n %d\n"
+ msgstr "error ejecutando `%s': código de finalización %d\n"
  
 +#: dirmngr/ocsp.c:265
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error parsing OCSP response for '%s': %s\n"
@@@ -10519,9 -8497,8 +10609,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "hashing the OCSP response for '%s' failed: %s\n"
- msgstr "al cambiar permisos de `%s' ocurri� el fallo: %s\n"
+ msgstr "al cambiar permisos de `%s' ocurrió el fallo: %s\n"
  
 +#: dirmngr/ocsp.c:328
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
@@@ -10533,9 -8508,8 +10623,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "allocating list item failed: %s\n"
- msgstr "fallo recibiendo la l�nea: %s\n"
+ msgstr "fallo recibiendo la línea: %s\n"
  
 +#: dirmngr/ocsp.c:479
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error getting responder ID: %s\n"
@@@ -10545,9 -8518,8 +10635,9 @@@ msgstr "error obteniendo nuevo PIN: %s\
  #, fuzzy
  #| msgid "certificate should have not been used for OCSP response signing\n"
  msgid "no suitable certificate found to verify the OCSP response\n"
- msgstr "el certificado no deber�a haberse usado para firma en respuesta OCSP\n"
+ msgstr "el certificado no debería haberse usado para firma en respuesta OCSP\n"
  
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
  #, fuzzy, c-format
  #| msgid "issuer certificate not found"
  msgid "issuer certificate not found: %s\n"
@@@ -10557,9 -8528,8 +10647,9 @@@ msgstr "no se encuentra emisor del cert
  #, fuzzy
  #| msgid "error reading list of trusted root certificates\n"
  msgid "caller did not return the target certificate\n"
- msgstr "error leyendo la lista de certificados ra�z fiables\n"
+ msgstr "error leyendo la lista de certificados raíz fiables\n"
  
 +#: dirmngr/ocsp.c:570
  #, fuzzy
  #| msgid "error storing certificate\n"
  msgid "caller did not return the issuing certificate\n"
@@@ -10637,87 -8593,71 +10727,87 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire(%s) failed: %s\n"
- msgstr "fallo mandando la l�nea: %s\n"
+ msgstr "fallo mandando la línea: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire failed: %s\n"
- msgstr "fallo mandando la l�nea: %s\n"
+ msgstr "fallo mandando la línea: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "select fallido: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error sending data: %s\n"
  msgstr "error enviando orden %s: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "start_cert_fetch failed: %s\n"
  msgstr "select fallido: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_next_cert failed: %s\n"
  msgstr "select fallido: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  #| msgid "cannot allocate outfile string: %s\n"
  msgid "can't allocate control structure: %s\n"
  msgstr "no puedo reservar espacio para la cadena de salida: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  #| msgid "failed to create stream from socket: %s\n"
  msgid "failed to allocate assuan context: %s\n"
  msgstr "fallo al crear un flujo desde el socket: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
- msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
+ msgstr "inicialización de la base de datos de confianza fallida: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  #| msgid "failed to store the creation date: %s\n"
  msgid "failed to the register commands with Assuan: %s\n"
- msgstr "fallo guardando la fecha de creaci�n: %s\n"
+ msgstr "fallo guardando la fecha de creación: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, fuzzy, c-format
  #| msgid "user '%s' list problem: %s\n"
  msgid "Assuan accept problem: %s\n"
  msgstr "problema lista usuario '%s': %s\n"
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10727,9 -8666,8 +10817,9 @@@ msgstr "firma fallida: %s\n
  #, fuzzy
  #| msgid "issuer certificate is not marked as a CA"
  msgid "accepting root CA not marked as a CA"
- msgstr "el certificado del emisor no est� marcado como CA"
+ msgstr "el certificado del emisor no está marcado como CA"
  
 +#: dirmngr/validate.c:227
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
@@@ -10743,9 -8679,8 +10833,9 @@@ msgstr "
  #, fuzzy
  #| msgid "checking the CRL failed: %s"
  msgid "checking CRL for"
- msgstr "la comprobaci�n de CRL fall�: %s"
+ msgstr "la comprobación de CRL falló: %s"
  
 +#: dirmngr/validate.c:528
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "selfsigned certificate has a BAD signature"
@@@ -10755,9 -8689,8 +10845,9 @@@ msgstr "certificado auto firmado con fi
  #, fuzzy, c-format
  #| msgid "checking for qualified certificate failed: %s\n"
  msgid "checking trustworthiness of root certificate failed: %s\n"
- msgstr "la comprobaci�n de la firma cualificada fall�: %s\n"
+ msgstr "la comprobación de la firma cualificada falló: %s\n"
  
 +#: dirmngr/validate.c:738
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate chain is good\n"
@@@ -10771,9 -8702,8 +10861,9 @@@ msgstr "DSA necesita un algoritmo de ha
  #, fuzzy
  #| msgid "certificate should have not been used for signing\n"
  msgid "certificate should not have been used for CRL signing\n"
- msgstr "el certificado no deber�a haberse usado para firmar\n"
+ msgstr "el certificado no debería haberse usado para firmar\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "silencioso"
  
@@@ -10781,11 -8710,9 +10871,11 @@@
  msgid "print data out hex encoded"
  msgstr "escribir datos de salida en hexadecimal"
  
 +#: tools/gpg-connect-agent.c:80
  msgid "decode received data lines"
- msgstr "decodificar l�neas de datos recibidos"
+ msgstr "decodificar líneas de datos recibidos"
  
 +#: tools/gpg-connect-agent.c:81
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "connect to the dirmngr"
@@@ -10801,19 -8726,15 +10891,19 @@@ msgstr "|NOMBRE|conectar al socket Assu
  msgid "|ADDR|connect to Assuan server at ADDR"
  msgstr "|NOMBRE|conectar al socket Assuan NOMBRE"
  
 +#: tools/gpg-connect-agent.c:88
  msgid "run the Assuan server given on the command line"
- msgstr "ejecutar el servidor Assuan indicando en l�nea de �rdenes"
+ msgstr "ejecutar el servidor Assuan indicando en línea de órdenes"
  
 +#: tools/gpg-connect-agent.c:90
  msgid "do not use extended connect mode"
- msgstr "no usar el modo de conexi�n extendido"
+ msgstr "no usar el modo de conexión extendido"
  
 +#: tools/gpg-connect-agent.c:92
  msgid "|FILE|run commands from FILE on startup"
- msgstr "|FICHERO|ejecuta �rdenes de FICHERO al empezar"
+ msgstr "|FICHERO|ejecuta órdenes de FICHERO al empezar"
  
 +#: tools/gpg-connect-agent.c:93
  msgid "run /subst on startup"
  msgstr "ejecutar /subst al empezar"
  
@@@ -10833,64 -8752,48 +10923,64 @@@ msgid "
  "Connect to a running agent and send commands\n"
  msgstr ""
  "Sintaxis: gpg-connect-agent [opciones]\n"
- "Conectar a un agente que se est� ejecutando y mandar �rdenes\n"
+ "Conectar a un agente que se está ejecutando y mandar órdenes\n"
  
 +#: tools/gpg-connect-agent.c:1247
  #, 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"
+ msgstr "la opción \"%s\" necesita un programa y parámetros opcionales\n"
  
 +#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
 +#: tools/gpg-connect-agent.c:1270
  #, c-format
  msgid "option \"%s\" ignored due to \"%s\"\n"
- msgstr "la opci�n \"%s\" se ignora por \"%s\"\n"
+ msgstr "la opción \"%s\" se ignora por \"%s\"\n"
  
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
  #, c-format
  msgid "receiving line failed: %s\n"
- msgstr "fallo recibiendo la l�nea: %s\n"
+ msgstr "fallo recibiendo la línea: %s\n"
  
 +#: tools/gpg-connect-agent.c:1458
  msgid "line too long - skipped\n"
- msgstr "l�nea demasiado larga -omitida\n"
+ msgstr "línea demasiado larga -omitida\n"
  
 +#: tools/gpg-connect-agent.c:1462
  msgid "line shortened due to embedded Nul character\n"
- msgstr "l�nea acortada por culpa del caracter Nul inclu�do\n"
+ msgstr "línea acortada por culpa del caracter Nul incluído\n"
  
 +#: tools/gpg-connect-agent.c:1837
  #, fuzzy, c-format
  #| msgid "unknown command `%s'\n"
  msgid "unknown command '%s'\n"
  msgstr "orden desconocida `%s'\n"
  
 +#: tools/gpg-connect-agent.c:1855
  #, c-format
  msgid "sending line failed: %s\n"
- msgstr "fallo mandando la l�nea: %s\n"
+ msgstr "fallo mandando la línea: %s\n"
  
 +#: tools/gpg-connect-agent.c:2251
  #, c-format
  msgid "error sending standard options: %s\n"
- msgstr "error enviando opciones est�ndar: %s\n"
+ msgstr "error enviando opciones estándar: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
 +#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
  msgid "Options controlling the diagnostic output"
- msgstr "Opciones que controlan la salida de diagn�sticos"
+ msgstr "Opciones que controlan la salida de diagnósticos"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
 +#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
  msgid "Options controlling the configuration"
- msgstr "Opciones que controlan la configuraci�n"
+ msgstr "Opciones que controlan la configuración"
  
 +#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
 +#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
  msgid "Options useful for debugging"
- msgstr "Opciones �tiles para el depurado"
+ msgstr "Opciones útiles para el depurado"
  
 +#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
  msgid "Options controlling the security"
  msgstr "Opciones que controlan la seguridad"
  
@@@ -10898,73 -8800,56 +10988,73 @@@
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|las claves SSH caducan en N segundos"
  
 +#: tools/gpgconf-comp.c:532
  msgid "|N|set maximum PIN cache lifetime to N seconds"
- msgstr "|N|establecer vida m�xima del cach� de PIN en N segundos"
+ msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
  
 +#: tools/gpgconf-comp.c:536
  msgid "|N|set maximum SSH key lifetime to N seconds"
- msgstr "|N|establecer vida m�xima de la clave SSH en N segundos"
+ msgstr "|N|establecer vida máxima de la clave SSH en N segundos"
  
 +#: tools/gpgconf-comp.c:560
  msgid "Options enforcing a passphrase policy"
- msgstr "Opciones que fuerzan una pol�tica de frases contrase�a"
+ msgstr "Opciones que fuerzan una política de frases contraseña"
  
 +#: tools/gpgconf-comp.c:563
  msgid "do not allow bypassing the passphrase policy"
- msgstr "no permitir evitar la pol�tica de frases contrase�a"
+ msgstr "no permitir evitar la política de frases contraseña"
  
 +#: tools/gpgconf-comp.c:567
  msgid "|N|set minimal required length for new passphrases to N"
- msgstr "|N|establecer longitud m�nima para nuevas frases contrase�a en N"
+ msgstr "|N|establecer longitud mínima para nuevas frases contraseña en N"
  
 +#: tools/gpgconf-comp.c:571
  msgid "|N|require at least N non-alpha characters for a new passphrase"
- msgstr "|N|pedir al menos N caracteres no alfab�ticos para nuevas contrase�as"
+ msgstr "|N|pedir al menos N caracteres no alfabéticos para nuevas contraseñas"
  
 +#: tools/gpgconf-comp.c:575
  msgid "|FILE|check new passphrases against pattern in FILE"
- msgstr "|FICHERO|comprobar nuevas frases contrase�a con el patr�n en FICHERO"
+ msgstr "|FICHERO|comprobar nuevas frases contraseña con el patrón en FICHERO"
  
 +#: tools/gpgconf-comp.c:579
  msgid "|N|expire the passphrase after N days"
- msgstr "|N|frase contrase�a caduca tras N d�as"
+ msgstr "|N|frase contraseña caduca tras N días"
  
 +#: tools/gpgconf-comp.c:583
  msgid "do not allow the reuse of old passphrases"
- msgstr "no permite reusar antiguas frases contrase�a"
+ msgstr "no permite reusar antiguas frases contraseña"
  
 +#: tools/gpgconf-comp.c:587
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set the Pinentry timeout to N seconds"
- msgstr "|N|establecer vida m�xima del cach� de PIN en N segundos"
+ msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
  
 +#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
  msgid "|NAME|use NAME as default secret key"
  msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
  
 +#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
  msgid "|NAME|encrypt to user ID NAME as well"
- msgstr "|NOMBRE|cifra para el ususario NOMBRE tambi�n"
+ msgstr "|NOMBRE|cifra para el ususario NOMBRE también"
  
 +#: tools/gpgconf-comp.c:704
  msgid "|SPEC|set up email aliases"
  msgstr "|ESPEC|establecer alias de email"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
- msgstr "Configuraci�n para servidores de claves"
+ msgstr "Configuración para servidores de claves"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|usar servidor de claves en URL"
  
 +#: tools/gpgconf-comp.c:735
  msgid "allow PKA lookups (DNS requests)"
- msgstr "permitir b�squedas PKA (peticiones DNS)"
+ msgstr "permitir búsquedas PKA (peticiones DNS)"
  
 +#: tools/gpgconf-comp.c:738
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr "|MECANISMOS|usa MECANISMOS para encontrar claves por emails"
  
@@@ -10972,169 -8856,141 +11062,177 @@@
  msgid "disable all access to the dirmngr"
  msgstr "prohibir todo acceso al dirmngr"
  
 +#: tools/gpgconf-comp.c:790
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
- msgstr "|NOMBRE|usa la codificaci�n NOMBRE para frases contrase�a PKCS#12"
+ msgstr "|NOMBRE|usa la codificación NOMBRE para frases contraseña PKCS#12"
  
 +#: tools/gpgconf-comp.c:820
  msgid "do not check CRLs for root certificates"
- msgstr "no comprobar CRLs para certificados ra�z"
+ msgstr "no comprobar CRLs para certificados raíz"
  
 +#: tools/gpgconf-comp.c:869
  msgid "Options controlling the format of the output"
  msgstr "Opciones que controlan el formato de la salida"
  
 +#: tools/gpgconf-comp.c:905
  msgid "Options controlling the interactivity and enforcement"
- msgstr "Opciones que controlan la interactividad y obligaci�n"
+ msgstr "Opciones que controlan la interactividad y obligación"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Opciones que controlan la seguridad"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
- msgstr "Configuraci�n de servidores HTTP"
+ msgstr "Configuración de servidores HTTP"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
- msgstr "usar configuraci�n del proxy HTTP del sistema"
+ msgstr "usar configuración del proxy HTTP del sistema"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
- msgstr "Configuraci�n de servidores LDAP que se usar�"
+ msgstr "Configuración de servidores LDAP que se usará"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr "lista de servidores LDAP"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
- msgstr "Configuraci�n de OCSP"
+ msgstr "Configuración de OCSP"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "error de red"
  
- # �Por qu� no frase de paso?
- # Porque todo el mundo sabe lo que es una contrase�a
+ # ¿Por qué no frase de paso?
+ # Porque todo el mundo sabe lo que es una contraseña
  # y una "frase de paso" no. Soy consciente de que se
  # traduce igual password y passphrase pero el contexto
- # permite saber de lo que se est� hablando.
- # No s�, no s�.
- # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
- # �Es que son m�s listos? :-)
+ # permite saber de lo que se está hablando.
+ # No sé, no sé.
+ # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
+ # ¿Es que son más listos? :-)
  #
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
  #| msgid "Bad Passphrase"
- msgid "PIN and Passphrase Entry"
- msgstr "Frase contrase�a err�nea"
+ msgid "Passphrase Entry"
+ msgstr "Frase contraseña errónea"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Componente no encontrado"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
- msgstr "Verificaci�n externa del componente %s fallida"
+ msgstr "Verificación externa del componente %s fallida"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
- msgstr "Note que las especificaci�n de grupo se ignoran\n"
+ msgstr "Note que las especificación de grupo se ignoran\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr "listar todos los componentes"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr "comprobar todos los programas"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|COMPONENTE|lista de opciones"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|COMPONENTE|cambiar opciones"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|COMPONENTE|comprobar opciones"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr "aplicar valores globales por defecto"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  #, fuzzy
  #| msgid "get the configuration directories for gpgconf"
  msgid "get the configuration directories for @GPGCONF@"
- msgstr "obtener directorios de configuraci�n para gpgconf"
+ msgstr "obtener directorios de configuración para gpgconf"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
- msgstr "listar fichero de configuraci�n global"
+ msgstr "listar fichero de configuración global"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
- msgstr "comprobar fichero global de configuraci�n"
+ msgstr "comprobar fichero global de configuración"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "actualiza la base de datos de confianza"
+ 
++#: tools/gpgconf.c:86
  #, fuzzy
  #| msgid "list all components"
  msgid "reload all or a given component"
  msgstr "listar todos los componentes"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  #| msgid "list all components"
  msgid "launch a given component"
  msgstr "listar todos los componentes"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  #, fuzzy
  #| msgid "list all components"
  msgid "kill a given component"
  msgstr "listar todos los componentes"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "usa como fichero de salida"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
- msgstr "activar cambios en tiempo de ejecuci�n, si es posible"
+ msgstr "activar cambios en tiempo de ejecución, si es posible"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgconf [options]\n"
@@@ -11144,35 -9000,30 +11242,35 @@@ msgid "
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  "Sintaxis: gpgconf [opciones]\n"
- "Administrar opciones de configuraci�n de las herramientas GnuPG\n"
+ "Administrar opciones de configuración de las herramientas GnuPG\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "Necesita un argumento de un componente"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "Componente no encontrado"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
- msgstr "No se permiten par�metros"
+ msgstr "No se permiten parámetros"
  
- # �rdenes, please...
- # 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? :-)
+ # Órdenes, please...
+ # 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:154
  msgid ""
  "@\n"
  "Commands:\n"
  " "
  msgstr ""
  "@\n"
- "�rdenes:\n"
+ "Órdenes:\n"
  " "
  
 +#: tools/symcryptrun.c:156
  msgid "decryption modus"
  msgstr "modo de descifrado"
  
@@@ -11208,19 -9052,16 +11306,19 @@@ msgid "
  msgstr ""
  "Sintaxis: symcryptrun --class CLASE --program PROGRAMA --keyfile FICHERO "
  "[opciones...] ORDEN [fichero entrada]\n"
- "Invocar una herramienta simple de cifrado sim�trico\n"
+ "Invocar una herramienta simple de cifrado simétrico\n"
  
 +#: tools/symcryptrun.c:278
  #, c-format
  msgid "%s on %s aborted with status %i\n"
- msgstr "%s en %s abort� con estado %i\n"
+ msgstr "%s en %s abortó con estado %i\n"
  
 +#: tools/symcryptrun.c:285
  #, c-format
  msgid "%s on %s failed with status %i\n"
- msgstr "%s en %s fall� con estado %i\n"
+ msgstr "%s en %s falló con estado %i\n"
  
 +#: tools/symcryptrun.c:317
  #, fuzzy, c-format
  #| msgid "can't create temporary directory `%s': %s\n"
  msgid "can't create temporary directory '%s': %s\n"
@@@ -11246,28 -9083,22 +11344,28 @@@ msgstr "error leyendo de %s: %s\n
  msgid "error closing %s: %s\n"
  msgstr "error cerrando %s: %s\n"
  
 +#: tools/symcryptrun.c:490
  msgid "no --program option provided\n"
- msgstr "falta la opci�n --program\n"
+ msgstr "falta la opción --program\n"
  
 +#: tools/symcryptrun.c:496
  msgid "only --decrypt and --encrypt are supported\n"
- msgstr "s�lo pueden usarse --decrypt y --encrypt\n"
+ msgstr "sólo pueden usarse --decrypt y --encrypt\n"
  
 +#: tools/symcryptrun.c:502
  msgid "no --keyfile option provided\n"
- msgstr "falta la opci�n --keyfile\n"
+ msgstr "falta la opción --keyfile\n"
  
 +#: tools/symcryptrun.c:513
  msgid "cannot allocate args vector\n"
- msgstr "no puedo reservar espacio para el vector de par�metros\n"
+ msgstr "no puedo reservar espacio para el vector de parámetros\n"
  
 +#: tools/symcryptrun.c:531
  #, c-format
  msgid "could not create pipe: %s\n"
- msgstr "no se pudo crear la tuber�a: %s\n"
+ msgstr "no se pudo crear la tubería: %s\n"
  
 +#: tools/symcryptrun.c:538
  #, c-format
  msgid "could not create pty: %s\n"
  msgstr "no se pudo crear pty: %s\n"
diff --cc po/et.po
index ea697fe,8a8e8c2..b4a24b2
--- a/po/et.po
+++ b/po/et.po
@@@ -6,19 -6,17 +6,19 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.2.2\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2004-06-17 11:04+0300\n"
  "Last-Translator: Toomas Soome <Toomas.Soome at microlink.ee>\n"
  "Language-Team: Estonian <et at li.org>\n"
  "Language: et\n"
  "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-15\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8-bit\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
- msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
  #. TRANSLATORS: These are labels for buttons etc used in
  #. Pinentries.  An underscore indicates that the next letter
@@@ -26,40 -24,31 +26,40 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
- msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
+ msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -67,7 -56,6 +67,7 @@@ msgstr "vigane parool
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr ""
  
@@@ -77,75 -65,59 +77,75 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, 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:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "halb parool"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
  msgstr "rida on liiga pikk\n"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "liiga pikk parool\n"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
- msgstr "Lubamatu s�mbol nimes\n"
+ msgstr "Lubamatu sümbol nimes\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
  msgstr "halb MPI"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "halb parool"
@@@ -155,31 -126,16 +155,31 @@@
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "kaitse algoritm %d%s ei ole toetatud\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
- msgstr "`%s' ei �nnestu luua: %s\n"
+ msgstr "`%s' ei õnnestu luua: %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
- msgstr "`%s' ei �nnestu avada: %s\n"
+ msgstr "`%s' ei õnnestu avada: %s\n"
  
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -189,68 -144,47 +189,58 @@@
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
 +#: agent/command-ssh.c:2424
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
- msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
  
 +#: agent/command-ssh.c:2444
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
- msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
+ msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Palun sisestage parool; see on salajane tekst \n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "muuda parooli"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Palun sisestage parool; see on salajane tekst \n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
- msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
+ msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -288,22 -215,18 +278,22 @@@ msgstr "Korrake parooli: 
  msgid "Repeat this PIN"
  msgstr "Korrake parooli: "
  
 +#: agent/divert-scd.c:299
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
- msgstr "parooli ei korratud �ieti; proovige uuesti"
+ msgstr "parooli ei korratud õieti; proovige uuesti"
  
 +#: agent/divert-scd.c:301
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
- msgstr "parooli ei korratud �ieti; proovige uuesti"
+ msgstr "parooli ei korratud õieti; proovige uuesti"
  
 +#: agent/divert-scd.c:302
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
- msgstr "parooli ei korratud �ieti; proovige uuesti"
+ msgstr "parooli ei korratud õieti; proovige uuesti"
  
 +#: agent/divert-scd.c:314
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
@@@ -323,12 -243,10 +313,12 @@@ msgstr "kirjutan faili `%s'\n
  msgid "Enter new passphrase"
  msgstr "Sisestage parool\n"
  
 +#: agent/genkey.c:172
  #, fuzzy
  msgid "Take this one anyway"
- msgstr "Kasutan seda v�tit ikka? "
+ msgstr "Kasutan seda võtit ikka? "
  
 +#: agent/genkey.c:202
  #, c-format
  msgid ""
  "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@@ -350,10 -265,9 +340,10 @@@ msgstr "
  #| msgid "Name must be at least 5 characters long\n"
  msgid "A passphrase should be at least %u character long."
  msgid_plural "A passphrase should be at least %u characters long."
- msgstr[0] "Nimes peab olema v�hemalt 5 s�mbolit\n"
- msgstr[1] "Nimes peab olema v�hemalt 5 s�mbolit\n"
+ msgstr[0] "Nimes peab olema vähemalt 5 sümbolit\n"
+ msgstr[1] "Nimes peab olema vähemalt 5 sümbolit\n"
  
 +#: agent/genkey.c:252
  #, c-format
  msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
  msgid_plural ""
@@@ -374,137 -285,108 +364,143 @@@ msgstr "
  #, fuzzy, c-format
  msgid "Please enter the passphrase to%0Aprotect your new key"
  msgstr ""
- "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
+ "Te vajate oma salajase võtme kaitsmiseks parooli.\n"
  "\n"
  
 +#: agent/genkey.c:606
  #, fuzzy
  msgid "Please enter the new passphrase"
  msgstr "muuda parooli"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
  " "
  msgstr ""
  "@\n"
- "V�tmed:\n"
+ "Võtmed:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "Võti on asendatud"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "ole jutukas"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
- msgstr "ole m�nev�rra vaiksem"
+ msgstr "ole mõnevõrra vaiksem"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
- msgstr "otsi v�tmeid v�tmeserverist"
+ msgstr "otsi võtmeid võtmeserverist"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
  msgstr "uuenda usalduse andmebaasi"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NIMI|terminali kooditabel on NIMI"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
  msgstr "viga parooli loomisel: %s\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
  msgstr "viga parooli loomisel: %s\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
  msgstr "ei ole toetatud"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -513,204 -395,153 +509,204 @@@ msgstr "ei ole toetatud
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Palun saatke veateated aadressil <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
- msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
+ msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
- msgstr "v�tmete fail `%s': %s\n"
+ msgstr "võtmete fail `%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
- msgstr "loen v�tmeid failist `%s'\n"
+ msgstr "loen võtmeid failist `%s'\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
- msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+ msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
- msgstr "%s ei �nnestu luua: %s\n"
+ msgstr "%s ei õnnestu luua: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, 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:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
- msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
+ msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
- msgstr "uuendamine eba�nnestus: %s\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
- msgstr "kirjutan salajase v�tme faili `%s'\n"
+ msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
- msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
+ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: kataloog on loodud\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
- msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
+ msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
- msgstr "%s: kataloogi ei �nnestu luua: %s\n"
+ msgstr "%s: kataloogi ei õnnestu luua: %s\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
- msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
+ msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
- msgstr "%s: j�tsin vahele: %s\n"
+ msgstr "%s: jätsin vahele: %s\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
  
 +#: agent/preset-passphrase.c:99
  #, fuzzy
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
 +#: agent/preset-passphrase.c:102
  msgid ""
  "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
  msgstr ""
- "@K�sud:\n"
+ "@Käsud:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
  " "
  msgstr ""
  "@\n"
- "V�tmed:\n"
+ "Võtmed:\n"
  " "
  
 +#: agent/protect-tool.c:154
  #, fuzzy
  msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
 +#: agent/protect-tool.c:156
  msgid ""
  "Syntax: gpg-protect-tool [options] [args]\n"
  "Secret key maintenance tool\n"
@@@ -749,37 -574,30 +745,38 @@@ msgstr "Katkesta
  msgid "error while asking for the passphrase: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
 +#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
  #, fuzzy, c-format
  msgid "file '%s', line %d: %s\n"
- msgstr "v�tit '%s' ei leitud: %s\n"
+ msgstr "võtit '%s' ei leitud: %s\n"
  
 +#: agent/trustlist.c:192 agent/trustlist.c:200
  #, fuzzy, c-format
  msgid "statement \"%s\" ignored in '%s', line %d\n"
  msgstr "viga lugemisel: %s\n"
  
 +#: agent/trustlist.c:206
  #, fuzzy, c-format
  msgid "system trustlist '%s' not available\n"
- msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
+ msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
  
 +#: agent/trustlist.c:250
  #, fuzzy, c-format
  msgid "bad fingerprint in '%s', line %d\n"
  msgstr "viga lugemisel: %s\n"
  
 +#: agent/trustlist.c:275 agent/trustlist.c:282
  #, fuzzy, c-format
  msgid "invalid keyflag in '%s', line %d\n"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
 +#: agent/trustlist.c:316 common/helpfile.c:136
  #, fuzzy, c-format
  msgid "error reading '%s', line %d: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -808,8 -623,6 +805,8 @@@ msgstr "
  msgid "Yes"
  msgstr "jah"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -839,40 -649,33 +836,40 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
  msgstr "muuda parooli"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
- msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
+ msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  msgid "Delete key"
- msgstr "luba v�ti"
+ msgstr "luba võti"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -887,21 -688,17 +884,21 @@@ msgstr "
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
- msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
 +#: agent/cvt-openpgp.c:338
  msgid "secret key parts are not available\n"
- msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
+ msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
  
 +#: agent/cvt-openpgp.c:344
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "public key algorithm %d (%s) is not supported\n"
@@@ -919,84 -714,72 +916,95 @@@ msgstr "kaitse algoritm %d%s ei ole toe
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "kaitse algoritm %d%s ei ole toetatud\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "uuendamine eba�nnestus: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
  #, fuzzy, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
+ #, fuzzy, c-format
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
- msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
+ msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  #, fuzzy
  msgid "problem setting the gpg-agent options\n"
  msgstr "probleem agendiga: agent tagastas 0x%lx\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
- msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
+ msgstr "ei õnnestu blokeerida mälupildi salvestamist: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
- msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
+ msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
+ 
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "pakendamine ebaõnnestus: %s\n"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "jah"
  
@@@ -1014,11 -794,9 +1022,11 @@@ msgid "nN
  msgstr "eE"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:86
  msgid "quit"
- msgstr "v�lju"
+ msgstr "välju"
  
 +#: common/yesno.c:89
  msgid "qQ"
  msgstr "vV"
  
@@@ -1051,56 -823,45 +1059,56 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
 +#: common/miscellaneous.c:143
  #, c-format
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
  msgstr ""
  
 +#: common/miscellaneous.c:146
  #, fuzzy, c-format
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
- msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+ msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
  
 +#: common/miscellaneous.c:554
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  msgid "connection to agent is in restricted mode\n"
  msgstr "seda ei saa teha pakettmoodis\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1166,35 -914,28 +1174,35 @@@ msgstr "halb sertifikaat
  msgid "Data encryption succeeded"
  msgstr ""
  
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
  #, fuzzy
  msgid "Data available"
- msgstr "V�tme leiate: "
+ msgstr "Võtme leiate: "
  
 +#: common/audit.c:767
  #, fuzzy
  msgid "Session key created"
- msgstr "%s: v�tmehoidla on loodud\n"
+ msgstr "%s: võtmehoidla on loodud\n"
  
 +#: common/audit.c:772 common/audit.c:912 common/audit.c:919
  #, fuzzy, c-format
  msgid "algorithm: %s"
  msgstr "pakend: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
  "\n"
  "Toetatud algoritmid:\n"
  
 +#: common/audit.c:778 common/audit.c:925
  #, fuzzy
  msgid "seems to be not encrypted"
- msgstr "kr�ptimata"
+ msgstr "krüptimata"
  
 +#: common/audit.c:784 common/audit.c:933
  msgid "Number of recipients"
  msgstr ""
  
@@@ -1207,22 -946,18 +1215,22 @@@ msgstr "
  msgid "Data signing succeeded"
  msgstr ""
  
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
  #, fuzzy, c-format
  msgid "data hash algorithm: %s"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: common/audit.c:862
  #, fuzzy, c-format
  msgid "Signer %d"
  msgstr "Allkiri aegus %s\n"
  
 +#: common/audit.c:866 common/audit.c:1065
  #, fuzzy, c-format
  msgid "attr hash algorithm: %s"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: common/audit.c:901
  msgid "Data decryption succeeded"
  msgstr ""
  
@@@ -1231,12 -965,10 +1239,12 @@@
  msgid "Encryption algorithm supported"
  msgstr "kaitse algoritm %d%s ei ole toetatud\n"
  
 +#: common/audit.c:993
  #, fuzzy
  msgid "Data verification succeeded"
- msgstr "allkirja kontroll j�eti �ra\n"
+ msgstr "allkirja kontroll jäeti ära\n"
  
 +#: common/audit.c:1002
  #, fuzzy
  msgid "Signature available"
  msgstr "Allkiri aegus %s\n"
@@@ -1246,37 -977,30 +1254,37 @@@
  msgid "Parsing data succeeded"
  msgstr "Korrektne allkiri kasutajalt \""
  
 +#: common/audit.c:1036
  #, fuzzy, c-format
  msgid "bad data hash algorithm: %s"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: common/audit.c:1051
  #, fuzzy, c-format
  msgid "Signature %d"
  msgstr "Allkiri aegus %s\n"
  
 +#: common/audit.c:1079
  #, fuzzy
  msgid "Certificate chain valid"
- msgstr "See v�ti on aegunud!"
+ msgstr "See võti on aegunud!"
  
 +#: common/audit.c:1090
  #, fuzzy
  msgid "Root certificate trustworthy"
  msgstr "halb sertifikaat"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
  msgstr "halb sertifikaat"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
- msgstr "V�tme leiate: "
+ msgstr "Võtme leiate: "
  
 +#: common/audit.c:1119
  #, fuzzy
  msgid "CRL/OCSP check of certificates"
  msgstr "halb sertifikaat"
@@@ -1308,22 -1026,18 +1316,22 @@@ msgstr "
  msgid "No help available for '%s'."
  msgstr "`%s' kohta abiinfo puudub"
  
 +#: common/helpfile.c:90
  #, fuzzy
  msgid "ignoring garbage line"
- msgstr "viga l�petaval real\n"
+ msgstr "viga lõpetaval real\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
  msgstr "tundmatu"
  
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
- msgstr "kirjutan salajase v�tme faili `%s'\n"
+ msgstr "kirjutan salajase võtme faili `%s'\n"
  
 +#: common/argparse.c:367
  #, fuzzy
  msgid "read error"
  msgstr "viga faili lugemisel"
@@@ -1344,47 -1055,38 +1352,47 @@@ msgstr "vigane argument
  msgid "invalid argument"
  msgstr "vigane pakend"
  
 +#: common/argparse.c:375
  #, fuzzy
  msgid "invalid command"
- msgstr "vastuolulised k�sud\n"
+ msgstr "vastuolulised käsud\n"
  
 +#: common/argparse.c:377
  #, fuzzy
  msgid "invalid alias definition"
- msgstr "vigased impordi v�tmed\n"
+ msgstr "vigased impordi võtmed\n"
  
 +#: common/argparse.c:379
  #, fuzzy
  msgid "out of core"
- msgstr "ei t��deldud"
+ msgstr "ei töödeldud"
  
 +#: common/argparse.c:381
  #, fuzzy
  msgid "invalid option"
- msgstr "vigased impordi v�tmed\n"
+ msgstr "vigased impordi võtmed\n"
  
 +#: common/argparse.c:389
  #, c-format
  msgid "missing argument for option \"%.50s\"\n"
  msgstr ""
  
 +#: common/argparse.c:391
  #, fuzzy, c-format
  msgid "invalid argument for option \"%.50s\"\n"
- msgstr "vigased impordi v�tmed\n"
+ msgstr "vigased impordi võtmed\n"
  
 +#: common/argparse.c:393
  #, c-format
  msgid "option \"%.50s\" does not expect an argument\n"
  msgstr ""
  
 +#: common/argparse.c:395
  #, fuzzy, c-format
  msgid "invalid command \"%.50s\"\n"
- msgstr "Vigane k�sklus (proovige \"help\")\n"
+ msgstr "Vigane käsklus (proovige \"help\")\n"
  
 +#: common/argparse.c:397
  #, c-format
  msgid "option \"%.50s\" is ambiguous\n"
  msgstr ""
@@@ -1394,67 -1095,53 +1402,67 @@@
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
- msgstr "ei t��deldud"
+ msgstr "ei töödeldud"
  
 +#: common/argparse.c:403
  #, fuzzy, c-format
  msgid "invalid option \"%.50s\"\n"
- msgstr "vigased impordi v�tmed\n"
+ msgstr "vigased impordi võtmed\n"
  
 +#: common/utf8conv.c:123
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' not available\n"
- msgstr "pakendamine eba�nnestus: %s\n"
+ msgstr "pakendamine ebaõnnestus: %s\n"
  
 +#: common/utf8conv.c:131
  #, fuzzy, c-format
  msgid "iconv_open failed: %s\n"
- msgstr "faili ei �nnestu avada: %s\n"
+ msgstr "faili ei õnnestu avada: %s\n"
  
 +#: common/utf8conv.c:385 common/utf8conv.c:651
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' failed: %s\n"
- msgstr "pakendamine eba�nnestus: %s\n"
+ msgstr "pakendamine ebaõnnestus: %s\n"
  
 +#: common/dotlock.c:707
  #, fuzzy, c-format
  msgid "failed to create temporary file '%s': %s\n"
- msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
+ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
  
 +#: common/dotlock.c:771
  #, fuzzy, c-format
  msgid "error writing to '%s': %s\n"
- msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
  
 +#: common/dotlock.c:1116
  #, c-format
  msgid "removing stale lockfile (created by %d)\n"
  msgstr ""
  
 +#: common/dotlock.c:1152
  #, fuzzy, c-format
  msgid "waiting for lock (held by %d%s) %s...\n"
- msgstr "kirjutan salajase v�tme faili `%s'\n"
+ msgstr "kirjutan salajase võtme faili `%s'\n"
  
 +#: common/dotlock.c:1153
  msgid "(deadlock?) "
  msgstr ""
  
 +#: common/dotlock.c:1192
  #, fuzzy, c-format
  msgid "lock '%s' not made: %s\n"
- msgstr "ei leia avalikku v�tit %08lX: %s\n"
+ msgstr "ei leia avalikku võtit %08lX: %s\n"
  
 +#: common/dotlock.c:1219
  #, fuzzy, c-format
  msgid "waiting for lock %s...\n"
- msgstr "kirjutan salajase v�tme faili `%s'\n"
+ msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1464,50 -1150,39 +1472,50 @@@
  msgid "armor: %s\n"
  msgstr "pakend: %s\n"
  
 +#: g10/armor.c:463
  msgid "invalid armor header: "
- msgstr "vigane pakendi p�is: "
+ msgstr "vigane pakendi päis: "
  
 +#: g10/armor.c:474
  msgid "armor header: "
- msgstr "pakendi p�is: "
+ msgstr "pakendi päis: "
  
 +#: g10/armor.c:487
  msgid "invalid clearsig header\n"
- msgstr "vigane avateksti allkirja p�is\n"
+ msgstr "vigane avateksti allkirja päis\n"
  
 +#: g10/armor.c:500
  #, fuzzy
  msgid "unknown armor header: "
- msgstr "pakendi p�is: "
+ msgstr "pakendi päis: "
  
 +#: g10/armor.c:553
  msgid "nested clear text signatures\n"
- msgstr "avateksti allkirjad �ksteise sees\n"
+ msgstr "avateksti allkirjad üksteise sees\n"
  
 +#: g10/armor.c:688
  #, fuzzy
  msgid "unexpected armor: "
  msgstr "ootamatu pakend:"
  
 +#: g10/armor.c:701
  msgid "invalid dash escaped line: "
- msgstr "vigane kriipsudega m�rgitud rida: "
+ msgstr "vigane kriipsudega märgitud rida: "
  
 +#: g10/armor.c:873 g10/armor.c:1490
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
- msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
+ msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
  
 +#: g10/armor.c:916
  msgid "premature eof (no CRC)\n"
- msgstr "enneaegne failil�pp (puudub CRC)\n"
+ msgstr "enneaegne faililõpp (puudub CRC)\n"
  
 +#: g10/armor.c:950
  msgid "premature eof (in CRC)\n"
- msgstr "enneaegne failil�pp (poolik CRC)\n"
+ msgstr "enneaegne faililõpp (poolik CRC)\n"
  
 +#: g10/armor.c:958
  msgid "malformed CRC\n"
  msgstr "vigane CRC\n"
  
@@@ -1516,133 -1190,104 +1524,132 @@@
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRC viga; %06lx - %06lx\n"
  
 +#: g10/armor.c:982
  #, fuzzy
  msgid "premature eof (in trailer)\n"
- msgstr "enneaegne failil�pp (l�petaval real)\n"
+ msgstr "enneaegne faililõpp (lõpetaval real)\n"
  
 +#: g10/armor.c:986
  msgid "error in trailer line\n"
- msgstr "viga l�petaval real\n"
+ msgstr "viga lõpetaval real\n"
  
 +#: g10/armor.c:1303
  msgid "no valid OpenPGP data found.\n"
  msgstr "ei leia OpenPGP andmeid.\n"
  
 +#: g10/armor.c:1308
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
- msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
+ msgstr "vigane pakend: rida on pikem, kui %d sümbolit\n"
  
 +#: g10/armor.c:1312
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
- "kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
+ "kvooditud sümbol pakendis - tõenäoliselt on kasutatud vigast MTA programmi\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "pole inimese poolt loetav"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr ""
- "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
- "ning l�pus peab olema '='\n"
+ "noteerimise nimes võivad olla ainult trükitavad sümbolid või tühikud\n"
+ "ning lõpus peab olema '='\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
- msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+ msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  #, fuzzy
  msgid "a notation name must not contain more than one '@' character\n"
- msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+ msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
- msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
+ msgstr "noteerimise väärtus ei või sisaldada kontroll sümboleid\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  msgid "a notation name may not contain an '=' character\n"
- msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+ msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
  #| "with an '='\n"
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr ""
- "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
- "ning l�pus peab olema '='\n"
+ "noteerimise nimes võivad olla ainult trükitavad sümbolid või tühikud\n"
+ "ning lõpus peab olema '='\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr ""
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Sisestage parool: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
- msgstr "HOIATUS: %s m��rab �le %s\n"
+ msgstr "HOIATUS: %s määrab üle %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, fuzzy, c-format
  msgid "OpenPGP card not available: %s\n"
- msgstr "salajane v�ti ei ole k�ttesaadav"
+ msgstr "salajane võti ei ole kättesaadav"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "seda ei saa teha pakettmoodis\n"
  
 +#: g10/card-util.c:107
  #, fuzzy
  msgid "This command is only available for version 2 cards\n"
- msgstr "See k�sklus ei ole %s moodis lubatud.\n"
+ msgstr "See käsklus ei ole %s moodis lubatud.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
- msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
+ msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Teie valik? "
  
@@@ -1660,198 -1302,153 +1667,198 @@@ msgstr "enable
  msgid "female"
  msgstr "enable"
  
 +#: g10/card-util.c:534
  #, fuzzy
  msgid "unspecified"
- msgstr "P�hjus puudub"
+ msgstr "Põhjus puudub"
  
 +#: g10/card-util.c:561
  #, fuzzy
  msgid "not forced"
- msgstr "ei t��deldud"
+ msgstr "ei töödeldud"
  
 +#: g10/card-util.c:561
  msgid "forced"
  msgstr ""
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr ""
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr ""
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr ""
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  #, fuzzy
  msgid "URL to retrieve public key: "
- msgstr "vastavat avalikku v�tit pole: %s\n"
+ msgstr "vastavat avalikku võtit pole: %s\n"
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
- msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr ""
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr ""
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  #, fuzzy
  msgid "Language preferences: "
  msgstr "uuendatud eelistused"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  #, fuzzy
  msgid "Error: invalid length of preference string.\n"
- msgstr "lubamatu s�mbol eelistuste s�nes\n"
+ msgstr "lubamatu sümbol eelistuste sõnes\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  #, fuzzy
  msgid "Error: invalid characters in preference string.\n"
- msgstr "lubamatu s�mbol eelistuste s�nes\n"
+ msgstr "lubamatu sümbol eelistuste sõnes\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr ""
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  #, fuzzy
  msgid "Error: invalid response.\n"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  #, fuzzy
  msgid "CA fingerprint: "
- msgstr "n�ita s�rmej�lge"
+ msgstr "näita sõrmejälge"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  #, fuzzy
  msgid "Error: invalid formatted fingerprint.\n"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, fuzzy, c-format
  msgid "key operation not possible: %s\n"
- msgstr "V�tme genereerimine eba�nnestus: %s\n"
+ msgstr "Võtme genereerimine ebaõnnestus: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  #, fuzzy
  msgid "not an OpenPGP card"
  msgstr "ei leia OpenPGP andmeid.\n"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
- msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
- msgstr "Millist v�tmepikkust te soovite? (1024) "
+ msgstr "Millist võtmepikkust te soovite? (1024) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
- msgstr "Millist v�tmepikkust te soovite? (1024) "
+ msgstr "Millist võtmepikkust te soovite? (1024) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
- msgstr "Millist v�tmepikkust te soovite? (1024) "
+ msgstr "Millist võtmepikkust te soovite? (1024) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
- msgstr "�mardatud �les %u bitini\n"
+ msgstr "ümardatud üles %u bitini\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
- msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
+ msgstr "jätsin vahele: avalik võti on juba olemas\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1859,213 -1456,162 +1866,213 @@@
  "You should change them using the command --change-pin\n"
  msgstr ""
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  #, fuzzy
  msgid "Please select the type of key to generate:\n"
- msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
+ msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  #, fuzzy
  msgid "   (1) Signature key\n"
  msgstr "Allkiri aegus %s\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  #, fuzzy
  msgid "   (2) Encryption key\n"
- msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+ msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Vigane valik.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  #, fuzzy
  msgid "Please select where to store the key:\n"
- msgstr "Palun valige t�histamise p�hjus:\n"
+ msgstr "Palun valige tühistamise põhjus:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
- msgstr "uuendamine eba�nnestus: %s\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
- msgstr "See k�sklus ei ole %s moodis lubatud.\n"
+ msgstr "See käsklus ei ole %s moodis lubatud.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
- msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
+ msgstr "jätsin vahele: avalik võti on juba olemas\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  msgid "Continue? (y/N) "
- msgstr "Allkirjastan t�esti? "
+ msgstr "Allkirjastan tõesti? "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
- msgstr "v�lju sellest men��st"
+ msgstr "välju sellest menüüst"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  #, fuzzy
  msgid "show admin commands"
- msgstr "vastuolulised k�sud\n"
+ msgstr "vastuolulised käsud\n"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
- msgstr "n�ita seda abiinfot"
+ msgstr "näita seda abiinfot"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  #, fuzzy
  msgid "list all available data"
- msgstr "V�tme leiate: "
+ msgstr "Võtme leiate: "
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr ""
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr ""
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr ""
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  #, fuzzy
  msgid "change the login name"
- msgstr "muuda aegumise kuup�eva"
+ msgstr "muuda aegumise kuupäeva"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  #, fuzzy
  msgid "change the language preferences"
  msgstr "muuda omaniku usaldust"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr ""
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  #, fuzzy
  msgid "change a CA fingerprint"
- msgstr "n�ita s�rmej�lge"
+ msgstr "näita sõrmejälge"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr ""
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  #, fuzzy
  msgid "generate new keys"
- msgstr "genereeri uus v�tmepaar"
+ msgstr "genereeri uus võtmepaar"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr ""
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr ""
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  #, fuzzy
  msgid "Admin-only command\n"
- msgstr "vastuolulised k�sud\n"
+ msgstr "vastuolulised käsud\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  #, fuzzy
  msgid "Admin commands are allowed\n"
- msgstr "vastuolulised k�sud\n"
+ msgstr "vastuolulised käsud\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  #, fuzzy
  msgid "Admin commands are not allowed\n"
- msgstr "kirjutan salajase v�tme faili `%s'\n"
+ msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
- msgstr "Vigane k�sklus (proovige \"help\")\n"
+ msgstr "Vigane käsklus (proovige \"help\")\n"
  
 +#: g10/decrypt.c:191 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
- msgstr "v�ti --output ei t��ta selle k�suga\n"
+ msgstr "võti --output ei tööta selle käsuga\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
- msgstr "`%s' ei �nnestu avada\n"
+ msgstr "`%s' ei õnnestu avada\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
- msgstr "v�tit '%s' ei leitud: %s\n"
+ msgstr "võtit '%s' ei leitud: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
- msgstr "viga v�tmebloki lugemisel: %s\n"
+ msgstr "viga võtmebloki lugemisel: %s\n"
  
 +#: g10/delkey.c:118 g10/getkey.c:579
  #, fuzzy, c-format
  msgid "key \"%s\" not found\n"
- msgstr "v�tit '%s' ei leitud: %s\n"
+ msgstr "võtit '%s' ei leitud: %s\n"
  
 +#: g10/delkey.c:129 g10/delkey.c:136
  msgid "(unless you specify the key by fingerprint)\n"
- msgstr "(kui te just ei m��ra v�tit s�rmej�ljega)\n"
+ msgstr "(kui te just ei määra võtit sõrmejäljega)\n"
  
 +#: g10/delkey.c:135
  #, fuzzy
  msgid "can't do this in batch mode without \"--yes\"\n"
- msgstr "pakettmoodis ei �nnestu seda teha v�tmeta \"--yes\"\n"
+ msgstr "pakettmoodis ei õnnestu seda teha võtmeta \"--yes\"\n"
  
 +#: g10/delkey.c:148
  #, fuzzy
  msgid "Delete this key from the keyring? (y/N) "
- msgstr "Kustutan selle v�tme v�tmehoidlast? "
+ msgstr "Kustutan selle võtme võtmehoidlast? "
  
 +#: g10/delkey.c:158
  #, fuzzy
  msgid "This is a secret key! - really delete? (y/N) "
- msgstr "See on salajane v�ti! - kas kustutan t�esti? "
+ msgstr "See on salajane võti! - kas kustutan tõesti? "
  
 +#: g10/delkey.c:201
  #, fuzzy, c-format
  msgid "deleting secret %s failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: g10/delkey.c:203
  msgid "key"
  msgstr "key"
  
@@@ -2073,41 -1618,33 +2080,41 @@@
  #, fuzzy
  #| msgid "Pubkey: "
  msgid "subkey"
- msgstr "Avalik v�ti: "
+ msgstr "Avalik võti: "
  
 +#: g10/delkey.c:226
  #, c-format
  msgid "deleting keyblock failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: g10/delkey.c:239
  msgid "ownertrust information cleared\n"
  msgstr "omaniku usalduse info puhastatud\n"
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
- msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
+ msgstr "avaliku võtme \"%s\" jaoks on salajane võti!\n"
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
- msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
+ msgstr "selle kustutamiseks kasutage võtit \"--delete-secret-keys\".\n"
  
 +#: g10/encrypt.c:232 g10/sign.c:1292
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
 +#: g10/encrypt.c:239
  msgid "can't use a symmetric ESK packet due to the S2K mode\n"
- msgstr "S2K moodi t�ttu ei saa s�mmeetrilist ESK paketti kasutada\n"
+ msgstr "S2K moodi tõttu ei saa sümmeetrilist ESK paketti kasutada\n"
  
 +#: g10/encrypt.c:253
  #, c-format
  msgid "using cipher %s\n"
- msgstr "kasutan �iffrit %s\n"
+ msgstr "kasutan šiffrit %s\n"
  
 +#: g10/encrypt.c:263 g10/encrypt.c:624
  #, fuzzy, c-format
  #| msgid "`%s' already compressed\n"
  msgid "'%s' already compressed\n"
@@@ -2117,9 -1653,8 +2124,9 @@@ msgstr "`%s' on juba pakitud\n
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
- msgstr "HOIATUS: `%s' on t�hi fail\n"
+ msgstr "HOIATUS: `%s' on tühi fail\n"
  
 +#: g10/encrypt.c:557
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "reading from '%s'\n"
@@@ -2130,9 -1664,8 +2137,9 @@@ msgstr "loen failist `%s'\n
  msgid ""
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
- "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+ "sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
  
 +#: g10/encrypt.c:707 g10/sign.c:984
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2144,84 -1676,68 +2151,84 @@@ msgstr "
  #, c-format
  msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
- "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+ "sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
  
 +#: g10/encrypt.c:903
  #, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
- msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
+ msgstr "%s/%s krüptitud kasutajale: \"%s\"\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "%s ei ole moodis %s lubatud.\n"
  
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
  #, c-format
  msgid "%s encrypted data\n"
- msgstr "%s kr�pteeritud andmed\n"
+ msgstr "%s krüpteeritud andmed\n"
  
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
  #, c-format
  msgid "encrypted with unknown algorithm %d\n"
- msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
+ msgstr "krüpteeritud tundmatu algoritmiga %d\n"
  
 +#: g10/decrypt-data.c:164 sm/decrypt.c:127
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
- msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �ifri n�rga v�tmega.\n"
+ msgstr "HOIATUS: teade on krüptitud sümmeetrilise šifri nõrga võtmega.\n"
  
 +#: g10/decrypt-data.c:176
  msgid "problem handling encrypted packet\n"
- msgstr "probleem kr�ptitud paketi k�sitlemisel\n"
+ msgstr "probleem krüptitud paketi käsitlemisel\n"
  
 +#: g10/exec.c:60
  msgid "no remote program execution supported\n"
- msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
+ msgstr "mittelokaalse programmi käivitamist ei toetata\n"
  
 +#: g10/exec.c:319
  msgid ""
  "external program calls are disabled due to unsafe options file permissions\n"
  msgstr ""
- "v�liste programmide k�ivitamine on blokeeritud, kuna seadete failil on\n"
- "ebaturvalised �igused\n"
+ "väliste programmide käivitamine on blokeeritud, kuna seadete failil on\n"
+ "ebaturvalised õigused\n"
  
 +#: g10/exec.c:349
  #, fuzzy
  msgid "this platform requires temporary files when calling external programs\n"
  msgstr ""
- "see platvorm n�uab v�liste programmide k�ivitamiseks ajutiste failide "
+ "see platvorm nõuab väliste programmide käivitamiseks ajutiste failide "
  "kasutamist\n"
  
 +#: g10/exec.c:427
  #, fuzzy, c-format
  msgid "unable to execute program '%s': %s\n"
- msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
+ msgstr "ei Õnnestu käivitada %s \"%s\": %s\n"
  
 +#: g10/exec.c:430
  #, fuzzy, c-format
  msgid "unable to execute shell '%s': %s\n"
- msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
+ msgstr "ei Õnnestu käivitada %s \"%s\": %s\n"
  
 +#: g10/exec.c:521
  #, c-format
  msgid "system error while calling external program: %s\n"
- msgstr "s�steemi viga v�lise programmi kasutamisel: %s\n"
+ msgstr "süsteemi viga välise programmi kasutamisel: %s\n"
  
 +#: g10/exec.c:532 g10/exec.c:599
  msgid "unnatural exit of external program\n"
- msgstr "v�line programm l�petas erandlikult\n"
+ msgstr "väline programm lõpetas erandlikult\n"
  
 +#: g10/exec.c:547
  msgid "unable to execute external program\n"
- msgstr "v�list programmi ei �nnestu k�ivitada\n"
+ msgstr "välist programmi ei õnnestu käivitada\n"
  
 +#: g10/exec.c:564
  #, c-format
  msgid "unable to read external program response: %s\n"
- msgstr "ei �nnestu lugeda v�lise programmi vastust: %s\n"
+ msgstr "ei õnnestu lugeda välise programmi vastust: %s\n"
  
 +#: g10/exec.c:610 g10/exec.c:617
  #, fuzzy, c-format
  #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
  msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
@@@ -2231,69 -1746,55 +2238,69 @@@ msgstr "HOIATUS: ei saa kustutada ajuti
  #, fuzzy, c-format
  #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
- msgstr "HOIATUS: ei �nnestu eemaldada ajutist kataloogi `%s': %s\n"
+ msgstr "HOIATUS: ei õnnestu eemaldada ajutist kataloogi `%s': %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  #, fuzzy
  msgid "export signatures that are marked as local-only"
  msgstr ""
  "\n"
- "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
+ "Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  #, fuzzy
  msgid "export revocation keys marked as \"sensitive\""
  msgstr ""
- "`%s' jaoks pole t�histamise v�tmeid\n"
+ "`%s' jaoks pole tühistamise võtmeid\n"
  "\n"
  
- #: g10/export.c:108
++#: g10/export.c:112
  #, fuzzy
  msgid "remove unusable parts from key during export"
- msgstr "mittekasutatav salajane v�ti"
+ msgstr "mittekasutatav salajane võti"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
- msgstr "%s: j�tsin vahele: %s\n"
+ msgstr "%s: jätsin vahele: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "kirjutan faili `%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
- msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
+ msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
- msgstr "kirjutan salajase v�tme faili `%s'\n"
+ msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
- msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
+ msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "HOIATUS: midagi ei eksporditud\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2304,13 -1804,10 +2311,13 @@@ msgstr "viga `%s' loomisel: %s\n
  msgid "[User ID not found]"
  msgstr "[Kasutaja id puudub]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
- msgstr "vigased impordi v�tmed\n"
+ msgstr "vigased impordi võtmed\n"
  
 +#: g10/getkey.c:516
  #, c-format
  msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
  msgstr ""
@@@ -2324,278 -1819,218 +2331,278 @@@ msgstr "viga `%s' lugemisel: %s\n
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "Warning: %s appears in the keyring %d times\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "viga `%s' loomisel: %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "viga `%s' loomisel: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
- msgstr "n�ita s�rmej�lge"
+ msgstr "näita sõrmejälge"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
- msgstr "salajast v�tit `%s' ei leitud: %s\n"
+ msgstr "salajast võtit `%s' ei leitud: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
- msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
+ msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
- msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
+ msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, fuzzy, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
- "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
+ "Vigane võti %08lX muudeti kehtivaks võtme --allow-non-selfsigned-uid "
  "kasutamisega\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, fuzzy, c-format
  msgid "using subkey %s instead of primary key %s\n"
- msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
+ msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "loo eraldiseisev allkiri"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[fail]|loo avateksti allkiri"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "loo eraldiseisev allkiri"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
- msgstr "kr�pteeri andmed"
+ msgstr "krüpteeri andmed"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
- msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
+ msgstr "krüpteerimine kasutades ainult sümmeetrilist šifrit"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
- msgstr "dekr�pteeri andmed (vaikimisi)"
+ msgstr "dekrüpteeri andmed (vaikimisi)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "kontrolli allkirja"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
- msgstr "n�ita v�tmeid"
+ msgstr "näita võtmeid"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
- msgstr "n�ita v�tmeid ja allkirju"
+ msgstr "näita võtmeid ja allkirju"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  #, fuzzy
  msgid "list and check key signatures"
- msgstr "kontrolli v�tmete allkirju"
+ msgstr "kontrolli võtmete allkirju"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
- msgstr "n�ita v�tmeid ja s�rmej�lgi"
+ msgstr "näita võtmeid ja sõrmejälgi"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
- msgstr "n�ita salajasi v�tmeid"
+ msgstr "näita salajasi võtmeid"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
- msgstr "genereeri uus v�tmepaar"
+ msgstr "genereeri uus võtmepaar"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
- msgstr "genereeri uus v�tmepaar"
+ msgstr "genereeri uus võtmepaar"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
- msgstr "genereeri uus v�tmepaar"
+ msgstr "genereeri uus võtmepaar"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
- msgstr "genereeri uus v�tmepaar"
+ msgstr "genereeri uus võtmepaar"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
- msgstr "genereeri t�histamise sertifikaat"
+ msgstr "genereeri tühistamise sertifikaat"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
- msgstr "eemalda v�tmed avalike v�tmete hoidlast"
+ msgstr "eemalda võtmed avalike võtmete hoidlast"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
- msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
+ msgstr "eemalda võtmed salajaste võtmete hoidlast"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
- msgstr "allkirjasta v�ti"
+ msgstr "allkirjasta võti"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
- msgstr "allkirjasta v�ti lokaalselt"
+ msgstr "allkirjasta võti lokaalselt"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
- msgstr "allkirjasta v�ti"
+ msgstr "allkirjasta võti"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
- msgstr "allkirjasta v�ti lokaalselt"
+ msgstr "allkirjasta võti lokaalselt"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
- msgstr "allkirjasta v�i toimeta v�tit"
+ msgstr "allkirjasta või toimeta võtit"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
  msgstr "muuda parooli"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
- msgstr "ekspordi v�tmed"
+ msgstr "ekspordi võtmed"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
- msgstr "ekspordi v�tmed v�tmeserverisse"
+ msgstr "ekspordi võtmed võtmeserverisse"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
- msgstr "impordi v�tmed v�tmeserverist"
+ msgstr "impordi võtmed võtmeserverist"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
- msgstr "otsi v�tmeid v�tmeserverist"
+ msgstr "otsi võtmeid võtmeserverist"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
- msgstr "uuenda v�tmeid v�tmeserverist"
+ msgstr "uuenda võtmeid võtmeserverist"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
- msgstr "impordi/mesti v�tmed"
+ msgstr "impordi/mesti võtmed"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "uuenda usalduse andmebaasi"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
- msgstr "|algo [failid]|tr�ki teatel�hendid"
+ msgstr "|algo [failid]|trüki teatelühendid"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
- msgstr "loo ascii pakendis v�ljund"
+ msgstr "loo ascii pakendis väljund"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
- msgstr "|NIMI|kr�pti NIMEle"
+ msgstr "|NIMI|krüpti NIMEle"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "kasuta seda kasutaja IDd"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
- msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
+ msgstr "|N|määra pakkimise tase N (0 blokeerib)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "kasuta kanoonilist tekstimoodi"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
- msgstr "�ra tee mingeid muutusi"
+ msgstr "ära tee mingeid muutusi"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
- msgstr "k�si enne �lekirjutamist"
+ msgstr "küsi enne ülekirjutamist"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
  msgstr ""
  "@\n"
- "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
+ "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2607,21 -2042,19 +2614,21 @@@
  " --fingerprint [names]      show fingerprints\n"
  msgstr ""
  "@\n"
- "N�ited:\n"
+ "Näited:\n"
  "\n"
- " -se -r Bob [fail]          allkirjasta ja kr�pti kasutajale Bob\n"
+ " -se -r Bob [fail]          allkirjasta ja krüpti kasutajale Bob\n"
  " --clearsign [fail]         loo avateksti allkiri\n"
  " --detach-sign [fail]       loo eraldiseisev allkiri\n"
- " --list-keys [nimed]        n�ita v�tmeid\n"
- " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
+ " --list-keys [nimed]        näita võtmeid\n"
+ " --fingerprint [nimed]      näita sõrmejälgi\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2632,11 -2065,10 +2639,11 @@@ msgid "
  "Sign, check, encrypt or decrypt\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "S�ntaks: gpg [v�tmed] [failid]\n"
- "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
- "vaikimisi operatsioon s�ltub sisendandmetest\n"
+ "Süntaks: gpg [võtmed] [failid]\n"
+ "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
+ "vaikimisi operatsioon sõltub sisendandmetest\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2644,635 -2076,503 +2651,640 @@@ msgstr "
  "\n"
  "Toetatud algoritmid:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
- msgstr "Avalik v�ti: "
+ msgstr "Avalik võti: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
- msgstr "�iffer: "
+ msgstr "Šiffer: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
- msgstr "R�si: "
+ msgstr "Räsi: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Pakkimine: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
- msgstr "kasuta: gpg [v�tmed] "
+ msgstr "kasuta: gpg [võtmed] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
- msgstr "vastuolulised k�sud\n"
+ msgstr "vastuolulised käsud\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  msgid "no = sign found in group definition '%s'\n"
- msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
+ msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
- msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
+ msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
- msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
+ msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
- msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
+ msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, 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:1559
++#: g10/gpg.c:1567
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
- msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
+ msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
- msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
+ msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
- msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
+ msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "tundmatu seade \"%s\"\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  msgid "show key usage information during key listings"
- msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
+ msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  #, fuzzy
  msgid "show all notations during signature listings"
- msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
+ msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "antud allkirja poliisi URL on vigane\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  #, fuzzy
  msgid "show the keyring name in key listings"
- msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
+ msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  #, fuzzy
  msgid "show expiration dates during signature listings"
- msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
+ msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "blokeeri v�ti"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "tundmatu vaikimisi saaja `%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "vigased impordi võtmed\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
- msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
+ msgstr "MÄRKUS: ignoreerin vana vaikimisi võtmete faili `%s'\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
- msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
+ msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Selline e-posti aadress ei ole lubatud\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  #, fuzzy
  msgid "could not parse keyserver URL\n"
- msgstr "ei saa parsida v�tmeserveri URI\n"
+ msgstr "ei saa parsida võtmeserveri URI\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
- msgstr "%s:%d: vigased ekspordi v�tmed\n"
+ msgstr "%s:%d: vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  #, fuzzy
  msgid "invalid keyserver options\n"
- msgstr "vigased ekspordi v�tmed\n"
+ msgstr "vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
- msgstr "%s:%d: vigased impordi v�tmed\n"
+ msgstr "%s:%d: vigased impordi võtmed\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
- msgstr "vigased impordi v�tmed\n"
+ msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
- msgstr "vigased impordi v�tmed\n"
+ msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
- msgstr "%s:%d: vigased ekspordi v�tmed\n"
+ msgstr "%s:%d: vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
- msgstr "vigased ekspordi v�tmed\n"
+ msgstr "vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
- msgstr "%s:%d: vigased impordi v�tmed\n"
+ msgstr "%s:%d: vigased impordi võtmed\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  #, fuzzy
  msgid "invalid list options\n"
- msgstr "vigased impordi v�tmed\n"
+ msgstr "vigased impordi võtmed\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "antud allkirja poliisi URL on vigane\n"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s ei ole lubatud kooditabel\n"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
- msgstr "%s:%d: vigased ekspordi v�tmed\n"
+ msgstr "%s:%d: vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  #, fuzzy
  msgid "invalid verify options\n"
- msgstr "vigased ekspordi v�tmed\n"
+ msgstr "vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
- msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
+ msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
- msgstr "%s:%d: vigased ekspordi v�tmed\n"
+ msgstr "%s:%d: vigased ekspordi võtmed\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
- msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
+ msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
- msgstr "HOIATUS: %s m��rab �le %s\n"
+ msgstr "HOIATUS: %s määrab üle %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ja %s ei ole koos lubatud!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
- msgstr "%s ja %s ei oma koos m�tet!\n"
+ msgstr "%s ja %s ei oma koos mõtet!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
- msgstr "kirjutan salajase v�tme faili `%s'\n"
+ msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
- msgstr "valitud �ifri algoritm ei ole lubatud\n"
+ msgstr "valitud šifri algoritm ei ole lubatud\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
- msgstr "valitud l�hendi algoritm ei ole lubatud\n"
+ msgstr "valitud lühendi algoritm ei ole lubatud\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
- msgstr "valitud �ifri algoritm ei ole lubatud\n"
+ msgstr "valitud šifri algoritm ei ole lubatud\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
- msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
+ msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed peab olema suurem, kui 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed peab olema suurem, kui 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  #, 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:3588
++#: g10/gpg.c:3686
  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"
+ msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 või 3\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  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"
+ msgstr "vigane min-sert-tase; peab olema 1, 2 või 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
- msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
+ msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
- msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
+ msgstr "vigane S2K mood; peab olema 0, 1 või 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "vigased vaikimisi eelistused\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
- msgstr "vigased isikliku �ifri eelistused\n"
+ msgstr "vigased isikliku šifri eelistused\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
- msgstr "vigased isikliku l�hendi eelistused\n"
+ msgstr "vigased isikliku lühendi eelistused\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "vigased isikliku pakkimise eelistused\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
- msgstr "%s ei t��ta veel koos %s-ga\n"
+ msgstr "%s ei tööta veel koos %s-ga\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, 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"
+ msgstr "šifri algoritm \"%s\" ei ole moodis %s lubatud\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, 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"
+ msgstr "sõnumilühendi algoritm \"%s\" ei ole moodis %s lubatud\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, 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:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
- msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  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"
+ "HOIATUS: määrati saajad (-r) aga ei kasutata avaliku võtme krüptograafiat\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [failinimi]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [failinimi]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
- msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
+ msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [failinimi]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  #, fuzzy
  msgid "--symmetric --encrypt [filename]"
  msgstr "--sign --encrypt [failinimi]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, 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:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [failinimi]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [failinimi]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  #, fuzzy
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--sign --encrypt [failinimi]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, 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:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [failinimi]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [failinimi]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [failinimi]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key kasutaja-id"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key kasutaja-id"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
- msgstr "--edit-key kasutaja-id [k�sud]"
+ msgstr "--edit-key kasutaja-id [käsud]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
  msgstr "--sign-key kasutaja-id"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
- msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
+ msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
- msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
+ msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
- msgstr "v�tme eksport eba�nnestus: %s\n"
+ msgstr "võtme eksport ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
- msgstr "v�tme eksport eba�nnestus: %s\n"
+ msgstr "võtme eksport ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
- msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
+ msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
- msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
+ msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
- msgstr "lahtipakendamine eba�nnestus: %s\n"
+ msgstr "lahtipakendamine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
- msgstr "pakendamine eba�nnestus: %s\n"
+ msgstr "pakendamine ebaõnnestus: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[failinimi]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
- msgstr "Kirjutage n��d oma teade ...\n"
+ msgstr "Kirjutage nüüd oma teade ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "antud sertifikaadi poliisi URL on vigane\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "antud allkirja poliisi URL on vigane\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "antud allkirja poliisi URL on vigane\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
- msgstr "v�ta v�tmed sellest v�tmehoidlast"
+ msgstr "võta võtmed sellest võtmehoidlast"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "teata ajatemplite konfliktist ainult hoiatusega"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
- msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpgv [võtmed] [failid] (-h näitab abiinfot)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
  msgstr ""
- "S�ntaks: gpg [v�tmed] [failid]\n"
- "kontrolli allkirju tuntud usaldusv��rsete v�tmetega\n"
+ "Süntaks: gpg [võtmed] [failid]\n"
+ "kontrolli allkirju tuntud usaldusväärsete võtmetega\n"
  
 +#: g10/helptext.c:72
  msgid "No help available"
  msgstr "Abiinfo puudub"
  
@@@ -3282,332 -2581,266 +3294,332 @@@
  msgid "No help available for '%s'"
  msgstr "`%s' kohta abiinfo puudub"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "uuenda usalduse andmebaasi"
  
- #: g10/import.c:147
++#: g10/import.c:160
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "uuenda usalduse andmebaasi"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  msgid "show key during import"
- msgstr "n�ita s�rmej�lge"
+ msgstr "näita sõrmejälge"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  #, fuzzy
  msgid "remove unusable parts from key after import"
- msgstr "mittekasutatav salajane v�ti"
+ msgstr "mittekasutatav salajane võti"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
- msgstr "j�tan bloki t��biga %d vahele\n"
+ msgstr "jätan bloki tüübiga %d vahele\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
- msgstr "%lu v�tit on seni t��deldud\n"
+ msgstr "%lu võtit on seni töödeldud\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
- msgstr "T��deldud kokku: %lu\n"
+ msgstr "Töödeldud kokku: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
- msgstr " vahele j�etud uusi v�tmeid: %lu\n"
+ msgstr " vahele jäetud uusi võtmeid: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
- msgstr " vahele j�etud uusi v�tmeid: %lu\n"
+ msgstr " vahele jäetud uusi võtmeid: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "    puudub kasutaja ID: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "            imporditud: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "              muutmata: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "       uusi kasutajaid: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
- msgstr "      uusi alamv�tmeid: %lu\n"
+ msgstr "      uusi alamvõtmeid: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "         uusi allkirju: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
- msgstr "      uusi t�histamisi: %lu\n"
+ msgstr "      uusi tühistamisi: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
- msgstr " loetud salajasi v�tmeid: %lu\n"
+ msgstr " loetud salajasi võtmeid: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
- msgstr " salajasi v�tmeid imporditud: %lu\n"
+ msgstr " salajasi võtmeid imporditud: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
- msgstr " muutmata salajasi v�tmeid: %lu\n"
+ msgstr " muutmata salajasi võtmeid: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "       pole imporditud: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "         uusi allkirju: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
- msgstr " loetud salajasi v�tmeid: %lu\n"
+ msgstr " loetud salajasi võtmeid: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
- msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+ msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
- msgstr "v�ti %08lX: kasutaja ID puudub\n"
+ msgstr "võti %08lX: kasutaja ID puudub\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  msgid "key %s: %s\n"
- msgstr "`%s' j�tsin vahele: %s\n"
+ msgstr "`%s' jätsin vahele: %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
- msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
+ msgstr "võti %08lX: HKP alamvõtme rike parandatud\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr ""
- "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
+ "võti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
- msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
+ msgstr "võti %08lX: puudub kehtiv kasutaja ID\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
- msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
+ msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
- msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
+ msgstr "võti %08lX: avalikku võtit ei leitud: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
- msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
+ msgstr "võti %08lX: uus võti - jätsin vahele\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
- msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
+ msgstr "ei leia kirjutatavat võtmehoidlat: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
- msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
- msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
+ msgstr "võti %08lX: avalik võti \"%s\" on imporditud\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
- msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
+ msgstr "võti %08lX: ei sobi meie koopiaga\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
- msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
+ msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
- msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
+ msgstr "võti %08lX: ei õnnestu lugeda algset võtmeblokki: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
- msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
+ msgstr "võti %08lX: \"%s\" 1 uus kasutaja ID\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
- msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
+ msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
- msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
+ msgstr "võti %08lX: \"%s\" 1 uus allkiri\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
- msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
+ msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
- msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
+ msgstr "võti %08lX: \"%s\" 1 uus alamvõti\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
- msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
+ msgstr "võti %08lX: \"%s\" %d uut alamvõtit\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
- msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
+ msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
- msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
+ msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
- msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
+ msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
- msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
+ msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
- msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
+ msgstr "võti %08lX: \"%s\" ei muudetud\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
- msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
+ msgstr "võti %08lX: salajane võti on imporditud\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
- msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
+ msgstr "jätsin vahele: avalik võti on juba olemas\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
- msgstr "salajast v�tit `%s' ei leitud: %s\n"
+ msgstr "salajast võtit `%s' ei leitud: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  #, fuzzy
  msgid "importing secret keys not allowed\n"
- msgstr "kirjutan salajase v�tme faili `%s'\n"
+ msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
- msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
+ msgstr "võti %08lX: salajane võti vigase šifriga %d - jätsin vahele\n"
  
  #. TRANSLATORS: For smartcard, each private key on
  #. host has a reference (stub) to a smartcard and
@@@ -3619,226 -2852,187 +3631,232 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
- "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
+ "võti %08lX: avalik võti puudub - tühistamise sertifikaati ei saa rakendada\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
- msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
+ msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
- msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
+ msgstr "võti %08lX: \"%s\" tühistamise sertifikaat imporditud\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
- msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
+ msgstr "võti %08lX: allkirjal puudub kasutaja ID\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
- msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
+ msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm kasutajaga \"%s\"\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
- msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
+ msgstr "võti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
- msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
+ msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
- msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
+ msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
- msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
+ msgstr "võti %08lX: võtmeseosel puudub alamvõti\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
- msgstr "v�ti %08lX: vigane alamv�tme seos\n"
+ msgstr "võti %08lX: vigane alamvõtme seos\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
- msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
+ msgstr "võti %08lX: vigane mitme alamvõtme seos\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
- msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
+ msgstr "võti %08lX: võtme tühistamiseks puudub alamvõti\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
- msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
+ msgstr "võti %08lX: vigane alamvõtme tühistamine\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
- msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
+ msgstr "võti %08lX: eemaldasin mitme alamvõtme tühistamise\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
- msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
+ msgstr "võti %08lX: jätsin vahele kasutaja ID '"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
- msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
+ msgstr "võti %08lX: jätsin alamvõtme vahele\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
- msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
+ msgstr "võti %08lX: mitte eksporditav allkiri (klass %02x) - jätan vahele\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
- msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
+ msgstr "võti %08lX: tühistamise sertifikaat on vales kohas - jätan vahele\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
- msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
+ msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - jätan vahele\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
- msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
+ msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
- msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
+ msgstr "võti %08lX: ootamatu allkirja klass (0x%02x) - jätan vahele\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
- msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
+ msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
- "HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
+ "HOIATUS: võti %08lX võib olla tühistatud: laen tühistamise võtit %08lX\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
- "HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
+ "HOIATUS: võti %08lX võib olla tühistatud: tühistamise võtit %08lX pole.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
- msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
+ msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
- msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
+ msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
- msgstr "v�tmehoidla `%s' on loodud\n"
+ msgstr "võtmehoidla `%s' on loodud\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
- msgstr "v�tmehoidla `%s' on loodud\n"
+ msgstr "võtmehoidla `%s' on loodud\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "viga `%s' loomisel: %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
- msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
+ msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
  
 +#: g10/keyedit.c:264
  msgid "[revocation]"
- msgstr "[t�histamine]"
+ msgstr "[tühistamine]"
  
 +#: g10/keyedit.c:264
  msgid "[self-signature]"
  msgstr "[iseenda allkiri]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
+ msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+ msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Korrektne allkiri kasutajalt \""
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  msgid "key %s:\n"
- msgstr "`%s' j�tsin vahele: %s\n"
+ msgstr "`%s' jätsin vahele: %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Kasutaja ID \"%s\" on t�histatud."
- msgstr[1] "Kasutaja ID \"%s\" on t�histatud."
+ msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
+ msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 allkiri j�i testimata, kuna v�ti puudub\n"
- msgstr[1] "1 allkiri j�i testimata, kuna v�ti puudub\n"
+ msgstr[0] "1 allkiri jäi testimata, kuna võti puudub\n"
+ msgstr[1] "1 allkiri jäi testimata, kuna võti puudub\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3846,21 -3040,18 +3864,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d halba allkirja\n"
  msgstr[1] "%d halba allkirja\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Korrektne allkiri kasutajalt \""
  msgstr[1] "Korrektne allkiri kasutajalt \""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3868,73 -3059,58 +3886,73 @@@
  "(by looking at passports, checking fingerprints from different sources, "
  "etc.)\n"
  msgstr ""
- "Palun otsustage, kuiv�rd te usaldate seda kasutajat\n"
- "teiste kasutajate v�tmete kontrollimisel (kontrollige\n"
- "passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
+ "Palun otsustage, kuivõrd te usaldate seda kasutajat\n"
+ "teiste kasutajate võtmete kontrollimisel (kontrollige\n"
+ "passe, kontrollige erinevatest allikatest näpujälgi...)?\n"
  "\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
- msgstr " %d = Usaldan v�hesel m��ral\n"
+ msgstr " %d = Usaldan vähesel määral\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
- msgstr " %d = Usaldan t�iesti\n"
+ msgstr " %d = Usaldan täiesti\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
- msgstr "Kasutaja ID \"%s\" on t�histatud."
+ msgstr "Kasutaja ID \"%s\" on tühistatud."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  Ei saa allkirjastada.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Kasutaja ID \"%s\" on aegunud."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  #, fuzzy
  msgid "Sign it? (y/N) "
- msgstr "Allkirjastan t�esti? "
+ msgstr "Allkirjastan tõesti? "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3943,11 -3119,9 +3961,11 @@@ msgstr "
  "Iseenda allkiri \"%s\"\n"
  "on PGP 2.x stiilis allkiri.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3956,11 -3130,9 +3974,11 @@@ msgstr "
  "Teie praegune allkiri \"%s\"\n"
  "on aegunud.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3969,346 -3141,277 +3987,346 @@@ msgstr "
  "Teie praegune allkiri \"%s\"\n"
  "on lokaalne allkiri.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
- "Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
+ "Kas te soovite seda edutada täielikuks eksporditavaks allkirjaks? (j/E) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
- msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
+ msgstr "\"%s\" on juba lokaalselt allkirjastatud võtmega %08lX\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
- msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
+ msgstr "\"%s\" on juba allkirjastatud võtmega %08lX\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
- msgstr "V�tmega %08lX pole midagi allkirjastada\n"
+ msgstr "Võtmega %08lX pole midagi allkirjastada\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
- msgstr "See v�ti on aegunud!"
+ msgstr "See võti on aegunud!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
- msgstr "See v�ti aegub %s.\n"
+ msgstr "See võti aegub %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
  "to the person named above?  If you don't know what to answer, enter \"0\".\n"
  msgstr ""
- "Kui hoolikalt te olete kontrollinud et v�ti, mida te asute allkirjastama,\n"
- "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
+ "Kui hoolikalt te olete kontrollinud et võti, mida te asute allkirjastama,\n"
+ "kuulub ka tegelikult ülal mainitud isikule? Kui te ei tea, mida vastata,\n"
  "sisestage \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Ma ei vasta.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
- msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
+ msgstr "   (1) Ma ei ole üldse kontrollinud.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
- msgstr "   (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
+ msgstr "   (3) Ma olen kontrollinud väga hoolikalt.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr ""
- "Olete t�esti kindel, et soovite seda v�tit oma\n"
- "v�tmega allkirjastada: \""
+ "Olete tõesti kindel, et soovite seda võtit oma\n"
+ "võtmega allkirjastada: \""
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "See saab olema iseenda allkiri.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
- "HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
+ "HOIATUS: allkirja ei märgita mitte-eksporditavaks.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
- "HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
+ "HOIATUS: allkirja ei märgita kehtetuks mitte-tunnistatavaks.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
- "Allkiri m�rgitakse mitte-eksporditavaks.\n"
+ "Allkiri märgitakse mitte-eksporditavaks.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
- "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
+ "Allkiri märgitakse kehtetuks mitte-tunnistatavaks.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
- "Ma ei ole seda v�tit �ldse kontrollinud.\n"
+ "Ma ei ole seda võtit üldse kontrollinud.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
- "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
+ "Ma olen seda võtit kontrollinud ainult pealiskaudselt.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
- "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
+ "Ma olen kontrollinud seda võtit väga hoolikalt.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  #, fuzzy
  msgid "Really sign? (y/N) "
- msgstr "Allkirjastan t�esti? "
+ msgstr "Allkirjastan tõesti? "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
- msgstr "allkirjastamine eba�nnestus: %s\n"
+ msgstr "allkirjastamine ebaõnnestus: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
- msgstr "salvesta ja v�lju"
+ msgstr "salvesta ja välju"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  #, fuzzy
  msgid "show key fingerprint"
- msgstr "n�ita s�rmej�lge"
+ msgstr "näita sõrmejälge"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Allkirja noteerimine: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
- msgstr "n�ita v�tit ja kasutaja IDd"
+ msgstr "näita võtit ja kasutaja IDd"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "vali kasutaja ID N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  #, fuzzy
  msgid "select subkey N"
  msgstr "vali kasutaja ID N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "check signatures"
- msgstr "t�hista allkirjad"
+ msgstr "tühista allkirjad"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  #, fuzzy
  msgid "sign selected user IDs locally"
- msgstr "allkirjasta v�ti lokaalselt"
+ msgstr "allkirjasta võti lokaalselt"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "lisa kasutaja ID"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "lisa foto ID"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "kustuta kasutaja ID"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  #, fuzzy
  msgid "delete selected subkeys"
- msgstr "kustuta sekundaarne v�ti"
+ msgstr "kustuta sekundaarne võti"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
- msgstr "lisa t�histamise v�ti"
+ msgstr "lisa tühistamise võti"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
- msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
+ msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
- msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
+ msgstr "v3 võtme aegumise aega ei saa muuta.\n"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  #, fuzzy
  msgid "flag the selected user ID as primary"
- msgstr "m�rgi kasutaja ID primaarseks"
+ msgstr "märgi kasutaja ID primaarseks"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
- msgstr "n�ita eelistusi (ekspert)"
+ msgstr "näita eelistusi (ekspert)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
- msgstr "n�ita eelistusi (detailsena)"
+ msgstr "näita eelistusi (detailsena)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  #, fuzzy
  msgid "set preference list for the selected user IDs"
- msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
+ msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
- msgstr "ei saa parsida v�tmeserveri URI\n"
+ msgstr "ei saa parsida võtmeserveri URI\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  #, fuzzy
  msgid "set a notation for the selected user IDs"
- msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
+ msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "muuda parooli"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "muuda omaniku usaldust"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
- msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
+ msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  #, fuzzy
  msgid "revoke selected user IDs"
- msgstr "t�hista kasutaja ID"
+ msgstr "tühista kasutaja ID"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  #, fuzzy
  msgid "revoke key or selected subkeys"
- msgstr "t�hista sekundaarne v�ti"
+ msgstr "tühista sekundaarne võti"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  #, fuzzy
  msgid "enable key"
- msgstr "luba v�ti"
+ msgstr "luba võti"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "disable key"
- msgstr "blokeeri v�ti"
+ msgstr "blokeeri võti"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  #, fuzzy
  msgid "show selected photo IDs"
- msgstr "n�ita foto ID"
+ msgstr "näita foto ID"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
- msgstr "Salajane v�ti on kasutatav.\n"
+ msgstr "Salajane võti on kasutatav.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
- msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
+ msgstr "Selle tegamiseks on vaja salajast võtit.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4316,354 -3419,279 +4334,355 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
- msgstr "V�ti on t�histatud."
+ msgstr "Võti on tühistatud."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
- msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
+ msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
- msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
+ msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "tundmatu allkirja klass"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
- msgstr "See k�sklus ei ole %s moodis lubatud.\n"
+ msgstr "See käsklus ei ole %s moodis lubatud.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
- msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
+ msgstr "Te peate valima vähemalt ühe kasutaja ID.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Viimast kasutaja ID ei saa kustutada!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
- msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
+ msgstr "Kas kustutan tõesti kõik kasutaja IDd? "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
- msgstr "Kas eemaldan t�esti selle kasutaja ID? "
+ msgstr "Kas eemaldan tõesti selle kasutaja ID? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
- msgstr "Kas eemaldan t�esti selle kasutaja ID? "
+ msgstr "Kas eemaldan tõesti selle kasutaja ID? "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  #, fuzzy
  msgid "You must select exactly one key.\n"
- msgstr "Te peata valima v�hemalt �he v�tme.\n"
+ msgstr "Te peata valima vähemalt ühe võtme.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
- msgstr "`%s' ei �nnestu avada: %s\n"
+ msgstr "`%s' ei õnnestu avada: %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
- msgstr "Te peata valima v�hemalt �he v�tme.\n"
+ msgstr "Te peata valima vähemalt ühe võtme.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
- msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
+ msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
- msgstr "Kas te t�esti soovite seda v�tit kustutada? "
+ msgstr "Kas te tõesti soovite seda võtit kustutada? "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
- msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
+ msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
- msgstr "Kas t�histan t�esti selle kasutaja ID? "
+ msgstr "Kas tühistan tõesti selle kasutaja ID? "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
- msgstr "Kas te t�esti soovite seda v�tit t�histada? "
+ msgstr "Kas te tõesti soovite seda võtit tühistada? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
+ msgstr "Kas te tõesti soovite valitud võtmeid tühistada? "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
- msgstr "Kas te t�esti soovite seda v�tit t�histada? "
+ msgstr "Kas te tõesti soovite seda võtit tühistada? "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "sea eelistuste nimekiri"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
- msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
+ msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
- msgstr "Kas t�esti uuendan seaded? "
+ msgstr "Kas tõesti uuendan seaded? "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Salvestan muutused? "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  #, fuzzy
  msgid "Quit without saving? (y/N) "
- msgstr "V�ljun salvestamata? "
+ msgstr "Väljun salvestamata? "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
- msgstr "uuendamine eba�nnestus: %s\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
- msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
+ msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
- msgstr "V�tme genereerimine eba�nnestus: %s\n"
+ msgstr "Võtme genereerimine ebaõnnestus: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
- msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
- msgstr "vigane v��rtus\n"
+ msgstr "vigane väärtus\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Tundmatu kasutaja ID.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  msgid "Nothing to sign.\n"
- msgstr "V�tmega %08lX pole midagi allkirjastada\n"
+ msgstr "Võtmega %08lX pole midagi allkirjastada\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
- msgstr "Teatel�hend: "
+ msgstr "Teatelühend: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Omadused: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  #, fuzzy
  msgid "Notations: "
  msgstr "Noteering: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
- msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
+ msgstr "Selle võtme võib olla tühistanud %s võti "
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, 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 "
+ msgstr "Selle võtme võib olla tühistanud %s võti "
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (tundlik)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
- msgstr "%s ei �nnestu luua: %s\n"
+ msgstr "%s ei õnnestu luua: %s\n"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
- msgstr "[t�histatud] "
+ msgstr "[tühistatud] "
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [aegub: %s]"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [aegub: %s]"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " usaldus: %c/%c"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " usaldus: %c/%c"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
- msgstr "See v�ti on blokeeritud"
+ msgstr "See võti on blokeeritud"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  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"
+ "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:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
- msgstr "[t�histatud] "
+ msgstr "[tühistatud] "
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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 ""
- "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
- "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
+ "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:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
- msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
+ msgstr "v3 võtme aegumise aega ei saa muuta.\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  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 ""
- "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"
+ "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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  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:4298
++#: g10/keyedit.c:4311
  msgid "You may not add a photo ID to a PGP2-style key.\n"
- msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
+ msgstr "Foto IDd ei saa PGP2 võtmele lisada.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Kustutan selle vigase allkirja? (j/E/v)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
- msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
+ msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4671,319 -3699,253 +4690,319 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Kustutatud %d allkiri.\n"
  msgstr[1] "Kustutatud %d allkiri.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Midagi ei kustutatud.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  #, fuzzy
  msgid "invalid"
  msgstr "vigane pakend"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
- msgstr "Kasutaja ID \"%s\" on t�histatud."
+ msgstr "Kasutaja ID \"%s\" on tühistatud."
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
- msgstr[0] "Kasutaja ID \"%s\" on t�histatud."
- msgstr[1] "Kasutaja ID \"%s\" on t�histatud."
+ msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
+ msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
- msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+ msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
- msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+ msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  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 ""
- "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"
+ "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:4585
++#: g10/keyedit.c:4601
  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"
+ msgstr "PGP 2.x-stiili võtmele ei saa määratud tühistajat lisada.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
- msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
+ msgstr "Sisestage määratud tühistaja kasutaja ID: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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"
+ msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  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"
+ msgstr "te ei saa nimetada võtit iseenda määratud tühistajaks\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  #, 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"
+ msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  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"
+ msgstr "HOIATUS: võtme seadmist määratud tühistajaks ei saa tagasi võtta!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  #, 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): "
+ "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
  msgstr ""
- "Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
+ "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
- msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
+ msgstr "Muudan sekundaarse võtme aegumise aega.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
- msgstr "Muudan primaarse v�tme aegumise aega.\n"
+ msgstr "Muudan primaarse võtme aegumise aega.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
- msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
+ msgstr "v3 võtme aegumise aega ei saa muuta.\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
- msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
+ msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
- msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
+ msgstr "Palun valige täpselt üks kasutaja ID.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, fuzzy, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
- msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
+ msgstr "jätan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Allkirja noteerimine: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  #, fuzzy
  msgid "Proceed? (y/N) "
- msgstr "Kirjutan �le (j/E)? "
+ msgstr "Kirjutan üle (j/E)? "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Kasutaja ID numbriga %d puudub\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Kasutaja ID numbriga %d puudub\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Kasutaja ID numbriga %d puudub\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Kasutaja ID numbriga %d puudub\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "kasutaja ID: \""
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, fuzzy, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "   allkirjastanud %08lX %s%s%s\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (mitte-eksporditav)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "See allkiri aegub %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
- msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
+ msgstr "Olete kindel, et soovite seda ikka tühistada? (j/E) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
- msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
+ msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   allkirjastanud %08lX %s%s\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, fuzzy, c-format
  msgid "You have signed these user IDs on key %s:\n"
- msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
+ msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (mitte-eksporditav)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
- msgstr "   t�histanud %08lX %s\n"
+ msgstr "   tühistanud %08lX %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
- msgstr "Te asute t�histama j�rgmisi allkirju:\n"
+ msgstr "Te asute tühistama järgmisi allkirju:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
- msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
+ msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
- msgstr "salajast v�tit pole\n"
+ msgstr "salajast võtit pole\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
- msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+ msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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:6370
++#: g10/keyedit.c:6386
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
- msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+ msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
- msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+ msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, 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"
+ msgstr "Näitan %s foto IDd suurusega %ld, võti 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "liiga palju `%c' eelistusi\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "liiga palju `%c' eelistusi\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "liiga palju `%c' eelistusi\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
- msgstr "lubamatu s�mbol eelistuste s�nes\n"
+ msgstr "lubamatu sümbol eelistuste sõnes\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "kirjutan otsese allkirja\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "kirjutan iseenda allkirja\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
- msgstr "kirjutan v�tit siduva allkirja\n"
+ msgstr "kirjutan võtit siduva allkirja\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
- msgstr "vigane v�tme suurus; kasutan %u bitti\n"
+ msgstr "vigane võtme suurus; kasutan %u bitti\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
- msgstr "v�tme suurus �mardatud �les %u bitini\n"
+ msgstr "võtme suurus ümardatud üles %u bitini\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  #, fuzzy
  msgid "Encrypt"
- msgstr "kr�pteeri andmed"
+ msgstr "krüpteeri andmed"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr ""
  
@@@ -4997,157 -3959,126 +5016,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
- msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
+ msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
- msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
+ msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
- msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
+ msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
- msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+ msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+ msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+ msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
- msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+ msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
- msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+ msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
- msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+ msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Allkirja noteerimine: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Kasutaja ID numbriga %d puudub\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
- msgstr "�mardatud �les %u bitini\n"
+ msgstr "ümardatud üles %u bitini\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
- msgstr "Millist v�tmepikkust te soovite? (1024) "
+ msgstr "Millist võtmepikkust te soovite? (1024) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
- msgstr "Millist v�tmepikkust te soovite? (1024) "
+ msgstr "Millist võtmepikkust te soovite? (1024) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
- msgstr "Soovitud v�tmepikkus on %u bitti\n"
+ msgstr "Soovitud võtmepikkus on %u bitti\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
- msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
+ msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5156,14 -4087,13 +5175,14 @@@
  "      <n>m = key expires in n months\n"
  "      <n>y = key expires in n years\n"
  msgstr ""
- "Palun m��rake, kui kaua on v�ti kehtiv.\n"
- "         0 = v�ti ei aegu\n"
- "      <n>  = v�ti aegub n p�evaga\n"
- "      <n>w = v�ti aegub n n�dalaga\n"
- "      <n>m = v�ti aegub n kuuga\n"
- "      <n>y = v�ti aegub n aastaga\n"
+ "Palun määrake, kui kaua on võti kehtiv.\n"
+ "         0 = võti ei aegu\n"
+ "      <n>  = võti aegub n päevaga\n"
+ "      <n>w = võti aegub n nädalaga\n"
+ "      <n>m = võti aegub n kuuga\n"
+ "      <n>y = võti aegub n aastaga\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5179,53 -4109,43 +5198,53 @@@ msgstr "
  "      <n>m = allkiri aegub n kuuga\n"
  "      <n>y = allkiri aegub n aastaga\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
- msgstr "V�ti on kehtiv kuni? (0) "
+ msgstr "Võti on kehtiv kuni? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Allkiri on kehtiv kuni? (0) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
- msgstr "vigane v��rtus\n"
+ msgstr "vigane väärtus\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s ei aegu kunagi\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s ei aegu kunagi\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s aegub %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Allkiri aegub %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
- "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
- "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
+ "Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
+ "Siiski käsitletakse neid korrektselt aastani 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  #, fuzzy
  msgid "Is this correct? (y/N) "
- msgstr "On see �ige (j/e)? "
+ msgstr "On see õige (j/e)? "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5236,7 -4156,6 +5255,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  #, fuzzy
  msgid ""
  "\n"
@@@ -5252,50 -4171,39 +5271,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
- msgstr "P�risnimi: "
+ msgstr "Pärisnimi: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
- msgstr "Lubamatu s�mbol nimes\n"
+ msgstr "Lubamatu sümbol nimes\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
- msgstr "Nimi ei v�i alata numbriga\n"
+ msgstr "Nimi ei või alata numbriga\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
- msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
+ msgstr "Nimes peab olema vähemalt 5 sümbolit\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "E-posti aadress: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "Selline e-posti aadress ei ole lubatud\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Kommentaar: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
- msgstr "Lubamatu s�mbol kommentaaris\n"
+ msgstr "Lubamatu sümbol kommentaaris\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Te kasutate kooditabelit `%s'.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5306,9 -4214,8 +5325,9 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
- msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
+ msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n"
  
  #. TRANSLATORS: These are the allowed answers in
  #. lower and uppercase.  Below you will find the matching
@@@ -5321,35 -4228,28 +5340,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnKkEeOoVv"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
- msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
+ msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
- msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
+ msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
- msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
+ msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
- msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
+ msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
- msgstr "Palun parandage k�igepealt viga\n"
+ msgstr "Palun parandage kõigepealt viga\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5358,16 -4258,13 +5377,16 @@@
  msgstr ""
  "Me peame genereerima palju juhuslikke baite. Praegu oleks hea teostada\n"
  "arvutil mingeid teisi tegevusi (kirjutada klaviatuuril, liigutada hiirt,\n"
- "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
+ "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
  "koguda paremat entroopiat.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
- msgstr "V�tme genereerimine eba�nnestus: %s\n"
+ msgstr "Võtme genereerimine ebaõnnestus: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5375,108 -4272,88 +5394,108 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' on juba pakitud\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  msgid "Create anyway? (y/N) "
- msgstr "Kasutan seda v�tit ikka? "
+ msgstr "Kasutan seda võtit ikka? "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  msgid "creating anyway\n"
- msgstr "genereeri uus v�tmepaar"
+ msgstr "genereeri uus võtmepaar"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
- msgstr "V�tme genereerimine katkestati.\n"
+ msgstr "Võtme genereerimine katkestati.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
- msgstr "`%s' ei �nnestu luua: %s\n"
+ msgstr "`%s' ei õnnestu luua: %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
- msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
+ msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
- msgstr "kirjutan avaliku v�tme faili `%s'\n"
+ msgstr "kirjutan avaliku võtme faili `%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
- msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
+ msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
- msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
- msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
+ msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
  msgstr ""
- "Pidage silmas, et seda v�tit ei saa kasutada kr�ptimiseks. \n"
- "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
- "kasutades v�tit \"--edit-key\".\n"
+ "Pidage silmas, et seda võtit ei saa kasutada krüptimiseks. \n"
+ "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
+ "kasutades võtit \"--edit-key\".\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
- msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
+ msgstr "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
- msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
+ msgstr "võti loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
- msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
+ msgstr "MÄRKUS: v3 võtmetele alamvõtmete loomine ei ole OpenPGP ühilduv\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
- msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
+ msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
- msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
+ msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  #, fuzzy
  msgid "Really create? (y/N) "
- msgstr "Loon t�esti? "
+ msgstr "Loon tõesti? "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "mitte kunagi"
  
@@@ -5513,60 -4383,49 +5532,60 @@@ msgstr[1] "%d halba allkirja\n
  #| msgid "1 signature not checked due to an error\n"
  msgid "%d signature not checked due to an error\n"
  msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 allkiri j�i vea t�ttu kontrollimata\n"
- msgstr[1] "1 allkiri j�i vea t�ttu kontrollimata\n"
+ msgstr[0] "1 allkiri jäi vea tõttu kontrollimata\n"
+ msgstr[1] "1 allkiri jäi vea tõttu kontrollimata\n"
  
 +#: g10/keylist.c:567
  #, c-format
  msgid "Warning: %lu key skipped due to its large size\n"
  msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
  msgstr[0] ""
  msgstr[1] ""
  
 +#: g10/keylist.c:589
  msgid "Keyring"
- msgstr "V�tmehoidla"
+ msgstr "Võtmehoidla"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
- msgstr "Primaarse v�tme s�rmej�lg:"
+ msgstr "Primaarse võtme sõrmejälg:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
- msgstr "    Alamv�tme s�rmej�lg:"
+ msgstr "    Alamvõtme sõrmejälg:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
- msgstr " Primaarse v�tme s�rmej�lg:"
+ msgstr " Primaarse võtme sõrmejälg:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
- msgstr "     Alamv�tme s�rmej�lg:"
+ msgstr "     Alamvõtme sõrmejälg:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  #, fuzzy
  msgid "      Key fingerprint ="
- msgstr "     V�tme s�rmej�lg ="
+ msgstr "     Võtme sõrmejälg ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr ""
  
 +#: g10/keyring.c:1498
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
- msgstr "kontrollin v�tmehoidlat `%s'\n"
+ msgstr "kontrollin võtmehoidlat `%s'\n"
  
 +#: g10/keyring.c:1572
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
- msgstr[0] "kontrollitud %lu v�tit (%lu allkirja)\n"
- msgstr[1] "kontrollitud %lu v�tit (%lu allkirja)\n"
+ msgstr[0] "kontrollitud %lu võtit (%lu allkirja)\n"
+ msgstr[1] "kontrollitud %lu võtit (%lu allkirja)\n"
  
 +#: g10/keyring.c:1588
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
@@@ -5581,209 -4439,166 +5600,209 @@@ msgid_plural " (%lu signatures)\n
  msgstr[0] "1 halb allkiri\n"
  msgstr[1] "1 halb allkiri\n"
  
 +#: g10/keyring.c:1665
  #, c-format
  msgid "%s: keyring created\n"
- msgstr "%s: v�tmehoidla on loodud\n"
+ msgstr "%s: võtmehoidla on loodud\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  #, fuzzy
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "antud allkirja poliisi URL on vigane\n"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  #, fuzzy
  msgid "disabled"
  msgstr "disable"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr ""
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, fuzzy, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
- msgstr "vigased ekspordi v�tmed\n"
+ msgstr "vigased ekspordi võtmed\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr ""
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
- msgstr[0] "k�sin v�tit %08lX v�tmeserverist %s\n"
- msgstr[1] "k�sin v�tit %08lX v�tmeserverist %s\n"
+ msgstr[0] "küsin võtit %08lX võtmeserverist %s\n"
+ msgstr[1] "küsin võtit %08lX võtmeserverist %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, fuzzy, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, fuzzy, c-format
  msgid "key \"%s\" not found on keyserver\n"
- msgstr "v�tit '%s' ei leitud: %s\n"
+ msgstr "võtit '%s' ei leitud: %s\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  #, fuzzy
  msgid "key not found on keyserver\n"
- msgstr "v�tit '%s' ei leitud: %s\n"
+ msgstr "võtit '%s' ei leitud: %s\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr ""
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, fuzzy, c-format
  msgid "requesting key %s from %s server %s\n"
- msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
+ msgstr "küsin võtit %08lX võtmeserverist %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, fuzzy, c-format
  msgid "requesting key %s from %s\n"
- msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
+ msgstr "küsin võtit %08lX võtmeserverist %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  msgid "no keyserver known\n"
- msgstr "vigased ekspordi v�tmed\n"
+ msgstr "vigased ekspordi võtmed\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, fuzzy, c-format
  msgid "skipped \"%s\": %s\n"
- msgstr "`%s' j�tsin vahele: %s\n"
+ msgstr "`%s' jätsin vahele: %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, fuzzy, c-format
  msgid "sending key %s to %s\n"
  msgstr ""
  "\"\n"
- "allkirjastatud teie v�tmega %08lX %s\n"
+ "allkirjastatud teie võtmega %08lX %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  msgid "requesting key from '%s'\n"
- msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
+ msgstr "küsin võtit %08lX võtmeserverist %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, fuzzy, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
  
 +#: g10/mainproc.c:254
  #, c-format
  msgid "weird size for an encrypted session key (%d)\n"
- msgstr "veider suurus kr�ptitud sessiooni v�tme jaoks (%d)\n"
+ msgstr "veider suurus krüptitud sessiooni võtme jaoks (%d)\n"
  
 +#: g10/mainproc.c:302
  #, c-format
  msgid "%s encrypted session key\n"
- msgstr "%s kr�pteeritud sessiooni v�ti\n"
+ msgstr "%s krüpteeritud sessiooni võti\n"
  
 +#: g10/mainproc.c:312
  #, fuzzy, c-format
  msgid "passphrase generated with unknown digest algorithm %d\n"
- msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
+ msgstr "krüpteeritud tundmatu algoritmiga %d\n"
  
 +#: g10/mainproc.c:378
  #, fuzzy, c-format
  msgid "public key is %s\n"
- msgstr "avalik v�ti on %08lX\n"
+ msgstr "avalik võti on %08lX\n"
  
 +#: g10/mainproc.c:456
  msgid "public key encrypted data: good DEK\n"
- msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
+ msgstr "avaliku võtmega krüpteeritud andmed: hea DEK\n"
  
 +#: g10/mainproc.c:489
  #, fuzzy, c-format
  msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
- msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
+ msgstr "krüpteeritud %u-bitise %s võtmega, ID %08lX, loodud %s\n"
  
 +#: g10/mainproc.c:493 g10/pkclist.c:228
  #, fuzzy, c-format
  msgid "      \"%s\"\n"
  msgstr "                 ka \""
  
 +#: g10/mainproc.c:497
  #, fuzzy, c-format
  msgid "encrypted with %s key, ID %s\n"
- msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
+ msgstr "krüpteeritud %s võtmega, ID %08lX\n"
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
- msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
+ msgstr "avaliku võtmega lahtikrüpteerimine ebaõnnestus: %s\n"
  
 +#: g10/mainproc.c:530
  #, c-format
  msgid "encrypted with %lu passphrases\n"
- msgstr "kr�pteeritud kasutades %lu parooli\n"
+ msgstr "krüpteeritud kasutades %lu parooli\n"
  
 +#: g10/mainproc.c:532
  msgid "encrypted with 1 passphrase\n"
- msgstr "kr�pteeritud �he parooliga\n"
+ msgstr "krüpteeritud ühe parooliga\n"
  
 +#: g10/mainproc.c:566 g10/mainproc.c:587
  #, c-format
  msgid "assuming %s encrypted data\n"
- msgstr "eeldan %s kr�pteeritud andmeid\n"
+ msgstr "eeldan %s krüpteeritud andmeid\n"
  
 +#: g10/mainproc.c:573
  #, c-format
  msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
- msgstr "IDEA �iffer pole saadaval, loodan kasutada selle asemel %s\n"
+ msgstr "IDEA šiffer pole saadaval, loodan kasutada selle asemel %s\n"
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  msgid "WARNING: message was not integrity protected\n"
- msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
+ msgstr "HOIATUS: teate kooskõlalisus ei ole tagatud\n"
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
- msgstr "lahtikr�pteerimine �nnestus\n"
+ msgstr "lahtikrüpteerimine õnnestus\n"
  
 +#: g10/mainproc.c:637
  msgid "WARNING: encrypted message has been manipulated!\n"
- msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
+ msgstr "HOIATUS: krüpteeritud teadet on muudetud!\n"
  
 +#: g10/mainproc.c:653
  #, c-format
  msgid "decryption failed: %s\n"
- msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
+ msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
  
 +#: g10/mainproc.c:676
  #, fuzzy
  #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
  msgid "Note: sender requested \"for-your-eyes-only\"\n"
- msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
+ msgstr "MÄRKUS: saatja nõudis \"ainult-teie-silmadele\"\n"
  
 +#: g10/mainproc.c:678
  #, c-format
  msgid "original file name='%.*s'\n"
  msgstr "algne failinimi on='%.*s'\n"
@@@ -5792,178 -4606,142 +5811,178 @@@
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
- msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
+ msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Korrektne allkiri kasutajalt \""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "HALB allkiri kasutajalt \""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Aegunud allkiri kasutajalt \""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Korrektne allkiri kasutajalt \""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
- msgstr "allkirja kontroll j�eti �ra\n"
+ msgstr "allkirja kontroll jäeti ära\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
- msgstr "neid allkirju ei �nnestu t��delda\n"
+ msgstr "neid allkirju ei õnnestu töödelda\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Allkiri aegus %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "                 ka \""
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
- msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
+ msgstr "Allkirja lõi %.*s kasutades %s võtit ID %08lX\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                 ka \""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
- msgstr "V�tme leiate: "
+ msgstr "Võtme leiate: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[ebakindel]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "                 ka \""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Allkiri aegus %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Allkiri aegub %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
- msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+ msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binaarne"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "tekstimood"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "tundmatu"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
- msgstr "tundmatu avaliku v�tme algoritm"
+ msgstr "tundmatu avaliku võtme algoritm"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Allkirja ei saa kontrollida: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "ei ole eraldiseisev allkiri\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "vana stiili (PGP 2.x) allkiri\n"
  
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
  #, fuzzy, c-format
  msgid "fstat of '%s' failed in %s: %s\n"
- msgstr "faili ei �nnestu avada: %s\n"
+ msgstr "faili ei õnnestu avada: %s\n"
  
 +#: g10/misc.c:170
  #, fuzzy, c-format
  msgid "fstat(%d) failed in %s: %s\n"
- msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
+ msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
  
 +#: g10/misc.c:279
  #, fuzzy, c-format
  msgid "WARNING: using experimental public key algorithm %s\n"
- msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
+ msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
  
 +#: g10/misc.c:286
  #, fuzzy
  msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
  msgstr ""
- "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+ "sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
  
 +#: g10/misc.c:300
  #, fuzzy, c-format
  msgid "WARNING: using experimental cipher algorithm %s\n"
- msgstr "realiseerimata �ifri algoritm"
+ msgstr "realiseerimata šifri algoritm"
  
 +#: g10/misc.c:319
  #, fuzzy, c-format
  msgid "WARNING: using experimental digest algorithm %s\n"
- msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+ msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
  
 +#: g10/misc.c:328
  #, fuzzy, c-format
  msgid "WARNING: digest algorithm %s is deprecated\n"
  msgstr ""
- "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+ "sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
  
 +#: g10/misc.c:353
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "Note: signatures using the %s algorithm are rejected\n"
- msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+ msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
  
 +#: g10/misc.c:375
  #, fuzzy, c-format
  msgid "(reported error: %s)\n"
  msgstr "viga lugemisel: %s\n"
@@@ -5977,38 -4753,31 +5996,38 @@@ msgstr "viga lugemisel: %s\n
  msgid "(further info: "
  msgstr ""
  
 +#: g10/misc.c:1056
  #, c-format
  msgid "%s:%d: deprecated option \"%s\"\n"
- msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
+ msgstr "%s:%d: ebasoovitav võti \"%s\"\n"
  
 +#: g10/misc.c:1060
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated option\n"
- msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+ msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
  
 +#: g10/misc.c:1062
  #, c-format
  msgid "please use \"%s%s\" instead\n"
  msgstr "palun kasutage selle asemel \"%s%s\"\n"
  
 +#: g10/misc.c:1069
  #, fuzzy, c-format
  msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
- msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+ msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
  
 +#: g10/misc.c:1079
  #, fuzzy, c-format
  msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
- msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+ msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
  
 +#: g10/misc.c:1083
  #, fuzzy, c-format
  msgid ""
  "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
- msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+ msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
  
 +#: g10/misc.c:1147
  msgid "Uncompressed"
  msgstr "Pakkimata"
  
@@@ -6018,26 -4786,21 +6037,26 @@@
  msgid "uncompressed|none"
  msgstr "Pakkimata"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  msgid "ambiguous option '%s'\n"
- msgstr "loen v�tmeid failist `%s'\n"
+ msgstr "loen võtmeid failist `%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  msgid "unknown option '%s'\n"
  msgstr "tundmatu vaikimisi saaja `%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "tundmatu allkirja klass"
@@@ -6048,12 -4810,10 +6067,12 @@@
  msgid "File '%s' exists. "
  msgstr "Fail `%s' on olemas. "
  
 +#: g10/openfile.c:88
  #, fuzzy
  msgid "Overwrite? (y/N) "
- msgstr "Kirjutan �le (j/E)? "
+ msgstr "Kirjutan üle (j/E)? "
  
 +#: g10/openfile.c:123
  #, c-format
  msgid "%s: unknown suffix\n"
  msgstr "%s: tundmatu suffiks\n"
@@@ -6062,11 -4821,9 +6081,11 @@@
  msgid "Enter new filename"
  msgstr "Sisestage uus failinimi"
  
 +#: g10/openfile.c:218
  msgid "writing to stdout\n"
- msgstr "kirjutan standardv�ljundisse\n"
+ msgstr "kirjutan standardväljundisse\n"
  
 +#: g10/openfile.c:366
  #, fuzzy, c-format
  #| msgid "assuming signed data in `%s'\n"
  msgid "assuming signed data in '%s'\n"
@@@ -6084,23 -4839,19 +6103,23 @@@ msgstr "uus omaduste fail `%s' on loodu
  msgid "WARNING: options in '%s' are not yet active during this run\n"
  msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
  
 +#: g10/parse-packet.c:257
  #, c-format
  msgid "can't handle public key algorithm %d\n"
- msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
+ msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
  msgstr ""
- "HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
- "v�ti\n"
+ "HOIATUS: tõenäoliselt ebaturvaline sümmeetriliselt krüpteeritud sessiooni "
+ "võti\n"
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
- msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
+ msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
  
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "probleem agendiga: agent tagastas 0x%lx\n"
@@@ -6113,12 -4862,10 +6132,12 @@@ msgstr "Sisestage parool\n
  msgid "cancelled by user\n"
  msgstr "katkestatud kasutaja poolt\n"
  
 +#: g10/passphrase.c:489
  #, fuzzy, c-format
  msgid " (main key ID %s)"
- msgstr " (peamise v�tme ID %08lX)"
+ msgstr " (peamise võtme ID %08lX)"
  
 +#: g10/passphrase.c:496
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr "Palun sisestage parool; see on salajane tekst \n"
@@@ -6138,17 -4882,14 +6157,17 @@@ msgstr "Palun sisestage parool; see on 
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Palun sisestage parool; see on salajane tekst \n"
  
 +#: g10/passphrase.c:513
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
- msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
+ msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
  
 +#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
- msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
+ msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
  
 +#: g10/passphrase.c:525
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6156,9 -4897,8 +6175,9 @@@
  "%u-bit %s key, ID %s,\n"
  "created %s%s.\n"
  "%s"
- msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
+ msgstr "%u-bitine %s võti, ID %08lX, loodud %s"
  
 +#: g10/photoid.c:77
  msgid ""
  "\n"
  "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@@ -6168,20 -4908,17 +6187,20 @@@
  msgstr ""
  "\n"
  "Valige foto ID'na kasutatav pilt. Pilt peab olema JPEG fail.\n"
- "Pidage meeles, et pilt salvestatakse teie avalikus v�tmes. Kui kasutate\n"
- "v�ga suurt pilti, on ka k�ti v�ha suur!\n"
- "M�istlik pildi suurus v�iks olla umbes 240x288.\n"
+ "Pidage meeles, et pilt salvestatakse teie avalikus võtmes. Kui kasutate\n"
+ "väga suurt pilti, on ka kõti väha suur!\n"
+ "Mõistlik pildi suurus võiks olla umbes 240x288.\n"
  
 +#: g10/photoid.c:99
  msgid "Enter JPEG filename for photo ID: "
  msgstr "Sisestage foto ID jaoks JPEG faili nimi: "
  
 +#: g10/photoid.c:120
  #, fuzzy, c-format
  msgid "unable to open JPEG file '%s': %s\n"
- msgstr "faili ei �nnestu avada: %s\n"
+ msgstr "faili ei õnnestu avada: %s\n"
  
 +#: g10/photoid.c:131
  #, c-format
  msgid "This JPEG is really large (%d bytes) !\n"
  msgstr ""
@@@ -6196,41 -4931,32 +6215,41 @@@ msgstr "Olete kindel, et soovite seda k
  msgid "'%s' is not a JPEG file\n"
  msgstr "\"%s\": ei ole JPEG fail\n"
  
 +#: g10/photoid.c:168
  msgid "Is this photo correct (y/N/q)? "
- msgstr "On see foto �ige (j/E/v)? "
+ msgstr "On see foto õige (j/E/v)? "
  
 +#: g10/photoid.c:380
  msgid "unable to display photo ID!\n"
- msgstr "foto ID ei saa n�idata!\n"
+ msgstr "foto ID ei saa näidata!\n"
  
 +#: g10/pkclist.c:72 g10/revoke.c:757
  msgid "No reason specified"
- msgstr "P�hjus puudub"
+ msgstr "Põhjus puudub"
  
 +#: g10/pkclist.c:74 g10/revoke.c:759
  msgid "Key is superseded"
- msgstr "V�ti on asendatud"
+ msgstr "Võti on asendatud"
  
 +#: g10/pkclist.c:76 g10/revoke.c:758
  msgid "Key has been compromised"
- msgstr "V�ti on kompromiteeritud"
+ msgstr "Võti on kompromiteeritud"
  
 +#: g10/pkclist.c:78 g10/revoke.c:760
  msgid "Key is no longer used"
- msgstr "V�ti ei ole enam kasutusel"
+ msgstr "Võti ei ole enam kasutusel"
  
 +#: g10/pkclist.c:80 g10/revoke.c:761
  msgid "User ID is no longer valid"
  msgstr "Kasutaja ID ei ole enam kehtiv"
  
 +#: g10/pkclist.c:84
  msgid "reason for revocation: "
- msgstr "t�histamise p�hjus: "
+ msgstr "tühistamise põhjus: "
  
 +#: g10/pkclist.c:100
  msgid "revocation comment: "
- msgstr "t�histamise kommentaar: "
+ msgstr "tühistamise kommentaar: "
  
  #. TRANSLATORS: These are the allowed answers in lower and
  #. uppercase.  Below you will find the matching strings which
@@@ -6250,10 -4974,9 +6269,10 @@@ msgstr "iItTvVjJ
  #, fuzzy
  msgid "No trust value assigned to:\n"
  msgstr ""
- "Usalduse v��rtus puudub:\n"
+ "Usalduse väärtus puudub:\n"
  "%4u%c/%08lX %s \""
  
 +#: g10/pkclist.c:257
  #, fuzzy, c-format
  msgid "  aka \"%s\"\n"
  msgstr "                 ka \""
@@@ -6262,9 -4984,8 +6281,9 @@@
  #, fuzzy
  msgid ""
  "How much do you trust that this key actually belongs to the named user?\n"
- msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
+ msgstr "See võti kuulub tõenäoliselt omanikule\n"
  
 +#: g10/pkclist.c:282
  #, fuzzy, c-format
  msgid "  %d = I don't know or won't say\n"
  msgstr " %d = Ei tea\n"
@@@ -6279,22 -4998,18 +6298,22 @@@ msgstr " %d = EI usalda\n
  msgid "  %d = I trust ultimately\n"
  msgstr " %d = Usaldan absoluutselt\n"
  
 +#: g10/pkclist.c:296
  #, fuzzy
  msgid "  m = back to the main menu\n"
- msgstr " t = tagasi p�himen��sse\n"
+ msgstr " t = tagasi põhimenüüsse\n"
  
 +#: g10/pkclist.c:299
  #, fuzzy
  msgid "  s = skip this key\n"
- msgstr " j = j�ta see v�ti vahele\n"
+ msgstr " j = jäta see võti vahele\n"
  
 +#: g10/pkclist.c:300
  #, fuzzy
  msgid "  q = quit\n"
- msgstr " v = v�lju\n"
+ msgstr " v = välju\n"
  
 +#: g10/pkclist.c:304
  #, c-format
  msgid ""
  "The minimum trust level for this key is: %s\n"
@@@ -6305,217 -5019,187 +6324,234 @@@ msgstr "
  msgid "Your decision? "
  msgstr "Teie otsus? "
  
 +#: g10/pkclist.c:331
  #, fuzzy
  msgid "Do you really want to set this key to ultimate trust? (y/N) "
- msgstr "Kas te t�esti soovite seda v�tit absoluutselt usaldada? "
+ msgstr "Kas te tõesti soovite seda võtit absoluutselt usaldada? "
  
 +#: g10/pkclist.c:345
  msgid "Certificates leading to an ultimately trusted key:\n"
- msgstr "Sertifikaadid t�iesti usaldatava v�tmeni:\n"
+ msgstr "Sertifikaadid täiesti usaldatava võtmeni:\n"
  
 +#: g10/pkclist.c:434
  #, fuzzy, c-format
  msgid "%s: There is no assurance this key belongs to the named user\n"
- msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
+ msgstr "%08lX: Ei ole midagi, mis näitaks, et see võti kuulub omanikule\n"
  
 +#: g10/pkclist.c:439
  #, fuzzy, c-format
  msgid "%s: There is limited assurance this key belongs to the named user\n"
- msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
+ msgstr "%08lX: Ei ole midagi, mis näitaks, et see võti kuulub omanikule\n"
  
 +#: g10/pkclist.c:445
  #, fuzzy
  msgid "This key probably belongs to the named user\n"
- msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
+ msgstr "See võti kuulub tõenäoliselt omanikule\n"
  
 +#: g10/pkclist.c:450
  msgid "This key belongs to us\n"
- msgstr "See v�ti kuulub meile\n"
+ msgstr "See võti kuulub meile\n"
+ 
++#: g10/pkclist.c:456
+ #, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:484
+ #, fuzzy
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "EI ole kindel, et see võti kuulub isikule, keda mainitakse\n"
+ "kasutaja ID väljal. Kui te *tõesti* teate, mida te teete,\n"
+ "võite järgnevale küsimusele vastata jaatavalt\n"
+ "\n"
+ 
++#: g10/pkclist.c:489
  #, fuzzy
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
  "you may answer the next question with yes.\n"
  msgstr ""
- "EI ole kindel, et see v�ti kuulub isikule, keda mainitakse\n"
- "kasutaja ID v�ljal. Kui te *t�esti* teate, mida te teete,\n"
- "v�ite j�rgnevale k�simusele vastata jaatavalt\n"
+ "EI ole kindel, et see võti kuulub isikule, keda mainitakse\n"
+ "kasutaja ID väljal. Kui te *tõesti* teate, mida te teete,\n"
+ "võite järgnevale küsimusele vastata jaatavalt\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  #, fuzzy
  msgid "Use this key anyway? (y/N) "
- msgstr "Kasutan seda v�tit ikka? "
+ msgstr "Kasutan seda võtit ikka? "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
- msgstr "HOIATUS: Kasutan mitteusaldatavat v�tit!\n"
+ msgstr "HOIATUS: Kasutan mitteusaldatavat võtit!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
- msgstr "HOIATUS: see v�ti v�ib olla t�histatud (t�histamise v�tit pole)\n"
+ msgstr "HOIATUS: see võti võib olla tühistatud (tühistamise võtit pole)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
- msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
+ msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
- msgstr "HOIATUS: See v�ti on omaniku poolt t�histatud!\n"
+ msgstr "HOIATUS: See võti on omaniku poolt tühistatud!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  #, fuzzy
  msgid "         This could mean that the signature is forged.\n"
- msgstr "         See v�ib t�hendada, et allkiri on v�ltsing.\n"
+ msgstr "         See võib tähendada, et allkiri on võltsing.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
- msgstr "HOIATUS: See alamv�ti on omaniku poolt t�histatud!\n"
+ msgstr "HOIATUS: See alamvõti on omaniku poolt tühistatud!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
- msgstr "M�rkus: See v�ti on blokeeritud.\n"
+ msgstr "Märkus: See võti on blokeeritud.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
- msgstr "M�rkus: See v�ti on aegunud!\n"
+ msgstr "Märkus: See võti on aegunud!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
- msgstr "HOIATUS: Seda v�tit ei ole sertifitseeritud usaldatava allkirjaga!\n"
+ msgstr "HOIATUS: Seda võtit ei ole sertifitseeritud usaldatava allkirjaga!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
- msgstr "         Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
+ msgstr "         Ei ole midagi, mis näitaks, et allkiri kuulub omanikule.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
- msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
+ msgstr "HOIATUS: Me EI usalda seda võtit!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
- msgstr "         Allkiri on t�en�oliselt V�LTSING.\n"
+ msgstr "         Allkiri on tõenäoliselt VÕLTSING.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
- "HOIATUS: Seda v�tit ei ole sertifitseeritud piisavalt usaldatava "
+ "HOIATUS: Seda võtit ei ole sertifitseeritud piisavalt usaldatava "
  "allkirjaga!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
- msgstr "%s: j�tsin vahele: %s\n"
+ msgstr "%s: jätsin vahele: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
- msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
+ msgstr "%s: jätsin vahele: avalik võti on blokeeritud\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
- msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
+ msgstr "%s: jätsin vahele: avalik võti on juba olemas\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
- msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
+ msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
- msgstr "Te ei m��ranud kasutaja IDd. (v�ite kasutada v�tit \"-r\")\n"
+ msgstr "Te ei määranud kasutaja IDd. (võite kasutada võtit \"-r\")\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr ""
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
  msgstr ""
  "\n"
- "Sisestage kasutaja ID.  L�petage t�hja reaga: "
+ "Sisestage kasutaja ID.  Lõpetage tühja reaga: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Tundmatu kasutaja ID.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
- msgstr "j�tsin vahele: avalik v�ti on juba vaikimisi saaja\n"
+ msgstr "jätsin vahele: avalik võti on juba vaikimisi saaja\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
- msgstr "Avalik v�ti on blokeeritud.\n"
+ msgstr "Avalik võti on blokeeritud.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
- msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
+ msgstr "jätsin vahele: avalik võti on juba olemas\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "tundmatu vaikimisi saaja `%s'\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "kehtivaid aadresse pole\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
- msgstr "v�ti %08lX: kasutaja ID puudub\n"
+ msgstr "võti %08lX: kasutaja ID puudub\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
- msgstr "v�ti %08lX: kasutaja ID puudub\n"
+ msgstr "võti %08lX: kasutaja ID puudub\n"
  
 +#: g10/plaintext.c:84
  msgid "data not saved; use option \"--output\" to save it\n"
- msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
+ msgstr "andmeid ei salvestatud; salvestamiseks kasutage võtit \"--output\"\n"
  
 +#: g10/plaintext.c:598
  msgid "Detached signature.\n"
  msgstr "Eraldiseisev allkiri.\n"
  
@@@ -6535,103 -5215,82 +6571,103 @@@ msgstr "allkirjastatud andmeid pole\n
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
- msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
+ msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
  
 +#: g10/plaintext.c:741
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
- msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
+ msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
  
 +#: g10/pubkey-enc.c:116
  #, fuzzy, c-format
  msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr "anon��mne saaja; proovin salajast v�tit %08lX ...\n"
+ msgstr "anonüümne saaja; proovin salajast võtit %08lX ...\n"
  
 +#: g10/pubkey-enc.c:123
  msgid "okay, we are the anonymous recipient.\n"
- msgstr "ok, me oleme anon��mne teate saaja.\n"
+ msgstr "ok, me oleme anonüümne teate saaja.\n"
  
 +#: g10/pubkey-enc.c:282
  msgid "old encoding of the DEK is not supported\n"
  msgstr "vana DEK kodeerimine ei ole toetatud\n"
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
- msgstr "�ifri algoritm %d%s on tundmatu v�i blokeeritud\n"
+ msgstr "šifri algoritm %d%s on tundmatu või blokeeritud\n"
  
 +#: g10/pubkey-enc.c:352
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
- msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
+ msgstr "MÄRKUS: šifri algoritm %d puudub eelistustes\n"
  
 +#: g10/pubkey-enc.c:377
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
- msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
+ msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
  
 +#: g10/pubkey-enc.c:384
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
- msgstr "M�RKUS: v�ti on t�histatud"
+ msgstr "MÄRKUS: võti on tühistatud"
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, c-format
  msgid "build_packet failed: %s\n"
- msgstr "build_packet eba�nnestus: %s\n"
+ msgstr "build_packet ebaõnnestus: %s\n"
  
 +#: g10/revoke.c:144
  #, fuzzy, c-format
  msgid "key %s has no user IDs\n"
- msgstr "v�ti %08lX: kasutaja ID puudub\n"
+ msgstr "võti %08lX: kasutaja ID puudub\n"
  
 +#: g10/revoke.c:312
  msgid "To be revoked by:\n"
- msgstr "T�histaja:\n"
+ msgstr "Tühistaja:\n"
  
 +#: g10/revoke.c:316
  msgid "(This is a sensitive revocation key)\n"
- msgstr "(See on tundlik t�histamise v�ti)\n"
+ msgstr "(See on tundlik tühistamise võti)\n"
  
 +#: g10/revoke.c:322
  #, fuzzy
  #| msgid "Secret key is available.\n"
  msgid "Secret key is not available.\n"
- msgstr "Salajane v�ti on kasutatav.\n"
+ msgstr "Salajane võti on kasutatav.\n"
  
 +#: g10/revoke.c:327
  #, fuzzy
  msgid "Create a designated revocation certificate for this key? (y/N) "
- msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
+ msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
  
 +#: g10/revoke.c:336 g10/revoke.c:727
  msgid "ASCII armored output forced.\n"
- msgstr "V�ljundis sunnitakse kasutama ASCII vormingut.\n"
+ msgstr "Väljundis sunnitakse kasutama ASCII vormingut.\n"
  
 +#: g10/revoke.c:352 g10/revoke.c:479
  #, c-format
  msgid "make_keysig_packet failed: %s\n"
- msgstr "make_keysig_packet eba�nnestus: %s\n"
+ msgstr "make_keysig_packet ebaõnnestus: %s\n"
  
 +#: g10/revoke.c:415
  msgid "Revocation certificate created.\n"
- msgstr "T�histamise sertifikaat on loodud.\n"
+ msgstr "Tühistamise sertifikaat on loodud.\n"
  
 +#: g10/revoke.c:421
  #, fuzzy, c-format
  msgid "no revocation keys found for \"%s\"\n"
  msgstr ""
- "`%s' jaoks pole t�histamise v�tmeid\n"
+ "`%s' jaoks pole tühistamise võtmeid\n"
  "\n"
  
 +#: g10/revoke.c:551
  #, fuzzy
  msgid "This is a revocation certificate for the OpenPGP key:"
- msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
+ msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
  
 +#: g10/revoke.c:567
  msgid ""
  "A revocation certificate is a kind of \"kill switch\" to publicly\n"
  "declare that a key shall not anymore be used.  It is not possible\n"
@@@ -6658,12 -5314,11 +6694,12 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
- msgstr "T�histamise sertifikaat on loodud.\n"
+ msgstr "Tühistamise sertifikaat on loodud.\n"
  
 +#: g10/revoke.c:634
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
- msgstr "salajast v�tit `%s' ei leitud: %s\n"
+ msgstr "salajast võtit `%s' ei leitud: %s\n"
  
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
@@@ -6677,14 -5330,12 +6713,14 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
 +#: g10/revoke.c:711
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
- msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
+ msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
  
 +#: g10/revoke.c:735
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6694,60 -5345,50 +6730,60 @@@
  "your media become unreadable.  But have some caution:  The print system of\n"
  "your machine might store the data and make it available to others!\n"
  msgstr ""
- "T�histamise sertifikaat on loodud.\n"
+ "Tühistamise sertifikaat on loodud.\n"
  "\n"
- "Palun salvestage see andmekandjale, mida saate kindlasse kohta �ra panna.\n"
- "Kui mallory saab sellele sertifikaadile juurdep��su, v�ib ta seda kasutades\n"
- "muuta k�ik teie v�tmed kasutamisk�lbmatuks.\n"
- "Samuti on m�istlik tr�kkida see sertifikaat paberile ja panna hoiule "
+ "Palun salvestage see andmekandjale, mida saate kindlasse kohta ära panna.\n"
+ "Kui mallory saab sellele sertifikaadile juurdepääsu, võib ta seda kasutades\n"
+ "muuta kõik teie võtmed kasutamiskõlbmatuks.\n"
+ "Samuti on mõistlik trükkida see sertifikaat paberile ja panna hoiule "
  "juhuks,\n"
  "kui meedia muutub loetamatuks. Aga olge ettevaatlik: teie arvuti "
- "tr�kis�steem\n"
- "v�ib salvestada need andmed ja teha teistele k�ttesaadavaks! \n"
+ "trükisüsteem\n"
+ "võib salvestada need andmed ja teha teistele kättesaadavaks! \n"
  
 +#: g10/revoke.c:769
  msgid "Please select the reason for the revocation:\n"
- msgstr "Palun valige t�histamise p�hjus:\n"
+ msgstr "Palun valige tühistamise põhjus:\n"
  
 +#: g10/revoke.c:779
  msgid "Cancel"
  msgstr "Katkesta"
  
 +#: g10/revoke.c:781
  #, c-format
  msgid "(Probably you want to select %d here)\n"
- msgstr "(T�en�oliselt soovite siin valida %d)\n"
+ msgstr "(Tõenäoliselt soovite siin valida %d)\n"
  
 +#: g10/revoke.c:822
  msgid "Enter an optional description; end it with an empty line:\n"
- msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
+ msgstr "Sisestage mittekohustuslik kirjeldus. Lõpetage tühja reaga:\n"
  
 +#: g10/revoke.c:850
  #, c-format
  msgid "Reason for revocation: %s\n"
- msgstr "T�histamise p�hjus: %s\n"
+ msgstr "Tühistamise põhjus: %s\n"
  
 +#: g10/revoke.c:852
  msgid "(No description given)\n"
  msgstr "(Kirjeldust ei antud)\n"
  
 +#: g10/revoke.c:857
  #, fuzzy
  msgid "Is this okay? (y/N) "
- msgstr "On see h�sti? "
+ msgstr "On see hästi? "
  
 +#: g10/seskey.c:62 sm/encrypt.c:123
  msgid "weak key created - retrying\n"
- msgstr "loodi n�rk v�ti - proovin uuesti\n"
+ msgstr "loodi nõrk võti - proovin uuesti\n"
  
 +#: g10/seskey.c:66
  #, c-format
  msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
  msgstr ""
- "s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin "
+ "sümmeetrilises šifris ei õnnestu vältida nõrga võtme kasutamist; proovisin "
  "%d korda!\n"
  
 +#: g10/seskey.c:306
  #, c-format
  msgid "%s key %s uses an unsafe (%zu bit) hash\n"
  msgstr ""
@@@ -6757,106 -5397,89 +6793,106 @@@
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
- msgstr "HOIATUS: allkirja l�hend on teatega konfliktne\n"
+ msgstr "HOIATUS: allkirja lühend on teatega konfliktne\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
- msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
+ msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, fuzzy, c-format
  msgid "please see %s for more information\n"
- msgstr " i = esita palun t�iendavat infot\n"
+ msgstr " i = esita palun täiendavat infot\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
- msgstr "HOIATUS: allkirjastamise alamv�tmel %08lX on vigane rist-sertifikaat\n"
+ msgstr "HOIATUS: allkirjastamise alamvõtmel %08lX on vigane rist-sertifikaat\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
- msgstr[0] "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
- msgstr[1] "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
+ msgstr[0] "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
+ msgstr[1] "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
- msgstr[0] "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
- msgstr[1] "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
+ msgstr[0] "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
+ msgstr[1] "avalik võti %08lX on %lu sekund uuem, kui allkiri\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu seconds in the future (time warp or clock problem)\n"
- msgstr[0] "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
- msgstr[1] "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
+ msgstr[0] "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
+ msgstr[1] "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu days in the future (time warp or clock problem)\n"
- msgstr[0] "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
- msgstr[1] "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
+ msgstr[0] "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
+ msgstr[1] "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  msgid "Note: signature key %s expired %s\n"
- msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
+ msgstr "MÄRKUS: allkirja võti %08lX aegus %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
- msgstr "M�RKUS: v�ti on t�histatud"
+ msgstr "MÄRKUS: võti on tühistatud"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, fuzzy, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
- msgstr "eeldan tundmatu kriitilise biti t�ttu v�tmel %08lX vigast allkirja\n"
+ msgstr "eeldan tundmatu kriitilise biti tõttu võtmel %08lX vigast allkirja\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
- msgstr "v�ti %08lX: alamv�tme t�histamise paketile puudub alamv�ti\n"
+ msgstr "võti %08lX: alamvõtme tühistamise paketile puudub alamvõti\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
- msgstr "v�ti %08lX: alamv�tme allkirjaga sidumiseks puudub alamv�ti\n"
+ msgstr "võti %08lX: alamvõtme allkirjaga sidumiseks puudub alamvõti\n"
  
 +#: g10/sign.c:88
  #, c-format
  msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
  msgstr ""
- "HOIATUS: noteerimise %%-asendus eba�nnestus (liiga suur). Kasutan "
+ "HOIATUS: noteerimise %%-asendus ebaõnnestus (liiga suur). Kasutan "
  "kompaktset.\n"
  
 +#: g10/sign.c:114
  #, fuzzy, c-format
  msgid ""
  "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
  msgstr ""
- "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
+ "HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
  "kompaktset.\n"
  
 +#: g10/sign.c:137
  #, fuzzy, c-format
  msgid ""
  "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
  "unexpanded.\n"
  msgstr ""
- "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
+ "HOIATUS: poliisi urli %%-asendus ebaõnnestus (liiga suur). Kasutan "
  "kompaktset.\n"
  
 +#: g10/sign.c:329
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s allkiri kasutajalt: \"%s\"\n"
@@@ -6866,53 -5488,44 +6902,53 @@@
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
- "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+ "sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
  
 +#: g10/sign.c:1009
  msgid "signing:"
  msgstr "allkirjastan:"
  
 +#: g10/sign.c:1286
  #, c-format
  msgid "%s encryption will be used\n"
- msgstr "kasutatakse %s kr�pteerimist\n"
+ msgstr "kasutatakse %s krüpteerimist\n"
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
  msgstr ""
- "v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
+ "võti ei ole märgitud ebaturvaliseks - sellega ei saa võlts RNGd kasutada!\n"
  
 +#: g10/skclist.c:187
  #, fuzzy, c-format
  msgid "skipped \"%s\": duplicated\n"
- msgstr "`%s' j�tsin vahele: duplikaat\n"
+ msgstr "`%s' jätsin vahele: duplikaat\n"
  
 +#: g10/skclist.c:206
  msgid "skipped: secret key already present\n"
- msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
+ msgstr "jätsin vahele: avalik võti on juba olemas\n"
  
 +#: g10/skclist.c:225
  #, fuzzy
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr ""
- "j�tsin `%s' vahele: see on PGP genereeritud ElGamal v�ti,\n"
+ "jätsin `%s' vahele: see on PGP genereeritud ElGamal võti,\n"
  "mis ei ole allkirjades kasutamiseks turvaline!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
- msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
+ msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
  
 +#: g10/tdbdump.c:105
  #, c-format
  msgid ""
  "# List of assigned trustvalues, created %s\n"
  "# (Use \"gpg --import-ownertrust\" to restore them)\n"
  msgstr ""
- "# Omistatud usalduse v��rtuste loend, loodud: %s\n"
+ "# Omistatud usalduse väärtuste loend, loodud: %s\n"
  "# (Taastamiseks kasutage \"gpg --import-ownertrust\")\n"
  
 +#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
  #, fuzzy, c-format
  msgid "error in '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -6926,17 -5537,14 +6962,17 @@@ msgstr "rida on liiga pikk\n
  msgid "colon missing"
  msgstr ""
  
 +#: g10/tdbdump.c:176
  #, fuzzy
  msgid "invalid fingerprint"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
 +#: g10/tdbdump.c:181
  #, fuzzy
  msgid "ownertrust value missing"
- msgstr "impordi usalduse v��rtused"
+ msgstr "impordi usalduse väärtused"
  
 +#: g10/tdbdump.c:217
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
  msgstr "viga usalduse kirje otsimisel: %s\n"
@@@ -6946,27 -5553,22 +6982,27 @@@
  msgid "read error in '%s': %s\n"
  msgstr "viga lugemisel: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
- msgstr "trustdb: sync eba�nnestus: %s\n"
+ msgstr "trustdb: sync ebaõnnestus: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  msgid "can't create lock for '%s'\n"
- msgstr "`%s' ei �nnestu luua: %s\n"
+ msgstr "`%s' ei õnnestu luua: %s\n"
  
 +#: g10/tdbio.c:146
  #, fuzzy, c-format
  msgid "can't lock '%s'\n"
- msgstr "`%s' ei �nnestu avada\n"
+ msgstr "`%s' ei õnnestu avada\n"
  
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
  #, c-format
  msgid "trustdb rec %lu: lseek failed: %s\n"
- msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
+ msgstr "trustdb kirje %lu: lseek ebaõnnestus: %s\n"
  
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
  #, c-format
  msgid "trustdb rec %lu: write failed (n=%d): %s\n"
  msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@@ -6980,17 -5580,14 +7016,17 @@@ msgstr "trustdb transaktsioon on liiga 
  msgid "%s: directory does not exist!\n"
  msgstr "%s: kataloogi ei ole!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
- msgstr "`%s' ei �nnestu sulgeda: %s\n"
+ msgstr "`%s' ei õnnestu sulgeda: %s\n"
  
 +#: g10/tdbio.c:724
  #, c-format
  msgid "%s: failed to create version record: %s"
- msgstr "%s: versioonikirje loomine ei �nnestu: %s"
+ msgstr "%s: versioonikirje loomine ei õnnestu: %s"
  
 +#: g10/tdbio.c:729
  #, c-format
  msgid "%s: invalid trustdb created\n"
  msgstr "%s: loodi vigane usalduse andmebaas\n"
@@@ -7004,19 -5599,16 +7040,19 @@@ msgstr "%s: trustdb on loodud\n
  #, fuzzy
  #| msgid "NOTE: trustdb not writable\n"
  msgid "Note: trustdb not writable\n"
- msgstr "M�RKUS: trustdb pole kirjutatav\n"
+ msgstr "MÄRKUS: trustdb pole kirjutatav\n"
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
  msgstr "%s: vigane trustdb\n"
  
 +#: g10/tdbio.c:834
  #, c-format
  msgid "%s: failed to create hashtable: %s\n"
- msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
+ msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
  
 +#: g10/tdbio.c:842
  #, c-format
  msgid "%s: error updating version record: %s\n"
  msgstr "%s: viga versioonikirje uuendamisel: %s\n"
@@@ -7032,17 -5621,14 +7068,17 @@@ msgstr "%s: viga versioonikirje lugemis
  msgid "%s: error writing version record: %s\n"
  msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
  
 +#: g10/tdbio.c:1461
  #, c-format
  msgid "trustdb: lseek failed: %s\n"
- msgstr "trustdb: lseek eba�nnestus: %s\n"
+ msgstr "trustdb: lseek ebaõnnestus: %s\n"
  
 +#: g10/tdbio.c:1472
  #, c-format
  msgid "trustdb: read failed (n=%d): %s\n"
- msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
+ msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
  
 +#: g10/tdbio.c:1497
  #, c-format
  msgid "%s: not a trustdb file\n"
  msgstr "%s: ei ole trustdb fail\n"
@@@ -7067,290 -5649,267 +7103,326 @@@ msgstr "%s: viga vaba kirje lugemisel: 
  msgid "%s: error writing dir record: %s\n"
  msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
  
 +#: g10/tdbio.c:1768
  #, c-format
  msgid "%s: failed to zero a record: %s\n"
- msgstr "%s: kirje nullimine eba�nnestus: %s\n"
+ msgstr "%s: kirje nullimine ebaõnnestus: %s\n"
  
 +#: g10/tdbio.c:1804
  #, c-format
  msgid "%s: failed to append a record: %s\n"
- msgstr "%s: kirje lisamine eba�nnestus: %s\n"
+ msgstr "%s: kirje lisamine ebaõnnestus: %s\n"
  
 +#: g10/tdbio.c:1865
  #, fuzzy
  msgid "Error: The trustdb is corrupted.\n"
  msgstr "%s: trustdb on loodud\n"
  
 +#: g10/textfilter.c:146
  #, c-format
  msgid "can't handle text lines longer than %d characters\n"
- msgstr "ei suuda k�sitleda tekstiridu mis on pikemad, kui %d s�mbolit\n"
+ msgstr "ei suuda käsitleda tekstiridu mis on pikemad, kui %d sümbolit\n"
  
 +#: g10/textfilter.c:241
  #, c-format
  msgid "input line longer than %d characters\n"
- msgstr "sisendrida on pikem, kui %d s�mbolit\n"
+ msgstr "sisendrida on pikem, kui %d sümbolit\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Toetatud algoritmid:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
- msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
+ msgstr ""
+ 
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "näita võtit ja kasutaja IDd"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Poliis: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
- msgstr "n�ita v�tmeid"
+ msgstr "näita võtmeid"
+ 
++#: g10/tofu.c:1715
+ #, fuzzy, c-format
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "|algo [failid]|trüki teatelühendid"
+ msgstr[1] "|algo [failid]|trüki teatelühendid"
  
- #: g10/tofu.c:1342
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1351
- #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "|algo [failid]|tr�ki teatel�hendid"
- msgstr[1] "|algo [failid]|tr�ki teatel�hendid"
- 
- #: g10/tofu.c:1357
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Kustutatud %d allkirja.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|algo [failid]|tr�ki teatel�hendid"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|algo [failid]|trüki teatelühendid"
+ msgstr[1] "|algo [failid]|trüki teatelühendid"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "krüpteeritud kasutades %lu parooli\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|algo [failid]|trüki teatelühendid"
+ msgstr[1] "|algo [failid]|trüki teatelühendid"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7364,133 -5923,116 +7436,145 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
- msgstr "`%s' ei ole kehtiv pikk v�tmeID\n"
+ msgstr "`%s' ei ole kehtiv pikk võtmeID\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, fuzzy, c-format
  msgid "key %s: accepted as trusted key\n"
- msgstr "v�ti %08lX: aktsepteerin usaldusv��rse v�tmena\n"
+ msgstr "võti %08lX: aktsepteerin usaldusväärse võtmena\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, fuzzy, c-format
  msgid "key %s occurs more than once in the trustdb\n"
- msgstr "v�ti %08lX esineb trustdb failis enam kui korra\n"
+ msgstr "võti %08lX esineb trustdb failis enam kui korra\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, fuzzy, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
- msgstr "v�ti %08lX: usaldataval v�tmel pole avalikku v�tit - j�tsin vahele\n"
+ msgstr "võti %08lX: usaldataval võtmel pole avalikku võtit - jätsin vahele\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, fuzzy, c-format
  msgid "key %s marked as ultimately trusted\n"
- msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
+ msgstr "võti on märgitud abslouutselt usaldatuks.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
- msgstr "usalduse kirje %lu, p�ringu t��p %d: lugemine eba�nnestus: %s\n"
+ msgstr "usalduse kirje %lu, päringu tüüp %d: lugemine ebaõnnestus: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
- msgstr "usalduse kirje %lu ei oma soovitud t��pi %d\n"
+ msgstr "usalduse kirje %lu ei oma soovitud tüüpi %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "trustdb kontrolliks puudub vajadus\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
- msgstr "trustdb j�rgmine kontroll %s\n"
+ msgstr "trustdb järgmine kontroll %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "trustdb kontrolliks puudub vajadus\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "trustdb kontrolliks puudub vajadus\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
- msgstr "ei leia avalikku v�tit %08lX: %s\n"
+ msgstr "ei leia avalikku võtit %08lX: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "palun tehke --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "kontrollin trustdb faili\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
- msgstr[0] "%lu v�tit on seni t��deldud\n"
- msgstr[1] "%lu v�tit on seni t��deldud\n"
+ msgstr[0] "%lu võtit on seni töödeldud\n"
+ msgstr[1] "%lu võtit on seni töödeldud\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
- msgstr[0] "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
- msgstr[1] "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
+ msgstr[0] "%d võtit töödeldud (%d kehtivust puhastatud)\n"
+ msgstr[1] "%d võtit töödeldud (%d kehtivust puhastatud)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
- msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
+ msgstr "absoluutselt usaldatavaid võtmeid pole\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
- msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
+ msgstr "puudub absoluutselt usaldatava võtme %08lX avalik võti\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
- msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
+ msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
  
 +#: g10/trust.c:105
  msgid "undefined"
  msgstr ""
  
@@@ -7523,12 -6060,10 +7607,12 @@@ msgstr "
  msgid "10 translator see trust.c:uid_trust_string_fixed"
  msgstr ""
  
 +#: g10/trust.c:149
  #, fuzzy
  msgid "[ revoked]"
- msgstr "[t�histatud] "
+ msgstr "[tühistatud] "
  
 +#: g10/trust.c:151 g10/trust.c:157
  #, fuzzy
  msgid "[ expired]"
  msgstr "[aegunud] "
@@@ -7565,21 -6093,18 +7649,21 @@@ msgid "
  "Please remember that the signature file (.sig or .asc)\n"
  "should be the first file given on the command line.\n"
  msgstr ""
- "allkirja ei �nnestu kontrollida.\n"
- "Palun pidage meeles, et allkirja fail (.sig v�i .asc)\n"
- "peab olema k�sureal esimene fail.\n"
+ "allkirja ei õnnestu kontrollida.\n"
+ "Palun pidage meeles, et allkirja fail (.sig või .asc)\n"
+ "peab olema käsureal esimene fail.\n"
  
 +#: g10/verify.c:204
  #, c-format
  msgid "input line %u too long or missing LF\n"
- msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
+ msgstr "sisendrida %u on liiga pikk või seavahetus puudub\n"
  
 +#: g10/verify.c:253
  #, fuzzy, c-format
  msgid "can't open fd %d: %s\n"
- msgstr "`%s' ei �nnestu avada: %s\n"
+ msgstr "`%s' ei õnnestu avada: %s\n"
  
 +#: kbx/kbxutil.c:92
  msgid "set debugging flags"
  msgstr ""
  
@@@ -7587,155 -6111,123 +7671,157 @@@
  msgid "enable full debugging"
  msgstr ""
  
 +#: kbx/kbxutil.c:117
  #, fuzzy
  msgid "Usage: kbxutil [options] [files] (-h for help)"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
 +#: kbx/kbxutil.c:120
  #, fuzzy
  msgid ""
  "Syntax: kbxutil [options] [files]\n"
  "List, export, import Keybox data\n"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "muuda parooli"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
  msgstr "muuda parooli"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
- msgstr "Palun valige t�histamise p�hjus:\n"
+ msgstr "Palun valige tühistamise põhjus:\n"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
- msgstr "Palun valige t�histamise p�hjus:\n"
+ msgstr "Palun valige tühistamise põhjus:\n"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
- msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
- msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
+ msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, fuzzy, c-format
- msgid "reading public key failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "remove keys from the public keyring"
+ msgid "response does not contain the EC public key\n"
+ msgstr "eemalda võtmed avalike võtmete hoidlast"
+ 
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1551
+ #, fuzzy, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
- msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
+ msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7745,26 -6237,21 +7831,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
- msgstr "Palun valige t�histamise p�hjus:\n"
+ msgstr "Palun valige tühistamise põhjus:\n"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7772,117 -6259,93 +7858,117 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "muuda parooli"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  #, fuzzy
  msgid "error reading application data\n"
- msgstr "viga v�tmebloki lugemisel: %s\n"
+ msgstr "viga võtmebloki lugemisel: %s\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: viga vaba kirje lugemisel: %s\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' on juba pakitud\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  #, fuzzy
  msgid "generating new key\n"
- msgstr "genereeri uus v�tmepaar"
+ msgstr "genereeri uus võtmepaar"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
- msgstr "genereeri uus v�tmepaar"
+ msgstr "genereeri uus võtmepaar"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
- msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "mittetoetatud URI"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  #, fuzzy
  msgid "generating key failed\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
- msgstr[0] "V�tme genereerimine eba�nnestus: %s\n"
- msgstr[1] "V�tme genereerimine eba�nnestus: %s\n"
+ msgstr[0] "Võtme genereerimine ebaõnnestus: %s\n"
+ msgstr[1] "Võtme genereerimine ebaõnnestus: %s\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
- msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+ msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "ei leia OpenPGP andmeid.\n"
@@@ -7903,7 -6363,6 +7989,7 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -7926,12 -6381,10 +8012,12 @@@ msgstr "|NIMI|kasuta NIME vaikimisi saa
  msgid "|NAME|use NAME as PC/SC driver"
  msgstr "|NIMI|kasuta NIME vaikimisi saajana"
  
 +#: scd/scdaemon.c:141
  #, fuzzy
  msgid "do not use the internal CCID driver"
- msgstr "�ra kasuta terminali"
+ msgstr "ära kasuta terminali"
  
 +#: scd/scdaemon.c:147
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
@@@ -7939,46 -6391,37 +8025,46 @@@
  msgid "do not use a reader's pinpad"
  msgstr ""
  
 +#: scd/scdaemon.c:155
  #, fuzzy
  msgid "deny the use of admin card commands"
- msgstr "vastuolulised k�sud\n"
+ msgstr "vastuolulised käsud\n"
  
 +#: scd/scdaemon.c:158
  msgid "use variable length input for pinpad"
  msgstr ""
  
 +#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
 +#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
 +#: sm/base64.c:327
  #, fuzzy, c-format
  msgid "invalid radix64 character %02x skipped\n"
- msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
+ msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
  
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
  msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
@@@ -7988,11 -6430,9 +8074,11 @@@
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  #, fuzzy
  msgid "shell"
  msgstr "help"
@@@ -8010,224 -6447,174 +8096,224 @@@ msgstr "
  msgid "critical marked policy without configured policies"
  msgstr ""
  
 +#: sm/certchain.c:343
  #, fuzzy, c-format
  msgid "failed to open '%s': %s\n"
- msgstr "`%s' ei �nnestu avada: %s\n"
+ msgstr "`%s' ei õnnestu avada: %s\n"
  
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
- msgstr "kirjutan salajase v�tme faili `%s'\n"
+ msgstr "kirjutan salajase võtme faili `%s'\n"
  
 +#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
  #, fuzzy
  msgid "certificate policy not allowed"
- msgstr "kirjutan salajase v�tme faili `%s'\n"
+ msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
- msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
- msgstr "M�RKUS: v�ti on t�histatud"
+ msgstr "MÄRKUS: võti on tühistatud"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
- msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
- msgstr "kirjutan salajase v�tme faili `%s'\n"
+ msgstr "kirjutan salajase võtme faili `%s'\n"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
- msgstr "See v�ti on aegunud!"
+ msgstr "See võti on aegunud!"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
- msgstr "See v�ti on aegunud!"
+ msgstr "See võti on aegunud!"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
- msgstr "See v�ti on aegunud!"
+ msgstr "See võti on aegunud!"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
- msgstr "See v�ti on aegunud!"
+ msgstr "See võti on aegunud!"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
  msgstr "         uusi allkirju: %lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
- msgstr "T�histamise sertifikaat on loodud.\n"
+ msgstr "Tühistamise sertifikaat on loodud.\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
  msgstr "halb sertifikaat"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
- msgstr "n�ita s�rmej�lge"
+ msgstr "näita sõrmejälge"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
- msgstr "genereeri t�histamise sertifikaat"
+ msgstr "genereeri tühistamise sertifikaat"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr ""
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
- msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "kontrolli allkirja"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
- msgstr "T�histamise sertifikaat on loodud.\n"
+ msgstr "Tühistamise sertifikaat on loodud.\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
  msgstr "halb sertifikaat"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8246,12 -6630,10 +8332,12 @@@ msgstr "
  msgid "none"
  msgstr "ei"
  
 +#: sm/certdump.c:552 sm/certdump.c:617
  #, fuzzy
  msgid "[Error - invalid encoding]"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
 +#: sm/certdump.c:560
  msgid "[Error - out of core]"
  msgstr ""
  
@@@ -8259,12 -6640,10 +8345,12 @@@
  msgid "[Error - No name]"
  msgstr ""
  
 +#: sm/certdump.c:623
  #, fuzzy
  msgid "[Error - invalid DN]"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
 +#: sm/certdump.c:833
  #, fuzzy, c-format
  msgid ""
  "Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -8273,20 -6652,17 +8359,20 @@@
  "S/N %s, ID 0x%08lX,\n"
  "created %s, expires %s.\n"
  msgstr ""
- "Te vajate kasutaja salajase v�tme lahtilukustamiseks parooli:\n"
+ "Te vajate kasutaja salajase võtme lahtilukustamiseks parooli:\n"
  "\"%.*s\"\n"
- "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
+ "%u-bitti %s võti, ID %08lX, loodud %s%s\n"
  
 +#: sm/certlist.c:122 dirmngr/validate.c:1075
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
 +#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
- msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
  
 +#: sm/certlist.c:142 dirmngr/validate.c:1095
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
@@@ -8310,12 -6681,10 +8396,12 @@@ msgstr "
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
 +#: sm/certreqgen.c:464
  #, fuzzy, c-format
  msgid "line %d: invalid algorithm\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: sm/certreqgen.c:478
  #, c-format
  msgid "line %d: invalid key length %u (valid are %d to %d)\n"
  msgstr ""
@@@ -8325,27 -6693,22 +8411,27 @@@
  msgid "line %d: no subject name given\n"
  msgstr ""
  
 +#: sm/certreqgen.c:505
  #, fuzzy, c-format
  msgid "line %d: invalid subject name label '%.*s'\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: sm/certreqgen.c:508
  #, fuzzy, c-format
  msgid "line %d: invalid subject name '%s' at pos %d\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: sm/certreqgen.c:525
  #, fuzzy, c-format
  msgid "line %d: not a valid email address\n"
  msgstr "Selline e-posti aadress ei ole lubatud\n"
  
 +#: sm/certreqgen.c:544
  #, fuzzy, c-format
  msgid "line %d: invalid serial number\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: sm/certreqgen.c:560
  #, c-format
  msgid "line %d: invalid issuer name label '%.*s'\n"
  msgstr ""
@@@ -8355,52 -6717,42 +8441,52 @@@
  msgid "line %d: invalid issuer name '%s' at pos %d\n"
  msgstr ""
  
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
  #, fuzzy, c-format
  msgid "line %d: invalid date given\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: sm/certreqgen.c:599
  #, fuzzy, c-format
  msgid "line %d: error getting signing key by keygrip '%s': %s\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
 +#: sm/certreqgen.c:618
  #, fuzzy, c-format
  msgid "line %d: invalid hash algorithm given\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: sm/certreqgen.c:633
  #, fuzzy, c-format
  msgid "line %d: invalid authority-key-id\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: sm/certreqgen.c:648
  #, fuzzy, c-format
  msgid "line %d: invalid subject-key-id\n"
- msgstr "v�ti %08lX: vigane alamv�tme seos\n"
+ msgstr "võti %08lX: vigane alamvõtme seos\n"
  
 +#: sm/certreqgen.c:686
  #, fuzzy, c-format
  msgid "line %d: invalid extension syntax\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: sm/certreqgen.c:699
  #, fuzzy, c-format
  msgid "line %d: error reading key '%s' from card: %s\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
 +#: sm/certreqgen.c:712
  #, fuzzy, c-format
  msgid "line %d: error getting key by keygrip '%s': %s\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
 +#: sm/certreqgen.c:729
  #, fuzzy, c-format
  msgid "line %d: key generation failed: %s <%s>\n"
- msgstr "V�tme genereerimine eba�nnestus: %s\n"
+ msgstr "Võtme genereerimine ebaõnnestus: %s\n"
  
 +#: sm/certreqgen.c:1324
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8411,12 -6762,10 +8497,12 @@@ msgstr "
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
  
 +#: sm/certreqgen-ui.c:163
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
- msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+ msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
 +#: sm/certreqgen-ui.c:164
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
@@@ -8431,32 -6778,26 +8517,32 @@@ msgstr "%s: viga vaba kirje lugemisel: 
  msgid "Serial number of the card: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
 +#: sm/certreqgen-ui.c:249
  #, fuzzy
  msgid "Available keys:\n"
- msgstr "blokeeri v�ti"
+ msgstr "blokeeri võti"
  
 +#: sm/certreqgen-ui.c:280
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:281
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
- msgstr "   (%d) RSA (allkirjastamiseks ja kr�ptimiseks)\n"
+ msgstr "   (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
  
 +#: sm/certreqgen-ui.c:282
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
  
 +#: sm/certreqgen-ui.c:283
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
- msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+ msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
  
 +#: sm/certreqgen-ui.c:307
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
@@@ -8465,22 -6805,19 +8551,22 @@@
  msgid "No subject name given\n"
  msgstr "(Kirjeldust ei antud)\n"
  
 +#: sm/certreqgen-ui.c:315
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
  #. TRANSLATORS: The 22 in the second string is the
  #. length of the first string up to the "%s".  Please
  #. adjust it do the length of your translation.  The
  #. second string is merely passed to atoi so you can
  #. drop everything after the number.
 +#: sm/certreqgen-ui.c:324
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: sm/certreqgen-ui.c:326
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
@@@ -8494,28 -6829,23 +8580,28 @@@ msgstr "E-posti aadress: 
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
- "Sisestage kasutaja ID.  L�petage t�hja reaga: "
+ "Sisestage kasutaja ID.  Lõpetage tühja reaga: "
  
 +#: sm/certreqgen-ui.c:343
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Sisestage uus failinimi"
  
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
- msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
+ msgstr "Sisestage mittekohustuslik kirjeldus. Lõpetage tühja reaga:\n"
  
 +#: sm/certreqgen-ui.c:348
  msgid "Enter URIs"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:355
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
- msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
+ msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
  
 +#: sm/certreqgen-ui.c:382
  msgid "These parameters are used:\n"
  msgstr ""
  
@@@ -8527,9 -6855,8 +8613,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
- msgstr "T�histamise sertifikaat on loodud.\n"
+ msgstr "Tühistamise sertifikaat on loodud.\n"
  
 +#: sm/certreqgen-ui.c:403
  msgid "This may take a while ...\n"
  msgstr ""
  
@@@ -8553,233 -6875,184 +8639,233 @@@ msgstr "
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
 +#: sm/delete.c:51 sm/delete.c:112
  #, fuzzy, c-format
  msgid "certificate '%s' not found: %s\n"
- msgstr "v�tit '%s' ei leitud: %s\n"
+ msgstr "võtit '%s' ei leitud: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
- msgstr "viga v�tmebloki lugemisel: %s\n"
+ msgstr "viga võtmebloki lugemisel: %s\n"
  
 +#: sm/delete.c:143
  #, fuzzy, c-format
  msgid "duplicated certificate '%s' deleted\n"
- msgstr "T�histamise sertifikaat on loodud.\n"
+ msgstr "Tühistamise sertifikaat on loodud.\n"
  
 +#: sm/delete.c:145
  #, fuzzy, c-format
  msgid "certificate '%s' deleted\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
 +#: sm/delete.c:175
  #, fuzzy, c-format
  msgid "deleting certificate \"%s\" failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: sm/encrypt.c:328
  #, fuzzy
  msgid "no valid recipients given\n"
  msgstr "(Kirjeldust ei antud)\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
- msgstr "n�ita salajasi v�tmeid"
+ msgstr "näita salajasi võtmeid"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
  msgstr "halb sertifikaat"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
  msgstr "halb sertifikaat"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
  msgstr "halb sertifikaat"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
- msgstr "loo ascii pakendis v�ljund"
+ msgstr "loo ascii pakendis väljund"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
- msgstr "�ra kasuta terminali"
+ msgstr "ära kasuta terminali"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
- msgstr "pakettmood: �ra k�si kunagi"
+ msgstr "pakettmood: ära küsi kunagi"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
- msgstr "eelda enamus k�simustele jah vastust"
+ msgstr "eelda enamus küsimustele jah vastust"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
- msgstr "eelda enamus k�simustele ei vastust"
+ msgstr "eelda enamus küsimustele ei vastust"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
- msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
+ msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
- msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
+ msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
- msgstr "|HOST|kasuta seda v�tmeserverit"
+ msgstr "|HOST|kasuta seda võtmeserverit"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
- msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
+ msgstr "|NIMI|kasuta šifri algoritmi NIMI"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
- msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
+ msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "S�ntaks: gpg [v�tmed] [failid]\n"
- "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
- "vaikimisi operatsioon s�ltub sisendandmetest\n"
+ "Süntaks: gpg [võtmed] [failid]\n"
+ "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
+ "vaikimisi operatsioon sõltub sisendandmetest\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
- msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
+ msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "tundmatu vaikimisi saaja `%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(Kirjeldust ei antud)\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
- msgstr " j = j�ta see v�ti vahele\n"
+ msgstr " j = jäta see võti vahele\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, fuzzy
  msgid "could not parse keyserver\n"
- msgstr "ei saa parsida v�tmeserveri URI\n"
+ msgstr "ei saa parsida võtmeserveri URI\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "kirjutan faili `%s'\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
- msgstr "`%s' ei �nnestu sulgeda: %s\n"
+ msgstr "`%s' ei õnnestu sulgeda: %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
 +#: sm/import.c:127
  #, fuzzy, c-format
  msgid "total number processed: %lu\n"
- msgstr "T��deldud kokku: %lu\n"
+ msgstr "Töödeldud kokku: %lu\n"
  
 +#: sm/import.c:246
  #, fuzzy
  msgid "error storing certificate\n"
- msgstr "genereeri t�histamise sertifikaat"
+ msgstr "genereeri tühistamise sertifikaat"
  
 +#: sm/import.c:254
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -8794,32 -7065,26 +8880,32 @@@ msgstr "viga parooli loomisel: %s\n
  msgid "error reading input: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
- msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, fuzzy, c-format
  msgid "problem re-searching certificate: %s\n"
- msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
+ msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -8832,17 -7095,14 +8918,17 @@@ msgstr "
  msgid "GPG_TTY has not been set - using maybe bogus default\n"
  msgstr ""
  
 +#: sm/qualified.c:105
  #, fuzzy, c-format
  msgid "invalid formatted fingerprint in '%s', line %d\n"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
 +#: sm/qualified.c:123
  #, fuzzy, c-format
  msgid "invalid country code in '%s', line %d\n"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
 +#: sm/qualified.c:206
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
@@@ -8877,12 -7133,10 +8963,12 @@@ msgstr "kaitse algoritm %d%s ei ole toe
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
 +#: sm/sign.c:517
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
- msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
 +#: sm/verify.c:450
  #, fuzzy
  msgid "Signature made "
  msgstr "Allkiri aegus %s\n"
@@@ -8918,12 -7166,10 +9004,12 @@@ msgstr "
  "\n"
  "See saab olema iseenda allkiri.\n"
  
 +#: dirmngr/certcache.c:106
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
- msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
 +#: dirmngr/certcache.c:117
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
@@@ -8947,29 -7189,24 +9033,29 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
- msgstr "`%s' ei �nnestu luua: %s\n"
+ msgstr "`%s' ei õnnestu luua: %s\n"
  
 +#: dirmngr/certcache.c:395
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
 +#: dirmngr/certcache.c:399
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
- msgstr "T�histamise sertifikaat on loodud.\n"
+ msgstr "Tühistamise sertifikaat on loodud.\n"
  
 +#: dirmngr/certcache.c:401
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
 +#: dirmngr/certcache.c:405
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
- msgstr "n�ita s�rmej�lge"
+ msgstr "näita sõrmejälge"
  
 +#: dirmngr/certcache.c:408
  msgid "   issuer ="
  msgstr ""
  
@@@ -8992,12 -7225,10 +9078,12 @@@ msgstr "halb sertifikaat
  msgid "    runtime cached certificates: %u\n"
  msgstr "viga parooli loomisel: %s\n"
  
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
- msgstr "T�histamise sertifikaat on loodud.\n"
+ msgstr "Tühistamise sertifikaat on loodud.\n"
  
 +#: dirmngr/certcache.c:508
  #, fuzzy
  msgid "certificate cached\n"
  msgstr "eelistus %c%lu on duplikaat\n"
@@@ -9008,12 -7237,10 +9094,12 @@@
  msgid "error caching certificate: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
 +#: dirmngr/certcache.c:593
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -9023,12 -7249,10 +9109,12 @@@
  msgid "error fetching certificate by subject: %s\n"
  msgstr "viga parooli loomisel: %s\n"
  
 +#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
  #, fuzzy
  msgid "no issuer found in certificate\n"
- msgstr "genereeri t�histamise sertifikaat"
+ msgstr "genereeri tühistamise sertifikaat"
  
 +#: dirmngr/certcache.c:1325
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -9037,45 -7260,37 +9123,45 @@@
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "creating directory '%s'\n"
- msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
+ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
  
 +#: dirmngr/crlcache.c:217
  #, fuzzy, c-format
  msgid "error creating directory '%s': %s\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
 +#: dirmngr/crlcache.c:245
  #, fuzzy, c-format
  msgid "ignoring database dir '%s'\n"
- msgstr "viga l�petaval real\n"
+ msgstr "viga lõpetaval real\n"
  
 +#: dirmngr/crlcache.c:254
  #, fuzzy, c-format
  msgid "error reading directory '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
 +#: dirmngr/crlcache.c:275
  #, fuzzy, c-format
  msgid "removing cache file '%s'\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: dirmngr/crlcache.c:284
  #, fuzzy, c-format
  #| msgid "enarmoring failed: %s\n"
  msgid "not removing file '%s'\n"
- msgstr "pakendamine eba�nnestus: %s\n"
+ msgstr "pakendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
 +#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
  #, fuzzy, c-format
  msgid "failed to open cache dir file '%s': %s\n"
- msgstr "`%s' ei �nnestu avada: %s\n"
+ msgstr "`%s' ei õnnestu avada: %s\n"
  
 +#: dirmngr/crlcache.c:421
  #, fuzzy, c-format
  msgid "error creating new cache dir file '%s': %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -9084,9 -7298,8 +9170,9 @@@
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing new cache dir file '%s': %s\n"
- msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
  
 +#: dirmngr/crlcache.c:435
  #, fuzzy, c-format
  msgid "error closing new cache dir file '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -9097,12 -7309,10 +9183,12 @@@
  msgid "new cache dir file '%s' created\n"
  msgstr "uus omaduste fail `%s' on loodud\n"
  
 +#: dirmngr/crlcache.c:445
  #, fuzzy, c-format
  msgid "failed to re-open cache dir file '%s': %s\n"
- msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
+ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
  
 +#: dirmngr/crlcache.c:473
  #, c-format
  msgid "first record of '%s' is not the version\n"
  msgstr ""
@@@ -9120,37 -7327,30 +9206,37 @@@ msgstr "
  msgid "extra field detected in crl record of '%s' line %u\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:623
  #, fuzzy, c-format
  msgid "invalid line detected in '%s' line %u\n"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
 +#: dirmngr/crlcache.c:632
  #, fuzzy, c-format
  msgid "duplicate entry detected in '%s' line %u\n"
- msgstr "T�histamise sertifikaat on loodud.\n"
+ msgstr "Tühistamise sertifikaat on loodud.\n"
  
 +#: dirmngr/crlcache.c:647
  #, c-format
  msgid "unsupported record type in '%s' line %u skipped\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:673
  #, fuzzy, c-format
  msgid "invalid issuer hash in '%s' line %u\n"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
 +#: dirmngr/crlcache.c:679
  #, fuzzy, c-format
  msgid "no issuer DN in '%s' line %u\n"
  msgstr "viga lugemisel: %s\n"
  
 +#: dirmngr/crlcache.c:686
  #, fuzzy, c-format
  msgid "invalid timestamp in '%s' line %u\n"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
 +#: dirmngr/crlcache.c:692
  #, fuzzy, c-format
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid "WARNING: invalid cache file hash in '%s' line %u\n"
@@@ -9164,12 -7362,10 +9250,12 @@@ msgstr "
  msgid "please check the reason and manually delete that file\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
  #, fuzzy, c-format
  msgid "failed to create temporary cache dir file '%s': %s\n"
- msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
+ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
  
 +#: dirmngr/crlcache.c:937
  #, fuzzy, c-format
  msgid "error closing '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -9180,12 -7375,10 +9266,12 @@@
  msgid "error renaming '%s' to '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
 +#: dirmngr/crlcache.c:1003
  #, fuzzy, c-format
  msgid "can't hash '%s': %s\n"
- msgstr "`%s' ei �nnestu sulgeda: %s\n"
+ msgstr "`%s' ei õnnestu sulgeda: %s\n"
  
 +#: dirmngr/crlcache.c:1011
  #, fuzzy, c-format
  msgid "error setting up MD5 hash context: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
@@@ -9195,21 -7387,17 +9281,21 @@@
  msgid "error hashing '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
 +#: dirmngr/crlcache.c:1055
  #, fuzzy, c-format
  msgid "invalid formatted checksum for '%s'\n"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
 +#: dirmngr/crlcache.c:1108
  msgid "too many open cache files; can't open anymore\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1126
  #, fuzzy, c-format
  msgid "opening cache file '%s'\n"
- msgstr "allkirjastamine eba�nnestus: %s\n"
+ msgstr "allkirjastamine ebaõnnestus: %s\n"
  
 +#: dirmngr/crlcache.c:1145
  #, fuzzy, c-format
  msgid "error opening cache file '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -9227,12 -7412,10 +9313,12 @@@ msgstr "
  msgid "calling unlock_db_file on an unlocked file\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1231
  #, fuzzy, c-format
  msgid "failed to create a new cache object: %s\n"
- msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
+ msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
  
 +#: dirmngr/crlcache.c:1286
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "no CRL available for issuer id %s\n"
@@@ -9269,12 -7446,10 +9355,12 @@@ msgstr "
  msgid "WARNING: invalid cache record length for S/N "
  msgstr ""
  
 +#: dirmngr/crlcache.c:1357
  #, fuzzy, c-format
  msgid "problem reading cache record for S/N %s: %s\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
  
 +#: dirmngr/crlcache.c:1360
  #, c-format
  msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
  msgstr ""
@@@ -9293,9 -7465,8 +9379,9 @@@ msgstr "viga parooli loomisel: %s\n
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
- msgstr "vigane r�sialgoritm `%s'\n"
+ msgstr "vigane räsialgoritm `%s'\n"
  
 +#: dirmngr/crlcache.c:1549
  #, c-format
  msgid "gcry_md_open for algorithm %d failed: %s\n"
  msgstr ""
@@@ -9306,23 -7476,19 +9392,23 @@@
  msgid "got an invalid S-expression from libksba\n"
  msgstr "vigane vastus agendilt\n"
  
 +#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
- msgstr "faili ei �nnestu avada: %s\n"
+ msgstr "faili ei õnnestu avada: %s\n"
  
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: dirmngr/crlcache.c:1699
  #, fuzzy, c-format
  #| msgid "build_packet failed: %s\n"
  msgid "ksba_crl_parse failed: %s\n"
- msgstr "build_packet eba�nnestus: %s\n"
+ msgstr "build_packet ebaõnnestus: %s\n"
  
 +#: dirmngr/crlcache.c:1714
  #, fuzzy, c-format
  msgid "error getting update times of CRL: %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -9346,12 -7508,10 +9432,12 @@@ msgstr "viga parooli loomisel: %s\n
  msgid "error inserting item into temporary cache file: %s\n"
  msgstr "kirjutan faili `%s'\n"
  
 +#: dirmngr/crlcache.c:1787
  #, fuzzy, c-format
  msgid "no CRL issuer found in CRL: %s\n"
- msgstr "genereeri t�histamise sertifikaat"
+ msgstr "genereeri tühistamise sertifikaat"
  
 +#: dirmngr/crlcache.c:1802
  msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
  msgstr ""
  
@@@ -9359,34 -7518,28 +9445,34 @@@
  #, fuzzy, c-format
  #| msgid "signature verification suppressed\n"
  msgid "CRL signature verification failed: %s\n"
- msgstr "allkirja kontroll j�eti �ra\n"
+ msgstr "allkirja kontroll jäeti ära\n"
  
 +#: dirmngr/crlcache.c:1858
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
- msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
 +#: dirmngr/crlcache.c:2001
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: dirmngr/crlcache.c:2008
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
- msgstr "uuendamine eba�nnestus: %s\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/crlcache.c:2042
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
- msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
+ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
  
 +#: dirmngr/crlcache.c:2046
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
- msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
+ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
  
 +#: dirmngr/crlcache.c:2056
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -9395,9 -7547,8 +9481,9 @@@
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
- msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
+ msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/crlcache.c:2076
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "kirjutan faili `%s'\n"
@@@ -9432,12 -7577,10 +9518,12 @@@ msgstr "viga `%s' lugemisel: %s\n
  msgid "creating cache file '%s'\n"
  msgstr "viga parooli loomisel: %s\n"
  
 +#: dirmngr/crlcache.c:2221
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
- msgstr "pakendamine eba�nnestus: %s\n"
+ msgstr "pakendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/crlcache.c:2235
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9478,12 -7614,10 +9564,12 @@@ msgstr "HOIATUS: vigane random_seed fai
  msgid "problem reading cache record: %s\n"
  msgstr "%s: viga vaba kirje lugemisel: %s\n"
  
 +#: dirmngr/crlcache.c:2344
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
- msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
+ msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
  
 +#: dirmngr/crlcache.c:2375
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -9492,22 -7625,18 +9578,22 @@@
  msgid "End CRL dump\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:2499
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
- msgstr "uuendamine eba�nnestus: %s\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/crlcache.c:2510
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
- msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
 +#: dirmngr/crlcache.c:2570
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: dirmngr/crlfetch.c:74
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
@@@ -9548,18 -7668,14 +9634,18 @@@ msgstr "viga `%s' loomisel: %s\n
  msgid "error retrieving '%s': http status %u\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
- msgstr "v�tit '%s' ei leitud: %s\n"
+ msgstr "võtit '%s' ei leitud: %s\n"
  
 +#: dirmngr/crlfetch.c:386
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
- msgstr "v�tit '%s' ei leitud: %s\n"
+ msgstr "võtit '%s' ei leitud: %s\n"
  
 +#: dirmngr/dirmngr-client.c:71
  msgid "use OCSP instead of CRLs"
  msgstr ""
  
@@@ -9567,12 -7682,10 +9653,12 @@@
  msgid "check whether a dirmngr is running"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:73
  #, fuzzy
  msgid "add a certificate to the cache"
- msgstr "T�histamise sertifikaat on loodud.\n"
+ msgstr "Tühistamise sertifikaat on loodud.\n"
  
 +#: dirmngr/dirmngr-client.c:74
  #, fuzzy
  msgid "validate a certificate"
  msgstr "halb sertifikaat"
@@@ -9608,15 -7714,13 +9694,15 @@@ msgstr "halb sertifikaat
  #, fuzzy
  #| msgid "Enter the user ID of the designated revoker: "
  msgid "force the use of the default OCSP responder"
- msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
+ msgstr "Sisestage määratud tühistaja kasutaja ID: "
  
 +#: dirmngr/dirmngr-client.c:169
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
 +#: dirmngr/dirmngr-client.c:173
  msgid ""
  "Syntax: dirmngr-client [options] [certfile|pattern]\n"
  "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9642,56 -7742,46 +9728,56 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to the dirmngr: %s\n"
- msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
+ msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:332
  #, fuzzy, c-format
  #| msgid "update failed: %s\n"
  msgid "lookup failed: %s\n"
- msgstr "uuendamine eba�nnestus: %s\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/dirmngr-client.c:347
  #, fuzzy, c-format
  msgid "loading CRL '%s' failed: %s\n"
- msgstr "pakendamine eba�nnestus: %s\n"
+ msgstr "pakendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/dirmngr-client.c:375
  msgid "a dirmngr daemon is up and running\n"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:397
  #, fuzzy, c-format
  msgid "validation of certificate failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
  #, fuzzy
  msgid "certificate is valid\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
  #, fuzzy
  msgid "certificate has been revoked\n"
- msgstr "M�RKUS: v�ti on t�histatud"
+ msgstr "MÄRKUS: võti on tühistatud"
  
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
  #, fuzzy, c-format
  msgid "certificate check failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: dirmngr/dirmngr-client.c:428
  #, fuzzy, c-format
  #| msgid "can't stat `%s': %s\n"
  msgid "got status: '%s'\n"
- msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
+ msgstr "ei õnnestu lugeda `%s' atribuute: %s\n"
  
 +#: dirmngr/dirmngr-client.c:443
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing base64 encoding: %s\n"
- msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
  
 +#: dirmngr/dirmngr-client.c:701
  #, fuzzy, c-format
  msgid "unsupported inquiry '%s'\n"
  msgstr ""
@@@ -9707,112 -7795,88 +9793,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  msgid "run without asking a user"
- msgstr "V�ljun salvestamata? "
+ msgstr "Väljun salvestamata? "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FAIL|lae laiendusmoodul FAIL"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
- msgstr "ei saa parsida v�tmeserveri URI\n"
+ msgstr "ei saa parsida võtmeserveri URI\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9823,93 -7887,74 +9913,93 @@@ msgid "
  "options)\n"
  msgstr ""
  "@\n"
- "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
+ "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
- msgstr "kasuta: gpg [v�tmed] "
+ msgstr "kasuta: gpg [võtmed] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "%s ja %s ei ole koos lubatud!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
- msgstr "pakendamine eba�nnestus: %s\n"
+ msgstr "pakendamine ebaõnnestus: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
- msgstr "pakendamine eba�nnestus: %s\n"
+ msgstr "pakendamine ebaõnnestus: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "rida on liiga pikk\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
- msgstr "viga: vigane s�rmej�lg\n"
+ msgstr "viga: vigane sõrmejälg\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "viga lugemisel: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  msgid "shutdown forced\n"
- msgstr "ei t��deldud"
+ msgstr "ei töödeldud"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -9962,9 -7996,8 +10052,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
 +#: dirmngr/dirmngr_ldap.c:212
  msgid ""
  "Syntax: dirmngr_ldap [options] [URL]\n"
  "Internal LDAP helper for Dirmngr\n"
@@@ -9975,31 -8007,24 +10065,31 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "invalid import options\n"
  msgid "invalid port number %d\n"
- msgstr "vigased impordi v�tmed\n"
+ msgstr "vigased impordi võtmed\n"
  
 +#: dirmngr/dirmngr_ldap.c:413
  #, c-format
  msgid "scanning result for attribute '%s'\n"
  msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
 +#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
 +#: dirmngr/dirmngr_ldap.c:677
  #, fuzzy, c-format
  msgid "error writing to stdout: %s\n"
- msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:437
  #, c-format
  msgid "          available attribute '%s'\n"
  msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:475
  #, fuzzy, c-format
  msgid "attribute '%s' not found\n"
- msgstr "v�tit '%s' ei leitud: %s\n"
+ msgstr "võtit '%s' ei leitud: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:482
  #, c-format
  msgid "found attribute '%s'\n"
  msgstr ""
@@@ -10061,25 -8075,21 +10151,25 @@@ msgstr "
  #, fuzzy
  #| msgid "WARNING: using insecure memory!\n"
  msgid "WARNING: using first attribute only\n"
- msgstr "HOIATUS: kasutan ebaturvalist m�lu!\n"
+ msgstr "HOIATUS: kasutan ebaturvalist mälu!\n"
  
 +#: dirmngr/dirmngr_ldap.c:636
  #, fuzzy, c-format
  msgid "LDAP init to '%s:%d' failed: %s\n"
- msgstr "pakendamine eba�nnestus: %s\n"
+ msgstr "pakendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:659
  #, fuzzy, c-format
  msgid "binding to '%s:%d' failed: %s\n"
- msgstr "pakendamine eba�nnestus: %s\n"
+ msgstr "pakendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:686
  #, fuzzy, c-format
  #| msgid "dearmoring failed: %s\n"
  msgid "searching '%s' failed: %s\n"
- msgstr "lahtipakendamine eba�nnestus: %s\n"
+ msgstr "lahtipakendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:718
  #, fuzzy, c-format
  msgid "'%s' is not an LDAP URL\n"
  msgstr "\"%s\": ei ole JPEG fail\n"
@@@ -10089,28 -8098,18 +10179,22 @@@
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
- msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:236
  #, fuzzy, c-format
  msgid "error reading log from ldap wrapper %d: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:304
  #, fuzzy, c-format
  msgid "npth_select failed: %s - waiting 1s\n"
- msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
+ msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:343
  #, c-format
  msgid "ldap wrapper %d ready"
  msgstr ""
@@@ -10125,12 -8122,10 +10209,12 @@@ msgstr "
  msgid "ldap wrapper %d ready: exitcode=%d\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:364
  #, fuzzy, c-format
  msgid "waiting for ldap wrapper %d failed: %s\n"
- msgstr "uuendamine eba�nnestus: %s\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:376
  #, c-format
  msgid "ldap wrapper %d stalled - killing\n"
  msgstr ""
@@@ -10140,12 -8134,10 +10224,12 @@@
  msgid "error spawning ldap wrapper reaper thread: %s\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
  #, fuzzy, c-format
  msgid "reading from ldap wrapper %d failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: dirmngr/ldap.c:91
  #, c-format
  msgid "invalid char 0x%02x in host name - not added\n"
  msgstr ""
@@@ -10155,12 -8146,10 +10239,12 @@@
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "otsin \"%s\" HKP serverist %s\n"
  
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: dirmngr/ldap.c:627
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
@@@ -10175,18 -8162,15 +10259,18 @@@ msgstr "
  msgid "invalid canonical S-expression found\n"
  msgstr "%s: vigane faili versioon %d\n"
  
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
- msgstr "faili ei �nnestu avada: %s\n"
+ msgstr "faili ei õnnestu avada: %s\n"
  
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
- msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
+ msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
  
 +#: dirmngr/misc.c:518
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10200,12 -8182,10 +10284,12 @@@ msgstr "viga `%s' lugemisel: %s\n
  msgid "response from server too large; limit is %d bytes\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:139
  #, fuzzy
  msgid "OCSP request not possible due to Tor mode\n"
- msgstr "v�tit '%s' ei leitud: %s\n"
+ msgstr "võtit '%s' ei leitud: %s\n"
  
 +#: dirmngr/ocsp.c:145
  msgid "OCSP request not possible due to disabled HTTP\n"
  msgstr ""
  
@@@ -10219,12 -8197,10 +10303,12 @@@ msgstr "viga `%s' lugemisel: %s\n
  msgid "error building OCSP request: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
 +#: dirmngr/ocsp.c:181
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
- msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
  
 +#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -10244,12 -8217,10 +10328,12 @@@ msgstr "viga teate saatmisel serverile 
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:293
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
- msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
 +#: dirmngr/ocsp.c:328
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
@@@ -10257,12 -8227,10 +10341,12 @@@
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:464
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: dirmngr/ocsp.c:479
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
  msgstr "viga parooli loomisel: %s\n"
@@@ -10271,32 -8238,26 +10355,32 @@@
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
- msgstr "v�tit '%s' ei leitud: %s\n"
+ msgstr "võtit '%s' ei leitud: %s\n"
  
 +#: dirmngr/ocsp.c:563
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:570
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
- msgstr "genereeri t�histamise sertifikaat"
+ msgstr "genereeri tühistamise sertifikaat"
  
 +#: dirmngr/ocsp.c:580
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
- msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
 +#: dirmngr/ocsp.c:614
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
- msgstr "%s: ei �nnestu kasutada: %s\n"
+ msgstr "%s: ei õnnestu kasutada: %s\n"
  
 +#: dirmngr/ocsp.c:621
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
@@@ -10304,9 -8264,8 +10388,9 @@@
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
- msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
+ msgstr "puudub salajaste võtmete vaikimisi võtmehoidla: %s\n"
  
 +#: dirmngr/ocsp.c:634
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
@@@ -10315,9 -8273,8 +10399,9 @@@
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
- msgstr "kasutan �iffrit %s\n"
+ msgstr "kasutan šiffrit %s\n"
  
 +#: dirmngr/ocsp.c:646
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
@@@ -10336,12 -8290,10 +10420,12 @@@ msgstr "
  msgid "good"
  msgstr ""
  
 +#: dirmngr/ocsp.c:708
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
- msgstr "M�RKUS: v�ti on t�histatud"
+ msgstr "MÄRKUS: võti on tühistatud"
  
 +#: dirmngr/ocsp.c:743
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
@@@ -10353,83 -8303,66 +10437,83 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
- msgstr "allkirjastamine eba�nnestus: %s\n"
+ msgstr "allkirjastamine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
- msgstr "allkirjastamine eba�nnestus: %s\n"
+ msgstr "allkirjastamine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
- msgstr "`%s' ei �nnestu luua: %s\n"
+ msgstr "`%s' ei õnnestu luua: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
+ msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
- msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
- msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
+ msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
- msgstr "allkirjastamine eba�nnestus: %s\n"
+ msgstr "allkirjastamine ebaõnnestus: %s\n"
  
 +#: dirmngr/validate.c:201
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
@@@ -10443,40 -8374,32 +10527,40 @@@ msgstr "kontrollin trustdb faili\n
  msgid "not checking CRL for"
  msgstr ""
  
 +#: dirmngr/validate.c:250
  #, fuzzy
  msgid "checking CRL for"
- msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
 +#: dirmngr/validate.c:528
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "kontrolli allkirja"
  
 +#: dirmngr/validate.c:561
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
- msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
+ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
  
 +#: dirmngr/validate.c:738
  #, fuzzy
  msgid "certificate chain is good\n"
  msgstr "eelistus %c%lu on duplikaat\n"
  
 +#: dirmngr/validate.c:968
  msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
+ msgstr "DSA nõuab 160 bitist räsialgoritmi kasutamist\n"
  
 +#: dirmngr/validate.c:1116
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
- msgstr "v�lju"
+ msgstr "välju"
  
 +#: tools/gpg-connect-agent.c:79
  msgid "print data out hex encoded"
  msgstr ""
  
@@@ -10513,12 -8428,10 +10597,12 @@@ msgstr "|FAIL|lae laiendusmoodul FAIL
  msgid "run /subst on startup"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:205
  #, fuzzy
  msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
 +#: tools/gpg-connect-agent.c:208
  msgid ""
  "Syntax: @GPG at -connect-agent [options]\n"
  "Connect to a running agent and send commands\n"
@@@ -10535,12 -8445,10 +10619,12 @@@ msgstr "
  msgid "option \"%s\" ignored due to \"%s\"\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
  #, fuzzy, c-format
  msgid "receiving line failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: tools/gpg-connect-agent.c:1458
  #, fuzzy
  msgid "line too long - skipped\n"
  msgstr "rida on liiga pikk\n"
@@@ -10554,12 -8460,10 +10638,12 @@@ msgstr "
  msgid "unknown command '%s'\n"
  msgstr "tundmatu vaikimisi saaja `%s'\n"
  
 +#: tools/gpg-connect-agent.c:1855
  #, fuzzy, c-format
  msgid "sending line failed: %s\n"
- msgstr "allkirjastamine eba�nnestus: %s\n"
+ msgstr "allkirjastamine ebaõnnestus: %s\n"
  
 +#: tools/gpg-connect-agent.c:2251
  #, fuzzy, c-format
  msgid "error sending standard options: %s\n"
  msgstr "viga teate saatmisel serverile `%s': %s\n"
@@@ -10629,29 -8515,23 +10713,29 @@@ msgstr "viga parooli loomisel: %s\n
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
  msgid "|NAME|use NAME as default secret key"
- msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
+ msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
  
 +#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
- msgstr "|NIMI|kr�pti NIMEle"
+ msgstr "|NIMI|krüpti NIMEle"
  
 +#: tools/gpgconf-comp.c:704
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
- msgstr "ei saa parsida v�tmeserveri URI\n"
+ msgstr "ei saa parsida võtmeserveri URI\n"
  
 +#: tools/gpgconf-comp.c:735
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
@@@ -10663,12 -8541,10 +10747,12 @@@ msgstr "
  msgid "disable all access to the dirmngr"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:790
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
- msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
+ msgstr "|NIMI|kasuta paroolidega šifri algoritmi NIMI"
  
 +#: tools/gpgconf-comp.c:820
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
@@@ -10680,173 -8554,142 +10764,181 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "võrgu viga"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "halb parool"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
- msgstr "ei leia avalikku v�tit"
+ msgstr "ei leia avalikku võtit"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
  msgstr "tundmatu seade \"%s\"\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
  msgstr "tundmatu seade \"%s\"\n"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "uuenda usalduse andmebaasi"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
- msgstr "kasuta v�ljundfailina"
+ msgstr "kasuta väljundfailina"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
- msgstr "ei leia avalikku v�tit"
+ msgstr "ei leia avalikku võtit"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  #, fuzzy
  msgid "No argument allowed"
- msgstr "kirjutan salajase v�tme faili `%s'\n"
+ msgstr "kirjutan salajase võtme faili `%s'\n"
  
 +#: tools/symcryptrun.c:154
  #, fuzzy
  msgid ""
  "@\n"
  "Commands:\n"
  " "
  msgstr ""
- "@K�sud:\n"
+ "@Käsud:\n"
  " "
  
 +#: tools/symcryptrun.c:156
  #, fuzzy
  msgid "decryption modus"
- msgstr "lahtikr�pteerimine �nnestus\n"
+ msgstr "lahtikrüpteerimine õnnestus\n"
  
 +#: tools/symcryptrun.c:157
  #, fuzzy
  msgid "encryption modus"
- msgstr "lahtikr�pteerimine �nnestus\n"
+ msgstr "lahtikrüpteerimine õnnestus\n"
  
 +#: tools/symcryptrun.c:161
  msgid "tool class (confucius)"
  msgstr ""
  
@@@ -10863,12 -8703,10 +10955,12 @@@ msgstr "
  msgid "input file name (default stdin)"
  msgstr ""
  
 +#: tools/symcryptrun.c:209
  #, fuzzy
  msgid "Usage: symcryptrun [options] (-h for help)"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
 +#: tools/symcryptrun.c:212
  msgid ""
  "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
  "[options...] COMMAND [inputfile]\n"
@@@ -10880,27 -8717,22 +10972,27 @@@ msgstr "
  msgid "%s on %s aborted with status %i\n"
  msgstr "%s ja %s ei ole koos lubatud!\n"
  
 +#: tools/symcryptrun.c:285
  #, fuzzy, c-format
  msgid "%s on %s failed with status %i\n"
- msgstr "faili ei �nnestu avada: %s\n"
+ msgstr "faili ei õnnestu avada: %s\n"
  
 +#: tools/symcryptrun.c:317
  #, fuzzy, c-format
  msgid "can't create temporary directory '%s': %s\n"
- msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
+ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
  
 +#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
  #, fuzzy, c-format
  msgid "could not open %s for writing: %s\n"
- msgstr "%s ei �nnestu avada: %s\n"
+ msgstr "%s ei õnnestu avada: %s\n"
  
 +#: tools/symcryptrun.c:385
  #, fuzzy, c-format
  msgid "error writing to %s: %s\n"
- msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
  
 +#: tools/symcryptrun.c:392
  #, fuzzy, c-format
  msgid "error reading from %s: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
@@@ -10910,12 -8741,10 +11002,12 @@@
  msgid "error closing %s: %s\n"
  msgstr "viga `%s' lugemisel: %s\n"
  
 +#: tools/symcryptrun.c:490
  #, fuzzy
  msgid "no --program option provided\n"
- msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
+ msgstr "mittelokaalse programmi käivitamist ei toetata\n"
  
 +#: tools/symcryptrun.c:496
  msgid "only --decrypt and --encrypt are supported\n"
  msgstr ""
  
@@@ -10927,62 -8754,50 +11019,62 @@@ msgstr "
  msgid "cannot allocate args vector\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:531
  #, fuzzy, c-format
  msgid "could not create pipe: %s\n"
- msgstr "%s ei �nnestu luua: %s\n"
+ msgstr "%s ei õnnestu luua: %s\n"
  
 +#: tools/symcryptrun.c:538
  #, fuzzy, c-format
  msgid "could not create pty: %s\n"
- msgstr "%s ei �nnestu luua: %s\n"
+ msgstr "%s ei õnnestu luua: %s\n"
  
 +#: tools/symcryptrun.c:554
  #, c-format
  msgid "could not fork: %s\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:582
  #, fuzzy, c-format
  msgid "execv failed: %s\n"
- msgstr "uuendamine eba�nnestus: %s\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
  
 +#: tools/symcryptrun.c:611
  #, fuzzy, c-format
  msgid "select failed: %s\n"
- msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
  
 +#: tools/symcryptrun.c:628
  #, fuzzy, c-format
  msgid "read failed: %s\n"
- msgstr "uuendamine eba�nnestus: %s\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
  
 +#: tools/symcryptrun.c:680
  #, fuzzy, c-format
  msgid "pty read failed: %s\n"
- msgstr "uuendamine eba�nnestus: %s\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
  
 +#: tools/symcryptrun.c:732
  #, fuzzy, c-format
  msgid "waitpid failed: %s\n"
- msgstr "uuendamine eba�nnestus: %s\n"
+ msgstr "uuendamine ebaõnnestus: %s\n"
  
 +#: tools/symcryptrun.c:746
  #, c-format
  msgid "child aborted with status %i\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:801
  #, fuzzy, c-format
  msgid "cannot allocate infile string: %s\n"
- msgstr "`%s' ei �nnestu luua: %s\n"
+ msgstr "`%s' ei õnnestu luua: %s\n"
  
 +#: tools/symcryptrun.c:814
  #, fuzzy, c-format
  msgid "cannot allocate outfile string: %s\n"
- msgstr "`%s' ei �nnestu luua: %s\n"
+ msgstr "`%s' ei õnnestu luua: %s\n"
  
 +#: tools/symcryptrun.c:987
  #, c-format
  msgid "either %s or %s must be given\n"
  msgstr ""
@@@ -10996,12 -8809,10 +11088,12 @@@ msgstr "
  msgid "class %s is not supported\n"
  msgstr "kaitse algoritm %d%s ei ole toetatud\n"
  
 +#: tools/gpg-check-pattern.c:144
  #, fuzzy
  msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
- msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
  
 +#: tools/gpg-check-pattern.c:147
  msgid ""
  "Syntax: gpg-check-pattern [options] patternfile\n"
  "Check a passphrase given on stdin against the patternfile\n"
diff --cc po/fi.po
index ec54f10,d2eefc1..2089584
--- a/po/fi.po
+++ b/po/fi.po
@@@ -22,7 -22,6 +22,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.2.2\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2004-06-16 22:40+0300\n"
  "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen at iki.fi>\n"
  "Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@@ -31,7 -30,6 +31,7 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@@ -42,40 -40,31 +42,40 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Haluatko varmasti poistaa valitut avaimet? "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -83,7 -72,6 +83,7 @@@ msgstr "väärä salasana
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr ""
  
@@@ -93,75 -81,59 +93,75 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, 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:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "väärä salasana"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
  msgstr "rivi on liian pitkä\n"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "salasana on liian pitkä\n"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Nimessä on epäkelpo merkki\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
  msgstr "MPI ei kelpaa"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "väärä salasana"
@@@ -171,25 -142,11 +171,25 @@@
  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:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -215,58 -168,39 +215,48 @@@ msgstr "virhe kirjoitettaessa salaisee
  msgid "no suitable card key found: %s\n"
  msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "avainlohkojen poisto epäonnistui: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "muuta salasanaa"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -398,8 -308,6 +388,8 @@@ msgstr "
  msgid "Please enter the new passphrase"
  msgstr "muuta salasanaa"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
@@@ -409,118 -317,92 +399,124 @@@ msgstr "
  "Valitsimet:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "Avain on uusittu"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "monisanainen"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "ole jonkinverran hiljaisempi"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
  msgstr "etsi avaimia avainpalvelimelta"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
  msgstr "päivitä luottamustietokanta"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
  msgstr "ei tuettu"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -529,163 -411,121 +525,163 @@@ msgstr "ei tuettu
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "asetustiedosto \"%s\": %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "luetaan asetukset tiedostosta \"%s\"\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
  msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "ei voida luoda kohdetta %s: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, 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:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "päivitys epäonnistui: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: hakemisto luotu\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: hakemistoa ei voi luoda: %s\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "salaisen päivitys epäonnistui: %s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: ohitettu: %s\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
@@@ -701,8 -539,6 +697,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -710,9 -546,6 +706,9 @@@ msgstr "
  "@Komennot:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -766,7 -591,6 +762,8 @@@ msgstr "Peru
  msgid "error while asking for the passphrase: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -825,8 -640,6 +822,8 @@@ msgstr "
  msgid "Yes"
  msgstr "kyllä|kylla|joo"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -856,40 -666,33 +853,40 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
  msgstr "muuta salasanaa"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Haluatko varmasti poistaa valitut avaimet? "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  msgid "Delete key"
  msgstr "ota avain käyttöön"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -904,12 -705,10 +901,12 @@@ msgstr "
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
@@@ -936,84 -731,72 +933,95 @@@ msgstr "suojausalgoritmi %d%s ei ole k�
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "päivitys epäonnistui: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "päivitys epäonnistui: %s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
  msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  #, fuzzy
  msgid "problem setting the gpg-agent options\n"
  msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "core-tiedostojen luontia ei voi estää: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "päivitys epäonnistui: %s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "ascii-koodaaminen epäonnistui: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "kyllä|kylla|joo"
  
@@@ -1068,7 -840,6 +1076,7 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
@@@ -1088,36 -856,29 +1096,36 @@@ msgstr "VAROITUS: \"%s\" on paheksuttu 
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  msgid "connection to agent is in restricted mode\n"
  msgstr "tätä ei voi tehdä eräajossa\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1198,8 -943,6 +1206,8 @@@ msgstr "%s: avainrengas luotu\n
  msgid "algorithm: %s"
  msgstr "ascii-koodaus: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1283,12 -1010,10 +1291,12 @@@ msgstr "Tämä avain on vanhentunut!
  msgid "Root certificate trustworthy"
  msgstr "virheellinen varmenne"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
  msgstr "virheellinen varmenne"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
  msgstr "Avain saatavilla kohteessa: "
@@@ -1330,7 -1047,6 +1338,7 @@@ msgstr "Ei ohjetta aiheesta \"%s\"
  msgid "ignoring garbage line"
  msgstr "virhe trailer-rivissä\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
  msgstr "tuntematon "
@@@ -1411,7 -1112,6 +1419,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
  msgstr "ei käsitelty"
@@@ -1470,8 -1159,6 +1478,8 @@@ msgstr "julkista avainta %08lX ei löyd
  msgid "waiting for lock %s...\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1559,13 -1228,11 +1567,13 @@@ msgstr "
  "viallista\n"
  "MTA:ta on käytetty\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "ei ihmisten luettavissa"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1573,25 -1240,20 +1581,25 @@@ msgstr "
  "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
  "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  #, fuzzy
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  msgid "a notation name may not contain an '=' character\n"
  msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
@@@ -1601,49 -1263,38 +1609,48 @@@ msgstr "
  "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
  "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr ""
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Syötä salasana: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
  msgstr "VAROITUS: %s korvaa %s:n\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, fuzzy, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "salaista avainta ei löydy"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "tätä ei voi tehdä eräajossa\n"
@@@ -1653,15 -1303,10 +1660,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Valintasi? "
  
@@@ -1693,184 -1332,142 +1700,184 @@@ msgstr "ei käsitelty
  msgid "forced"
  msgstr ""
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr ""
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr ""
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr ""
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  #, fuzzy
  msgid "URL to retrieve public key: "
  msgstr "ei vastaavaa julkista avainta: %s\n"
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr ""
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr ""
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  #, fuzzy
  msgid "Language preferences: "
  msgstr "päivitä valinnat"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  #, fuzzy
  msgid "Error: invalid length of preference string.\n"
  msgstr "Valinnassa on luvaton merkki\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  #, fuzzy
  msgid "Error: invalid characters in preference string.\n"
  msgstr "Valinnassa on luvaton merkki\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr ""
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  #, fuzzy
  msgid "Error: invalid response.\n"
  msgstr "virhe: sormenjälki on väärä\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  #, fuzzy
  msgid "CA fingerprint: "
  msgstr "näytä sormenjälki"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  #, fuzzy
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "virhe: sormenjälki on väärä\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, fuzzy, c-format
  msgid "key operation not possible: %s\n"
  msgstr "Avaimen luonti epäonnistui: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  #, fuzzy
  msgid "not an OpenPGP card"
  msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Minkä kokoisen avaimen haluat? (1024) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "Minkä kokoisen avaimen haluat? (1024) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Minkä kokoisen avaimen haluat? (1024) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "pyöristetty %u bittiin\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
  msgstr "ohitetaan: salainen avain on jo paikalla\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1878,155 -1475,120 +1885,155 @@@
  "You should change them using the command --change-pin\n"
  msgstr ""
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  #, fuzzy
  msgid "Please select the type of key to generate:\n"
  msgstr "Valitse millaisen avaimen haluat:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  #, fuzzy
  msgid "   (1) Signature key\n"
  msgstr "Allekirjoitus vanheni %s\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  #, fuzzy
  msgid "   (2) Encryption key\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Valinta ei kelpaa.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  #, fuzzy
  msgid "Please select where to store the key:\n"
  msgstr "Valitse mitätöinnin syy:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "päivitys epäonnistui: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
  msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "ohitetaan: salainen avain on jo paikalla\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  msgid "Continue? (y/N) "
  msgstr "Varmastiko allekirjoita? "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "ulos tästä valikosta"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  #, fuzzy
  msgid "show admin commands"
  msgstr "ristiriitainen komento\n"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "näytä tämä ohje"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  #, fuzzy
  msgid "list all available data"
  msgstr "Avain saatavilla kohteessa: "
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr ""
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr ""
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr ""
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  #, fuzzy
  msgid "change the login name"
  msgstr "muuta voimassoloaikaa"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  #, fuzzy
  msgid "change the language preferences"
  msgstr "muuta luottamusastetta"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr ""
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  #, fuzzy
  msgid "change a CA fingerprint"
  msgstr "näytä sormenjälki"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr ""
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  #, fuzzy
  msgid "generate new keys"
  msgstr "luo uusi avainpari"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr ""
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr ""
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  #, fuzzy
  msgid "Admin-only command\n"
  msgstr "ristiriitainen komento\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  #, fuzzy
  msgid "Admin commands are allowed\n"
  msgstr "ristiriitainen komento\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  #, fuzzy
  msgid "Admin commands are not allowed\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
  
@@@ -2034,23 -1595,15 +2041,23 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "tiedostoa \"%s\" ei voi avata\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "avainta \"%s\" ei löydy: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "virhe luettaessa avainlohkoa: %s\n"
@@@ -2167,7 -1698,6 +2174,7 @@@ msgstr "valittu symmetrinen salain %s (
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
@@@ -2250,65 -1765,51 +2257,65 @@@ msgstr "VAROITUS: tilapäistiedostoa (%
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  #, fuzzy
  msgid "export signatures that are marked as local-only"
  msgstr ""
  "\n"
  "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  #, fuzzy
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
  
- #: g10/export.c:108
++#: g10/export.c:112
  #, fuzzy
  msgid "remove unusable parts from key during export"
  msgstr "salaista avainta ei voi käyttää"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: ohitettu: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "kirjoitetaan kohteeseen \"%s\"\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "VAROITUS: mitään ei viety\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2319,8 -1819,6 +2326,8 @@@ msgstr "virhe luotaessa \"%s\": %s\n
  msgid "[User ID not found]"
  msgstr "[Käyttäjätunnusta ei löytynyt]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
  msgstr "virheelliset tuontivalitsimet\n"
@@@ -2341,268 -1836,209 +2348,268 @@@ msgstr "virhe luettaessa tiedostoa \"%s
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "virhe luotaessa \"%s\": %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "virhe luotaessa \"%s\": %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
  msgstr "näytä sormenjälki"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "salaista avainta \"%s\" ei löydy: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, fuzzy, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
  "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, fuzzy, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr ""
  "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "tee erillinen allekirjoitus"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "tee erillinen allekirjoitus"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "salaa tiedot"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "salaa vain symmetrisellä salaimella"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "avaa tiedot (oletus)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "tarkista allekirjoitus"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "näytä avaimet"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "näytä avaimet allekirjoituksineen"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "tarkista avainten allekirjoitukset"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "näytä avaimet sormenjälkineen"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "näytä salaiset avaimet"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "luo uusi avainpari"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "luo uusi avainpari"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "luo uusi avainpari"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "luo uusi avainpari"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "luo mitätöintivarmenne"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "poista avaimet julkisten avainten renkaasta"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "poista avaimet salaisten avainten renkaasta"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "allekirjoita avain"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "allekirjoita avain paikallisesti"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "allekirjoita avain"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "allekirjoita avain paikallisesti"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "allekirjoita tai muokkaa avainta"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
  msgstr "muuta salasanaa"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "vie avaimia"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "vie avaimia palvelimelle"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "nouda avaimia avainpalvelimelta"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "etsi avaimia avainpalvelimelta"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "päivitä kaikki avaimet avainpalvelimelta"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "nouda/liitä avaimia"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "päivitä luottamustietokanta"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "tuota ascii-koodattu tuloste"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NIMI|salaa vastaanottajalle NIMI"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, 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:535
++#: g10/gpg.c:539
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "käytä tekstimuotoa"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "älä tee muutoksia"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "kysy ennen ylikirjoittamista"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2611,7 -2047,6 +2618,7 @@@ msgstr "
  "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
  "sivuilta)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2630,13 -2065,11 +2637,13 @@@ msgstr "
  " --list-keys [nimet]        näytä avaimet\n"
  " --fingerprint [nimet]      näytä sormenjäljet\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2651,7 -2084,6 +2658,7 @@@ msgstr "
  "allekirjoita, tarkista, salaa tai avaa\n"
  "oletustoiminto riippuu syötteestä\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2659,627 -2091,496 +2666,632 @@@ msgstr "
  "\n"
  "Tuetut algoritmit:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "JulkAvain: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Salaus: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Tiiviste: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Pakkaus: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "käyttö: gpg [valitsimet] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "ristiriitainen komento\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, 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:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, 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:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, 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:1544
++#: g10/gpg.c:1552
  #, 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:1547
++#: g10/gpg.c:1555
  #, 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:1553
++#: g10/gpg.c:1561
  #, 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:1556
++#: g10/gpg.c:1564
  #, 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:1559
++#: g10/gpg.c:1567
  #, 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:1565
++#: g10/gpg.c:1573
  #, 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:1568
++#: g10/gpg.c:1576
  #, 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:1571
++#: g10/gpg.c:1579
  #, 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:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "tuntematon asetus \"%s\"\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "poista avain käytöstä"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "virheelliset tuontivalitsimet\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
  msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Sähköpostiosoite ei kelpaa\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "virheelliset tuontivalitsimet\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s ei kelpaa merkistöksi\n"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: virheelliset vientivalitsimet\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "VAROITUS: %s korvaa %s:n\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s ja %s yhdessä on järjetöntä!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "valittu salausalgoritmi ei kelpaa\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "valittu tiivistealgoritmi ei kelpaa\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "valittu salausalgoritmi ei kelpaa\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed täytyy olla suurempi kuin 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  #, 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:3588
++#: g10/gpg.c:3686
  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:3590
++#: g10/gpg.c:3688
  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:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  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:3597
++#: g10/gpg.c:3695
  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:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "virheelliset oletusarvoiset valinnat\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ja %s eivät vielä toimi yhdessä\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, 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:3704
++#: g10/gpg.c:3802
  #, 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:3709
++#: g10/gpg.c:3807
  #, 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:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  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:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [tiedostonimi]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [tiedostonimi]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "avaus epäonnistui: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [tiedostonimi]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  #, fuzzy
  msgid "--symmetric --encrypt [filename]"
  msgstr "--sign --encrypt [tiedostonimi]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, 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:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--allekirjoita [tiedostonimi]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [tiedostonimi]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  #, fuzzy
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--sign --encrypt [tiedostonimi]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, 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:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [tiedostonimi]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [tiedostonimi]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [tiedostonimi]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key käyttäjätunnus"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key käyttäjätunnus"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key käyttäjätunnus [komennot]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
  msgstr "--sign-key käyttäjätunnus"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "avaimen vienti epäonnistui: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "avaimen vienti epäonnistui: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "ascii-koodauksen purku epäonnistui: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "ascii-koodaaminen epäonnistui: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[tiedostonimi]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Kirjoita viestisi...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "annettu varmennekäytännön URL on virheellinen\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "ota avaimet tästä avainrenkaasta"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -3298,330 -2597,264 +3310,330 @@@ msgstr "Ei ohjeita saatavilla
  msgid "No help available for '%s'"
  msgstr "Ei ohjetta aiheesta \"%s\""
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "päivitä luottamustietokanta"
  
- #: g10/import.c:147
++#: g10/import.c:160
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "päivitä luottamustietokanta"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  msgid "show key during import"
  msgstr "näytä sormenjälki"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "salaista avainta ei voi käyttää"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "ohitetaan tyypin %d lohko\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "tähän mennessä käsitelty %lu avainta\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Kaikkiaan käsitelty: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "      ohitetaan uudet avaimet: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "      ohitetaan uudet avaimet: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          ilman käyttäjätunnuksia: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "              tuotu: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "             muuttamatonta: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "          uusia käyttäjätunnuksia: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "           uusia aliavaimia: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        uusia allekirjoituksia: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "   uusia avainten mitätöintejä: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "      luettuja salaisia avaimia: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  tuotuja salaisia avaimia: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " muuttamattomia salaisia avaimia: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "          ei tuotu: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "        uusia allekirjoituksia: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "      luettuja salaisia avaimia: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
  # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "avain %08lX: ei käyttäjätunnusta\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "ohitetaan \"%s\": %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr ""
  "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "avain %08lX: uusi avain - ohitetaan\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "avain %08lX: \"%s\" ei muutoksia\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "avain %08lX: salainen avain tuotu\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "ohitetaan: salainen avain on jo paikalla\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "salaista avainta \"%s\" ei löydy: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
@@@ -3636,179 -2869,145 +3648,179 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "avain %08lX: käyttäjätunnus ohitettu '"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "avain %08lX: aliavain ohitettu\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr ""
  "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
  "ei saatavilla.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
  msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
  msgstr "avainrengas \"%s\" luotu\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
  msgstr "avainrengas \"%s\" luotu\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "virhe luotaessa \"%s\": %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
@@@ -3821,36 -3018,34 +3833,42 @@@ msgstr "[mitätöinti]
  msgid "[self-signature]"
  msgstr "[oma-allekirjoitus]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
  
  # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Allekirjoitus täsmää lähettäjään \""
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "ohitetaan \"%s\": %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
  msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3858,7 -3053,6 +3876,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
  msgstr[1] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3866,21 -3060,18 +3884,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d väärää allekirjoitusta\n"
  msgstr[1] "%d väärää allekirjoitusta\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Allekirjoitus täsmää lähettäjään \""
  msgstr[1] "Allekirjoitus täsmää lähettäjään \""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3893,68 -3084,53 +3911,68 @@@ msgstr "
  "lähteistä...)?\n"
  "\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Luotan osittain\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Luotan täysin\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Käyttäjätunnus \"%s\" on mitätöity."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  Allekirjoittaminen ei onnistu.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Varmastiko allekirjoita? "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3963,13 -3139,11 +3981,13 @@@ msgstr "
  "Oma-allekirjoitus kohteessa \"%s\"\n"
  "on PGP 2.x -muodon allekirjoitus.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr ""
  "Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
  "(k/E) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3978,11 -3152,9 +3996,11 @@@ msgstr "
  "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
  "on vanhentunut.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3991,44 -3163,35 +4009,44 @@@ msgstr "
  "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
  "on paikallinen allekirjoitus.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "Tämä avain on vanhentunut!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Avain vanhenee %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4037,32 -3200,26 +4055,32 @@@ msgstr "
  "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
  "Jos et tiedä vastausta, syötä \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) En vastaa.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) En ole tarkistanut lainkaan.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Olen suorittanut arkisen tarkistuksen.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4071,265 -3228,211 +4089,265 @@@ msgstr "
  "Haluatko varmasti allekirjoittaa tämän avaimen\n"
  "omalla avaimellasi: \""
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Tämä tulee olemaan oma-allekirjoitus.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "En ole tarkistanut tätä avainta lainkaan.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Olen tarkistanut avaimen arkisesti.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Olen tarkistanut avaimen erittäin huolellisesti.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Varmastiko allekirjoita? "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "allekirjoitus epäonnistui: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "tallenna ja lopeta"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "näytä sormenjälki"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Allekirjoitusnotaatio: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "näytä avaimet ja käyttäjätunnukset"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "valitse käyttäjätunnus N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  #, fuzzy
  msgid "select subkey N"
  msgstr "valitse käyttäjätunnus N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "check signatures"
  msgstr "mitätöi allekirjoitus"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "allekirjoita avain paikallisesti"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "lisää käyttäjätunnus"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "lisää valokuva"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "poista käyttäjätunnus"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "poista toissijainen avain"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "lisää mitätöintiavain"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "merkitse käyttäjätunnus ensisijaiseksi"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "näytä valinnat (asiantuntija)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "näytä valinnat (monisanaisesti)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "muuta salasanaa"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "muuta luottamusastetta"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "mitätöi käyttäjätunnus"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "mitätöi toissijainen avain"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  #, fuzzy
  msgid "enable key"
  msgstr "ota avain käyttöön"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "disable key"
  msgstr "poista avain käytöstä"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "näytä valokuvatunniste"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "Salainen avain on saatavilla.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Tähän tarvitaan salainen avain.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4337,279 -3440,220 +4355,279 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "Avain on mitätöity."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "tuntematon allekirjoitusluokka"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Varmastiko poista tämä käyttäjätunnus? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Varmastiko poista tämä käyttäjätunnus? "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Sinun täytyy valita ainakin yksi avain.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Sinun täytyy valita ainakin yksi avain.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Haluatko varmasti poistaa valitut avaimet? "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Haluatko varmasti poistaa tämän avaimen? "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "näytä valinnat"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Varmastiko päivitä valinnat? "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Tallenna muutokset? "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Lopeta tallentamatta muutoksia?"
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "päivitys epäonnistui: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Avaimen luonti epäonnistui: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "virhe: sormenjälki on väärä\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "arvo ei kelpaa\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Käyttäjätunnusta ei löydy.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Tiiviste: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Ominaisuudet: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  #, fuzzy
  msgid "Notations: "
  msgstr "Notaatio: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, 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:3853
++#: g10/keyedit.c:3866
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (luottamuksellinen)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "ei voida luoda kohdetta %s: %s\n"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[mitätöity] "
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [vanhenee: %s]"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [vanhenee: %s]"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " luottamus: %c/%c"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " luottamus: %c/%c"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Tämä avain on poistettu käytöstä"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4617,19 -3661,14 +4635,20 @@@ 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:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[mitätöity] "
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4637,17 -3676,14 +4656,17 @@@ 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:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
  msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4656,35 -3692,27 +4675,35 @@@ 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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  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:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4692,38 -3720,31 +4711,38 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "%d allekirjoitus poistettu.\n"
  msgstr[1] "%d allekirjoitus poistettu.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Mitään ei poistettu.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  #, fuzzy
  msgid "invalid"
  msgstr "virheellinen ascii-koodaus"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Käyttäjätunnus \"%s\" on mitätöity."
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
  msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
  msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, 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:4505
++#: g10/keyedit.c:4521
  #, 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:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4733,39 -3754,31 +4752,39 @@@ msgstr "
  "voi\n"
  "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  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:4602
++#: g10/keyedit.c:4618
  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:4627
++#: g10/keyedit.c:4643
  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:4642
++#: g10/keyedit.c:4658
  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:4664
++#: g10/keyedit.c:4680
  #, 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:4682
++#: g10/keyedit.c:4698
  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:4688
++#: g10/keyedit.c:4704
  #, 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:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4773,243 -3786,192 +4792,243 @@@
  msgstr ""
  "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  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:4971
++#: g10/keyedit.c:4987
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Valitse tasan yksi käyttäjätunnus!\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, 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:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Haluatko varmasti käyttää sitä (k/E)? "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Haluatko varmasti käyttää sitä (k/E)? "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Allekirjoitusnotaatio: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Ylikirjoita (k/E)? "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, 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:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "käyttäjätunnus: \""
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (vientiin kelpaamaton)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Tämä allekirjoitus vanheni %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   %08lX allekirjoitti tämän %s%s\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, 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:6094
++#: g10/keyedit.c:6110
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (vientiin kelpaamaton)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, 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:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "salainen avain ei ole saatavilla\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, 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:6257
++#: g10/keyedit.c:6273
  #, 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:6370
++#: g10/keyedit.c:6386
  #, 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:6432
++#: g10/keyedit.c:6448
  #, 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:6529
++#: g10/keyedit.c:6545
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
  "(käyttäjätunnus %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "valinta %c%lu on kopio\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "liian monta \"%c\" valintaa\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "liian monta \"%c\" valintaa\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "liian monta \"%c\" valintaa\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "Valinnassa on luvaton merkki\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "kirjoitetaan suora allekirjoitus\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "kirjoitetaan oma-allekirjoitus\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "avaimen koko on pyöristetty %u bittiin\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  #, fuzzy
  msgid "Encrypt"
  msgstr "salaa tiedot"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr ""
  
@@@ -5023,157 -3985,126 +5042,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (vain salaus)\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Valitse millaisen avaimen haluat:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA ja ElGamal (oletus)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA ja ElGamal (oletus)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (vain allekirjoitus)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (vain allekirjoitus)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (vain salaus)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA ja ElGamal (oletus)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (vain allekirjoitus)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (vain salaus)\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Allekirjoitusnotaatio: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "pyöristetty %u bittiin\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Minkä kokoisen avaimen haluat? (1024) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Minkä kokoisen avaimen haluat? (1024) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Halutun avaimen koko on %u bittiä\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Valitse millaisen avaimen haluat:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5189,7 -4120,6 +5208,7 @@@ msgstr "
  "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
  "     <n>y = Avain vanhenee n vuoden kuluttua\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5205,40 -4135,32 +5224,40 @@@ msgstr "
  "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
  "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "Avain on voimassa? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Allekirjoitus on voimassa? (0) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "arvo ei kelpaa\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s ei vanhene koskaan\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s ei vanhene koskaan\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s vanhenee %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Allekirjoitus vanhenee %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5246,12 -4168,10 +5265,12 @@@ msgstr "
  "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
  "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Onko tämä oikein (k/e) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5262,7 -4182,6 +5281,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  #, fuzzy
  msgid ""
  "\n"
@@@ -5280,50 -4199,39 +5299,50 @@@ msgstr "
  "     \"Matti Meikäläinen (nuorempi) <matti.meikalainen at osoite.fi>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Oikea nimi: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Nimessä on epäkelpo merkki\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "Nimi ei voi alkaa numerolla\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "Sähköpostiosoite: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "Sähköpostiosoite ei kelpaa\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Huomautus: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Huomautuksessa on epäkelpo merkki\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Käytät merkistöä \"%s\".\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5334,7 -4242,6 +5353,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
  
@@@ -5349,35 -4256,28 +5368,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnHhSsOoLl"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Ole hyvä ja korjaa ensin virhe\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5389,13 -4289,10 +5408,13 @@@ msgstr "
  "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
  "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Avaimen luonti epäonnistui: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5403,66 -4300,53 +5422,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "\"%s\" on jo pakattu\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "luo uusi avainpari"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "Avaimen luonti keskeytetty.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "HUOM: salainen avain %08lX vanheni %s\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5471,7 -4355,6 +5490,7 @@@ msgstr "
  "Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
  "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5479,7 -4362,6 +5498,7 @@@ msgstr "
  "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
  "kellon kanssa on ongelmia)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5487,27 -4369,22 +5506,27 @@@ msgstr "
  "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
  "kellon kanssa on ongelmia)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Haluatko varmasti luoda? "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "ei koskaan"
  
@@@ -5558,30 -4426,24 +5577,30 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "Avainrengas"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Ensisijaisen avaimen sormenjälki:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "     Aliavaimen sormenjälki:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr " Ensisijaisen avaimen sormenjälki:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "      Aliavaimen sormenjälki:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  #, fuzzy
  msgid "      Key fingerprint ="
  msgstr "     Avaimen sormenjälki ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr ""
  
@@@ -5617,113 -4474,90 +5636,113 @@@ msgstr[1] "1 väärä allekirjoitus\n
  msgid "%s: keyring created\n"
  msgstr "%s: avainrengas luotu\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  #, fuzzy
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  #, fuzzy
  msgid "disabled"
  msgstr "disable"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr ""
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, fuzzy, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "virheelliset vientivalitsimet\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr ""
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
  msgstr[0] "pyydetään avainta %08lX kohteesta %s\n"
  msgstr[1] "pyydetään avainta %08lX kohteesta %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, fuzzy, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, fuzzy, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "avainta \"%s\" ei löydy: %s\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  #, fuzzy
  msgid "key not found on keyserver\n"
  msgstr "avainta \"%s\" ei löydy: %s\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr ""
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, fuzzy, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "pyydetään avainta %08lX kohteesta %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, fuzzy, c-format
  msgid "requesting key %s from %s\n"
  msgstr "pyydetään avainta %08lX kohteesta %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  msgid "no keyserver known\n"
  msgstr "virheelliset vientivalitsimet\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, fuzzy, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "ohitetaan \"%s\": %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, fuzzy, c-format
  msgid "sending key %s to %s\n"
  msgstr ""
  "\"\n"
  "allekirjoitettu avaimellasi %08lX %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  msgid "requesting key from '%s'\n"
  msgstr "pyydetään avainta %08lX kohteesta %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, fuzzy, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
@@@ -5825,135 -4639,108 +5844,135 @@@ msgstr "alkuperäisen tiedoston nimi=\"
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Allekirjoitus täsmää lähettäjään \""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Vanhentunut allekirjoitus lähettäjältä \""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Allekirjoitus täsmää lähettäjään \""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "allekirjoituksen varmistus vaiennetaan\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "näitä allekirjoituksia ei voi käsitellä\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Allekirjoitus vanheni %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "                aka \""
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr ""
  "Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                aka \""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Avain saatavilla kohteessa: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[ei tiedossa]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "                aka \""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Allekirjoitus vanheni %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Allekirjoitus vanhenee %s\n"
  
  # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binääri"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "teksti"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "tuntematon "
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "tuntematon julkisen avaimen algoritmi"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "allekirjoitus ei ole erillinen\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
  "tarkistaa.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
  
@@@ -6057,26 -4825,21 +6076,26 @@@ msgstr "pakkaamaton
  msgid "uncompressed|none"
  msgstr "pakkaamaton"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "luetaan asetukset tiedostosta \"%s\"\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  msgid "unknown option '%s'\n"
  msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "tuntematon allekirjoitusluokka"
@@@ -6377,7 -5085,21 +6396,24 @@@ msgstr "Tämä avain todennäköisesti 
  msgid "This key belongs to us\n"
  msgstr "Tämä on oma avain\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "Avaimen kuulumista nimetylle käyttäjätunnukselle EI voida varmistaa.\n"
+ "Jos *todella*  tiedät mitä olet tekemässä, vastaa seuraavaan\n"
+ "kysymykseen kyllä\n"
+ "\n"
+ 
++#: g10/pkclist.c:489
  #, fuzzy
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
@@@ -6389,135 -5111,107 +6425,135 @@@ msgstr "
  "kysymykseen kyllä\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  #, fuzzy
  msgid "Use this key anyway? (y/N) "
  msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "VAROITUS: Käytettyyn avaimeen ei luoteta!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
  "VAROITUS: tämä avain saattaa olla mitätöity (mitätöintiavainta ei "
  "saatavilla)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "VAROITUS: Tämän avaimen haltija on mitätöinyt avaimen!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  #, fuzzy
  msgid "         This could mean that the signature is forged.\n"
  msgstr "         Tämä voi merkitä sitä, että allekirjoitus on väärennös.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "VAROITUS: Haltija on mitätöinyt tämän aliavaimen!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Huom: Tämä avain on poistettu käytöstä\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Huom: Tämä avain on vanhentunut!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr ""
  "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
  "         Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
  "haltijalleen.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "         Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
  "VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n"
  "allekirjoituksella!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "         Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: ohitettu: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "Et määritellyt käyttäjätunnusta. (voit käyttää valitsinta \"-r\")\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr ""
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6525,37 -5219,29 +6561,37 @@@ msgstr "
  "\n"
  "Syötä käyttäjätunnus.  Lopeta tyhjällä rivillä: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Käyttäjätunnusta ei löydy.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "Julkinen avain on poistettu käytöstä\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "ohitettu: julkinen avain on jo asetettu\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "ei kelvollisia vastaanottajia\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "avain %08lX: ei käyttäjätunnusta\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@@ -6804,41 -5444,34 +6840,41 @@@ msgstr "
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "VAROITUS: allekirjoitustiiviste ei täsmää viestin kanssa\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, fuzzy, c-format
  msgid "please see %s for more information\n"
  msgstr " i = näytä lisätietoja\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
  "VAROITUS: allekirjoitusaliavaimella %08lX on epäkelpo ristiinvarmennus\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
  msgstr[0] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
  msgstr[1] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
  msgstr[0] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
  msgstr[1] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6851,7 -5484,6 +6887,7 @@@ msgstr[1] "
  "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
  "kellon kanssa on ongelmia)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
@@@ -6863,29 -5495,24 +6899,29 @@@ msgstr[1] "
  "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
  "kellon kanssa on ongelmia)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "HUOM: avain on mitätöity!"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, fuzzy, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
  "Epäkelpo allekirjoitus avaimelta %08lX oletettavasti johtuen tuntemattomasta "
  "\"critical bit\":istä\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
@@@ -6957,7 -5573,6 +6993,7 @@@ msgstr "
  "ohitetaan \"%s\": tämä on PGP:n luoma ElGamal-avain, jolla ei voi "
  "allekirjoittaa turvallisesti!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@@ -7005,12 -5612,10 +7041,12 @@@ msgstr "virhe etsittäessä luottamusti
  msgid "read error in '%s': %s\n"
  msgstr "lukuvirhe: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: synkronointi epäonnistui: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
@@@ -7039,7 -5639,6 +7075,7 @@@ msgstr "trustdb-tapahtuma on liian suur
  msgid "%s: directory does not exist!\n"
  msgstr "%s: hakemistoa ei ole olemassa!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
@@@ -7151,265 -5728,247 +7187,301 @@@ msgstr "yli %d merkkiä pitkiä tekstir
  msgid "input line longer than %d characters\n"
  msgstr "syöterivi on yli %d merkkiä pitkä\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Tuetut algoritmit:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr ""
+ 
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "näytä avaimet ja käyttäjätunnukset"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Käytäntö: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "näytä avaimet"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
  msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
+ #, c-format
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "%d allekirjoitusta poistettu.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
+ msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "salattu %lu salasanalla\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
+ msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7423,106 -5982,94 +7495,118 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
  msgstr "\"%s\" ei kelpaa pitkänä avaintunnuksena\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, fuzzy, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "avain %08lX: hyväksytty luotettuna avaimena\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, fuzzy, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "avain %08lX esiintyy trustdb:ssä useammin kuin kerran\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, fuzzy, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr ""
  "avain %08lX: luotetulle avaimelle ei löydy julkista avainta - ohitetaan\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, fuzzy, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "Avain on määritelty ehdottoman luotettavaksi.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "luottamustietue %lu, pyyntötyyppi %d: luku epäonnistui: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "trustdb:n tarkistusta ei tarvita\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "seuraava trustdb tarkistus %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "trustdb:n tarkistusta ei tarvita\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "trustdb:n tarkistusta ei tarvita\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "julkista avainta %08lX ei löydy: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "tee --check-trustdb, kiitos\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "tarkistetaan trustdb:tä\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "tähän mennessä käsitelty %lu avainta\n"
  msgstr[1] "tähän mennessä käsitelty %lu avainta\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7530,22 -6077,18 +7614,22 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
  msgstr[1] "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@@ -7659,143 -6181,113 +7743,145 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "muuta salasanaa"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
  msgstr "muuta salasanaa"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "Valitse mitätöinnin syy:\n"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "Valitse mitätöinnin syy:\n"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, fuzzy, c-format
- msgid "reading public key failed: %s\n"
- msgstr "avainlohkojen poisto epäonnistui: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "remove keys from the public keyring"
+ msgid "response does not contain the EC public key\n"
+ msgstr "poista avaimet julkisten avainten renkaasta"
+ 
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1551
+ #, fuzzy, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "avainlohkojen poisto epäonnistui: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7805,26 -6297,21 +7891,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Valitse mitätöinnin syy:\n"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7832,118 -6319,94 +7918,118 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "muuta salasanaa"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "virhe luettaessa avainlohkoa: %s\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  #, fuzzy
  msgid "key already exists\n"
  msgstr "\"%s\" on jo pakattu\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  #, fuzzy
  msgid "generating new key\n"
  msgstr "luo uusi avainpari"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
  msgstr "luo uusi avainpari"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI-muotoa ei tueta"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Avaimen luonti epäonnistui: %s\n"
  msgstr[1] "Avaimen luonti epäonnistui: %s\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
  # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@@ -7964,7 -6424,6 +8050,7 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8020,16 -6468,13 +8106,16 @@@ msgid "
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8049,11 -6491,9 +8135,11 @@@ msgstr "gpg-agent ei ole käytettäviss
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  #, fuzzy
  msgid "shell"
  msgstr "apua"
@@@ -8086,209 -6520,162 +8172,209 @@@ msgstr "kirjoitan salaisen avaimen koht
  msgid "certificate policy not allowed"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
  msgstr "HUOM: avain on mitätöity!"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
  msgstr "Tämä avain on vanhentunut!"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
  msgstr "Tämä avain on vanhentunut!"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
  msgstr "Tämä avain on vanhentunut!"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
  msgstr "Tämä avain on vanhentunut!"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
  msgstr "        uusia allekirjoituksia: %lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
  msgstr "Mitätöintivarmenne luotu.\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
  msgstr "virheellinen varmenne"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "näytä sormenjälki"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
  msgstr "luo mitätöintivarmenne"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr ""
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "tarkista allekirjoitus"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "valinta %c%lu on kopio\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
  msgstr "Mitätöintivarmenne luotu.\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
  msgstr "virheellinen varmenne"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8619,7 -6940,6 +8705,7 @@@ msgstr "
  msgid "certificate '%s' not found: %s\n"
  msgstr "avainta \"%s\" ei löydy: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
  msgstr "virhe luettaessa avainlohkoa: %s\n"
@@@ -8644,134 -6960,104 +8730,134 @@@ msgstr "avainlohkojen poisto epäonnist
  msgid "no valid recipients given\n"
  msgstr "(Kuvausta ei annettu)\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
  msgstr "näytä salaiset avaimet"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
  msgstr "virheellinen varmenne"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
  msgstr "virheellinen varmenne"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
  msgstr "virheellinen varmenne"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "tuota ascii-koodattu tuloste"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "älä käytä lainkaan päätettä"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "eräajo: älä kysy mitään"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NIMI|käytä salausalgoritmia NIMI"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8782,47 -7068,38 +8868,47 @@@ msgstr "
  "allekirjoita, tarkista, salaa tai avaa\n"
  "oletustoiminto riippuu syötteestä\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(Kuvausta ei annettu)\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " o = ohita tämä avain\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "kirjoitetaan kohteeseen \"%s\"\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -8840,7 -7114,6 +8926,7 @@@ msgstr "luo mitätöintivarmenne
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -8855,32 -7126,26 +8941,32 @@@ msgstr "virhe luotaessa salasanaa: %s\n
  msgid "error reading input: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
  msgstr "virhe luotaessa salasanaa: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, fuzzy, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
  msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -9770,112 -7858,88 +9856,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Lopeta tallentamatta muutoksia?"
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9889,91 -7953,72 +9979,91 @@@ msgstr "
  "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
  "sivuilta)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "käyttö: gpg [valitsimet] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "ascii-koodaaminen epäonnistui: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "ascii-koodaaminen epäonnistui: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "rivi on liian pitkä\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "virhe: sormenjälki on väärä\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "lukuvirhe: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "ei käsitelty"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10153,13 -8162,6 +10243,7 @@@ msgstr "\"%s\" ei ole JPEG-tiedosto\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
  msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
@@@ -10417,77 -8367,61 +10501,77 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "allekirjoitus epäonnistui: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "allekirjoitus epäonnistui: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "avainlohkojen poisto epäonnistui: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10535,7 -8460,6 +10619,7 @@@ msgstr "DSA vaatii 160-bittisen tiivist
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "lopeta|sulje"
@@@ -10706,11 -8589,9 +10790,11 @@@ msgstr "|NIMI|salaa vastaanottajalle NI
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
@@@ -10744,148 -8618,121 +10828,156 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "verkkovirhe"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "väärä salasana"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "julkista avainta ei löydy"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
  msgstr "tuntematon asetus \"%s\"\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
  msgstr "tuntematon asetus \"%s\"\n"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "päivitä luottamustietokanta"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "käytä tulostustiedostona"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
  msgstr "julkista avainta ei löydy"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  #, fuzzy
  msgid "No argument allowed"
  msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
diff --cc po/fr.po
index 0e09d95,4cb138f..2a323cc
--- a/po/fr.po
+++ b/po/fr.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 2.1\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2015-09-10 16:22+0200\n"
  "Last-Translator: David Prévot <david at tilapin.org>\n"
  "Language-Team: French <traduc at traduc.org>\n"
@@@ -18,7 -17,6 +18,7 @@@
  "Plural-Forms: nplurals=2; plural=(n > 1);\n"
  "X-Generator: Lokalize 1.5\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "impossible d'obtenir le verrou pinentry : %s\n"
@@@ -29,48 -27,39 +29,48 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|_Annuler"
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|Code personnel :"
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  #, fuzzy
  #| msgid "|pinentry-label|_Cancel"
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|_Annuler"
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  #| msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr ""
  "Voulez-vous vraiment supprimer de façon permanente la clef secrète OpenPGP :"
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -78,7 -67,6 +78,7 @@@ msgstr "phrase de passe incorrecte
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr "Qualité :"
  
@@@ -88,13 -76,11 +88,13 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "La qualité du texte entré ci-dessus.\n"
  "Veuillez demander à votre administrateur des précisions sur les critères."
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -102,7 -88,6 +102,7 @@@ msgstr "
  "Veuillez entrer votre code personnel, afin de débloquer la clef secrète "
  "pendant cette session"
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -110,53 -95,40 +110,53 @@@ msgstr "
  "Veuillez entrer votre phrase secrète, afin de débloquer la clef secrète "
  "pendant cette session"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Phrase secrète :"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "ne correspond pas — veuillez réessayer"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (essai %d sur %d)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr "Répéter :"
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
  msgstr "Code personnel trop long"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
  msgstr "Phrase secrète trop longue"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
  msgstr "Caractères incorrects dans le code personnel"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr "Code personnel trop court"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "Mauvais code personnel"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
  msgstr "Mauvaise phrase secrète"
  
@@@ -165,24 -136,10 +165,24 @@@
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "impossible de créer « %s » : %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "impossible d'ouvrir « %s » : %s\n"
@@@ -207,17 -160,6 +207,7 @@@ msgstr "aucune clef d'authentification 
  msgid "no suitable card key found: %s\n"
  msgstr "aucune clef de carte convenable n'a été trouvée : %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "échec de dissimulation de la clef : %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "erreur d'écriture la clef : %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -226,24 -168,19 +216,24 @@@ msgstr "
  "Un processus SSH demande à utiliser la clef%%0A  %s%%0A  (%s)%%0AVoulez-vous "
  "l'autoriser ?"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr "Autoriser"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr "Refuser"
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Veuillez entrer la phrase secrète pour la clef SSH%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Veuillez répéter cette phrase secrète"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -252,16 -189,13 +242,16 @@@ msgstr "
  "Veuillez entrer une phrase secrète pour protéger la clef secrète%%0A   %s"
  "%%0A   %s%%0Areçue dans l'espace de stockage de clefs de gpg-agent"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "échec de création du flux à partir de cette socket : %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr "Veuillez insérer la carte de numéro de série"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "Veuillez retirer la carte présente et insérer celle de numéro de série"
  
@@@ -394,8 -304,6 +384,8 @@@ msgstr "Veuillez entrer la phrase secr�
  msgid "Please enter the new passphrase"
  msgstr "Veuillez entrer la nouvelle phrase secrète"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -403,113 -311,87 +393,119 @@@ msgstr "
  "@Options :\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "exécuter en mode démon (arrière-plan)"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "exécuter en mode serveur (premier plan)"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "run in server mode"
+ msgid "run in supervised mode"
+ msgstr "exécuter en mode serveur"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "bavard"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "devenir beaucoup plus silencieux"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr "sortie de commandes à la sh"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr "sortie de commandes à la csh"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FICHIER|lire les options depuis le FICHIER"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "ne pas détacher de la console"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr "ne pas capturer le clavier et la souris"
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
  msgstr "utiliser un fichier journal pour le serveur"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr "|PROG|utiliser PROG pour entrer le code personnel"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr "|PROG|utiliser PROG comme SCdaemon"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
  msgstr "ne pas utiliser le SCdaemon"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|connect to host NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NOM|se connecter à l'hôte NOM"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr "ignorer les demandes de modification du TTY"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr "ignorer les demandes de modification d'aff. X"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr "|N|oublier les codes personnels après N secondes"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr "ne pas utiliser le cache de code pour signer"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  #| msgid "do not allow the reuse of old passphrases"
  msgid "disallow the use of an external password cache"
  msgstr "ne pas autoriser la réutilisation d'anciennes phrases secrètes"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "ne pas marquer les clefs comme de confiance"
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
  msgstr "permettre de préconfigurer la phrase secrète"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  msgid "enable ssh support"
  msgstr "activer la prise en charge de SSH"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
  msgstr "activer la prise en charge de putty"
  
@@@ -517,21 -399,14 +513,21 @@@
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "Veuillez signaler toutes anomalies sur <@EMAIL@> (en anglais)\n"
  "et tout problème de traduction à <traduc at traduc.org>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -539,138 -414,103 +535,138 @@@ msgstr "
  "Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
  "Gestionnaire de clefs secrètes pour @GNUPG@\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "niveau de débogage « %s » incorrect\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "Remarque : pas de fichier d'options par défaut « %s »\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "fichier d'options « %s » : %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "lecture des options de « %s »\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "Remarque : « %s » n'est pas considéré comme une option\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "impossible de créer la socket : %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "le nom de la socket « %s » est trop long\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr ""
  "une instance de gpg-agent fonctionne déjà —\n"
  "pas de démarrage d'une nouvelle instance\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
  msgstr "erreur de lecture du « nonce » de la socket\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "erreur de lien de la socket à « %s » : %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Avertissement : les droits de %s ne sont pas sûrs « %s »\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "échec de listen() : %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "écoute sur la socket « %s »\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, 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:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "répertoire « %s » créé\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "échec de stat() pour « %s » : %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "impossible d'utiliser « %s » comme répertoire personnel\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "erreur de lecture du « nonce » sur le descripteur %d : %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "gestionnaire 0x%lx pour le descripteur %d démarré\n"
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "gestionnaire 0x%lx pour le descripteur %d terminé\n"
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr "gestionnaire SSH 0x%lx pour le descripteur %d démarré\n"
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "gestionnaire SSH 0x%lx pour le descripteur %d terminé\n"
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "échec de npth_pselect : %s — attente 1 s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s arrêté\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr ""
  "aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
@@@ -688,8 -526,6 +684,8 @@@ msgstr "
  "Syntaxe : gpg-preset-passphrase [options] KEYGRIP\n"
  "Maintenance du cache des mots de passe\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -697,9 -533,6 +693,9 @@@ msgstr "
  "@Commandes :\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -755,7 -580,6 +751,8 @@@ msgstr "annulé\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "erreur de demande de la phrase secrète : %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "erreur d'ouverture de « %s » : %s\n"
@@@ -815,8 -630,6 +812,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Oui"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "Non"
  
@@@ -848,14 -658,12 +845,14 @@@ msgstr "Exact
  msgid "Wrong"
  msgstr "Faux"
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  "Remarque : cette phrase secrète n'a jamais été modifiée.%0AVeuillez la "
  "modifier maintenant."
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@@ -864,15 -672,12 +861,15 @@@ msgstr "
  "Cette phrase secrète n'a pas été modifiée%%0Adepuis le %.4s-%.2s-%.2s. "
  "Veuillez la modifier maintenant."
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
  msgstr "Modifier la phrase secrète"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr "Je la modifierai plus tard"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -880,11 -685,9 +877,11 @@@
  "%%0A?"
  msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  msgid "Delete key"
  msgstr "Supprimer la clef"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -903,13 -704,11 +900,13 @@@ msgstr "DSA nécessite que la taille d
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "la clef %s utilise un hachage non sûr (%u bits)\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  "un hachage de %1$zu bits n'est pas valable pour une clef %3$s de %2$u bits\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "échec de vérification de la signature créée : %s\n"
@@@ -934,83 -729,72 +931,95 @@@ msgid "protection hash algorithm %d (%s
  msgstr ""
  "l'algorithme de protection de hachage %d (%s) n'est pas pris en charge\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "erreur de création d'un tube : %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "erreur de création d'un flux pour un tube : %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "erreur de création de processus fils : %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- #| msgid "waiting for process %d to terminate failed: %s\n"
- msgid "waiting for processes to terminate failed: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
  msgstr "échec d'attente de fin du processus %d : %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "erreur d'exécution de « %s » : il n'est sans doute pas installé\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "erreur d'exécution de « %s » : code de retour %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, c-format
  msgid "error running '%s': terminated\n"
  msgstr "erreur d'exécution de « %s » : terminé\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "échec d'attente de fin du processus %d : %s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "erreur de lecture du code de retour du processus %d : %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "échec d'attente de fin du processus %d : %s\n"
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, c-format
  msgid "can't connect to '%s': %s\n"
  msgstr "impossible de se connecter à « %s » : %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "problème de configuration des options de gpg-agent\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "impossible d'empêcher la génération de fichiers « core » : %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Avertissement : le propriétaire de %s n'est pas sûr « %s »\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Avertissement : les droits de %s ne sont pas sûrs « %s »\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ #| msgid "waiting for the agent to come up ... (%ds)\n"
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "attente pour permettre à l'agent d'arriver… (%d s)\n"
+ 
++#: common/sysutils.c:685
+ #, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "impossible de renommer « %s » en « %s » : %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "oui"
  
@@@ -1064,7 -837,6 +1073,7 @@@ msgstr "hors limite de la mémoire séc
  msgid "out of core while allocating %lu bytes"
  msgstr "hors limite lors de l'allocation de %lu octets"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "erreur d'allocation de suffisamment de mémoire : %s\n"
@@@ -1084,38 -853,31 +1093,38 @@@ msgstr "Attention : « %s%s » est u
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  "pas d'instance de gpg-agent en cours d'exécution — démarrage de « %s »\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr "attente pour permettre à l'agent d'arriver… (%d s)\n"
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr "connexion à l'agent établie\n"
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  #| msgid "connection to agent established\n"
  msgid "connection to agent is in restricted mode\n"
  msgstr "connexion à l'agent établie\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr "pas d'instance de Dirmngr en cours d'exécution — démarrage de « %s »\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr "attente pour permettre au dirmngr d'arriver… (%d s)\n"
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr "connexion au dirmngr établie\n"
  
@@@ -1186,8 -932,6 +1195,8 @@@ msgstr "Clef de session créée
  msgid "algorithm: %s"
  msgstr "algorithme : %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "algorithme non pris en charge : %s"
@@@ -1262,11 -990,9 +1271,11 @@@ msgstr "Chaîne de certificats correcte
  msgid "Root certificate trustworthy"
  msgstr "Certificat racine digne de confiance"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "aucune liste de révocations trouvée pour le certificat"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
  msgstr "la liste de révocations de certificat est trop vieille"
  
@@@ -1303,7 -1021,6 +1312,7 @@@ msgstr "Pas d'aide disponible pour « 
  msgid "ignoring garbage line"
  msgstr "ligne inutile ignorée"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[aucun]"
  
@@@ -1373,7 -1075,6 +1382,7 @@@ msgstr "l'option « %.50s » est ambi
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "la commande « %.50s » est ambiguë\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
  msgstr "hors limite\n"
  
@@@ -1431,8 -1121,6 +1440,8 @@@ msgstr "verrou « %s » non effectif�
  msgid "waiting for lock %s...\n"
  msgstr "attente du verrou %s…\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
@@@ -1516,13 -1186,11 +1525,13 @@@ msgstr "
  "caractère Quoted-Printable dans l'armure provenant sans\n"
  "doute d'un serveur de courriers électroniques défectueux\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "non lisible par l'utilisateur"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1530,25 -1198,20 +1539,25 @@@ msgstr "
  "un nom de notation ne doit contenir que des caractères imprimables ou des "
  "espaces, et se terminer avec « = »\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "un nom de notation d'utilisateur doit contenir un caractère « @ »\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "un nom de notation ne doit pas contenir plus d'un caractère « @ »\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  #| msgid "a notation name must not contain more than one '@' character\n"
  msgid "a notation name may not contain an '=' character\n"
  msgstr "un nom de notation ne doit pas contenir plus d'un caractère « @ »\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
@@@ -1558,49 -1221,38 +1567,48 @@@ msgstr "
  "un nom de notation ne doit contenir que des caractères imprimables ou des "
  "espaces, et se terminer avec « = »\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "Attention : des données de notation incorrectes ont été trouvées.\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr "échec de transfert de la demande %s au client\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Entrez la phrase secrète : "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring '%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "erreur de création du porte-clefs « %s » : %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: "
  msgid "WARNING: %s\n"
  msgstr "Attention : "
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "la carte OpenPGP n'est pas disponible : %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "carte OpenPGP nº %s détectée\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "impossible de faire cela en mode automatique\n"
  
@@@ -1608,14 -1259,9 +1616,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Cette commande n'est disponible que pour les cartes en version 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
  msgstr "le code de réinitialisation n'est plus disponible\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Quel est votre choix ? "
  
@@@ -1643,123 -1283,93 +1651,123 @@@ msgstr "non forcé
  msgid "forced"
  msgstr "forcé"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr "Erreur : seul l'ASCII standard est permis pour l'instant.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "Erreur : le caractère « < » ne peut pas être utilisé.\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "Erreur : les espaces doubles ne sont pas permises.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "Nom du détenteur de la carte : "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "Prénom du détenteur de la carte : "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr "Erreur : nom combiné trop long (limité à %d caractères).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "URL pour récupérer la clef publique : "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Erreur : URL trop longue (limitée à %d caractères).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "erreur de lecture de « %s » : %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "erreur d'écriture de « %s » : %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "Données d'identification (nom du compte) : "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  "Erreur : données d'identification trop longues (limitées à\n"
  "%d caractères).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "Données DO privées : "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr "Erreur : DO privé trop long (limité à %d caractères).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "Préférences de langue : "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
  msgstr "Erreur : taille incorrecte de la chaîne de préférences.\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
  msgstr "Erreur : caractères incorrects dans la chaîne de préférences.\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "Sexe ((M)asculin, (F)éminin ou espace) : "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
  msgstr "Erreur : réponse incorrecte.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "empreinte de l'autorité de certification : "
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "Erreur : formatage incorrect de l'empreinte.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "opération sur la clef impossible : %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "ce n'est pas une carte OpenPGP"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr ""
  "erreur de lecture des renseignements actuellement contenus\n"
  "dans la clef : %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr "Faut-il remplacer la clef existante ? (o/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
@@@ -1769,58 -1379,46 +1777,58 @@@ msgstr "
  "           En cas d'échec de génération de la clef, veuillez vérifier les\n"
  "           tailles permises dans la documentation de la carte.\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Quelle taille de clef désirez-vous pour la clef de signature ? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "Quelle taille de clef désirez-vous pour la clef de chiffrement ? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr ""
  "Quelle taille de clef désirez-vous pour la clef d'authentification ? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "arrondie à %u bits\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "les tailles de clefs %s doivent être dans l'intervalle %u-%u\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  "La carte sera maintenant reconfigurée pour générer une clef de %u bits\n"
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "erreur de modification de taille de clef %d en %u bits : %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  "Faut-il faire une sauvegarde hors carte de la clef de chiffrement ? (O/n) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  msgid "Note: keys are already stored on the card!\n"
  msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr "Faut-il remplacer les clefs existantes ? (o/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1831,146 -1429,111 +1839,146 @@@ msgstr "
  "   code personnel = « %s »     code personnel d'admin. = « %s ».\n"
  "Vous devriez les modifier avec la commande --change-pin\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "Veuillez sélectionner le type de clef à générer :\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "   (1) Clef de signature\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) Clef de chiffrement\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Clef d'authentification\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Choix incorrect.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "Veuillez sélectionner l'endroit où stocker la clef :\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "échec de KEYTOCARD : %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
  msgstr "Cette commande n'est pas permise en mode %s.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  #| msgid "Note: keys are already stored on the card!\n"
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  #| msgid "Continue? (Y/n) "
  msgid "Continue? (y/N) "
  msgstr "Faut-il continuer ? (O/n) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "quitter ce menu"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
  msgstr "afficher les commandes d'administration"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "afficher cette aide"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "afficher toutes les données disponibles"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "modifier le nom du détenteur de la carte"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "modifier l'URL pour récupérer la clef"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "récupérer la clef indiquée dans l'URL de la carte"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "modifier l'identifiant de connexion"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "modifier les préférences de langue"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "modifier le sexe du détenteur de la carte"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "modifier une empreinte d'autorité de certification"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr ""
  "inverser le paramètre obligeant à entrer le code personnel pour les\n"
  "signatures"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "générer de nouvelles clefs"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "menu pour modifier ou déverrouiller le code personnel"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "vérifier le code personnel et afficher toutes les données"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr "débloquer le code personnel en utilisant un code de réinitialisation"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr "gpg/carte> "
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "La commande n'est utilisable qu'en mode administration\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "Les commandes d'administration sont permises\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "Les commandes d'administration ne sont pas permises\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Commande incorrecte (essayez « help »)\n"
  
@@@ -1978,22 -1540,14 +1986,22 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output n'est pas compatible avec cette commande\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "impossible d'ouvrir « %s »\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "clef « %s » introuvable : %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "erreur de lecture du bloc de clef : %s\n"
@@@ -2110,7 -1642,6 +2118,7 @@@ msgstr "
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s chiffré pour : « %s »\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "impossible d'utiliser %s en mode %s.\n"
@@@ -2195,56 -1711,42 +2203,56 @@@ msgstr "
  "Attention : impossible de supprimer le répertoire temporaire « %s » :\n"
  "            %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
  msgstr "exporter les signatures marquées comme locales seulement"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr "exporter les attributs d'identité (en général les photos d'identité)"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "exporter les clefs de révocation marquées comme « sensibles »"
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "supprimer les parties inutilisables de la clef pendant l'exportation"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "supprimer autant que possible de la clef pendant l'exportation"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  msgid " - skipped"
  msgstr " — ignoré"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "écriture de « %s »\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "clef %s : matériel de clef sur la carte — ignorée\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "il est interdit d'exporter les clefs secrètes\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "clef %s : clef de type PGP 2.x — ignorée\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "Attention : rien n'a été exporté\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "erreur de création de « %s » : %s\n"
@@@ -2253,8 -1754,6 +2261,8 @@@
  msgid "[User ID not found]"
  msgstr "[identité introuvable]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "(check argument of option '%s')\n"
@@@ -2277,255 -1773,196 +2285,255 @@@ msgstr "erreur de fermeture de %s : %s
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "erreur de création du porte-clefs « %s » : %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "« %s » automatiquement récupéré par %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "erreur de récupération de « %s » avec %s : %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "Aucune empreinte"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "clef secrète « %s » introuvable : %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
  "La clef incorrecte %s a été rendue valable par\n"
  "--allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr ""
  "utilisation de la sous-clef %s à la place de la clef\n"
  "principale %s\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "faire une signature"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
  msgstr "faire une signature en texte clair"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "faire une signature détachée"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "chiffrer les données"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "chiffrement symétrique seulement"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "déchiffrer les données (défaut)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "vérifier une signature"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "afficher les clefs"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "afficher les clefs et les signatures"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "afficher et vérifier les signatures de clefs"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "afficher les clefs et les empreintes"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "afficher les clefs secrètes"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "générer une nouvelle paire de clefs"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  msgid "quickly generate a new key pair"
  msgstr "générer rapidement une nouvelle paire de clefs"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "quickly generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "générer rapidement une nouvelle paire de clefs"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "quickly generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "générer rapidement une nouvelle paire de clefs"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr "générer une paire de clefs complètes"
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "générer un certificat de révocation"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "supprimer les clefs du porte-clefs public"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "supprimer les clefs du porte-clefs secret"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  msgid "quickly sign a key"
  msgstr "signer rapidement une clef"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  msgid "quickly sign a key locally"
  msgstr "signer rapidement une clef localement"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "signer une clef"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "signer une clef localement"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "signer ou éditer une clef"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
  msgstr "modifier une phrase secrète"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "exporter les clefs"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "exporter les clefs vers un serveur de clefs"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "importer les clefs d'un serveur de clefs"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "chercher les clefs avec un serveur de clefs"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "mettre à jour les clefs depuis un serveur"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "importer ou fusionner les clefs"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "afficher l'état de la carte"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "modifier les données d'une carte"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "modifier le code personnel d'une carte"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "mettre la base de confiance à jour"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
  msgstr "indiquer les fonctions de hachage"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "exécuter en mode serveur"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "créer une sortie ASCII avec armure"
  
  # NOTE: Extra initial space to realign the output (maybe wchar issue)
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|niveau de compression N (0 désactive)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "utiliser le mode texte canonique"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
  msgstr "|FICHIER|écrire la sortie dans le FICHIER"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "ne rien modifier"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "demander avant d'écraser un fichier"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr "utiliser le comportement strict d'OpenPGP"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2534,7 -1971,6 +2542,7 @@@ msgstr "
  "(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
  "et options)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2554,11 -1990,9 +2562,11 @@@ msgstr "
  " --list-keys [noms]         montrer les clefs\n"
  " --fingerprint [noms]       montrer les empreintes\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2568,7 -2002,6 +2576,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:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2576,86 -2009,71 +2584,86 @@@ msgstr "
  "\n"
  "Algorithmes pris en charge :\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "Clef publique : "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Chiffrement : "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Hachage : "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Compression : "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "utilisation : %s [options] %s\n"
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "commandes en conflit\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, 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:1529
++#: g10/gpg.c:1537
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr ""
  "Attention : le propriétaire du répertoire personnel « %s »\n"
  "            n'est pas sûr\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr ""
  "Attention : le propriétaire du fichier de configuration « %s »\n"
  "            n'est pas sûr\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr ""
  "Attention : le propriétaire de l'extension « %s »\n"
  "            n'est pas sûr\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr ""
  "Attention : les droits du répertoire personnel « %s »\n"
  "            ne sont pas sûrs\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr ""
  "Attention : les droits du fichier de configuration « %s »\n"
  "            ne sont pas sûrs\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr ""
  "Attention : les droits de l'extension « %s »\n"
  "            ne sont pas sûrs\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr ""
  "Attention : le propriétaire du répertoire contenant le répertoire personnel\n"
  "            « %s » n'est pas sûr\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2663,21 -2081,18 +2671,21 @@@ msgstr "
  "Attention : le propriétaire du répertoire contenant le fichier de\n"
  "            configuration « %s » n'est pas sûr\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr ""
  "Attention : le propriétaire du répertoire contenant l'extension\n"
  "            « %s » n'est pas sûr\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr ""
  "Attention : les droits du répertoire contenant le répertoire personnel\n"
  "            « %s » ne sont pas sûrs\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2685,527 -2100,415 +2693,533 @@@ msgstr "
  "Attention : les droits du répertoire contenant le fichier de configuration\n"
  "            « %s » ne sont pas sûrs\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr ""
  "Attention : les droits du répertoire contenant l'extension\n"
  "            « %s » ne sont pas sûrs\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "élément de configuration « %s » inconnu\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "montrer les photos d'identité en affichant les clefs"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  msgid "show key usage information during key listings"
  msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr "montrer les URL de politique en affichant les signatures"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "montrer toutes les notations en affichant les signatures"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr "utiliser les notations aux normes IETF en affichant les signatures"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  "utiliser les notations fournies par l'utilisateur en affichant les signatures"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr ""
  "montrer les URL des serveurs de clefs favoris en affichant les signatures"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr "indiquer la validité de l'identité en affichant les clefs"
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr "montrer les identités révoquées et expirées en affichant les clefs"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr "indiquer les sous-clefs révoquées et expirées en affichant les clefs"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "montrer le nom du porte-clefs en affichant les clefs"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "montrer les dates d'expiration en affichant les signatures"
  
- #: g10/gpg.c:2011
- #, fuzzy
- #| msgid "Available keys:\n"
- msgid "available TOFU policies:\n"
- msgstr "Clefs disponibles :\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "valid values for option '%s':\n"
+ msgstr "argument incorrect pour l'option « %.50s »\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  #| msgid "unknown option '%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "option « %s » inconnue\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "invalid value for option '%s'\n"
+ msgstr "argument incorrect pour l'option « %.50s »\n"
+ 
++#: g10/gpg.c:2203
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "Remarque : l'ancien fichier d'options par défaut « %s » a été ignoré\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "Remarque : %s n'est pas pour une utilisation normale.\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "« %s » n'est pas une date d'expiration de signature valable\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "ligne %d : ce n'est pas une adresse électronique valable\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "mode pinentry « %s » incorrect\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "« %s » n'est pas un jeu de caractères valable\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "impossible d'analyser l'URL du serveur de clefs\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "les options du serveur de clefs sont incorrectes\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s : %d : options d'importation incorrectes\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "options d'importation incorrectes\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "options de liste incorrectes\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s : %d : options d'exportation incorrectes\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "options d'exportation incorrectes\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s : %d : options de liste incorrectes\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "options de liste incorrectes\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "montrer les photos d'identité en vérifiant les signatures"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr "montrer les URL de politique en vérifiant les signatures"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "montrer toutes les notations en vérifiant les signatures"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  "utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
  msgstr ""
  "montrer les URL des serveurs de clefs favoris en vérifiant les signatures"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
  msgstr "indiquer la validité de l'identité en vérifiant les signatures"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  "montrer les identités révoquées et expirées en vérifiant les signatures"
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  msgid "show only the primary user ID in signature verification"
  msgstr "ne montrer que l'identité principale en vérifiant les signatures"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "valider les signatures avec les données PKA"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "augmenter la confiance des signatures avec des données PKA valables"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s : %d : options de vérification incorrectes\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "options de vérification incorrectes\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "impossible de configurer le chemin d'exécution à %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s : %d : liste de recherche automatique de clef incorrecte\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr "liste de recherche automatique de clef incorrecte\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "Attention : le programme pourrait créer un fichier « core ».\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "Attention : %s remplace %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s n'est pas permis avec %s.\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s n'a aucun sens avec %s.\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr "Attention : exécution avec un système de temps contrefait : "
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "ne sera pas exécuté avec une mémoire non sécurisée à cause de %s\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "la fonction de hachage sélectionnée est incorrecte\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "l'algorithme de compression sélectionné est incorrect\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "« completes-needed » doit être supérieur à 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "« marginals-needed » doit être supérieur à 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  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:3588
++#: g10/gpg.c:3686
  msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
  msgstr "« default-cert-level » incorrect ; doit être 0, 1, 2 ou 3\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "« min-cert-level » incorrect ; doit être , 1, 2 ou 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "Remarque : le mode S2K simple (0) est fortement déconseillé\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "mode S2K incorrect ; doit être 0, 1 ou 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "préférences par défaut incorrectes\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "préférences personnelles de chiffrement incorrectes\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "préférences personnelles de hachage incorrectes\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "préférences personnelles de compression incorrectes\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ne fonctionne pas encore avec %s\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "impossible d'utiliser l'algorithme de hachage « %s » en mode %s.\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "impossible d'utiliser l'algorithme de compression « %s » en mode %s.\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "impossible d'initialiser la base de confiance : %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  "Attention : les destinataires (-r) indiqués n'utilisent pas\n"
  "            de clef publique pour le chiffrement\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [fichier]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [fichier]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "échec du chiffrement symétrique de « %s » : %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [fichier]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [fichier]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "impossible d'utiliser --symmetric --encrypt avec --s2k-mode 0\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "impossible d'utiliser --symmetric --encrypt en mode %s\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [fichier]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [fichier]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [fichier]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr "impossible d'utiliser --symmetric --sign --encrypt avec --s2k-mode 0\n"
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "impossible d'utiliser --symmetric --sign --encrypt en mode %s\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [fichier]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [fichier]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [fichier]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key identité"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key identité"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key identité [commandes]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
  msgstr "--passwd <identité>"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "échec d'envoi vers le serveur de clefs : %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "échec de réception depuis le serveur de clefs : %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "échec d'exportation de la clef : %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "échec d'exportation de la clef : %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "échec de recherche au sein du serveur de clefs : %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "échec de déconstruction d'une armure : %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "échec de construction d'une armure : %s \n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "algorithme de hachage « %s » incorrect\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  #| msgid "error loading certificate '%s': %s\n"
  msgid "error parsing key specification '%s': %s\n"
  msgstr "erreur de chargement du certificat « %s » : %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[fichier]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Vous pouvez taper votre message…\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "l'URL de politique de certification donnée est incorrecte\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "l'URL de politique de signature donnée est incorrecte\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "l'URL du serveur de clefs favori qui a été donnée est incorrecte\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FICHIER|prendre les clefs dans le porte-clefs FICHIER"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "convertir les conflits de date en avertissements"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|écrire l'état sur ce descripteur"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Utilisation : gpgv [options] [fichiers] (-h pour l'aide)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3222,138 -2523,110 +3236,138 @@@ msgstr "Pas d'aide disponible
  msgid "No help available for '%s'"
  msgstr "Pas d'aide disponible pour « %s »"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr "importer des signatures marquées comme locales seulement"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr "réparer les données endommagées du serveur pks pendant l'importation"
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "ne pas mettre à jour la base de confiance après l'importation"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "ne pas mettre à jour la base de confiance après l'importation"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "afficher l'empreinte de la clef"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr "n'accepter que les mises à jour des clefs existantes"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
  msgstr "nettoyer les parties inutilisables de la clef après l'importation"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "supprimer autant que possible de la clef après l'importation"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "un bloc de type %d a été ignoré\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu clefs traitées jusqu'à présent\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "      Quantité totale traitée : %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "     nouvelles clefs ignorées : %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "     nouvelles clefs ignorées : %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "                sans identité : %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                    importées : %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                non modifiées : %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "          nouvelles identités : %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "         nouvelles sous-clefs : %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "         nouvelles signatures : %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "nouvelles révocations de clef : %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "          clefs secrètes lues : %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "     clefs secrètes importées : %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " clefs secrètes non modifiées : %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "                non importées : %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "         signatures nettoyées : %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "          identités nettoyées : %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3362,189 -2635,151 +3376,189 @@@ msgstr "
  "Attention : la clef %s contient des préférences pour des\n"
  "            algorithmes indisponibles pour ces identités :\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "            « %s » : préférence pour l'algorithme de chiffrement %s\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "            « %s » : préférence pour l'algorithme de hachage %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "            « %s » : préférence pour l'algorithme de compression %s\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "vous devriez mettre à jour vos préférences et redistribuer cette\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr "clef pour éviter d'éventuels problèmes d'algorithmes non appropriés\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "vous pouvez mettre à jour vos préférences avec :\n"
  "gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "clef %s : pas d'identité\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, c-format
  msgid "key %s: %s\n"
  msgstr "clef %s : %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr "rejetée par le filtre d’importation"
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "clef %s : corruption de sous-clef PKS réparée\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "clef %s : identité « %s » non autosignée acceptée\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "clef %s : pas d'identité valable\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "cela pourrait provenir d'une autosignature manquante\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "clef %s : clef publique introuvable : %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "clef %s : nouvelle clef — ignorée\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "aucun porte-clefs accessible en écriture n'a été trouvé : %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "erreur d'écriture du porte-clefs « %s » : %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "clef %s : clef publique « %s » importée\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "clef %s : ne correspond pas à notre copie\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "clef %s : impossible de trouver le bloc de clef d'origine : %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "clef %s : impossible de lire le bloc de clef d'origine : %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "clef %s : « %s » 1 nouvelle identité\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "clef %s : « %s » %d nouvelles identités\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "clef %s : « %s » 1 nouvelle signature\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "clef %s : « %s » %d nouvelles signatures\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "clef %s : « %s » 1 nouvelle sous-clef\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "clef %s : « %s » %d nouvelles sous-clefs\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "clef %s : « %s » %d signature nettoyée\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "clef %s : « %s » %d signatures nettoyées\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "clef %s : « %s » %d identité nettoyée\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "clef %s : « %s » %d identités nettoyées\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "clef %s : « %s » n'est pas modifiée\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "clef %s : clef secrète importée\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "clef %s : la clef secrète clef existe déjà\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "clef secrète %s : %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "impossible d'importer des clefs secrètes\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "clef %s : clef secrète avec chiffrement %d incorrect — ignorée\n"
@@@ -3559,179 -2794,145 +3573,179 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "clef %s : pas de clef publique — impossible d'appliquer le certificat\n"
  "          de révocation\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "clef %s : certificat de révocation incorrect : %s — rejeté\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "clef %s : « %s » certificat de révocation importé\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "clef %s : pas d'identité pour la signature\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "clef %s : algorithme à clef publique non géré avec l'identité « %s »\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "clef %s : autosignature de l'identité « %s » incorrecte\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "clef %s : algorithme à clef publique non pris en charge\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "clef %s : signature directe de clef incorrecte\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "clef %s : pas de sous-clef pour relier la clef\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "clef %s : lien à la sous-clef incorrect\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "clef %s : suppression de lien multiple aux sous-clefs\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "clef %s : pas de sous-clef pour révoquer la clef\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "clef %s : révocation de sous-clef incorrecte\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "clef %s : suppression de la révocation de sous-clefs multiples\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "clef %s : identité « %s » ignorée\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "clef %s : sous-clef ignorée\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "clef %s : signature non exportable (classe 0x%02X) — ignorée\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "clef %s : certificat de révocation au mauvais endroit — ignoré\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "clef %s : certificat de révocation incorrect : %s — ignoré\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "clef %s : signature de sous-clef au mauvais endroit — ignorée\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "clef %s : classe de signature inattendue (0x%02X) — ignorée\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "clef %s : identités en double détectées — fusionnées\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "Attention : la clef %s est peut-être révoquée :\n"
  "            récupération de la clef de révocation %s\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "Attention : la clef %s est peut-être révoquée :\n"
  "            la clef de révocation %s est absente.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "clef %s : ajout du certificat de révocation « %s »\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "clef %s : ajout de la signature directe de clef\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "erreur de création du trousseau local « %s » : %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, c-format
  msgid "error creating keyring '%s': %s\n"
  msgstr "erreur de création du porte-clefs « %s » : %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, c-format
  msgid "keybox '%s' created\n"
  msgstr "le trousseau local « %s » a été créé\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, c-format
  msgid "keyring '%s' created\n"
  msgstr "le porte-clefs « %s » a été créé\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "ressource de bloc de clef « %s » : %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  #| msgid "error opening '%s': %s\n"
  msgid "error opening key DB: %s\n"
  msgstr "erreur d'ouverture de « %s » : %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "échec de reconstruction du cache de porte-clefs : %s\n"
@@@ -3744,32 -2943,31 +3758,38 @@@ msgstr "[révocation]
  msgid "[self-signature]"
  msgstr "[autosignature]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "erreur d'allocation de mémoire : %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "clef %s : algorithme à clef publique non pris en charge\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "Bonne signature de"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  #| msgid "key %s: %s\n"
  msgid "key %s:\n"
  msgstr "clef %s : %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3777,7 -2975,6 +3797,7 @@@ msgid_plural "%d duplicate signatures r
  msgstr[0] "Identité « %s » : %d signature supprimée\n"
  msgstr[1] "Identité « %s » : %d signature supprimée\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3785,7 -2982,6 +3805,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 signature non vérifiée à cause d'une clef manquante\n"
  msgstr[1] "1 signature non vérifiée à cause d'une clef manquante\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3793,7 -2989,6 +3813,7 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d mauvaises signatures\n"
  msgstr[1] "%d mauvaises signatures\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3801,14 -2996,12 +3821,14 @@@ msgid_plural "%d signatures reordered\n
  msgstr[0] "Bonne signature de"
  msgstr[1] "Bonne signature de"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3819,17 -3012,14 +3839,17 @@@ msgstr "
  "vérifier les clefs des autres utilisateurs (en regardant les passeports, en\n"
  "vérifiant les empreintes depuis diverses sources, etc.)\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = je fais très légèrement confiance\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = je fais entièrement confiance\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3839,52 -3029,40 +3859,52 @@@ msgstr "
  "Une profondeur supérieure à 1 permet à la clef que vous signez de faire\n"
  "des signatures de confiance de votre part.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Veuillez entrer un domaine pour restreindre cette signature, ou appuyer\n"
  "sur la touche entrée pour aucun domaine.\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "L'identité « %s » est révoquée."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Voulez-vous vraiment toujours la signer ? (o/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr " Impossible de signer.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "L'identité « %s » est expiré."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "L'identité « %s » n'est pas autosignée."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "L'identité « %s » peut être signée. "
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
  msgstr "Faut-il la signer ? (o/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3893,11 -3071,9 +3913,11 @@@ msgstr "
  "L'autosignature de « %s »\n"
  "est une signature de type PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Voulez-vous la modifier en autosignature OpenPGP ? (o/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3906,13 -3082,11 +3926,13 @@@ msgstr "
  "Votre signature actuelle de « %s »\n"
  "a expiré.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Voulez-vous créer une nouvelle signature pour remplacer celle qui a\n"
  "expiré ? (o/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3921,43 -3095,34 +3941,43 @@@ msgstr "
  "Votre signature actuelle de « %s »\n"
  "est locale.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Voulez-vous la rendre complètement exportable ? (o/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "« %s » a déjà été signée localement par la clef %s\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "« %s » a déjà été signée par la clef %s\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Voulez-vous quand même encore la signer ? (o/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Rien à signer avec la clef %s\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "Cette clef a expiré."
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Cette clef va expirer le %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Voulez-vous que votre signature expire en même temps ? (O/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3966,31 -3131,25 +3986,31 @@@ msgstr "
  "Avec quel soin avez-vous vérifié que la clef à signer appartient bien à\n"
  "la personne sus-nommée ? Si vous ne savez quoi répondre, entrez « 0 ».\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Je ne répondrai pas.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Je n'ai pas vérifié du tout.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) J'ai partiellement vérifié.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) J'ai complètement vérifié.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Quel est votre choix ? (Entrez « ? » pour plus de renseignements) : "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3999,229 -3158,175 +4019,229 @@@ msgstr "
  "Voulez-vous vraiment signer cette clef avec votre\n"
  "clef « %s » (%s)\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
  msgstr "Ce sera une autosignature.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "Attention : la signature ne sera pas marquée comme non exportable.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "Attention : La signature ne sera pas marquée comme non révocable.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "La signature sera marquée comme non exportable.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "La signature sera marquée comme non révocable.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "Je n'ai pas du tout vérifié cette clef.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "J'ai partiellement vérifié cette clef.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "J'ai complètement vérifié cette clef.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
  msgstr "Voulez-vous vraiment signer ? (o/N) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "échec de la signature : %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "La clef ne possède que des éléments partiels ou stockés sur carte\n"
  "— pas de phrase secrète à modifier.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "clef %s : erreur de modification de la phrase secrète : %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "enregistrer et quitter"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "afficher l'empreinte de la clef"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  #| msgid "Enter the keygrip: "
  msgid "show the keygrip"
  msgstr "Entrez le keygrip : "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "afficher la clef et les identités"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "sélectionner l'identité N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "sélectionner la sous-clef N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "vérifier les signatures"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  "signer les identités sélectionnées [* voir ci-dessous les commandes "
  "similaires]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "signer les identités sélectionnées localement"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "signer les identités sélectionnées avec une signature de confiance"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "signer les identités sélectionnées avec une signature non révocable"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "ajouter une identité"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "ajouter une photo d'identité"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "supprimer les identités sélectionnées"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "ajouter une sous-clef"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "ajouter une clef à une carte à puce"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "déplacer une clef vers une carte à puce"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "déplacer une clef de sauvegarde vers une carte à puce"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "supprimer les sous-clefs sélectionnées"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "ajouter une clef de révocation"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "supprimer les signatures des identités sélectionnées"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr ""
  "modifier la date d'expiration de la clef ou des sous-clefs sélectionnées"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "marquer l'identité sélectionnée comme principale"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "afficher les préférences (expert)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "afficher les préférences (bavard)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "définir la liste de préférences pour les identités sélectionnées"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "définir le serveur de clefs favori pour les identités sélectionnées"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
  msgstr "définir une notation pour les identités sélectionnées"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "modifier la phrase secrète"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "modifier la confiance du propriétaire"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "révoquer les signatures des identités sélectionnées"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "révoquer les identités sélectionnées"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "révoquer la clef ou des sous-clefs sélectionnées"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "activer la clef"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "désactiver la clef"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "montrer les photos d'identité sélectionnées"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "compacter les identités inutilisables et supprimer les\n"
  "            signatures inutilisables de la clef"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "compacter les identités inutilisables et supprimer toutes\n"
  "            les signatures de la clef"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "La clef secrète est disponible.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "La clef secrète est nécessaire pour faire cela.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4233,263 -3338,204 +4253,263 @@@ msgstr "
  "  confiance (tsign), « nr » pour les signatures non révocables\n"
  "  (nrsign), ou toute combinaison possible (ltsign, tnrsign, etc.).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "La clef est révoquée."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Conseil : sélectionner les identités à signer\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "Type de signature « %s » inconnu\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Cette commande n'est pas permise en mode %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Vous devez sélectionner au moins une identité.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Vous ne pouvez pas supprimer la dernière identité.\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Faut-il vraiment supprimer toutes les identités sélectionnées ? (o/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
  msgstr "Faut-il vraiment supprimer cette identité ? (o/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
  msgstr "Faut-il vraiment déplacer la clef principale ? (o/N) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "Vous devez sélectionner exactement une clef.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "La commande attend un nom de fichier comme argument\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "Impossible d'ouvrir « %s » : %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Erreur de lecture de la clef de sauvegarde sur « %s » : %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Vous devez sélectionner au moins une clef.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Voulez-vous vraiment supprimer cette clef ? (o/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr ""
  "Voulez-vous vraiment révoquer toutes les identités sélectionnées ? (o/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Voulez-vous vraiment révoquer cette identité ? (o/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Voulez-vous vraiment révoquer toute la clef ? (o/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Voulez-vous vraiment révoquer les sous-clefs sélectionnées ? (o/N) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Voulez-vous vraiment révoquer cette sous-clef ? (o/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "La confiance du propriétaire pourrait ne pas être définie à partir de\n"
  "la base de confiance d'un tiers\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "Définir la liste de préférences en :\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Faut-il vraiment mettre à jour les préférences pour les\n"
  "identités sélectionnées ? (o/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
  msgstr "Faut-il vraiment mettre à jour les préférences ? (o/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
  msgstr "Faut-il enregistrer les modifications ? (o/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
  msgstr "Faut-il quitter sans enregistrer ? (o/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "échec de la mise à jour : %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "La clef n'a pas été modifiée donc la mise à jour est inutile.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Échec de génération de la clef : %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "« %s » n’est pas une empreinte\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "« %s » n’est pas l’empreinte principale\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "valeur incorrecte\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "No matching user IDs."
  msgstr "Pas d’identités correspondantes."
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "Nothing to sign.\n"
  msgstr "Rien à signer.\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Hachage : "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Fonctionnalités : "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "Serveur de clefs sans modification"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Serveur de clefs favori : "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "Notations : "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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 une identité de type PGP 2.x.\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "La clef suivante a été révoquée le %s par la clef %s %s\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "Cette clef peut être révoquée par la clef %s %s"
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(sensible)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "créé : %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "révoquée : %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "expirée : %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "expire : %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "utilisation : %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "nº de carte : "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "confiance : %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "validité : %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Cette clef a été désactivée"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4497,17 -3543,12 +4517,18 @@@ msgstr "
  "Veuillez remarquer que la validité affichée pour la clef n'est pas\n"
  "forcément correcte avant d'avoir relancé le programme.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "révoquée"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "expirée"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4516,15 -3557,12 +4537,15 @@@ msgstr "
  "commande\n"
  "            risque de rendre une autre identité principale par défaut.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  msgid "You may want to change its expiration date too.\n"
  msgstr "Vous pourriez modifier aussi sa date d’expiration.\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4533,36 -3571,28 +4554,36 @@@ msgstr "
  "Attention : c'est une clef de type PGP 2. Ajouter une photo d'identité\n"
  "            peut forcer certaines versions de PGP à rejeter cette clef.\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Voulez-vous vraiment toujours l'ajouter ? (o/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr ""
  "Vous ne devriez pas ajouter de photo d'identité à une clef de type PGP 2.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Cette identité existe déjà pour cette clef.\n"
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Supprimer cette bonne signature ? (o/N/q)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Supprimer cette signature incorrecte ? (o/N/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Supprimer cette signature inconnue ? (o/N/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Faut-il vraiment supprimer cette autosignature ? (o/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4570,20 -3600,16 +4591,20 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "%d signature supprimée.\n"
  msgstr[1] "%d signature supprimée.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Rien n'a été supprimé.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "incorrecte"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Identité « %s » compactée : %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4591,17 -3617,14 +4612,17 @@@ msgid_plural "User ID \"%s\": %d signat
  msgstr[0] "Identité « %s » : %d signature supprimée\n"
  msgstr[1] "Identité « %s » : %d signature supprimée\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Identité « %s » : déjà minimisée\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Identité « %s » : déjà nettoyée\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4610,43 -3633,35 +4631,43 @@@ msgstr "
  "Attention : c'est une clef de type PGP 2.x. Ajouter un révocateur désigné\n"
  "            peut forcer certaines versions de PGP à rejeter cette clef.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  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 clef de type PGP 2."
  "x.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Entrez l'identité du révocateur désigné : "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr ""
  "impossible d'utiliser une clef de type PGP 2.x comme révocateur désigné.\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr ""
  "vous ne pouvez pas utiliser une clef comme son propre révocateur désigné\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
  msgstr "cette clef à déjà été désignée comme un révocateur\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr ""
  "Attention : l'établissement d'une clef comme révocateur désigné\n"
  "            est irréversible.\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr ""
  "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4656,239 -3671,188 +4677,239 @@@ msgid "
  msgstr ""
  "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Modification de la date d'expiration d'une sous-clef.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Modification de la date d'expiration de la clef principale.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "Vous ne pouvez pas modifier la date d'expiration d'une clef v3\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "la sous-clef de signature %s a déjà une certification croisée\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  "la sous-clef %s ne signe pas et n'a donc pas besoin de certification "
  "croisée\n"
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Veuillez sélectionner exactement une identité.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "l'autosignature v3 de l'identité « %s » a été ignorée\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "Entrez l'URL de votre serveur de clefs favori : "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Voulez-vous vraiment le remplacer ? (o/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Voulez-vous vraiment le supprimer ? (o/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "Entrez la notation : "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
  msgstr "Faut-il continuer ? (o/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Pas d'identité d'indice %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Pas d'identité avec le hachage %s\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Pas de sous-clef d'indice %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Pas de sous-clef d'indice %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "identité : « %s »\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "signée par votre clef %s le %s%s%s\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (non exportable)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Cette signature a expiré le %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Voulez-vous vraiment toujours la révoquer ? (o/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr ""
  "Faut-il créer un certificat de révocation pour cette signature ? (o/N) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr "Non signée par vous.\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Vous avez signé ces identités sur la clef %s :\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (non révocable)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "révoquée par votre clef %s le %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Vous êtes sur le point de révoquer ces signatures :\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Faut-il vraiment créer les certificats de révocation ? (o/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "pas de clef secrète\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "l'identité « %s »\" est déjà révoquée.\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr ""
  "Attention : une signature d'identité date de %d secondes dans le futur\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "La clef %s est déjà révoqué.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "La sous-clef %s est déjà révoquée.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "Affichage de la photo d'identité %s de taille %ld pour la clef\n"
  "%s (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "préférence « %s » en double\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "trop de préférences de chiffrement\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "trop de préférences de hachage\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
  msgstr "trop de préférences de compression\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "élément « %s » incorrect dans la chaîne de préférences\n"
  
  # g10/keygen.c:123 ???
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "écriture de la signature directe\n"
  
  # g10/keygen.c:123 ???
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "écriture de l'autosignature\n"
  
  # g10/keygen.c:161 ???
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "écriture de la signature de lien à la clef\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "taille incorrecte ; utilisation de %u bits\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "taille arrondie à %u bits\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "Attention : certains programmes OpenPGP ne peuvent pas gérer\n"
  "            de clef DSA avec cette taille de hachage\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "Signer"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "Certifier"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "Chiffrer"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "Authentifier"
  
@@@ -4902,150 -3866,119 +4923,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "SsCcAaQq"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Actions possibles pour une clef %s : "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "Actions actuellement permises : "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Inverser la capacité de signature\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Inverser la capacité de chiffrement\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Inverser la capacité d'authentification\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Terminé\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Sélectionnez le type de clef désiré :\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA et RSA (par défaut)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA et Elgamal\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (signature seule)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (signature seule)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (chiffrement seul)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (chiffrement seul)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (indiquez vous-même les capacités)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (indiquez vous-même les capacités)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC et ECC\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (signature seule)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (indiquez vous-même les capacités)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (chiffrement seul)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) Clef existante\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Entrez le keygrip : "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Ce n'est pas un keygrip valable (40 chiffres hexadécimaux attendus)\n"
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Pas de clef avec ce keygrip\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "arrondie à %u bits\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "les clefs %s peuvent faire une taille comprise entre %u et %u bits.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Quelle taille de clef désirez-vous pour la sous-clef ? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Quelle taille de clef désirez-vous ? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "La taille demandée est %u bits\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Sélectionnez le type de courbe elliptique désiré :\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5061,7 -3994,6 +5082,7 @@@ msgstr "
  "      <n>m = la clef expire dans n mois\n"
  "      <n>y = la clef expire dans n ans\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5078,38 -4010,30 +5099,38 @@@ msgstr "
  "      <n>m = la signature expire dans n mois\n"
  "      <n>y = la signature expire dans n ans\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "Pendant combien de temps la clef est-elle valable ? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Pendant combien de temps la signature est-elle valable ? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "valeur incorrecte\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "La clef n'expire pas du tout\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "La signature n'expire pas du tout\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "La clef expire le %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "La signature expire le %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5117,11 -4041,9 +5138,11 @@@ msgstr "
  "Le système ne peut pas afficher les dates au-delà de 2038.\n"
  "Cependant, la gestion des dates sera correcte jusqu'en 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "Est-ce correct ? (o/N) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5135,7 -4057,6 +5156,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5151,49 -4072,38 +5172,49 @@@ msgstr "
  "   « Heinrich Heine (le poète) <heinrichh at duesseldorf.de> »\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Nom réel : "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Caractère incorrect dans le nom\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "Le nom ne doit pas commencer par un chiffre\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "Le nom doit contenir au moins cinq caractères\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "Adresse électronique : "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "Ce n'est pas une adresse électronique valable\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Commentaire : "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Caractère incorrect dans le commentaire\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Vous utilisez le jeu de caractères « %s ».\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5204,7 -4114,6 +5225,7 @@@ msgstr "
  "    « %s »\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Ne mettez pas d'adresse électronique dans le nom réel ou dans le "
@@@ -5221,34 -4130,27 +5242,34 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcAaOoQq"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr ""
  "Changer le (N)om, le (C)ommentaire, l'(A)dresse électronique ou (Q)uitter ? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
  "Changer le (N)om, le (C)ommentaire, l'(A)dresse électronique\n"
  "ou (O)ui/(Q)uitter ? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Changer le (N)om, l’(A)dresse électronique ou (Q)uitter ? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Changer le (N)om, l'(A)dresse électronique ou (O)ui/(Q)uitter ? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Veuillez d'abord corriger l'erreur\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5260,13 -4162,10 +5281,13 @@@ msgstr "
  "pendant la génération de nombres premiers ; cela donne au générateur de\n"
  "nombres aléatoires une meilleure chance d'obtenir suffisamment d'entropie.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Échec de génération de la clef : %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5277,64 -4176,51 +5298,64 @@@ msgstr "
  "   « %s »\n"
  "\n"
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr "Faut-il continuer ? (O/n) "
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Une clef pour « %s » existe déjà\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  msgid "Create anyway? (y/N) "
  msgstr "Faut-il quand même créer ? (o/N) "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  msgid "creating anyway\n"
  msgstr "création quand même\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  "Remarque : Utilisez « %s %s » pour une fenêtre de dialogue de génération de "
  "clef complète.\n"
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "La génération de clef a été annulée.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "impossible de créer le fichier de sauvegarde « %s » : %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "Remarque : sauvegarde de la clef de la carte dans « %s »\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "écriture de la clef publique dans « %s »\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "aucun porte-clefs public accessible en écriture n'a été trouvé : %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "les clefs publique et secrète ont été créées et signées.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5343,7 -4229,6 +5364,7 @@@ msgstr "
  "pouvez\n"
  "utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5351,7 -4236,6 +5372,7 @@@ msgstr "
  "la clef a été créée %lu seconde dans le futur (faille temporelle ou\n"
  "problème d'horloge)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5359,26 -4243,21 +5380,26 @@@ msgstr "
  "la clef a été créée %lu secondes dans le futur (faille temporelle ou\n"
  "problème d'horloge)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr ""
  "Remarque : la création de sous-clefs pour des clefs v3 n'est pas compatible\n"
  "           avec OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Les parties secrètes de la clef principale ne sont pas disponibles.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr ""
  "Les parties secrètes de la clef principale sont stockées sur la carte.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
  msgstr "Faut-il vraiment la créer ? (o/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "jamais    "
  
@@@ -5430,29 -4300,23 +5451,29 @@@ msgstr[1] "Attention : %lu clefs igno
  msgid "Keyring"
  msgstr "Porte-clefs"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Empreinte de clef principale :"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "   Empreinte de la sous-clef :"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr "Empreinte clef princip. :"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr " Empreinte de sous-clef :"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr " Empreinte de la clef ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr " Nº de série de carte ="
  
@@@ -5490,55 -4349,43 +5511,55 @@@ msgstr[1] "1 mauvaise signature\n
  msgid "%s: keyring created\n"
  msgstr "%s : porte-clefs créé\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr "inclure les clefs révoquées dans les résultats de recherche"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr "inclure les sous-clefs en cherchant par identifiant de clef"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr "récupérer les clefs automatiquement en vérifiant les signatures"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "respecter l'URL de serveur de clefs favori indiqué dans la clef"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  "respecter l'enregistrement PKA positionné sur une clef en récupérant les "
  "clefs"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "désactivée"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr "Entrez le ou les nombres, (S)uivant, ou (Q)uitter > "
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "protocole de serveur de clefs incorrect (nous %d!=gestionnaire %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "« %s » n'est pas un identifiant de clef : ignoré\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  #| msgid "refreshing %d keys from %s\n"
  msgid "refreshing %d key from %s\n"
@@@ -5546,58 -4393,47 +5567,58 @@@ msgid_plural "refreshing %d keys from %
  msgstr[0] "rafraîchissement de %d clefs à partir de %s\n"
  msgstr[1] "rafraîchissement de %d clefs à partir de %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr ""
  "Attention : impossible de rafraîchir la clef %s\n"
  "            avec %s : %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "clef « %s » introuvable sur le serveur de clefs\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "clef introuvable sur le serveur de clefs\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr "pas de serveur de clefs connu (utilisez l'option --keyserver)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "demande de la clef %s sur le serveur %s %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "requête de la clef %s sur %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  #| msgid "no keyserver action!\n"
  msgid "no keyserver known\n"
  msgstr "pas d'action pour le serveur de clefs.\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "« %s » a été ignorée : %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "envoi de la clef %s à %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, c-format
  msgid "requesting key from '%s'\n"
  msgstr "requête de la clef sur « %s »\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "Attention : impossible de récupérer l'URI %s : %s\n"
@@@ -5699,129 -4515,102 +5720,129 @@@ msgstr "nom de fichier original : « 
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr "Attention : plusieurs textes en clair ont été vus\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "révocation autonome — utilisez « gpg --import » pour l'appliquer\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "aucune signature trouvée\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "MAUVAISE signature de « %s »"
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Signature expirée de « %s »"
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Bonne signature de « %s »"
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "vérification de signature supprimée\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "impossible de traiter ces données ambiguës de signature\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Signature faite le %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               avec la clef %s %s\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Signature faite le %s avec la clef %s d'identifiant %s\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                alias « %s »"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Clef disponible sur : "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[doute]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                alias « %s »"
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "La signature a expiré le %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "La signature expire le %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "signature %s, algorithme de hachage %s%s%s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binaire"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "mode texte"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "inconnu"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  msgid ", key algorithm "
  msgstr ", algorithme de clef "
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Impossible de vérifier la signature : %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "la signature n'est pas détachée\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "Attention : plusieurs signatures ont été détectées.\n"
  "            Seule la première sera vérifiée.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "signature autonome de classe 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "signature d'un ancien type (PGP 2.x)\n"
  
@@@ -5928,28 -4698,23 +5949,28 @@@ msgstr "Non compressé
  msgid "uncompressed|none"
  msgstr "non compressé|non|sans"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "ce message ne sera pas utilisable par %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "option « %s » ambiguë\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, c-format
  msgid "unknown option '%s'\n"
  msgstr "option « %s » inconnue\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  "une clef publique ECDSA est censée être dans un encodage SEC multiple de "
  "8 bits\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  #| msgid "Unknown signature type '%s'\n"
  msgid "unknown weak digest '%s'\n"
@@@ -6250,7 -4960,26 +6271,29 @@@ msgstr "Cette clef appartient sans dout
  msgid "This key belongs to us\n"
  msgstr "Cette clef nous appartient\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ #| msgid "root certificate has now been marked as trusted\n"
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "le certificat racine a maintenant été marqué de confiance\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "La clef n'appartient PAS forcément à la personne nommée\n"
+ "dans l'identité. Si vous savez *vraiment* ce que vous\n"
+ "faites, vous pouvez répondre oui à la prochaine question.\n"
+ "\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6261,136 -4990,108 +6304,136 @@@ msgstr "
  "faites, vous pouvez répondre oui à la prochaine question.\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "Faut-il quand même utiliser cette clef ? (o/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "Attention : utilisation d'une clef sans confiance.\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
  "Attention : cette clef est peut-être révoquée (clef de révocation absente)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "Attention : cette clef a été révoquée par son révocateur désigné.\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "Attention : cette clef à été révoquée par son propriétaire.\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
  msgstr ""
  "            Cela pourrait signifier que la signature est contrefaite.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "Attention : cette sous-clef à été révoquée par son propriétaire.\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Remarque : cette clef a été désactivée.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr "Remarque : l'adresse vérifiée du signataire est « %s »\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  "Remarque : l'adresse du signataire « %s » ne correspond pas à l'entrée DNS\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr "confiance ajustée à TOTALE car les renseignements PKA sont conformes\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr "confiance ajustée à JAMAIS à cause de mauvais renseignements PKA\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Remarque : cette clef a expiré.\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr ""
  "Attention : cette clef n'est pas certifiée avec une signature de confiance.\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
  "            Rien n'indique que la signature appartient à son propriétaire.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "Attention : nous n'avons PAS confiance en cette clef.\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "            La signature est sans doute CONTREFAITE.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
  "Attention : cette clef n'a pas suffisamment de signatures de confiance.\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr ""
  "            Aucune certitude que la signature appartienne à son "
  "propriétaire.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s : ignoré : %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s : ignoré : la clef publique est désactivée\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s : ignoré : clef publique déjà présente\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to '%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "impossible de se connecter à « %s » : %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  #| msgid "line %d: invalid date given\n"
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "ligne %d : date donnée incorrect\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  #| msgid "line %d: invalid date given\n"
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "ligne %d : date donnée incorrect\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "Vous n'avez pas indiqué d'identité (vous pouvez utiliser « -r »).\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "Destinataires actuels :\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6398,38 -5099,30 +6441,38 @@@ msgstr "
  "\n"
  "Entrez l'identité, en terminant par une ligne vide : "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Cette identité n'existe pas.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr ""
  "ignoré : la clef publique est déjà définie en destinataire par défaut\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "La clef publique est désactivée.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "ignoré : clef publique déjà activée\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "destinataire par défaut « %s » inconnu\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "pas de destinataire valable\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Remarque : la clef %s n'a pas de fonctionnalité %s\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Remarque : la clef %s n'a pas de préférence pour %s\n"
@@@ -6699,28 -5346,23 +6742,28 @@@ msgid "%s key %s requires a %zu bit or 
  msgstr ""
  "la clef %s %s nécessite un hachage d'au moins %zu bits (le hachage est %s)\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "Attention : conflit de hachage de signature dans le message\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr ""
  "Attention : la sous-clef de signature %s n'a pas de certificat croisé\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
  msgstr "veuillez consulter %s pour plus de renseignements\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
  "Attention : la sous-clef de signature %s a un certificat croisé incorrect\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu second newer than the signature\n"
@@@ -6730,7 -5372,6 +6773,7 @@@ msgstr[0] "
  msgstr[1] ""
  "la clef publique %s est plus récente de %lu seconde que la signature\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu day newer than the signature\n"
@@@ -6740,7 -5381,6 +6783,7 @@@ msgstr[0] "
  msgstr[1] ""
  "la clef publique %s est plus récente de %lu seconde que la signature\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6755,7 -5395,6 +6798,7 @@@ msgstr[1] "
  "la clef %s a été créée %lu seconde dans le futur\n"
  "(faille temporelle ou problème d'horloge)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6769,30 -5408,25 +6812,30 @@@ msgstr[1] "
  "la clef %s a été créée %lu seconde dans le futur\n"
  "(faille temporelle ou problème d'horloge)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "Remarque : la clef de signature %s a expiré le %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "Remarque : la clef de signature %s a été révoquée\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
  "la signature de la clef %s est supposée être fausse car un bit\n"
  "critique est inconnu\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr ""
  "clef %s : pas de sous-clef pour la signature de révocation de sous-clef\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "clef %s : pas de sous-clef pour la signature de lien à la sous-clef\n"
@@@ -6867,7 -5490,6 +6910,7 @@@ msgstr "
  "c'est une clef Elgamal générée par PGP qui n'est pas sûre pour les "
  "signatures."
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "enregistrement de confiance %lu, type %d : échec d'écriture : %s\n"
@@@ -6912,12 -5526,10 +6955,12 @@@ msgstr "impossible de trouver l'enregis
  msgid "read error in '%s': %s\n"
  msgstr "erreur de lecture dans « %s » : %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "base de confiance : échec de synchronisation : %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "impossible de créer un verrou pour « %s »\n"
@@@ -6947,7 -5554,6 +6990,7 @@@ msgstr "transaction de base de confianc
  msgid "%s: directory does not exist!\n"
  msgstr "%s : le répertoire n'existe pas.\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "impossible d'accéder à « %s » : %s\n"
@@@ -7056,179 -5640,170 +7099,208 @@@ msgstr "impossible de traiter les ligne
  msgid "input line longer than %d characters\n"
  msgstr "la ligne d'entrée est plus longue que %d caractères\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "erreur d'envoi d'options standards : %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "algorithme non pris en charge : %s"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "erreur d'envoi de données : %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing base64 encoding: %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "erreur d'écriture en encodage base64 : %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "error initializing reader object: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "erreur d'initialisation de l'objet lecteur : %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  #| msgid "error opening '%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "erreur d'ouverture de « %s » : %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "erreur d'envoi de données : %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr ""
+ 
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  #| msgid "error getting responder ID: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "erreur de lecture de l'identifiant de répondeur : %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "afficher la clef et les identités"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "validité : %s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "erreur de lecture des options stockées : %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "afficher les clefs"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "indiquer les fonctions de hachage"
  msgstr[1] "indiquer les fonctions de hachage"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1746
+ #, c-format
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ #| msgid "error writing key: %s\n"
+ msgid "resetting keydb: %s\n"
+ msgstr "erreur d'écriture la clef : %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  #| msgid "error setting OCSP target: %s\n"
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "erreur de configuration de la cible OCSP : %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
@@@ -7236,94 -5811,87 +7308,103 @@@ msgstr "erreur de création d'un tube 
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "%d signatures supprimées\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "indiquer les fonctions de hachage"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "indiquer les fonctions de hachage"
+ msgstr[1] "indiquer les fonctions de hachage"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "chiffré avec %lu phrases secrètes\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "indiquer les fonctions de hachage"
+ msgstr[1] "indiquer les fonctions de hachage"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7337,106 -5905,95 +7418,118 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "erreur d'envoi de données : %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring '%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
+ 
++#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
  msgstr "« %s » n'est pas un identifiant valable de clef longue\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "clef %s : acceptée comme clef de confiance\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "la clef %s apparaît plusieurs fois dans la base de confiance\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr "clef %s : pas de clef publique pour la clef de confiance — ignorée\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "clef %s marquée de confiance ultime.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr ""
  "enregistrement de confiance %lu, type de requête %d : échec de lecture : %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "l'enregistrement de confiance %lu n'est pas du type %d demandé\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  "Vous pourriez essayer de recréer la base de confiance avec les commandes :\n"
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr "Si cela ne fonctionne pas, veuillez consulter le mode d'emploi\n"
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "impossible d'utiliser ce modèle de confiance inconnu (%d) —\n"
  "     utilisation du modèle de confiance %s à la place\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "utilisation du modèle de confiance %s\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "inutile de vérifier la base de confiance\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "la prochaine vérification de la base de confiance aura lieu le %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr ""
  "inutile de vérifier la base de confiance avec le modèle de\n"
  "     confiance « %s »\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr ""
  "inutile de mettre à jour la base de confiance avec le modèle de\n"
  "     confiance « %s »\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "clef publique %s introuvable : %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "veuillez faire un --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "vérification de la base de confiance\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7444,7 -6001,6 +7537,7 @@@ msgid_plural "%d keys processed
  msgstr[0] "%lu clefs traitées jusqu'à présent\n"
  msgstr[1] "%lu clefs traitées jusqu'à présent\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7452,16 -6008,13 +7545,16 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d clefs traitées (%d comptes de validité réinitialisés)\n"
  msgstr[1] "%d clefs traitées (%d comptes de validité réinitialisés)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "aucune clef de confiance ultime n'a été trouvée\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "la clef publique de la clef de confiance ultime %s est introuvable\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7469,7 -6022,6 +7562,7 @@@ msgstr "
  "profondeur : %d  valables : %3d  signées : %3d\n"
  "     confiance : %d i., %d n.d., %d j., %d m., %d t., %d u.\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7584,60 -6115,47 +7677,60 @@@ msgstr "
  "Syntaxe : kbxutil [options] [fichiers]\n"
  "Afficher, exporter, importer les données de trousseau local\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "le module RSA est manquant ou sa taille n'est pas de %d bits\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "l'exposant public RSA est manquant ou plus grand que %d bits\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "le rappel du code personnel a renvoyé une erreur : %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr "le code personnel nul n'a pas encore été modifié\n"
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "|N|Veuillez entrer un nouveau code personnel pour les clefs standards."
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
  msgstr "||Veuillez entrer le code personnel pour les clefs standards."
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr ""
  "|NP|Veuillez entrer un nouveau code de déblocage personnel (CDP) pour les "
  "clefs standards."
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr ""
  "|P|Veuillez entrer le code de déblocage personnel (CDP) pour les clefs "
  "standards."
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  "|N|Veuillez entrer un nouveau code personnel pour permettre à la clef de "
  "créer des signatures qualifiées."
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  "||Veuillez entrer le code personnel pour permettre à la clef de créer des "
  "signatures qualifiées."
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7645,7 -6163,6 +7738,7 @@@ msgstr "
  "|NP|Veuillez entrer un nouveau code de déblocage personnel (CDP) pour "
  "permettre à la clef de créer des signatures qualifiées."
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7653,85 -6170,69 +7746,87 @@@ msgstr "
  "|P|Veuillez entrer le code de déblocage personnel (CDP) pour permettre à la "
  "clef de créer des signatures qualifiées."
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "erreur de lecture du nouveau code personnel : %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "impossible de stocker l'empreinte : %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "impossible de stocker la date de création : %s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "échec de lecture de clef publique : %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "la réponse ne contient pas les données de clef publique\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr "la réponse ne contient pas le module RSA\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr "la réponse ne contient pas l'exposant public RSA\n"
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "response does not contain the EC public point\n"
+ msgid "response does not contain the EC public key\n"
  msgstr "la réponse ne contient pas le point public EC\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "la réponse ne contient pas les données de clef publique\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "échec de lecture de clef publique : %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "utilisation du code personnel par défaut en tant que %s\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "impossible d'utiliser le code personnel par défaut en tant que %s :\n"
  "%s — désactivation de la prochaine utilisation par défaut\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Veuillez entrer le code personnel%%0A[signatures faites : %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
  msgstr "||Veuillez entrer le code personnel"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  "le code personnel pour CHV%d est trop court ; la taille minimale\n"
  "est %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "échec de vérification CHV%d : %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "erreur de récupération de l'état CHV de la carte\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr "la carte est irrémédiablement bloquée.\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7746,26 -6247,21 +7841,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr ""
  "|A|Veuillez entrer le code personnel d'administration%%0A[tentatives "
  "restantes : %d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Veuillez entrer le code personnel d'administration"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr "l'accès aux commandes d'administration n'est pas configuré\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Veuillez entrer le code de réinitialisation pour la carte"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7775,83 -6271,65 +7870,83 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr "|RN|Nouveau code de réinitialisation"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Nouveau code personnel d'administration"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|Nouveau code personnel"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr ""
  "||Veuillez entrer le code personnel d'administration et le nouveau code "
  "personnel d'administration"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Veuillez entrer le code personnel et le nouveau code personnel"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
  msgstr "erreur de lecture des données d'application\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "erreur de lecture de l'empreinte DO\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "la clef existe déjà\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr "la clef existante sera remplacée\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "génération d'une nouvelle clef\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
  msgstr "écriture d'une nouvelle clef\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "la date de création est manquant\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  "le nombre premier RSA %s est manquant ou sa taille n'est pas de\n"
  "%d bits\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "impossible de stocker la clef : %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI non pris en charge"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "veuillez patienter pendant la génération de la clef…\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
  msgstr "échec de génération de la clef\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -7859,32 -6337,26 +7954,32 @@@ msgid_plural "key generation completed 
  msgstr[0] "la génération de clef est terminé (%d secondes)\n"
  msgstr[1] "la génération de clef est terminé (%d secondes)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "structure de carte OpenPGP incorrecte (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr "l'empreinte de la carte ne correspond pas à celle demandée\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "signatures créées jusqu'à présent : %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "la vérification du code personnel d'administration est actuellement\n"
  "interdite avec cette commande\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr ""
@@@ -7906,7 -6375,6 +8001,7 @@@ msgstr "|N|Nouveau code personnel initi
  msgid "run in multi server mode (foreground)"
  msgstr "exécuter en mode multiserveur (premier plan)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NIVEAU|définir le niveau de débogage à NIVEAU"
  
@@@ -7958,18 -6415,15 +8053,18 @@@ msgstr "
  "Syntaxe : scdaemon [options] [commande [arguments]]\n"
  "Démon de carte à puce pour @GNUPG@\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  "veuillez utiliser l'option « --daemon » pour exécuter le programme\n"
  "en arrière-plan\n"
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "gestionnaire pour le descripteur %d démarré\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "gestionnaire pour le descripteur %d terminé\n"
@@@ -7991,11 -6442,9 +8086,11 @@@ msgstr "
  msgid "validation model requested by certificate: %s"
  msgstr "modèle de validation demandé par le certificat : %s"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr "chaîne"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr "invite"
  
@@@ -8026,201 -6469,154 +8121,201 @@@ msgstr "Remarque : politique de certif
  msgid "certificate policy not allowed"
  msgstr "politique de certificat non autorisée"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr "recherche d'émetteur à l'extérieur\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr "nombre d'émetteurs correspondants : %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr "recherche d'émetteur dans le cache du Dirmngr\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "nombre de certificats correspondants : %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "échec de recherche de clef seulement dans le cache du dirmngr : %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "impossible d'allouer la gestion de base de clefs\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
  msgstr "le certificat a été révoquée"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "l'état du certificat est inconnu"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr "veuillez vous assurer que le « dirmngr » est correctement installé\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
  msgstr "échec de vérification de la liste de révocations de certificat : %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "certificat avec validité incorrecte : %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr "certificat pas encore valable"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
  msgstr "certificat racine pas encore valable"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr "certificat intermédiaire pas encore valable"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
  msgstr "le certificat a expiré"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
  msgstr "le certificat racine a expiré"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
  msgstr "le certificat intermédiaire a expiré"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr "des attributs nécessaires du certificat sont manquants : %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
  msgstr "certificat avec validité incorrecte"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr "signature non créée pendant la durée de vie du certificat"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr "certificat non créé pendant la durée de vie de l'émetteur"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  "certificat intermédiaire non créé pendant la durée de vie de l'émetteur"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  (       signature créée le "
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "  (       certificat créé le "
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
  msgstr "  (certificat valable depuis "
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr "  (  émetteur valable depuis "
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "empreinte=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr "le certificat racine a maintenant été marqué de confiance\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr "marquage de confiance interactif non activé dans gpg-agent\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr "marquage de confiance interactif désactivé pour cette session\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  "Attention : date de création de la signature inconnue — date supposée "
  "actuelle"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "aucun émetteur trouvé dans le certificat"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr "certificat autosigné avec une mauvaise signature"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr "le certificat racine n'est pas marqué de confiance"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "échec de vérification de la liste de confiance : %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr "chaîne de certificats trop longue\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "certificat d'émetteur introuvable"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
  msgstr "certificat avec une mauvaise signature"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  "un autre certificat d'autorité de certification pouvant correspondre a été "
  "trouvé — nouvel essai"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  "chaîne de certificats plus longue que celle autorisée par l'autorité de "
  "certification (%d)"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "le certificat est correct\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
  msgstr "le certificat intermédiaire est correct\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
  msgstr "le certificat racine est correct\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr "basculement en modèle chaîne"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr "modèle de validation utilisé : %s"
@@@ -8550,7 -6880,6 +8645,7 @@@ msgstr "(ça ne ressemble pas à un mes
  msgid "certificate '%s' not found: %s\n"
  msgstr "certificat « %s » introuvable : %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
  msgstr "erreur de verrouillage du trousseau local : %s\n"
@@@ -8574,123 -6899,93 +8669,123 @@@ msgstr "échec de suppression du certif
  msgid "no valid recipients given\n"
  msgstr "aucune destinataire valable donnée\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
  msgstr "afficher les clefs externes"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
  msgstr "afficher la chaîne de certificats"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
  msgstr "importer les certificats"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
  msgstr "exporter les certificats"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "enregistrer une carte à puce"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "passer une commande au dirmngr"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr "appeler gpg-protect-tool"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
  msgstr "créer une sortie encodée en base-64"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr "entrée supposée au format PEM"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr "entrée supposée au format base-64"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr "entrée supposée au format binaire"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr "ne pas consulter liste de révocations de cert."
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr "vérifier la validité avec OCSP"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr "|N|nombre de certificats à inclure"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr "|FICHIER|prendre renseignements de politique du FICHIER"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr "ne pas vérifier les politiques de certificat"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr "récupérer certificats d'émetteur manquants"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "ne pas utiliser du tout le terminal"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FICHIER|écrire un journal serveur dans le FICHIER"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FICHIER|écrire un journal d'audit dans le FICHIER"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "mode automatique : aucune question"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "oui comme réponse à la plupart des questions"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "non comme réponse à la plupart des questions"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FICHIER|ajouter le trousseau à la liste de trousseaux"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|IDENTITÉ| utiliser IDENTITÉ comme clef secr. par défaut"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|utiliser ce serveur pour rechercher les clefs"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOM|utiliser l'algorithme de hachage NOM"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Utilisation : @GPGSM@ [options] [fichiers] (-h pour l'aide)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8700,46 -6995,37 +8795,46 @@@ msgstr "
  "Signer, vérifier, chiffrer ou déchiffrer en utilisant le protocole S/MIME\n"
  "L'opération par défaut dépend des données entrées\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "Remarque : ne sera pas capable de chiffrer à « %s » : %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "modèle de validation « %s » inconnu\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s : %u : aucun nom d'hôte donné\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s : %u : mot de passe donné sans utilisateur\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s : %u : ignorer cette ligne\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
  msgstr "impossible d'analyser le serveur de clefs\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "importation des certificats commun « %s »\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "impossible de signer en utilisant « %s » : %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr "commande incorrecte (il n'y a pas de commande implicite)\n"
  
@@@ -8756,7 -7039,6 +8851,7 @@@ msgstr "erreur de stockage du certifica
  msgid "basic certificate checks failed - not imported\n"
  msgstr "échec des vérifications de base du certificat — non importé\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "erreur de lecture des options stockées : %s\n"
@@@ -8771,31 -7051,25 +8866,31 @@@ msgstr "erreur d'importation du certifi
  msgid "error reading input: %s\n"
  msgstr "erreur de lecture de l'entrée : %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
  msgstr "impossible d'obtenir l'empreinte\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr "problème de recherche de certificat existant : %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "impossible de trouver une base de clefs inscriptible : %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
  msgstr "erreur de stockage du certificat : %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "problème de nouvelle recherche de certificat : %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
  msgstr "erreur de stockage des options : %s\n"
@@@ -9723,116 -7820,92 +9818,120 @@@ msgstr "nom de fichier absolu attendu\n
  msgid "looking up '%s'\n"
  msgstr "recherche de « %s »\n"
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr "afficher le contenu du cache de la liste de révocations de certificat"
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  msgid "|FILE|load CRL from FILE into cache"
  msgstr ""
  "|FICHIER|charger la liste de révocations de certificat du FICHIER dans le "
  "cache"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|récupérer une liste de révocations de certificat d'une URL"
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr "arrêter le dirmngr"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr "vider le cache"
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  msgid "run without asking a user"
  msgstr "exécuter sans demander à l'utilisateur"
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr "forcer le chargement des listes de révocations de certificat obsolètes"
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr "permettre l'envoi de requêtes OCSP"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr "interdire l'utilisation d'HTTP"
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr "interdire l'utilisation de LDAP"
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  "ignorer les points de distribution de liste de révocations de certificat en "
  "HTTP"
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  "ignorer les points de distribution de liste de révocations de certificat en "
  "LDAP"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "ignorer les URL de service OCSP contenues dans le certificat"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|rediriger toutes les requêtes HTTP vers l'URL"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HÔTE|utiliser l'HÔTE pour les requêtes LDAP"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "ne pas utiliser d'hôtes de repli avec --ldap-proxy"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FICHIER|lire la liste de serveurs LDAP depuis le FICHIER"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  "ajouter les nouveaux serveurs découverts dans les points de distribution de "
  "liste de révocations de certificat à la liste de serveurs"
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|définir le temps d'expiration de LDAP à N secondes"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|utiliser le répondeur OCSP à l'URL"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|EMPR|réponse OCSP signée par EMPR"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|ne pas renvoyer plus de N éléments dans une requête"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|FICHIER|utiliser les certificats de CA dans FICHIER pour HKP par TLS"
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9842,11 -7915,9 +9941,11 @@@ msgstr "
  "(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
  "et options)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Utilisation : @DIRMNGR@ [options] (-h pour l'aide)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9855,79 -7926,62 +9954,79 @@@ msgstr "
  "Serveur de clefs, liste de révocations de certificat et accès OCSP pour "
  "@GNUPG@\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "les niveaux de débogage possibles sont : %s\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, c-format
  msgid "usage: %s [options] "
  msgstr "utilisation : %s [options] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  msgid "colons are not allowed in the socket name\n"
  msgstr "les deux-points ne sont pas permis dans le nom de socket\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr ""
  "échec de récupération de liste de révocations de certificat sur « %s » : %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr ""
  "échec du traitement de liste de révocations de certificat sur « %s » : %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s : %u : ligne trop longue — ignorée\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s : %u : empreinte incorrecte détectée\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s : %u : erreur de lecture : %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s : %u : fin de ligne inutile ignorée\n"
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr "SIGHUP reçu — relecture de la configuration et vidage des caches\n"
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "SIGUSR2 reçu — aucune action définie\n"
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "SIGTERM reçu — arrêt…\n"
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "SIGTERM reçu — encore %d connexions actives\n"
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  msgid "shutdown forced\n"
  msgstr "arrêt forcé\n"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "SIGINT reçu — arrêt immédiat\n"
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "signal %d reçu — aucune action définie\n"
@@@ -10097,13 -8115,6 +10196,7 @@@ msgstr "« %s » n'est pas une URL LD
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr "« %s » est une URL LDAP incorrecte\n"
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, c-format
- msgid "error allocating memory: %s\n"
- msgstr "erreur d'allocation de mémoire : %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, c-format
  msgid "error printing log line: %s\n"
  msgstr "erreur d'affichage de ligne du journal : %s\n"
@@@ -10356,76 -8315,60 +10449,76 @@@ msgstr "le répondeur OCSP a renvoyé u
  msgid "OCSP responder returned an too old status\n"
  msgstr "le répondeur OCSP a renvoyé un trop vieil état\n"
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "échec d'assuan_inquire(%s) : %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr "ldapserver manquant"
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr "serialno manquant dans l'identifiant de certificat"
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "échec d'assuan_inquire : %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "échec de fetch_cert_by_url : %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "erreur d'envoi de données : %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "échec de start_cert_fetch : %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "échec de fetch_next_cert : %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d dépassé\n"
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "impossible d'allouer une structure de contrôle : %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "échec d'allocation du contexte Assuan : %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "impossible d'initialiser le serveur : %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "impossible d'enregistrer les commandes avec Assuan : %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "problème d'accept_assuan : %s\n"
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "problème de traitement Assuan : %s\n"
@@@ -10474,7 -8408,6 +10567,7 @@@ msgstr "
  "le certificat n'aurait pas dû être utilisé pour signer une liste de "
  "révocations de certificat\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "silencieux"
  
@@@ -10646,11 -8538,9 +10739,11 @@@ msgstr "|NOM|chiffrer aussi pour l'iden
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|configurer les alias d'adresse"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr "Configuration pour les serveurs de clefs"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|utiliser le serveur de clefs à l'URL"
  
@@@ -10682,130 -8565,114 +10775,146 @@@ msgstr "Options contrôlant le format d
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Options contrôlant l'interactivité et la mise en application"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Options contrôlant la sécurité"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr "Configuration pour les serveurs HTTP"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr "utiliser la configuration de serveur mandataire (proxy) du système"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr "Configuration des serveurs LDAP à utiliser"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr "liste de serveurs LDAP"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr "Configuration pour OCSP"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ #, fuzzy
+ #| msgid "GPG for OpenPGP"
+ msgid "OpenPGP"
  msgstr "GPG pour OpenPGP"
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
- msgstr "Agent GPG"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
+ msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ #, fuzzy
+ #| msgid "Smartcard Daemon"
+ msgid "Smartcards"
  msgstr "Démon de carte à puce"
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ #, fuzzy
+ #| msgid "GPG for S/MIME"
+ msgid "S/MIME"
  msgstr "GPG pour S/MIME"
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "erreur de réseau"
  
- #: tools/gpgconf-comp.c:1068
- msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1071
+ #, fuzzy
+ #| msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "Entrée de code personnel et de phrase secrète"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  msgid "Component not suitable for launching"
  msgstr "Composant non convenable pour le lancement"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Échec de vérification externe du composant %s"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr "Remarquez que les spécifications de groupe sont ignorées\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr "afficher tous les composants"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr "vérifier tous les programmes"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|COMPOSANT|afficher les options"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|COMPOSANT|modifier les options"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|COMPOSANT|vérifier les options"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr "appliquer les valeurs par défaut globales"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "aff. répertoires de configuration pour @GPGCONF@"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
  msgstr "afficher le fichier de configuration globale"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
  msgstr "vérifier le fichier de configuration globale"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "mettre la base de confiance à jour"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr "recharger tous les composants ou celui donné"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr "lancer un composant donné"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr "tuer un composant donné"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "utiliser comme fichier de sortie"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr "activer modif. pendant l'exécution si possible"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Utilisation : @GPGCONF@ [options] (-h pour l'aide)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10813,15 -8680,12 +10922,15 @@@ msgstr "
  "Syntaxe : @GPGCONF@ [options]\n"
  "Gérer les options de configuration pour les outils du système @GNUPG@\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "Un argument de composant nécessaire"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "Composant introuvable"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr "Aucun argument permis"
  
diff --cc po/gl.po
index d5af6ec,0b5d876..01f51c7
--- a/po/gl.po
+++ b/po/gl.po
@@@ -6,16 -6,14 +6,16 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.2.4\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2003-12-04 11:39+0100\n"
  "Last-Translator: Jacobo Tarrio <jtarrio at trasno.net>\n"
  "Language-Team: Galician <gpul-traduccion at ceu.fi.udc.es>\n"
  "Language: gl\n"
  "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-1\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, 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"
@@@ -26,41 -24,32 +26,41 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  #| msgid "Do you really want to create a sign and encrypt key? "
  msgid "Do you really want to make your passphrase visible on the screen?"
- msgstr "�Seguro que quere crear unha chave para asinar e cifrar? "
+ msgstr "¿Seguro que quere crear unha chave para asinar e cifrar? "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -68,7 -57,6 +68,7 @@@ msgstr "contrasinal incorrecto
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr ""
  
@@@ -78,103 -66,72 +78,103 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, 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"
+ msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
- msgstr "contrasinal err�neo"
+ msgstr "contrasinal erróneo"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
- msgstr "li�a longa de m�is\n"
+ msgstr "liña longa de máis\n"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "contrasinal demasiado longo\n"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
- msgstr "Caracter non v�lido no nome\n"
+ msgstr "Caracter non válido no nome\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
- msgstr "MPI err�neo"
+ msgstr "MPI erróneo"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
- msgstr "contrasinal err�neo"
+ msgstr "contrasinal erróneo"
  
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
  #, fuzzy, c-format
  msgid "ssh keys greater than %d bits are not supported\n"
- msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
+ msgstr "o algoritmo de protección %d%s non está soportado\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "non se pode crear `%s': %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -200,58 -153,39 +200,48 @@@ msgstr "erro escribindo no chaveiro sec
  msgid "no suitable card key found: %s\n"
  msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "fallou o borrado do bloque de chaves: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "erro escribindo no chaveiro `%s': %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
- msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+ msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "cambia-lo contrasinal"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
- msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+ msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
- msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
+ msgstr "%s: fallo ao crear unha táboa hash: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -290,22 -217,18 +280,22 @@@ msgstr "Repita o contrasinal: 
  msgid "Repeat this PIN"
  msgstr "Repita o contrasinal: "
  
 +#: agent/divert-scd.c:299
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
- msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
+ msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
  
 +#: agent/divert-scd.c:301
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
- msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
+ msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
  
 +#: agent/divert-scd.c:302
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
- msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
+ msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
  
 +#: agent/divert-scd.c:314
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
@@@ -325,12 -245,10 +315,12 @@@ msgstr "escribindo a `%s'\n
  msgid "Enter new passphrase"
  msgstr "Introduza o contrasinal\n"
  
 +#: agent/genkey.c:172
  #, fuzzy
  msgid "Take this one anyway"
- msgstr "�Empregar esta chave de t�dolos xeitos?"
+ msgstr "¿Empregar esta chave de tódolos xeitos?"
  
 +#: agent/genkey.c:202
  #, c-format
  msgid ""
  "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@@ -376,137 -287,108 +366,143 @@@ msgstr "
  #, fuzzy, c-format
  msgid "Please enter the passphrase to%0Aprotect your new key"
  msgstr ""
- "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
+ "Necesita un contrasinal para protexe-la súa chave secreta.\n"
  "\n"
  
 +#: agent/genkey.c:606
  #, fuzzy
  msgid "Please enter the new passphrase"
  msgstr "cambia-lo contrasinal"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
  " "
  msgstr ""
  "@\n"
- "Opci�ns:\n"
+ "Opcións:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "A chave é obsoleta"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "lareto"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
- msgstr "ser un pouqui�o m�is calado"
+ msgstr "ser un pouquiño máis calado"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
- msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+ msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
  msgstr "buscar chaves nun servidor de chaves"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
  msgstr "actualiza-la base de datos de confianza"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
- msgstr "non est� soportado"
+ msgstr "non está soportado"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -515,181 -397,135 +511,181 @@@ msgstr "non está soportado
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "Por favor, informe dos erros no programa a <gnupg-bugs at gnu.org>,\n"
- "e dos erros na traducci�n a <proxecto at trasno.net>.\n"
+ "e dos erros na traducción a <proxecto at trasno.net>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
- msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
+ msgstr "NOTA: non existe o ficheiro de opcións por defecto `%s'\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
- msgstr "ficheiro de opci�ns `%s': %s\n"
+ msgstr "ficheiro de opcións `%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
- msgstr "lendo as opci�ns de `%s'\n"
+ msgstr "lendo as opcións de `%s'\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
- msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+ msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "non foi posible crear %s: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, fuzzy, c-format
  msgid "socket name '%s' is too long\n"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, 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"
+ msgstr "gpg-agent non está dispoñible nesta sesión\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
- msgstr "a actualizaci�n fallou: %s\n"
+ msgstr "a actualización fallou: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "gravando a chave secreta en `%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "non se pode crea-lo directorio `%s': %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: directorio creado\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, 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:1957
++#: agent/gpg-agent.c:2248
  #, 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:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
- msgstr "o segredo da actualizaci�n fallou: %s\n"
+ msgstr "o segredo da actualización fallou: %s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "\t%lu chaves omitidas\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
- msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
+ msgstr "gpg-agent non está dispoñible nesta sesión\n"
  
 +#: agent/preset-passphrase.c:99
  #, fuzzy
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
 +#: agent/preset-passphrase.c:102
  msgid ""
  "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -697,40 -533,32 +693,40 @@@ msgstr "
  "@Comandos:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
  " "
  msgstr ""
  "@\n"
- "Opci�ns:\n"
+ "Opcións:\n"
  " "
  
 +#: agent/protect-tool.c:154
  #, fuzzy
  msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
 +#: agent/protect-tool.c:156
  msgid ""
  "Syntax: gpg-protect-tool [options] [args]\n"
  "Secret key maintenance tool\n"
  msgstr ""
  
 +#: agent/protect-tool.c:693
  #, fuzzy
  msgid "Please enter the passphrase to unprotect the PKCS#12 object."
- msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+ msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
 +#: agent/protect-tool.c:698
  #, fuzzy
  msgid "Please enter the passphrase to protect the new PKCS#12 object."
- msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+ msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
 +#: agent/protect-tool.c:704
  msgid ""
  "Please enter the passphrase to protect the imported object within the GnuPG "
  "system."
@@@ -741,9 -568,8 +737,9 @@@ msgstr "
  msgid ""
  "Please enter the passphrase or the PIN\n"
  "needed to complete this operation."
- msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+ msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
  #, fuzzy
  msgid "cancelled\n"
  msgstr "Cancelar"
@@@ -753,7 -578,6 +749,8 @@@
  msgid "error while asking for the passphrase: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -768,22 -590,18 +765,22 @@@ msgstr "non se atopou a chave `%s': %s\
  msgid "statement \"%s\" ignored in '%s', line %d\n"
  msgstr "erro de lectura: %s\n"
  
 +#: agent/trustlist.c:206
  #, fuzzy, c-format
  msgid "system trustlist '%s' not available\n"
- msgstr "hai partes da chave secreta non dispo�ibles\n"
+ msgstr "hai partes da chave secreta non dispoñibles\n"
  
 +#: agent/trustlist.c:250
  #, fuzzy, c-format
  msgid "bad fingerprint in '%s', line %d\n"
  msgstr "erro de lectura: %s\n"
  
 +#: agent/trustlist.c:275 agent/trustlist.c:282
  #, fuzzy, c-format
  msgid "invalid keyflag in '%s', line %d\n"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
 +#: agent/trustlist.c:316 common/helpfile.c:136
  #, fuzzy, c-format
  msgid "error reading '%s', line %d: %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -812,8 -627,6 +809,8 @@@ msgstr "
  msgid "Yes"
  msgstr "si|sim"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -843,40 -653,33 +840,40 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
  msgstr "cambia-lo contrasinal"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
- msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
+ msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  msgid "Delete key"
  msgstr "habilitar unha chave"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -891,116 -692,98 +888,127 @@@ msgstr "
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
- msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
+ msgstr "fallou a comprobación da sinatura creada: %s\n"
  
 +#: agent/cvt-openpgp.c:338
  msgid "secret key parts are not available\n"
- msgstr "hai partes da chave secreta non dispo�ibles\n"
+ msgstr "hai partes da chave secreta non dispoñibles\n"
  
 +#: agent/cvt-openpgp.c:344
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "public key algorithm %d (%s) is not supported\n"
- msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
+ msgstr "o algoritmo de protección %d%s non está soportado\n"
  
 +#: agent/cvt-openpgp.c:448
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection algorithm %d (%s) is not supported\n"
- msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
+ msgstr "o algoritmo de protección %d%s non está soportado\n"
  
 +#: agent/cvt-openpgp.c:455
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection hash algorithm %d (%s) is not supported\n"
- msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
+ msgstr "o algoritmo de protección %d%s non está soportado\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "a actualizaci�n fallou: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "a actualización fallou: %s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
  msgstr "non se puido conectar a `%s': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  #, fuzzy
  msgid "problem setting the gpg-agent options\n"
  msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
- msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
+ msgstr "non é posible deshabilita-los volcados de 'core': %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "a actualización fallou: %s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "non se puido poñe-la armadura: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "si|sim"
  
@@@ -1055,7 -827,6 +1063,7 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
@@@ -1065,46 -835,37 +1073,46 @@@
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
  msgstr ""
  
 +#: common/miscellaneous.c:146
  #, fuzzy, c-format
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
- msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+ msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
  
 +#: common/miscellaneous.c:554
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  msgid "connection to agent is in restricted mode\n"
  msgstr "non se pode facer iso no modo por lotes\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1156,12 -907,10 +1164,12 @@@ msgstr "Certificado correcto
  msgid "|audit-log-result|Some"
  msgstr "Certificado correcto"
  
 +#: common/audit.c:726
  #, fuzzy
  msgid "Certificate chain available"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
 +#: common/audit.c:733
  #, fuzzy
  msgid "root certificate missing"
  msgstr ""
@@@ -1172,12 -920,10 +1180,12 @@@
  msgid "Data encryption succeeded"
  msgstr ""
  
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
  #, fuzzy
  msgid "Data available"
- msgstr "Chave dispo�ible en: "
+ msgstr "Chave dispoñible en: "
  
 +#: common/audit.c:767
  #, fuzzy
  msgid "Session key created"
  msgstr "%s: chaveiro creado\n"
@@@ -1187,8 -932,6 +1195,8 @@@
  msgid "algorithm: %s"
  msgstr "armadura: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1213,36 -952,29 +1221,36 @@@ msgstr "
  msgid "Data signing succeeded"
  msgstr ""
  
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
  #, fuzzy, c-format
  msgid "data hash algorithm: %s"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: common/audit.c:862
  #, fuzzy, c-format
  msgid "Signer %d"
  msgstr "A sinatura caducou o %s\n"
  
 +#: common/audit.c:866 common/audit.c:1065
  #, fuzzy, c-format
  msgid "attr hash algorithm: %s"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: common/audit.c:901
  msgid "Data decryption succeeded"
  msgstr ""
  
 +#: common/audit.c:910
  #, fuzzy
  msgid "Encryption algorithm supported"
- msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
+ msgstr "o algoritmo de protección %d%s non está soportado\n"
  
 +#: common/audit.c:993
  #, fuzzy
  msgid "Data verification succeeded"
- msgstr "verificaci�n de sinatura suprimida\n"
+ msgstr "verificación de sinatura suprimida\n"
  
 +#: common/audit.c:1002
  #, fuzzy
  msgid "Signature available"
  msgstr "A sinatura caducou o %s\n"
@@@ -1252,58 -983,47 +1260,58 @@@
  msgid "Parsing data succeeded"
  msgstr "Sinatura correcta de \""
  
 +#: common/audit.c:1036
  #, fuzzy, c-format
  msgid "bad data hash algorithm: %s"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: common/audit.c:1051
  #, fuzzy, c-format
  msgid "Signature %d"
  msgstr "A sinatura caducou o %s\n"
  
 +#: common/audit.c:1079
  #, fuzzy
  msgid "Certificate chain valid"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
 +#: common/audit.c:1090
  #, fuzzy
  msgid "Root certificate trustworthy"
  msgstr ""
  "Non se atoparon certificados con confianza non definida.\n"
  "\n"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
  msgstr "Certificado correcto"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
- msgstr "Chave dispo�ible en: "
+ msgstr "Chave dispoñible en: "
  
 +#: common/audit.c:1119
  #, fuzzy
  msgid "CRL/OCSP check of certificates"
  msgstr "Certificado correcto"
  
 +#: common/audit.c:1139
  #, fuzzy
  msgid "Included certificates"
- msgstr "Certificado non v�lido"
+ msgstr "Certificado non válido"
  
 +#: common/audit.c:1194
  msgid "No audit log entries."
  msgstr ""
  
 +#: common/audit.c:1243
  #, fuzzy
  msgid "Unknown operation"
- msgstr "versi�n desco�ecida"
+ msgstr "versión descoñecida"
  
 +#: common/audit.c:1261
  msgid "Gpg-Agent usable"
  msgstr ""
  
@@@ -1311,22 -1030,18 +1319,22 @@@
  msgid "Dirmngr usable"
  msgstr ""
  
 +#: common/audit.c:1307
  #, fuzzy, c-format
  msgid "No help available for '%s'."
- msgstr "Non hai axuda dispo�ible para `%s'"
+ msgstr "Non hai axuda dispoñible para `%s'"
  
 +#: common/helpfile.c:90
  #, fuzzy
  msgid "ignoring garbage line"
- msgstr "error nunha li�a adicional\n"
+ msgstr "error nunha liña adicional\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
- msgstr "desco�ecido"
+ msgstr "descoñecido"
  
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "gravando a chave secreta en `%s'\n"
@@@ -1336,53 -1050,43 +1344,53 @@@
  msgid "read error"
  msgstr "erro de lectura de ficheiro"
  
 +#: common/argparse.c:369
  #, fuzzy
  msgid "keyword too long"
- msgstr "li�a longa de m�is\n"
+ msgstr "liña longa de máis\n"
  
 +#: common/argparse.c:371
  #, fuzzy
  msgid "missing argument"
- msgstr "argumento non v�lido"
+ msgstr "argumento non válido"
  
 +#: common/argparse.c:373
  #, fuzzy
  #| msgid "invalid armor"
  msgid "invalid argument"
- msgstr "armadura non v�lida"
+ msgstr "armadura non válida"
  
 +#: common/argparse.c:375
  #, fuzzy
  msgid "invalid command"
  msgstr "comandos conflictivos\n"
  
 +#: common/argparse.c:377
  #, fuzzy
  msgid "invalid alias definition"
- msgstr "opci�ns de importaci�n non v�lidas\n"
+ msgstr "opcións de importación non válidas\n"
  
 +#: common/argparse.c:379
  #, fuzzy
  msgid "out of core"
  msgstr "non procesado"
  
 +#: common/argparse.c:381
  #, fuzzy
  msgid "invalid option"
- msgstr "opci�ns de importaci�n non v�lidas\n"
+ msgstr "opcións de importación non válidas\n"
  
 +#: common/argparse.c:389
  #, c-format
  msgid "missing argument for option \"%.50s\"\n"
  msgstr ""
  
 +#: common/argparse.c:391
  #, fuzzy, c-format
  msgid "invalid argument for option \"%.50s\"\n"
- msgstr "opci�ns de importaci�n non v�lidas\n"
+ msgstr "opcións de importación non válidas\n"
  
 +#: common/argparse.c:393
  #, c-format
  msgid "option \"%.50s\" does not expect an argument\n"
  msgstr ""
@@@ -1402,32 -1103,26 +1410,32 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
  msgstr "non procesado"
  
 +#: common/argparse.c:403
  #, fuzzy, c-format
  msgid "invalid option \"%.50s\"\n"
- msgstr "opci�ns de importaci�n non v�lidas\n"
+ msgstr "opcións de importación non válidas\n"
  
 +#: common/utf8conv.c:123
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' not available\n"
- msgstr "non se puido po�e-la armadura: %s\n"
+ msgstr "non se puido poñe-la armadura: %s\n"
  
 +#: common/utf8conv.c:131
  #, fuzzy, c-format
  msgid "iconv_open failed: %s\n"
  msgstr "non se puido abrir un ficheiro: %s\n"
  
 +#: common/utf8conv.c:385 common/utf8conv.c:651
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' failed: %s\n"
- msgstr "non se puido po�e-la armadura: %s\n"
+ msgstr "non se puido poñe-la armadura: %s\n"
  
 +#: common/dotlock.c:707
  #, fuzzy, c-format
  msgid "failed to create temporary file '%s': %s\n"
  msgstr "non se pode crea-lo directorio `%s': %s\n"
@@@ -1451,18 -1142,14 +1459,18 @@@ msgstr "gravando a chave secreta en `%s
  msgid "(deadlock?) "
  msgstr ""
  
 +#: common/dotlock.c:1192
  #, fuzzy, c-format
  msgid "lock '%s' not made: %s\n"
- msgstr "non se atopou a chave p�blica %08lX: %s\n"
+ msgstr "non se atopou a chave pública %08lX: %s\n"
  
 +#: common/dotlock.c:1219
  #, fuzzy, c-format
  msgid "waiting for lock %s...\n"
  msgstr "gravando a chave secreta en `%s'\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1472,42 -1158,33 +1480,42 @@@
  msgid "armor: %s\n"
  msgstr "armadura: %s\n"
  
 +#: g10/armor.c:463
  msgid "invalid armor header: "
- msgstr "cabeceira de armadura non v�lida: "
+ msgstr "cabeceira de armadura non válida: "
  
 +#: g10/armor.c:474
  msgid "armor header: "
  msgstr "cabeceira de armadura: "
  
 +#: g10/armor.c:487
  msgid "invalid clearsig header\n"
- msgstr "cabeceira de sinatura en claro non v�lida\n"
+ msgstr "cabeceira de sinatura en claro non válida\n"
  
 +#: g10/armor.c:500
  #, fuzzy
  msgid "unknown armor header: "
  msgstr "cabeceira de armadura: "
  
 +#: g10/armor.c:553
  msgid "nested clear text signatures\n"
- msgstr "sinaturas en texto claro ani�adas\n"
+ msgstr "sinaturas en texto claro aniñadas\n"
  
 +#: g10/armor.c:688
  #, fuzzy
  msgid "unexpected armor: "
  msgstr "armadura inesperada:"
  
 +#: g10/armor.c:701
  msgid "invalid dash escaped line: "
- msgstr "li�a escapada cunha barra non v�lida: "
+ msgstr "liña escapada cunha barra non válida: "
  
 +#: g10/armor.c:873 g10/armor.c:1490
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
- msgstr "car�cter radix64 non v�lido %02x omitido\n"
+ msgstr "carácter radix64 non válido %02x omitido\n"
  
 +#: g10/armor.c:916
  msgid "premature eof (no CRC)\n"
  msgstr "fin de ficheiro prematura (non hai CRC)\n"
  
@@@ -1524,116 -1198,93 +1532,115 @@@ msgstr "CRC mal formado\n
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "Erro de CRC; %06lx - %06lx\n"
  
 +#: g10/armor.c:982
  #, fuzzy
  msgid "premature eof (in trailer)\n"
- msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
+ msgstr "fin de ficheiro prematura (nas liñas adicionais)\n"
  
 +#: g10/armor.c:986
  msgid "error in trailer line\n"
- msgstr "error nunha li�a adicional\n"
+ msgstr "error nunha liña adicional\n"
  
 +#: g10/armor.c:1303
  msgid "no valid OpenPGP data found.\n"
- msgstr "non se atoparon datos OpenPGP v�lidos.\n"
+ msgstr "non se atoparon datos OpenPGP válidos.\n"
  
 +#: g10/armor.c:1308
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
- msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
+ msgstr "armadura incorrecta: liña máis longa ca %d caracteres\n"
  
 +#: g10/armor.c:1312
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
- "car�cter quoted-printable na armadura - seguramente empregouse un MTA con "
+ "carácter quoted-printable na armadura - seguramente empregouse un MTA con "
  "erros\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "non lexible por humanos"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr ""
- "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
+ "un nome de notación só debe ter caracteres imprimibles ou espacios, e debe "
  "rematar en '='\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
- msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
+ msgstr "un nome de notación de usuario debe conte-lo carácter '@'\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  #, fuzzy
  msgid "a notation name must not contain more than one '@' character\n"
- msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
+ msgstr "un nome de notación de usuario debe conte-lo carácter '@'\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
- msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
+ msgstr "un valor de notación non pode empregar ningún carácter de control\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  msgid "a notation name may not contain an '=' character\n"
- msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
+ msgstr "un nome de notación de usuario debe conte-lo carácter '@'\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
  #| "with an '='\n"
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr ""
- "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
+ "un nome de notación só debe ter caracteres imprimibles ou espacios, e debe "
  "rematar en '='\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
- msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
+ msgstr "AVISO: atopáronse datos de notación non válidos\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, fuzzy, c-format
  msgid "failed to proxy %s inquiry to client\n"
- msgstr "erro ao p�r '%s' na base de datos de confianza: %s\n"
+ msgstr "erro ao pór '%s' na base de datos de confianza: %s\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Introduza o contrasinal: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
  msgstr "AVISO: %s fai que se ignore %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, fuzzy, c-format
  msgid "OpenPGP card not available: %s\n"
- msgstr "a chave secreta non est� dispo�ible"
+ msgstr "a chave secreta non está dispoñible"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "non se pode facer iso no modo por lotes\n"
@@@ -1643,19 -1293,13 +1650,19 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Non se admite este comando no modo %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
- msgstr "hai partes da chave secreta non dispo�ibles\n"
+ msgstr "hai partes da chave secreta non dispoñibles\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
- msgstr "�A s�a selecci�n? "
+ msgstr "¿A súa selección? "
  
 +#: g10/card-util.c:279 g10/card-util.c:330
  msgid "[not set]"
  msgstr ""
  
@@@ -1683,184 -1322,142 +1690,184 @@@ msgstr "non procesado
  msgid "forced"
  msgstr ""
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr ""
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr ""
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr ""
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  #, fuzzy
  msgid "URL to retrieve public key: "
- msgstr "non hai unha chave p�blica correspondente: %s\n"
+ msgstr "non hai unha chave pública correspondente: %s\n"
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "erro escribindo no chaveiro `%s': %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr ""
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr ""
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  #, fuzzy
  msgid "Language preferences: "
  msgstr "preferencias actualizadas"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  #, fuzzy
  msgid "Error: invalid length of preference string.\n"
- msgstr "caracter non v�lido na cadea de preferencias\n"
+ msgstr "caracter non válido na cadea de preferencias\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  #, fuzzy
  msgid "Error: invalid characters in preference string.\n"
- msgstr "caracter non v�lido na cadea de preferencias\n"
+ msgstr "caracter non válido na cadea de preferencias\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr ""
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  #, fuzzy
  msgid "Error: invalid response.\n"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  #, fuzzy
  msgid "CA fingerprint: "
  msgstr "Pegada dactilar:"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  #, fuzzy
  msgid "Error: invalid formatted fingerprint.\n"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, fuzzy, c-format
  msgid "key operation not possible: %s\n"
- msgstr "A xeraci�n da chave fallou: %s\n"
+ msgstr "A xeración da chave fallou: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  #, fuzzy
  msgid "not an OpenPGP card"
- msgstr "non se atoparon datos OpenPGP v�lidos.\n"
+ msgstr "non se atoparon datos OpenPGP válidos.\n"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
- msgstr "�Qu� tama�o de chave quere? (1024) "
+ msgstr "¿Qué tamaño de chave quere? (1024) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
- msgstr "�Qu� tama�o de chave quere? (1024) "
+ msgstr "¿Qué tamaño de chave quere? (1024) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
- msgstr "�Qu� tama�o de chave quere? (1024) "
+ msgstr "¿Qué tamaño de chave quere? (1024) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "redondeado a %u bits\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
- msgstr "om�tese: a chave secreta xa est� presente\n"
+ msgstr "omítese: a chave secreta xa está presente\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1868,155 -1465,120 +1875,155 @@@
  "You should change them using the command --change-pin\n"
  msgstr ""
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  #, fuzzy
  msgid "Please select the type of key to generate:\n"
  msgstr "Por favor, seleccione o tipo de chave que quere:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  #, fuzzy
  msgid "   (1) Signature key\n"
  msgstr "A sinatura caducou o %s\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  #, fuzzy
  msgid "   (2) Encryption key\n"
- msgstr "   (%d) RSA (s� cifrar)\n"
+ msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
- msgstr "Selecci�n non v�lida.\n"
+ msgstr "Selección non válida.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  #, fuzzy
  msgid "Please select where to store the key:\n"
- msgstr "Por favor, escolla o motivo da revocaci�n:\n"
+ msgstr "Por favor, escolla o motivo da revocación:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
- msgstr "a actualizaci�n fallou: %s\n"
+ msgstr "a actualización fallou: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
  msgstr "Non se admite este comando no modo %s.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
- msgstr "om�tese: a chave secreta xa est� presente\n"
+ msgstr "omítese: a chave secreta xa está presente\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  msgid "Continue? (y/N) "
- msgstr "�Asinar de verdade? "
+ msgstr "¿Asinar de verdade? "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
- msgstr "sa�r deste men�"
+ msgstr "saír deste menú"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  #, fuzzy
  msgid "show admin commands"
  msgstr "comandos conflictivos\n"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "amosar esta axuda"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  #, fuzzy
  msgid "list all available data"
- msgstr "Chave dispo�ible en: "
+ msgstr "Chave dispoñible en: "
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr ""
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr ""
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr ""
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  #, fuzzy
  msgid "change the login name"
- msgstr "cambia-la fecha de expiraci�n"
+ msgstr "cambia-la fecha de expiración"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  #, fuzzy
  msgid "change the language preferences"
  msgstr "cambia-la confianza sobre o dono"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr ""
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  #, fuzzy
  msgid "change a CA fingerprint"
  msgstr "amosar fingerprint"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr ""
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  #, fuzzy
  msgid "generate new keys"
  msgstr "xerar un novo par de chaves"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr ""
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr ""
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  #, fuzzy
  msgid "Admin-only command\n"
  msgstr "comandos conflictivos\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  #, fuzzy
  msgid "Admin commands are allowed\n"
  msgstr "comandos conflictivos\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  #, fuzzy
  msgid "Admin commands are not allowed\n"
  msgstr "gravando a chave secreta en `%s'\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Comando incorrecto (tente \"help\")\n"
  
@@@ -2024,23 -1585,15 +2031,23 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output non traballa con este comando\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "non se puido abrir `%s'\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "non se atopou a chave `%s': %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "erro ao le-lo bloque de chaves: %s\n"
@@@ -2060,17 -1610,14 +2067,17 @@@ msgid "can't do this in batch mode with
  msgstr ""
  "iso non se pode facer no modo de procesamento por lotes sen \"--yes\"\n"
  
 +#: g10/delkey.c:148
  #, fuzzy
  msgid "Delete this key from the keyring? (y/N) "
- msgstr "�Borrar esta chave do chaveiro? "
+ msgstr "¿Borrar esta chave do chaveiro? "
  
 +#: g10/delkey.c:158
  #, fuzzy
  msgid "This is a secret key! - really delete? (y/N) "
- msgstr "�Esta � unha chave secreta! - �est� seguro de que quere borrala? "
+ msgstr "¡Esta é unha chave secreta! - ¿está seguro de que quere borrala? "
  
 +#: g10/delkey.c:201
  #, fuzzy, c-format
  msgid "deleting secret %s failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
@@@ -2083,36 -1628,29 +2090,36 @@@ msgstr "chave
  #, fuzzy
  #| msgid "Pubkey: "
  msgid "subkey"
- msgstr "P�blica: "
+ msgstr "Pública: "
  
 +#: g10/delkey.c:226
  #, c-format
  msgid "deleting keyblock failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
 +#: g10/delkey.c:239
  msgid "ownertrust information cleared\n"
- msgstr "borrouse a informaci�n de confianza\n"
+ msgstr "borrouse a información de confianza\n"
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
- msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
+ msgstr "¡hai unha chave secreta para a chave pública \"%s\"!\n"
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
- msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
+ msgstr "empregue a opción \"--delete-secret-keys\" para borrala primeiro.\n"
  
 +#: g10/encrypt.c:232 g10/sign.c:1292
  #, c-format
  msgid "error creating passphrase: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
 +#: g10/encrypt.c:239
  msgid "can't use a symmetric ESK packet due to the S2K mode\n"
- msgstr "non se pode empregar un paquete sim�trico ESK debido ao modo S2K\n"
+ msgstr "non se pode empregar un paquete simétrico ESK debido ao modo S2K\n"
  
 +#: g10/encrypt.c:253
  #, fuzzy, c-format
  msgid "using cipher %s\n"
  msgstr "fallou a sinatura: %s\n"
@@@ -2121,15 -1658,13 +2128,15 @@@
  #, fuzzy, c-format
  #| msgid "`%s' already compressed\n"
  msgid "'%s' already compressed\n"
- msgstr "`%s' xa est� comprimido\n"
+ msgstr "`%s' xa está comprimido\n"
  
 +#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
- msgstr "AVISO: `%s' � un ficheiro baleiro\n"
+ msgstr "AVISO: `%s' é un ficheiro baleiro\n"
  
 +#: g10/encrypt.c:557
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "reading from '%s'\n"
@@@ -2140,29 -1674,25 +2147,29 @@@ msgstr "lendo de `%s'\n
  msgid ""
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
- "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
+ "forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
  
 +#: g10/encrypt.c:707 g10/sign.c:984
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
  "preferences\n"
  msgstr ""
- "forza-lo algoritmo de compresi�n %s (%d) viola as preferencias do "
+ "forza-lo algoritmo de compresión %s (%d) viola as preferencias do "
  "destinatario\n"
  
 +#: g10/encrypt.c:817
  #, c-format
  msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
- "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
+ "forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
  
 +#: g10/encrypt.c:903
  #, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s cifrado para: \"%s\"\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "non se pode empregar %s no modo %s\n"
@@@ -2172,32 -1701,26 +2179,32 @@@
  msgid "%s encrypted data\n"
  msgstr "datos cifrados con %s\n"
  
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
  #, c-format
  msgid "encrypted with unknown algorithm %d\n"
- msgstr "cifrado cun algoritmo desco�ecido %d\n"
+ msgstr "cifrado cun algoritmo descoñecido %d\n"
  
 +#: g10/decrypt-data.c:164 sm/decrypt.c:127
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
- msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado sim�trico.\n"
+ msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado simétrico.\n"
  
 +#: g10/decrypt-data.c:176
  msgid "problem handling encrypted packet\n"
  msgstr "problema ao manexa-lo paquete cifrado\n"
  
 +#: g10/exec.c:60
  msgid "no remote program execution supported\n"
- msgstr "non se soporta a execuci�n remota de programas\n"
+ msgstr "non se soporta a execución remota de programas\n"
  
 +#: g10/exec.c:319
  msgid ""
  "external program calls are disabled due to unsafe options file permissions\n"
  msgstr ""
- "as chamadas a programas externos est�n desactivadas debido a opci�ns de "
+ "as chamadas a programas externos están desactivadas debido a opcións de "
  "permisos de ficheiros non seguras\n"
  
 +#: g10/exec.c:349
  #, fuzzy
  msgid "this platform requires temporary files when calling external programs\n"
  msgstr ""
@@@ -2219,11 -1739,9 +2226,11 @@@ msgstr "non se puido executar %s \"%s\"
  msgid "system error while calling external program: %s\n"
  msgstr "erro do sistema ao chamar a un programa externo: %s\n"
  
 +#: g10/exec.c:532 g10/exec.c:599
  msgid "unnatural exit of external program\n"
- msgstr "sa�da non natural do programa externo\n"
+ msgstr "saída non natural do programa externo\n"
  
 +#: g10/exec.c:547
  msgid "unable to execute external program\n"
  msgstr "non se puido executar un programa externo\n"
  
@@@ -2244,65 -1759,51 +2251,65 @@@ msgstr "AVISO: non se puido borra-lo fi
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  #, fuzzy
  msgid "export signatures that are marked as local-only"
  msgstr ""
  "\n"
  "A sinatura hase marcar coma non revocable.\n"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  #, fuzzy
  msgid "export revocation keys marked as \"sensitive\""
- msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
+ msgstr "non se atoparon chaves de revocación para `%s'\n"
  
- #: g10/export.c:108
++#: g10/export.c:112
  #, fuzzy
  msgid "remove unusable parts from key during export"
  msgstr "chave secreta non utilizable"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: omitido: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "escribindo a `%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "gravando a chave secreta en `%s'\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "AVISO: non se exportou nada\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2313,13 -1813,10 +2320,13 @@@ msgstr "erro ao crear `%s': %s\n
  msgid "[User ID not found]"
  msgstr "[Non se atopou o id de usuario]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
- msgstr "opci�ns de importaci�n non v�lidas\n"
+ msgstr "opcións de importación non válidas\n"
  
 +#: g10/getkey.c:516
  #, c-format
  msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
  msgstr ""
@@@ -2335,275 -1830,215 +2342,275 @@@ msgstr "erro lendo `%s': %s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "erro ao crear `%s': %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "erro ao crear `%s': %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
  msgstr "Pegada dactilar:"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "non se atopou a chave secreta `%s': %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "|NOME|empregar NOME coma chave secreta por defecto"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "|NOME|empregar NOME coma chave secreta por defecto"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, fuzzy, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
- "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
+ "Chave %08lX non válida convertida en válida por --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, fuzzy, c-format
  msgid "using subkey %s instead of primary key %s\n"
- msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
+ msgstr "emprégase a chave secundaria %08lX no canto da primaria %08lX\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "facer unha sinatura separada"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[ficheiro]|facer unha sinatura en texto claro"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "facer unha sinatura separada"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "cifrar datos"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
- msgstr "cifrar s� con cifrado sim�trico"
+ msgstr "cifrar só con cifrado simétrico"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "descifrar datos (por defecto)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verificar unha sinatura"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "ve-la lista de chaves"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "ve-la lista de chaves e sinaturas"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "verifica-las sinaturas das chaves"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "ve-la lista de chaves e pegadas dactilares"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "ve-la lista de chaves secretas"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "xerar un novo par de chaves"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "xerar un novo par de chaves"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "xerar un novo par de chaves"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "xerar un novo par de chaves"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
- msgstr "xerar un certificado de revocaci�n"
+ msgstr "xerar un certificado de revocación"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
- msgstr "borrar chaves do chaveiro p�blico"
+ msgstr "borrar chaves do chaveiro público"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "borrar chaves do chaveiro secreto"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "asinar unha chave"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "asinar unha chave localmente"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "asinar unha chave"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "asinar unha chave localmente"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "asinar ou editar unha chave"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
  msgstr "cambia-lo contrasinal"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "exportar chaves"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "exportar chaves a un servidor de chaves"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "importar chaves dun servidor de chaves"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "buscar chaves nun servidor de chaves"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
- msgstr "actualizar t�dalas chaves dun servidor de chaves"
+ msgstr "actualizar tódalas chaves dun servidor de chaves"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "importar/mesturar chaves"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "actualiza-la base de datos de confianza"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
- msgstr "crear sa�da con armadura en ascii"
+ msgstr "crear saída con armadura en ascii"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NOME|cifrar para NOME"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "empregar este id de usuario para asinar ou descifrar"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
- msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
+ msgstr "|N|axusta-lo nivel de compresión a N (0 desactiva)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
- msgstr "usar modo de texto can�nico"
+ msgstr "usar modo de texto canónico"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
- msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+ msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
- msgstr "non facer ning�n cambio"
+ msgstr "non facer ningún cambio"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "avisar antes de sobrescribir"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
  msgstr ""
  "@\n"
- "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
+ "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2623,13 -2058,11 +2630,13 @@@ msgstr "
  " --list-keys [nomes]        amosa-las chaves\n"
  " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2640,11 -2073,10 +2647,11 @@@ msgid "
  "Sign, check, encrypt or decrypt\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "Sintaxe: gpg [opci�ns] [ficheiros]\n"
+ "Sintaxe: gpg [opcións] [ficheiros]\n"
  "asinar, verificar, cifrar ou descifrar\n"
- "a operaci�n por defecto depende dos datos de entrada\n"
+ "a operación por defecto depende dos datos de entrada\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2652,975 -2084,776 +2659,980 @@@ msgstr "
  "\n"
  "Algoritmos soportados:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
- msgstr "P�blica: "
+ msgstr "Pública: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Cifra: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
- msgstr "Compresi�n: "
+ msgstr "Compresión: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
- msgstr "uso: gpg [opci�ns] "
+ msgstr "uso: gpg [opcións] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "comandos conflictivos\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, 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"
+ msgstr "non se atopou un signo = na definición do grupo \"%s\"\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, 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:1556
++#: g10/gpg.c:1564
  #, 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:1559
++#: g10/gpg.c:1567
  #, 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:1565
++#: g10/gpg.c:1573
  #, 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:1568
++#: g10/gpg.c:1576
  #, 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:1571
++#: g10/gpg.c:1579
  #, 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:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
- msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
+ msgstr " creouse un novo ficheiro de configuración `%s'\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
- msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
+ msgstr "o URL de normativa de sinaturas dado non é válido\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  #, fuzzy
  msgid "show the keyring name in key listings"
- msgstr "amosar en que chaveiro est� unha chave listada"
+ msgstr "amosar en que chaveiro está unha chave listada"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "deshabilitar unha chave"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
- msgstr "destinatario por defecto `%s' desco�ecido\n"
+ msgstr "destinatario por defecto `%s' descoñecido\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "opcións de importación non válidas\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
- msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
+ msgstr "NOTA: ignórase o antigo ficheiro de opcións por defecto `%s'\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
- msgstr "NOTA: �%s non � para uso normal!\n"
+ msgstr "NOTA: ¡%s non é para uso normal!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
- msgstr "%s non � un xogo de caracteres v�lido\n"
+ msgstr "%s non é un xogo de caracteres válido\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
- msgstr "Non � un enderezo de e-mail v�lido\n"
+ msgstr "Non é un enderezo de e-mail válido\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
- msgstr "%s non � un xogo de caracteres v�lido\n"
+ msgstr "%s non é un xogo de caracteres válido\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "non se puido analisa-lo URI do servidor de chaves\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
- msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
+ msgstr "%s:%d: opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  #, fuzzy
  msgid "invalid keyserver options\n"
- msgstr "opci�ns de exportaci�n non v�lidas\n"
+ msgstr "opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
- msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
+ msgstr "%s:%d: opcións de importación non válidas\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
- msgstr "opci�ns de importaci�n non v�lidas\n"
+ msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
- msgstr "opci�ns de importaci�n non v�lidas\n"
+ msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
- msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
+ msgstr "%s:%d: opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
- msgstr "opci�ns de exportaci�n non v�lidas\n"
+ msgstr "opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
- msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
+ msgstr "%s:%d: opcións de importación non válidas\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  #, fuzzy
  msgid "invalid list options\n"
- msgstr "opci�ns de importaci�n non v�lidas\n"
+ msgstr "opcións de importación non válidas\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  #, fuzzy
  msgid "show all notations during signature verification"
- msgstr "%s non � un xogo de caracteres v�lido\n"
+ msgstr "%s non é un xogo de caracteres válido\n"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
- msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
+ msgstr "o URL de normativa de sinaturas dado non é válido\n"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "show user ID validity during signature verification"
- msgstr "%s non � un xogo de caracteres v�lido\n"
+ msgstr "%s non é un xogo de caracteres válido\n"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
- msgstr "%s non � un xogo de caracteres v�lido\n"
+ msgstr "%s non é un xogo de caracteres válido\n"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
- msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
+ msgstr "%s:%d: opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  #, fuzzy
  msgid "invalid verify options\n"
- msgstr "opci�ns de exportaci�n non v�lidas\n"
+ msgstr "opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "non se puido estabrecer exec-path a %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
- msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
+ msgstr "%s:%d: opcións de exportación non válidas\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
- msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
+ msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "AVISO: %s fai que se ignore %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
- msgstr "�%s non se admite con %s!\n"
+ msgstr "¡%s non se admite con %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
- msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
+ msgstr "¡%s non ten sentido empregándoo con %s!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, 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:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
- msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
+ msgstr "o algoritmo de cifrado seleccionado non é válido\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
- msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
+ msgstr "o algoritmo de resumo seleccionado non é válido\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
- msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
+ msgstr "o algoritmo de cifrado seleccionado non é válido\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
- msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
+ msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed debe ser superior a 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed debe ser superior a 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  #, 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:3588
++#: g10/gpg.c:3686
  #, 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"
+ msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  #, 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"
+ msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
- msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
+ msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
- msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
+ msgstr "modo S2K non válido; debe ser 0, 1 ou 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
- msgstr "preferencias por defecto non v�lidas\n"
+ msgstr "preferencias por defecto non válidas\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
- msgstr "preferencias de cifrado personais non v�lidas\n"
+ msgstr "preferencias de cifrado personais non válidas\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
- msgstr "preferencias de resumo personais non v�lidas\n"
+ msgstr "preferencias de resumo personais non válidas\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
- msgstr "preferencias de compresi�n personais non v�lidas\n"
+ msgstr "preferencias de compresión personais non válidas\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
- msgstr "�%s a�nda non traballa con %s!\n"
+ msgstr "¡%s aínda non traballa con %s!\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, 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:3704
++#: g10/gpg.c:3802
  #, 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:3709
++#: g10/gpg.c:3807
  #, 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"
+ msgstr "non se pode empregar o algoritmo de compresión \"%s\" no modo %s\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, 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:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
- "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
+ "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave pública\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [ficheiro]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [ficheiro]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "o descifrado fallou: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [ficheiro]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  #, fuzzy
  msgid "--symmetric --encrypt [filename]"
  msgstr "--sign --encrypt [ficheiro]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, 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:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [ficheiro]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [ficheiro]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  #, fuzzy
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--sign --encrypt [ficheiro]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, 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:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [ficheiro]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [ficheiro]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [ficheiro]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key id-de-usuario"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key id-de-usuario"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key id-de-usuario [comandos]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
  msgstr "--sign-key id-de-usuario"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
- msgstr "o env�o ao servidor de chaves fallou: %s\n"
+ msgstr "o envío ao servidor de chaves fallou: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
- msgstr "a recepci�n do servidor de chaves fallou: %s\n"
+ msgstr "a recepción do servidor de chaves fallou: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
- msgstr "a exportaci�n da chave fallou: %s\n"
+ msgstr "a exportación da chave fallou: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
- msgstr "a exportaci�n da chave fallou: %s\n"
+ msgstr "a exportación da chave fallou: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "a busca no servidor de chaves fallou fallou: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
- msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
+ msgstr "a actualización no servidor de chaves fallou: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "non se puido quita-la armadura: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
- msgstr "non se puido po�e-la armadura: %s\n"
+ msgstr "non se puido poñe-la armadura: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[ficheiro]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
- msgstr "Escriba a s�a mensaxe ...\n"
+ msgstr "Escriba a súa mensaxe ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
- msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
+ msgstr "o URL de normativa de certificación dado non é válido\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
- msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
+ msgstr "o URL de normativa de sinaturas dado non é válido\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
- msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
+ msgstr "o URL de normativa de sinaturas dado non é válido\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "toma-las chaves deste chaveiro"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "converte-los conflictos de selo de data nun aviso"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
- msgstr "|DF|escribi-la informaci�n de estado a este DF"
+ msgstr "|DF|escribi-la información de estado a este DF"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
- msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpgv [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
  msgstr ""
- "Sintaxe: gpg [opci�ns] [ficheiros]\n"
- "Comproba as sinaturas contra chaves de confianza co�ecidas\n"
+ "Sintaxe: gpg [opcións] [ficheiros]\n"
+ "Comproba as sinaturas contra chaves de confianza coñecidas\n"
  
 +#: g10/helptext.c:72
  msgid "No help available"
- msgstr "Non hai axuda dispo�ible"
+ msgstr "Non hai axuda dispoñible"
  
 +#: g10/helptext.c:82
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "No help available for '%s'"
- msgstr "Non hai axuda dispo�ible para `%s'"
+ msgstr "Non hai axuda dispoñible para `%s'"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "actualiza-la base de datos de confianza"
  
- #: g10/import.c:147
++#: g10/import.c:160
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "actualiza-la base de datos de confianza"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  msgid "show key during import"
  msgstr "amosar fingerprint"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "chave secreta non utilizable"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "pasando por alto un bloque de tipo %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu chaves procesadas hasta polo momento\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
- msgstr "N�mero total procesado: %lu\n"
+ msgstr "Número total procesado: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "novas chaves omitidas: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "novas chaves omitidas: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "   sin IDs de usuario: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "           importadas: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "          sin cambios: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr " novos IDs de usuario: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "     novas sub-chaves: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "         novas sinaturas: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
- msgstr " novas revocaci�ns de chaves: %lu\n"
+ msgstr " novas revocacións de chaves: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "chaves secretas lidas: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "chaves secretas importadas: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "chaves secretas sin cambios: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "       non importadas: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "         novas sinaturas: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "chaves secretas lidas: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "Sinatura %s, algoritmo de resumo %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "chave %08lX: non hai ID de usuario\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  msgid "key %s: %s\n"
- msgstr "om�tese `%s': %s\n"
+ msgstr "omítese `%s': %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
- msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
+ msgstr "chave %08lX: arranxouse a corrupción da sub-chave HKP\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
- msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
+ msgstr "chave %08lX: non hai IDs de usuario válidos\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
- msgstr "chave %08lX: chave p�blica non atopada: %s\n"
+ msgstr "chave %08lX: chave pública non atopada: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "chave %08lX: nova chave - omitida\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "erro escribindo no chaveiro `%s': %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
- msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
+ msgstr "chave %08lX: chave pública \"%s\" importada\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "chave %08lX: non coincide coa nosa copia\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr ""
  "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
  "%s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr ""
  "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
  "%s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "chave %08lX: \"%s\" sen cambios\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "chave %08lX: chave secreta importada\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
- msgstr "om�tese: a chave secreta xa est� presente\n"
+ msgstr "omítese: a chave secreta xa está presente\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "non se atopou a chave secreta `%s': %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "gravando a chave secreta en `%s'\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
- msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
+ msgstr "chave %08lX: chave secreta cunha cifra %d non válida - omitida\n"
  
  #. TRANSLATORS: For smartcard, each private key on
  #. host has a reference (stub) to a smartcard and
@@@ -3632,226 -2865,188 +3644,232 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
- "chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
- "certificado de revocaci�n\n"
+ "chave %08lX: non hai chave pública - non se pode aplica-lo\n"
+ "certificado de revocación\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr ""
- "chave %08lX: certificado de revocaci�n incorrecto:\n"
+ "chave %08lX: certificado de revocación incorrecto:\n"
  "%s - rechazado\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
- msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
+ msgstr "chave %08lX: \"%s\" certificado de revocación importado\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
- "chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
+ "chave %08lX: algoritmo de chave pública non soportado no ID de usuario \"%s"
  "\"\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr ""
- "chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
+ "chave %08lX: auto-sinatura non válida no identificadr de usuario \"%s\"\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
- msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
+ msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
- msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
+ msgstr "chave %08lX: non hai sub-chave para a ligazón da chave\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
- msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
+ msgstr "chave %08lX: ligazón de sub-chave incorrecta\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
- msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
+ msgstr "chave %08lX: eliminouse unha ligazón de sub-chave múltiple\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
- msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
+ msgstr "chave %08lX: non hai unha sub-chave para a revocación da chave\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
- msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
+ msgstr "chave %08lX: revocación de sub-chave non válida\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
- msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
+ msgstr "chave %08lX: eliminouse a revocación de sub-chaves múltiples\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "chave %08lX: omitido o ID de usuario '"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "chave %08lX: omitida a sub-chave\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
- msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
+ msgstr "chave %08lX: certificado de revocación no lugar erróneo - omitido\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
- msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
+ msgstr "chave %08lX: certificado de revocación incorrecto: %s - omitido\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
- "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n "
+ "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocación "
  "%08lX\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
- "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
+ "AVISO: a chave %08lX pode estar revocada: chave de revocación %08lX "
  "ausente.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
- msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
+ msgstr "chave %08lX: \"%s\" certificado de revocación engadido\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
  msgstr "chaveiro `%s' creado\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
  msgstr "chaveiro `%s' creado\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "erro ao crear `%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
- msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
+ msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
  
 +#: g10/keyedit.c:264
  msgid "[revocation]"
- msgstr "[revocaci�n]"
+ msgstr "[revocación]"
  
 +#: g10/keyedit.c:264
  msgid "[self-signature]"
  msgstr "[auto-sinatura]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
+ msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "Sinatura %s, algoritmo de resumo %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Sinatura correcta de \""
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  msgid "key %s:\n"
- msgstr "om�tese `%s': %s\n"
+ msgstr "omítese `%s': %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "O ID de usuario \"%s\" est� revocado."
- msgstr[1] "O ID de usuario \"%s\" est� revocado."
+ msgstr[0] "O ID de usuario \"%s\" está revocado."
+ msgstr[1] "O ID de usuario \"%s\" está revocado."
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3859,29 -3054,25 +3877,29 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 sinatura non verificada debido a unha chave que falta\n"
  msgstr[1] "1 sinatura non verificada debido a unha chave que falta\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
- msgstr[0] "%d sinaturas err�neas\n"
- msgstr[1] "%d sinaturas err�neas\n"
+ msgstr[0] "%d sinaturas erróneas\n"
+ msgstr[1] "%d sinaturas erróneas\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Sinatura correcta de \""
  msgstr[1] "Sinatura correcta de \""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3893,446 -3084,358 +3911,446 @@@ msgstr "
  "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
  "comprobando pegadas dactilares de varias fontes...).\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
- msgstr " %d = Conf�o marxinalmente\n"
+ msgstr " %d = Confío marxinalmente\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
- msgstr " %d = Conf�o totalmente\n"
+ msgstr " %d = Confío totalmente\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
- msgstr "O ID de usuario \"%s\" est� revocado."
+ msgstr "O ID de usuario \"%s\" está revocado."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
- msgstr "�Est� seguro de que quere asinalo? (s/N) "
+ msgstr "¿Está seguro de que quere asinalo? (s/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr " Non se puido asinar.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
- msgstr "O ID de usuario \"%s\" est� caducado."
+ msgstr "O ID de usuario \"%s\" está caducado."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
- msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
+ msgstr "O ID de usuario \"%s\" non está asinado por el mesmo."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
- msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
+ msgstr "O ID de usuario \"%s\" non está asinado por el mesmo."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  #, fuzzy
  msgid "Sign it? (y/N) "
- msgstr "�Asinar de verdade? "
+ msgstr "¿Asinar de verdade? "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
  "is a PGP 2.x-style signature.\n"
  msgstr ""
  "A auto-sinatura de \"%s\"\n"
- "� unha sinatura tipo PGP 2.x\n"
+ "é unha sinatura tipo PGP 2.x\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
- msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
+ msgstr "¿Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "has expired.\n"
  msgstr ""
- "A s�a sinatura actual en \"%s\"\n"
+ "A súa sinatura actual en \"%s\"\n"
  "caducou.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
- msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
+ msgstr "¿Quere emitir unha nova sinatura que substitúa á caducada? (s/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "is a local signature.\n"
  msgstr ""
- "A s�a sinatura actual en \"%s\"\n"
- "� unha sinatura local.\n"
+ "A súa sinatura actual en \"%s\"\n"
+ "é unha sinatura local.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
- msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
+ msgstr "¿Quere promovela a sinatura totalmente exportable? (s/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
- msgstr "�Quere asinalo outra vez de t�dolos xeitos? (s/N) "
+ msgstr "¿Quere asinalo outra vez de tódolos xeitos? (s/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nada que asinar coa chave %08lX\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
- msgstr "�Esta chave caducou!"
+ msgstr "¡Esta chave caducou!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Esta chave ha caducar o %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
- msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
+ msgstr "¿Quere que a súa sinatura caduque ao mesmo tempo? (S/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
  "to the person named above?  If you don't know what to answer, enter \"0\".\n"
  msgstr ""
- "�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
+ "¿Con canto tino comprobou que a chave que vai asinar realmente pertence á\n"
  "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Non hei respostar.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Non o comprobei en absoluto.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
- msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
+ msgstr "   (2) Fixen algunhas comprobacións.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
- msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
+ msgstr "   (3) Fixen comprobacións moi exhaustivas.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
- msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
+ msgstr "¿A súa elección? (introduza '?' para ter máis información): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr ""
- "�Esta seguro de que quere asinar esta chave\n"
- "coa s�a chave: \""
+ "¿Esta seguro de que quere asinar esta chave\n"
+ "coa súa chave: \""
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Esta ha ser unha auto-sinatura.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "AVISO: a sinatura non se ha marcar coma non exportable.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "AVISO: A sinatura non se ha marcar coma non revocable.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "A sinatura hase marcar coma non exportable.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "A sinatura hase marcar coma non revocable.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "Non se comprobou esta chave en absoluto.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Comprobouse esta chave de xeito informal.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Comprobouse esta chave con moito tino.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  #, fuzzy
  msgid "Really sign? (y/N) "
- msgstr "�Asinar de verdade? "
+ msgstr "¿Asinar de verdade? "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "fallou a sinatura: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
- msgstr "gardar e sa�r"
+ msgstr "gardar e saír"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "amosar fingerprint"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
- msgstr "Notaci�n de sinaturas: "
+ msgstr "Notación de sinaturas: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "listar chave e IDs de usuario"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "selecciona-lo ID de usuario N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  #, fuzzy
  msgid "select subkey N"
  msgstr "selecciona-lo ID de usuario N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "check signatures"
  msgstr "revocar sinaturas"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "asina-la chave localmente"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "engadir un ID de usuario"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
- msgstr "engadir unha identificaci�n fotogr�fica"
+ msgstr "engadir unha identificación fotográfica"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "borrar un ID de usuario"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "borrar unha chave secundaria"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
- msgstr "engadir unha chave de revocaci�n"
+ msgstr "engadir unha chave de revocación"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr ""
- "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
+ "¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
  "seleccionados? "
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
- msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
+ msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "marcar un ID de usuario coma primario"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "lista-las preferencias (expertos)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "lista-las preferencias (moitos datos)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr ""
- "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
+ "¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
  "seleccionados? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "non se puido analisa-lo URI do servidor de chaves\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr ""
- "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
+ "¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
  "seleccionados? "
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "cambia-lo contrasinal"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "cambia-la confianza sobre o dono"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
- msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
+ msgstr "¿Seguro de que quere revocar tódolos IDs de usuario seleccionados? "
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "revocar un ID de usuario"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "revocar unha chave secundaria"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  #, fuzzy
  msgid "enable key"
  msgstr "habilitar unha chave"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "disable key"
  msgstr "deshabilitar unha chave"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  #, fuzzy
  msgid "show selected photo IDs"
- msgstr "amosa-la identificaci�n fotogr�fica"
+ msgstr "amosa-la identificación fotográfica"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
- msgstr "A chave secreta est� disponible.\n"
+ msgstr "A chave secreta está disponible.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
- msgstr "C�mpre a chave secreta para facer isto.\n"
+ msgstr "Cómpre a chave secreta para facer isto.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4340,358 -3443,283 +4358,359 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
- msgstr "A chave est� revocada."
+ msgstr "A chave está revocada."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
- msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
+ msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
- msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
+ msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
- msgstr "clase de sinatura desco�ecida"
+ msgstr "clase de sinatura descoñecida"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Non se admite este comando no modo %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Debe seleccionar alomenos un ID de usuario.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
- msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
+ msgstr "¡Non pode borra-lo último ID de usuario!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
- msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
+ msgstr "¿Seguro de que quere borrar tódolos IDs de usuario seleccionados? "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
- msgstr "�Seguro de que quere borrar este ID de usuario? "
+ msgstr "¿Seguro de que quere borrar este ID de usuario? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
- msgstr "�Seguro de que quere borrar este ID de usuario? "
+ msgstr "¿Seguro de que quere borrar este ID de usuario? "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Debe seleccionar alomenos unha chave.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "non se puido abrir `%s': %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Debe seleccionar alomenos unha chave.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
- msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
+ msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
- msgstr "�Seguro de que quere borrar esta chave? "
+ msgstr "¿Seguro de que quere borrar esta chave? "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
- msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
+ msgstr "¿Seguro de que quere revocar tódolos IDs de usuario seleccionados? "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
- msgstr "�Seguro de que quere revocar este ID de usuario? "
+ msgstr "¿Seguro de que quere revocar este ID de usuario? "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
- msgstr "�Realmente quere revocar esta chave? "
+ msgstr "¿Realmente quere revocar esta chave? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgstr "�Realmente quere revoca-las chaves seleccionadas? "
+ msgstr "¿Realmente quere revoca-las chaves seleccionadas? "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
- msgstr "�Realmente quere revocar esta chave? "
+ msgstr "¿Realmente quere revocar esta chave? "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "estabrece-la lista de preferencias"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
- "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
+ "¿Seguro que quere actualiza-las preferencias dos IDs de usuario "
  "seleccionados? "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
- msgstr "�Realmente desexa actualiza-las preferencias? "
+ msgstr "¿Realmente desexa actualiza-las preferencias? "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  #, fuzzy
  msgid "Save changes? (y/N) "
- msgstr "�Garda-los cambios? "
+ msgstr "¿Garda-los cambios? "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  #, fuzzy
  msgid "Quit without saving? (y/N) "
- msgstr "�Sa�r sin gardar? "
+ msgstr "¿Saír sin gardar? "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
- msgstr "a actualizaci�n fallou: %s\n"
+ msgstr "a actualización fallou: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
- msgstr "A xeraci�n da chave fallou: %s\n"
+ msgstr "A xeración da chave fallou: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
- msgstr "valor non v�lido\n"
+ msgstr "valor non válido\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Non hai tal ID de usuario.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Nada que asinar coa chave %08lX\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Resumo: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
- msgstr "Caracter�sticas: "
+ msgstr "Características: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  #, fuzzy
  msgid "Notations: "
- msgstr "Notaci�n: "
+ msgstr "Notación: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Esta chave pode estar revocada por %s chave "
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, 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:3853
++#: g10/keyedit.c:3866
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (sensible)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "non foi posible crear %s: %s\n"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[revocada] "
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [caduca: %s]"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [caduca: %s]"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " confianza: %c/%c"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " confianza: %c/%c"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
- msgstr "Esta chave est� desactivada"
+ msgstr "Esta chave está desactivada"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  msgstr ""
- "Te�a en conta que a validez da chave amosada non � necesariamente\n"
+ "Teña en conta que a validez da chave amosada non é necesariamente\n"
  "correcta a menos que reinicie o programa.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[revocada] "
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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 ""
- "AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
+ "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:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
- msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
+ msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  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 ""
- "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"
+ "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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
- msgstr "�Est� seguro de que quere engadila? (s/N) "
+ msgstr "¿Está seguro de que quere engadila? (s/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  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 "
+ "Non pode engadir unha identificación fotográfica a unha chave de estilo "
  "PGP2.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
- msgstr "�Borrar esta sinatura correcta? (s/N/q)"
+ msgstr "¿Borrar esta sinatura correcta? (s/N/q)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
- msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
+ msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
- msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
+ msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
- msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
+ msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4699,328 -3727,262 +4718,328 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Borrada %d sinatura.\n"
  msgstr[1] "Borrada %d sinatura.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Non se borrou nada.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  #, fuzzy
  msgid "invalid"
- msgstr "armadura non v�lida"
+ msgstr "armadura non válida"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
- msgstr "O ID de usuario \"%s\" est� revocado."
+ msgstr "O ID de usuario \"%s\" está revocado."
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
- msgstr[0] "O ID de usuario \"%s\" est� revocado."
- msgstr[1] "O ID de usuario \"%s\" est� revocado."
+ msgstr[0] "O ID de usuario \"%s\" está revocado."
+ msgstr[1] "O ID de usuario \"%s\" está revocado."
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
- msgstr "o ID de usuario \"%s\" xa est� revocado\n"
+ msgstr "o ID de usuario \"%s\" xa está revocado\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
- msgstr "o ID de usuario \"%s\" xa est� revocado\n"
+ msgstr "o ID de usuario \"%s\" xa está revocado\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  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 ""
- "AVISO: Esta � unha chave de estilo PGP 2.x. Se engade un revocador "
+ "AVISO: Esta é unha chave de estilo PGP 2.x. Se engade un revocador "
  "designado\n"
- "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
+ "       pode facer que algunhas versións de PGP rexeiten esta chave.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  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:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Introduza o ID de usuario do revocador designado: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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:4642
++#: g10/keyedit.c:4658
  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:4664
++#: g10/keyedit.c:4680
  #, fuzzy
  msgid "this key has already been designated as a revoker\n"
- msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
+ msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  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 "
+ "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
  "se pode desfacer!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  #, 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): "
+ "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
  msgstr ""
- "�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
+ "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
- msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
+ msgstr "Cambiando a data de expiración para a chave secundaria.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
- msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
+ msgstr "Cambiando a data de expiración da chave primaria.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  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"
+ msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, 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 "
+ "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
  "se pode desfacer!\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Escolla exactamente un ID de usuario.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, 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:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
- msgstr "�Est� seguro de que quere empregala (s/N)? "
+ msgstr "¿Está seguro de que quere empregala (s/N)? "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
- msgstr "�Est� seguro de que quere empregala (s/N)? "
+ msgstr "¿Está seguro de que quere empregala (s/N)? "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  #, fuzzy
  msgid "Enter the notation: "
- msgstr "Notaci�n de sinaturas: "
+ msgstr "Notación de sinaturas: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  #, fuzzy
  msgid "Proceed? (y/N) "
- msgstr "�Sobrescribir? (s/N) "
+ msgstr "¿Sobrescribir? (s/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
- msgstr "Non hai ID de usuario con �ndice %d\n"
+ msgstr "Non hai ID de usuario con índice %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
- msgstr "Non hai ID de usuario con �ndice %d\n"
+ msgstr "Non hai ID de usuario con índice %d\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
- msgstr "Non hai ID de usuario con �ndice %d\n"
+ msgstr "Non hai ID de usuario con índice %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
- msgstr "Non hai ID de usuario con �ndice %d\n"
+ msgstr "Non hai ID de usuario con índice %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID de usuario: \""
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (non exportable)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Esta sinatura caducou o %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
- msgstr "�Est� seguro de que quere revocala? (s/N) "
+ msgstr "¿Está seguro de que quere revocala? (s/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
- msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
+ msgstr "¿Crear un certificado de revocación para esta sinatura? (s/N) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   asinada por %08lX no %s%s\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, fuzzy, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Asinou estes IDs de usuario: \n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (non exportable)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   revocada por %08lX no %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
- msgstr "Est� a punto de revocar estas sinaturas:\n"
+ msgstr "Está a punto de revocar estas sinaturas:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
- msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
+ msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "non hai chave secreta\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
- msgstr "o ID de usuario \"%s\" xa est� revocado\n"
+ msgstr "o ID de usuario \"%s\" xa está revocado\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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:6370
++#: g10/keyedit.c:6386
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
- msgstr "o ID de usuario \"%s\" xa est� revocado\n"
+ msgstr "o ID de usuario \"%s\" xa está revocado\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
- msgstr "o ID de usuario \"%s\" xa est� revocado\n"
+ msgstr "o ID de usuario \"%s\" xa está revocado\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
- "Amosando a id. fotogr�fica %s de tama�o %ld da chave 0x%08lX (uid %d)\n"
+ "Amosando a id. fotográfica %s de tamaño %ld da chave 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "preferencia %c%lu duplicada\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "demasiadas preferencias `%c'\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "demasiadas preferencias `%c'\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "demasiadas preferencias `%c'\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
- msgstr "caracter non v�lido na cadea de preferencias\n"
+ msgstr "caracter non válido na cadea de preferencias\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "escribindo unha sinatura directa\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "escribindo a propia sinatura\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "escribindo unha sinatura que liga a chave\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
- msgstr "tama�o de chave non v�lido; empregando %u bits\n"
+ msgstr "tamaño de chave non válido; empregando %u bits\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
- msgstr "tama�o de chave redondeado a %u bits\n"
+ msgstr "tamaño de chave redondeado a %u bits\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  #, fuzzy
  msgid "Encrypt"
  msgstr "cifrar datos"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr ""
  
@@@ -5034,157 -3996,126 +5053,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
- msgstr "   (%d) ElGamal (s� cifrar)\n"
+ msgstr "   (%d) ElGamal (só cifrar)\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Por favor, seleccione o tipo de chave que quere:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA e ElGamal (por defecto)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA e ElGamal (por defecto)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
- msgstr "   (%d) DSA (s� asinar)\n"
+ msgstr "   (%d) DSA (só asinar)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
- msgstr "   (%d) RSA (s� asinar)\n"
+ msgstr "   (%d) RSA (só asinar)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
- msgstr "   (%d) ElGamal (s� cifrar)\n"
+ msgstr "   (%d) ElGamal (só cifrar)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
- msgstr "   (%d) RSA (s� cifrar)\n"
+ msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (s� cifrar)\n"
+ msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (s� cifrar)\n"
+ msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA e ElGamal (por defecto)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
- msgstr "   (%d) DSA (s� asinar)\n"
+ msgstr "   (%d) DSA (só asinar)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
- msgstr "   (%d) RSA (s� cifrar)\n"
+ msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
- msgstr "   (%d) RSA (s� cifrar)\n"
+ msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
- msgstr "   (%d) RSA (s� cifrar)\n"
+ msgstr "   (%d) RSA (só cifrar)\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
- msgstr "Notaci�n de sinaturas: "
+ msgstr "Notación de sinaturas: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
- msgstr "Non hai ID de usuario con �ndice %d\n"
+ msgstr "Non hai ID de usuario con índice %d\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "redondeado a %u bits\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
- msgstr "�Qu� tama�o de chave quere? (1024) "
+ msgstr "¿Qué tamaño de chave quere? (1024) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
- msgstr "�Qu� tama�o de chave quere? (1024) "
+ msgstr "¿Qué tamaño de chave quere? (1024) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
- msgstr "O tama�o de chave requerido son %u bits\n"
+ msgstr "O tamaño de chave requerido son %u bits\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Por favor, seleccione o tipo de chave que quere:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5200,7 -4131,6 +5219,7 @@@ msgstr "
  "      <n>m = a chave caduca en n meses\n"
  "      <n>y = a chave caduca en n anos\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5216,53 -4146,43 +5235,53 @@@ msgstr "
  "      <n>m = a sinatura caduca en n meses\n"
  "      <n>y = a sinatura caduca en n anos\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
- msgstr "�Por canto tempo � v�lida a chave? (0) "
+ msgstr "¿Por canto tempo é válida a chave? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
- msgstr "�Por canto tempo � v�lida a sinatura? (0) "
+ msgstr "¿Por canto tempo é válida a sinatura? (0) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
- msgstr "valor non v�lido\n"
+ msgstr "valor non válido\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s non caduca nunca\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s non caduca nunca\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s caduca o %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "A sinatura caduca o %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
- "O seu sistema non pode amosar datas m�is al� do 2038.\n"
- "A�nda as�, hase tratar correctamente ata o 2106.\n"
+ "O seu sistema non pode amosar datas máis aló do 2038.\n"
+ "Aínda así, hase tratar correctamente ata o 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  #, fuzzy
  msgid "Is this correct? (y/N) "
- msgstr "�Isto � correcto? (s/n) "
+ msgstr "¿Isto é correcto? (s/n) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5273,7 -4193,6 +5292,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  #, fuzzy
  msgid ""
  "\n"
@@@ -5290,50 -4209,39 +5309,50 @@@ msgstr "
  "     \"Heinrich Heime (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Nome: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
- msgstr "Caracter non v�lido no nome\n"
+ msgstr "Caracter non válido no nome\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
- msgstr "O nome non pode comezar cun d�xito\n"
+ msgstr "O nome non pode comezar cun díxito\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "O nome debe ter alomenos 5 caracteres\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "Enderezo de E-mail: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
- msgstr "Non � un enderezo de e-mail v�lido\n"
+ msgstr "Non é un enderezo de e-mail válido\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Comentario: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
- msgstr "Car�cter non v�lido no comentario\n"
+ msgstr "Carácter non válido no comentario\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
- msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
+ msgstr "Está a usa-lo xogo de caracteres `%s'.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5344,10 -4252,9 +5363,10 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
- "Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
+ "Por favor, non poña o enderezo de correo no nome real ou no comentario\n"
  
  #. TRANSLATORS: These are the allowed answers in
  #. lower and uppercase.  Below you will find the matching
@@@ -5360,53 -4267,43 +5379,53 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeAaSs"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
- msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
+ msgstr "¿Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)aír? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
- msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
+ msgstr "¿Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)aír? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
- msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
+ msgstr "¿Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)aír? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
- msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
+ msgstr "¿Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)aír? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Por favor, corrixa antes o erro\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
  "disks) during the prime generation; this gives the random number\n"
  "generator a better chance to gain enough entropy.\n"
  msgstr ""
- "C�mpre xerar unha morea de bytes aleatorios. E unha boa idea facer outras\n"
+ "Cómpre xerar unha morea de bytes aleatorios. E unha boa idea facer outras\n"
  "cousas (premer teclas no teclado, move-lo rato, usa-los discos duros)\n"
- "mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
- "n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
+ "mentres se xeran os números primos; isto proporciónalle ao xerador de\n"
+ "números aleatorios unha opoertunidade de acumular entropía de abondo.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
- msgstr "A xeraci�n da chave fallou: %s\n"
+ msgstr "A xeración da chave fallou: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5414,68 -4311,55 +5433,68 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
- msgstr "`%s' xa est� comprimido\n"
+ msgstr "`%s' xa está comprimido\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
- msgstr "�Crear de t�dolos xeitos? "
+ msgstr "¿Crear de tódolos xeitos? "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
- msgstr "�Crear de t�dolos xeitos? "
+ msgstr "¿Crear de tódolos xeitos? "
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
- msgstr "Cancelouse a xeraci�n de chaves.\n"
+ msgstr "Cancelouse a xeración de chaves.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "non se pode crear `%s': %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
- msgstr "gravando a chave p�blica en `%s'\n"
+ msgstr "gravando a chave pública en `%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
- msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
+ msgstr "non se atopou un chaveiro público no que se poida escribir: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
- msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
+ msgstr "erro escribindo no chaveiro público `%s': %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
- msgstr "cre�ronse e asin�ronse as chaves p�blica e secreta.\n"
+ msgstr "creáronse e asináronse as chaves pública e secreta.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5485,7 -4369,6 +5504,7 @@@ msgstr "
  "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
  "con esa finalidade.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5493,7 -4376,6 +5512,7 @@@ msgstr "
  "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
  "reloxo)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5501,35 -4383,28 +5520,35 @@@ msgstr "
  "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
  "reloxo)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
- msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
+ msgstr "NOTA: a creación de subchaves para chaves v3 non cumpre OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
- msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
+ msgstr "as partes secretas da chave primaria non están dispoñibles.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
- msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
+ msgstr "as partes secretas da chave primaria non están dispoñibles.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  #, fuzzy
  msgid "Really create? (y/N) "
- msgstr "�Crear realmente? "
+ msgstr "¿Crear realmente? "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "nunca     "
  
 +#: g10/keylist.c:331
  msgid "Critical signature policy: "
- msgstr "Normativa de sinaturas cr�ticas: "
+ msgstr "Normativa de sinaturas críticas: "
  
 +#: g10/keylist.c:333
  msgid "Signature policy: "
  msgstr "Normativa de sinaturas: "
  
@@@ -5537,23 -4411,19 +5556,23 @@@
  msgid "Critical preferred keyserver: "
  msgstr ""
  
 +#: g10/keylist.c:428
  msgid "Critical signature notation: "
- msgstr "Notaci�n de sinaturas cr�ticas: "
+ msgstr "Notación de sinaturas críticas: "
  
 +#: g10/keylist.c:430
  msgid "Signature notation: "
- msgstr "Notaci�n de sinaturas: "
+ msgstr "Notación de sinaturas: "
  
 +#: g10/keylist.c:472
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d good signature\n"
  msgid_plural "%d good signatures\n"
- msgstr[0] "%d sinaturas err�neas\n"
- msgstr[1] "%d sinaturas err�neas\n"
+ msgstr[0] "%d sinaturas erróneas\n"
+ msgstr[1] "%d sinaturas erróneas\n"
  
 +#: g10/keylist.c:485
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to an error\n"
  msgid "%d signature not checked due to an error\n"
@@@ -5572,30 -4440,24 +5591,30 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "Chaveiro"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Pegada dactilar da chave primaria:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "     Pegada dactilar da sub-chave:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr "Pegada dactilar da chave primaria:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "     Pegada dactilar da sub-chave:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  #, fuzzy
  msgid "      Key fingerprint ="
  msgstr "     Pegada dactilar ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr ""
  
@@@ -5624,151 -4482,121 +5643,151 @@@ msgstr[1] "\t%lu chaves actualizadas\n
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
- msgstr[0] "1 sinatura err�nea\n"
- msgstr[1] "1 sinatura err�nea\n"
+ msgstr[0] "1 sinatura errónea\n"
+ msgstr[1] "1 sinatura errónea\n"
  
 +#: g10/keyring.c:1665
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: chaveiro creado\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  #, fuzzy
  msgid "honor the preferred keyserver URL set on the key"
- msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
+ msgstr "o URL de normativa de sinaturas dado non é válido\n"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  #, fuzzy
  msgid "disabled"
  msgstr "disable"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr ""
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, fuzzy, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
- msgstr "opci�ns de exportaci�n non v�lidas\n"
+ msgstr "opcións de exportación non válidas\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, fuzzy, c-format
  msgid "\"%s\" not a key ID: skipping\n"
- msgstr "%s: non � un ID de chave v�lido\n"
+ msgstr "%s: non é un ID de chave válido\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
  msgstr[0] "solicitando a chave %08lX de %s\n"
  msgstr[1] "solicitando a chave %08lX de %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, fuzzy, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, fuzzy, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "non se atopou a chave `%s': %s\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  #, fuzzy
  msgid "key not found on keyserver\n"
  msgstr "non se atopou a chave `%s': %s\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr ""
- "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
+ "non hai un servidor de chaves coñecido (empregue a opción --keyserver)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, fuzzy, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "solicitando a chave %08lX de %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, fuzzy, c-format
  msgid "requesting key %s from %s\n"
  msgstr "solicitando a chave %08lX de %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  msgid "no keyserver known\n"
- msgstr "opci�ns de exportaci�n non v�lidas\n"
+ msgstr "opcións de exportación non válidas\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, fuzzy, c-format
  msgid "skipped \"%s\": %s\n"
- msgstr "om�tese `%s': %s\n"
+ msgstr "omítese `%s': %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, fuzzy, c-format
  msgid "sending key %s to %s\n"
  msgstr ""
  "\"\n"
- "asinado coa s�a chave %08lX no %s\n"
+ "asinado coa súa chave %08lX no %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  msgid "requesting key from '%s'\n"
  msgstr "solicitando a chave %08lX de %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, fuzzy, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
  
 +#: g10/mainproc.c:254
  #, c-format
  msgid "weird size for an encrypted session key (%d)\n"
- msgstr "tama�o moi estra�o para unha chave de sesi�n cifrada (%d)\n"
+ msgstr "tamaño moi estraño para unha chave de sesión cifrada (%d)\n"
  
 +#: g10/mainproc.c:302
  #, c-format
  msgid "%s encrypted session key\n"
- msgstr "chave de sesi�n cifrada con %s\n"
+ msgstr "chave de sesión cifrada con %s\n"
  
 +#: g10/mainproc.c:312
  #, fuzzy, c-format
  msgid "passphrase generated with unknown digest algorithm %d\n"
- msgstr "cifrado cun algoritmo desco�ecido %d\n"
+ msgstr "cifrado cun algoritmo descoñecido %d\n"
  
 +#: g10/mainproc.c:378
  #, fuzzy, c-format
  msgid "public key is %s\n"
- msgstr "a chave p�blica � %08lX\n"
+ msgstr "a chave pública é %08lX\n"
  
 +#: g10/mainproc.c:456
  msgid "public key encrypted data: good DEK\n"
- msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
+ msgstr "datos cifrados coa chave pública: DEK correcto\n"
  
 +#: g10/mainproc.c:489
  #, fuzzy, c-format
  msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
  msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
@@@ -5783,12 -4609,10 +5802,12 @@@ msgstr "               alias \"
  msgid "encrypted with %s key, ID %s\n"
  msgstr "cifrado cunha chave %s, ID %08lX\n"
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
- msgstr "fallou o descifrado de chave p�blica: %s\n"
+ msgstr "fallou o descifrado de chave pública: %s\n"
  
 +#: g10/mainproc.c:530
  #, c-format
  msgid "encrypted with %lu passphrases\n"
  msgstr "cifrado con %lu contrasinais\n"
@@@ -5797,29 -4620,23 +5816,29 @@@
  msgid "encrypted with 1 passphrase\n"
  msgstr "cifrado con 1 contrasinal\n"
  
 +#: g10/mainproc.c:566 g10/mainproc.c:587
  #, c-format
  msgid "assuming %s encrypted data\n"
- msgstr "supo�endo datos cifrados con %s\n"
+ msgstr "supoñendo datos cifrados con %s\n"
  
 +#: g10/mainproc.c:573
  #, c-format
  msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
- msgstr "A cifra IDEA non est� dispo�ible, t�ntase empregar %s no seu canto\n"
+ msgstr "A cifra IDEA non está dispoñible, téntase empregar %s no seu canto\n"
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  msgid "WARNING: message was not integrity protected\n"
- msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
+ msgstr "AVISO: a mensaxe non tiña protección de integridade\n"
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
  msgstr "descifrado correcto\n"
  
 +#: g10/mainproc.c:637
  msgid "WARNING: encrypted message has been manipulated!\n"
- msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
+ msgstr "AVISO: ¡a mensaxe cifrada foi manipulada!\n"
  
 +#: g10/mainproc.c:653
  #, c-format
  msgid "decryption failed: %s\n"
  msgstr "o descifrado fallou: %s\n"
@@@ -5839,153 -4653,122 +5858,153 @@@ msgstr "nome do ficheiro orixinal='%.*s
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
- msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
+ msgstr "revocación independente - empregue \"gpg --import\" para aplicar\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Sinatura correcta de \""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "Sinatura INCORRECTA de\""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Sinatura caducada de \""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Sinatura correcta de \""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
- msgstr "verificaci�n de sinatura suprimida\n"
+ msgstr "verificación de sinatura suprimida\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
- msgstr "non se poden manexar estas sinaturas m�ltiples\n"
+ msgstr "non se poden manexar estas sinaturas múltiples\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "A sinatura caducou o %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "               alias \""
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "               alias \""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
- msgstr "Chave dispo�ible en: "
+ msgstr "Chave dispoñible en: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[incerto]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "               alias \""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "A sinatura caducou o %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "A sinatura caduca o %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "Sinatura %s, algoritmo de resumo %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binario"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "modo texto"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
- msgstr "desco�ecido"
+ msgstr "descoñecido"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
- msgstr "algoritmo de chave p�blica desco�ecido"
+ msgstr "algoritmo de chave pública descoñecido"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Non foi posible verifica-la sinatura: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
- msgstr "non � unha sinatura separada\n"
+ msgstr "non é unha sinatura separada\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
- "AVISO: detect�ronse sinaturas m�ltiples. S� se ha comproba-la primeira.\n"
+ "AVISO: detectáronse sinaturas múltiples. Só se ha comproba-la primeira.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "sinatura independiente de clase 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
- msgstr "Sinatura � vello estilo (PGP 2.x)\n"
+ msgstr "Sinatura ó vello estilo (PGP 2.x)\n"
  
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
  #, fuzzy, c-format
  msgid "fstat of '%s' failed in %s: %s\n"
  msgstr ""
- "a actualizaci�n da base de datos de confianza fallou:\n"
+ "a actualización da base de datos de confianza fallou:\n"
  "%s\n"
  
 +#: g10/misc.c:170
  #, fuzzy, c-format
  msgid "fstat(%d) failed in %s: %s\n"
  msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
  
 +#: g10/misc.c:279
  #, fuzzy, c-format
  msgid "WARNING: using experimental public key algorithm %s\n"
- msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
+ msgstr "non é posible manexa-lo algoritmo de chave pública %d\n"
  
 +#: g10/misc.c:286
  #, fuzzy
  msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
  msgstr ""
@@@ -6027,38 -4803,31 +6046,38 @@@ msgstr "erro de lectura: %s\n
  msgid "(further info: "
  msgstr ""
  
 +#: g10/misc.c:1056
  #, c-format
  msgid "%s:%d: deprecated option \"%s\"\n"
- msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
+ msgstr "%s:%d: opción a extinguir \"%s\"\n"
  
 +#: g10/misc.c:1060
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated option\n"
- msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+ msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
  
 +#: g10/misc.c:1062
  #, c-format
  msgid "please use \"%s%s\" instead\n"
  msgstr "empregue \"%s%s\" no seu canto\n"
  
 +#: g10/misc.c:1069
  #, fuzzy, c-format
  msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
- msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+ msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
  
 +#: g10/misc.c:1079
  #, fuzzy, c-format
  msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
- msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+ msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
  
 +#: g10/misc.c:1083
  #, fuzzy, c-format
  msgid ""
  "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
- msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+ msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
  
 +#: g10/misc.c:1147
  msgid "Uncompressed"
  msgstr "Sen comprimir"
  
@@@ -6068,55 -4836,44 +6087,55 @@@
  msgid "uncompressed|none"
  msgstr "Sen comprimir"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "esta mensaxe pode non ser utilizable por %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  msgid "ambiguous option '%s'\n"
- msgstr "lendo as opci�ns de `%s'\n"
+ msgstr "lendo as opcións de `%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  msgid "unknown option '%s'\n"
- msgstr "destinatario por defecto `%s' desco�ecido\n"
+ msgstr "destinatario por defecto `%s' descoñecido\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  msgid "unknown weak digest '%s'\n"
- msgstr "clase de sinatura desco�ecida"
+ msgstr "clase de sinatura descoñecida"
  
 +#: g10/openfile.c:84
  #, fuzzy, c-format
  #| msgid "File `%s' exists. "
  msgid "File '%s' exists. "
  msgstr "O ficheiro `%s' xa existe. "
  
 +#: g10/openfile.c:88
  #, fuzzy
  msgid "Overwrite? (y/N) "
- msgstr "�Sobrescribir? (s/N) "
+ msgstr "¿Sobrescribir? (s/N) "
  
 +#: g10/openfile.c:123
  #, c-format
  msgid "%s: unknown suffix\n"
- msgstr "%s: sufixo desco�ecido\n"
+ msgstr "%s: sufixo descoñecido\n"
  
 +#: g10/openfile.c:147
  msgid "Enter new filename"
  msgstr "Introduza o novo nome de ficheiro"
  
 +#: g10/openfile.c:218
  msgid "writing to stdout\n"
- msgstr "escribindo na sa�da est�ndar\n"
+ msgstr "escribindo na saída estándar\n"
  
 +#: g10/openfile.c:366
  #, fuzzy, c-format
  #| msgid "assuming signed data in `%s'\n"
  msgid "assuming signed data in '%s'\n"
@@@ -6126,30 -4882,25 +6145,30 @@@ msgstr "suponse que hai datos asinados 
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new configuration file '%s' created\n"
- msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
+ msgstr " creouse un novo ficheiro de configuración `%s'\n"
  
 +#: g10/openfile.c:498
  #, fuzzy, c-format
  #| msgid "WARNING: options in `%s' are not yet active during this run\n"
  msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
+ msgstr "AVISO: as opcións de `%s' aínda non están activas nesta execución\n"
  
 +#: g10/parse-packet.c:257
  #, c-format
  msgid "can't handle public key algorithm %d\n"
- msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
+ msgstr "non é posible manexa-lo algoritmo de chave pública %d\n"
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
  msgstr ""
- "AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
+ "AVISO: chave de sesión cifrada simetricamente potencialmente insegura\n"
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
- msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
+ msgstr "un subpaquete de tipo %d ten o bit crítico posto\n"
  
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
@@@ -6167,37 -4915,30 +6186,37 @@@ msgstr "cancelado polo usuario\n
  msgid " (main key ID %s)"
  msgstr " (ID principal da chave %08lX)"
  
 +#: g10/passphrase.c:496
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
- msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+ msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
 +#: g10/passphrase.c:500
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
- msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+ msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
 +#: g10/passphrase.c:505
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
- msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+ msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
 +#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
- msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+ msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
  
 +#: g10/passphrase.c:513
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
- msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
+ msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
  
 +#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
- msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
+ msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
  
 +#: g10/passphrase.c:525
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6216,12 -4956,11 +6235,12 @@@ msgid "
  "Keeping the image close to 240x288 is a good size to use.\n"
  msgstr ""
  "\n"
- "Escolla unha imaxe a empregar coma identificaci�n fotogr�fica. A imaxe ten\n"
- "que ser un ficheiro JPEG. Lembre que a imaxe armac�nase coa s�a chave\n"
- "p�blica. Se emprega unha imaxe moi grande, a s�a chave tam�n se ha volver\n"
- "moi grande. Un bo tama�o para empregar � un semellante a 240x288.\n"
+ "Escolla unha imaxe a empregar coma identificación fotográfica. A imaxe ten\n"
+ "que ser un ficheiro JPEG. Lembre que a imaxe armacénase coa súa chave\n"
+ "pública. Se emprega unha imaxe moi grande, a súa chave tamén se ha volver\n"
+ "moi grande. Un bo tamaño para empregar é un semellante a 240x288.\n"
  
 +#: g10/photoid.c:99
  msgid "Enter JPEG filename for photo ID: "
  msgstr "Introduza o nome do ficheiro JPEG: "
  
@@@ -6235,33 -4972,26 +6254,33 @@@ msgstr "non se puido abrir un ficheiro
  msgid "This JPEG is really large (%d bytes) !\n"
  msgstr ""
  
 +#: g10/photoid.c:133
  #, fuzzy
  msgid "Are you sure you want to use it? (y/N) "
- msgstr "�Est� seguro de que quere empregala (s/N)? "
+ msgstr "¿Está seguro de que quere empregala (s/N)? "
  
 +#: g10/photoid.c:149
  #, fuzzy, c-format
  msgid "'%s' is not a JPEG file\n"
- msgstr "\"%s\" non � un ficheiro JPEG\n"
+ msgstr "\"%s\" non é un ficheiro JPEG\n"
  
 +#: g10/photoid.c:168
  msgid "Is this photo correct (y/N/q)? "
- msgstr "�� esta foto correcta (s/N/q)? "
+ msgstr "¿É esta foto correcta (s/N/q)? "
  
 +#: g10/photoid.c:380
  msgid "unable to display photo ID!\n"
- msgstr "�non se pode amosa-la identificaci�n fotogr�fica!\n"
+ msgstr "¡non se pode amosa-la identificación fotográfica!\n"
  
 +#: g10/pkclist.c:72 g10/revoke.c:757
  msgid "No reason specified"
  msgstr "Non se especificou un motivo"
  
 +#: g10/pkclist.c:74 g10/revoke.c:759
  msgid "Key is superseded"
- msgstr "A chave � obsoleta"
+ msgstr "A chave é obsoleta"
  
 +#: g10/pkclist.c:76 g10/revoke.c:758
  msgid "Key has been compromised"
  msgstr "Esta chave quedou descoberta"
  
@@@ -6269,17 -4998,14 +6288,17 @@@
  msgid "Key is no longer used"
  msgstr "Xa non se emprega esta chave"
  
 +#: g10/pkclist.c:80 g10/revoke.c:761
  msgid "User ID is no longer valid"
- msgstr "O ID de usuario xa non � v�lido"
+ msgstr "O ID de usuario xa non é válido"
  
 +#: g10/pkclist.c:84
  msgid "reason for revocation: "
- msgstr "motivo para a revocaci�n: "
+ msgstr "motivo para a revocación: "
  
 +#: g10/pkclist.c:100
  msgid "revocation comment: "
- msgstr "comentario de revocaci�n: "
+ msgstr "comentario de revocación: "
  
  #. TRANSLATORS: These are the allowed answers in lower and
  #. uppercase.  Below you will find the matching strings which
@@@ -6318,48 -5039,39 +6337,48 @@@ msgstr "Esta chave probablemente perten
  msgid "  %d = I don't know or won't say\n"
  msgstr " %d = Non sei\n"
  
 +#: g10/pkclist.c:284
  #, fuzzy, c-format
  msgid "  %d = I do NOT trust\n"
- msgstr " %d = NON conf�o\n"
+ msgstr " %d = NON confío\n"
  
 +#: g10/pkclist.c:290
  #, fuzzy, c-format
  msgid "  %d = I trust ultimately\n"
- msgstr " %d = Conf�o absolutamente\n"
+ msgstr " %d = Confío absolutamente\n"
  
 +#: g10/pkclist.c:296
  #, fuzzy
  msgid "  m = back to the main menu\n"
- msgstr " m = voltar ao men� principal\n"
+ msgstr " m = voltar ao menú principal\n"
  
 +#: g10/pkclist.c:299
  #, fuzzy
  msgid "  s = skip this key\n"
  msgstr " o = omitir esta chave\n"
  
 +#: g10/pkclist.c:300
  #, fuzzy
  msgid "  q = quit\n"
- msgstr " s = sa�r\n"
+ msgstr " s = saír\n"
  
 +#: g10/pkclist.c:304
  #, c-format
  msgid ""
  "The minimum trust level for this key is: %s\n"
  "\n"
  msgstr ""
  
 +#: g10/pkclist.c:310 g10/revoke.c:786
  msgid "Your decision? "
- msgstr "�A s�a decisi�n? "
+ msgstr "¿A súa decisión? "
  
 +#: g10/pkclist.c:331
  #, fuzzy
  msgid "Do you really want to set this key to ultimate trust? (y/N) "
- msgstr "�Est� seguro de querer dar confianza absoluta a esta chave? "
+ msgstr "¿Está seguro de querer dar confianza absoluta a esta chave? "
  
 +#: g10/pkclist.c:345
  msgid "Certificates leading to an ultimately trusted key:\n"
  msgstr "Certificados que conducen a unha chave de confianza absoluta:\n"
  
@@@ -6367,212 -5078,187 +6386,231 @@@
  #, fuzzy, c-format
  msgid "%s: There is no assurance this key belongs to the named user\n"
  msgstr ""
- "%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
+ "%08lX: Non hai indicacións de que a sinatura pertenza ao seu propietario.\n"
  
 +#: g10/pkclist.c:439
  #, fuzzy, c-format
  msgid "%s: There is limited assurance this key belongs to the named user\n"
  msgstr ""
- "%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
+ "%08lX: Non hai indicacións de que a sinatura pertenza ao seu propietario.\n"
  
 +#: g10/pkclist.c:445
  #, fuzzy
  msgid "This key probably belongs to the named user\n"
  msgstr "Esta chave probablemente pertenza ao propietario\n"
  
 +#: g10/pkclist.c:450
  msgid "This key belongs to us\n"
- msgstr "Esta chave pert�ncenos a n�s\n"
+ msgstr "Esta chave perténcenos a nós\n"
+ 
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
+ "Non se atoparon certificados con confianza non definida.\n"
+ "\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "NON é seguro que a chave pertenza á persoa indicada no ID de\n"
+ "usuario. Se *de verdade* sabe o que está a facer, pode\n"
+ "respostar á seguinte pregunta cun \"si\"\n"
+ "\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:489
  #, fuzzy
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
  "you may answer the next question with yes.\n"
  msgstr ""
- "NON � seguro que a chave pertenza � persoa indicada no ID de\n"
- "usuario. Se *de verdade* sabe o que est� a facer, pode\n"
- "respostar � seguinte pregunta cun \"si\"\n"
+ "NON é seguro que a chave pertenza á persoa indicada no ID de\n"
+ "usuario. Se *de verdade* sabe o que está a facer, pode\n"
+ "respostar á seguinte pregunta cun \"si\"\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  #, fuzzy
  msgid "Use this key anyway? (y/N) "
- msgstr "�Empregar esta chave de t�dolos xeitos?"
+ msgstr "¿Empregar esta chave de tódolos xeitos?"
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
- msgstr "AVISO: �Empr�gase unha chave que non � de confianza!\n"
+ msgstr "AVISO: ¡Emprégase unha chave que non é de confianza!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  #, fuzzy
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
- "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
+ "AVISO: a chave %08lX pode estar revocada: chave de revocación %08lX "
  "ausente.\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  #, fuzzy
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
- msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
+ msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
- msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
+ msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  #, fuzzy
  msgid "         This could mean that the signature is forged.\n"
- msgstr "       Isto pode significar que a sinatura est� falsificada.\n"
+ msgstr "       Isto pode significar que a sinatura está falsificada.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
- msgstr "AVISO: �Esta subchave est� revocada polo propietario!\n"
+ msgstr "AVISO: ¡Esta subchave está revocada polo propietario!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
- msgstr "Nota: Esta chave est� desactivada.\n"
+ msgstr "Nota: Esta chave está desactivada.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
- msgstr "Nota: �Esta chave xa caducou!\n"
+ msgstr "Nota: ¡Esta chave xa caducou!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
- msgstr "AVISO: �Esta chave non est� certificada cunha sinatura de confianza!\n"
+ msgstr "AVISO: ¡Esta chave non está certificada cunha sinatura de confianza!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
- "       Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
+ "       Non hai indicacións de que a sinatura pertenza ao seu propietario.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
- msgstr "AVISO: �Esta chave NON � de confianza!\n"
+ msgstr "AVISO: ¡Esta chave NON é de confianza!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "       Probablemente, a sinatura estea FALSIFICADA.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
- "AVISO: �Esta chave non est� certificada con sinaturas de suficiente "
+ "AVISO: ¡Esta chave non está certificada con sinaturas de suficiente "
  "confianza!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
- msgstr "       Non � seguro que a sinatura pertenza ao seu propietario.\n"
+ msgstr "       Non é seguro que a sinatura pertenza ao seu propietario.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: omitido: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
- msgstr "%s: omitido: a chave p�blica est� desactivada\n"
+ msgstr "%s: omitido: a chave pública está desactivada\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
- msgstr "%s: omitido: a chave p�blica xa est� presente\n"
+ msgstr "%s: omitido: a chave pública xa está presente\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "non se puido conectar a `%s': %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr ""
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
  msgstr ""
  "\n"
- "Introduza o ID de usuario. Remate cunha li�a en branco: "
+ "Introduza o ID de usuario. Remate cunha liña en branco: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Non hai tal ID de usuario.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr ""
- "omitido: a chave p�blica xa est� estabrecida coma destinatario por defecto\n"
+ "omitido: a chave pública xa está estabrecida coma destinatario por defecto\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
- msgstr "A chave p�blica est� desactivada.\n"
+ msgstr "A chave pública está desactivada.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
- msgstr "omitido: chave p�blica xa estabrecida\n"
+ msgstr "omitido: chave pública xa estabrecida\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
- msgstr "destinatario por defecto `%s' desco�ecido\n"
+ msgstr "destinatario por defecto `%s' descoñecido\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
- msgstr "non hai enderezos v�lidos\n"
+ msgstr "non hai enderezos válidos\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "chave %08lX: non hai ID de usuario\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "chave %08lX: non hai ID de usuario\n"
  
 +#: g10/plaintext.c:84
  msgid "data not saved; use option \"--output\" to save it\n"
- msgstr "os datos non foron gardados; use a opci�n \"--output\" para gardalos\n"
+ msgstr "os datos non foron gardados; use a opción \"--output\" para gardalos\n"
  
 +#: g10/plaintext.c:598
  msgid "Detached signature.\n"
  msgstr "Sinatura non adxunta.\n"
  
@@@ -6599,25 -5280,20 +6637,25 @@@ msgstr "non foi posible abri-los datos 
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "non foi posible abri-los datos asinados `%s'\n"
  
 +#: g10/pubkey-enc.c:116
  #, fuzzy, c-format
  msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr "destinatario an�nimo; tentando a chave secreta %08lX ...\n"
+ msgstr "destinatario anónimo; tentando a chave secreta %08lX ...\n"
  
 +#: g10/pubkey-enc.c:123
  msgid "okay, we are the anonymous recipient.\n"
- msgstr "vale, n�s somo-lo destinatario an�nimo.\n"
+ msgstr "vale, nós somo-lo destinatario anónimo.\n"
  
 +#: g10/pubkey-enc.c:282
  msgid "old encoding of the DEK is not supported\n"
- msgstr "a codificaci�n vella do DEK non est� soportada\n"
+ msgstr "a codificación vella do DEK non está soportada\n"
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
- msgstr "o algoritmo de cifrado %d%s � desco�ecido ou est� desactivado\n"
+ msgstr "o algoritmo de cifrado %d%s é descoñecido ou está desactivado\n"
  
 +#: g10/pubkey-enc.c:352
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
@@@ -6631,10 -5305,8 +6669,10 @@@ msgstr "NOTA: a chave secreta %08lX cad
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
- msgstr "NOTA: a chave est� revocada"
+ msgstr "NOTA: a chave está revocada"
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, c-format
  msgid "build_packet failed: %s\n"
  msgstr "a chamada a build_packet fallou: %s\n"
@@@ -6648,45 -5318,36 +6686,45 @@@ msgstr "chave %08lX: non hai ID de usua
  msgid "To be revoked by:\n"
  msgstr "Ha ser revocada por:\n"
  
 +#: g10/revoke.c:316
  msgid "(This is a sensitive revocation key)\n"
- msgstr "(Esta � unha chave de revocaci�n sensible)\n"
+ msgstr "(Esta é unha chave de revocación sensible)\n"
  
 +#: g10/revoke.c:322
  #, fuzzy
  #| msgid "Secret key is available.\n"
  msgid "Secret key is not available.\n"
- msgstr "A chave secreta est� disponible.\n"
+ msgstr "A chave secreta está disponible.\n"
  
 +#: g10/revoke.c:327
  #, fuzzy
  msgid "Create a designated revocation certificate for this key? (y/N) "
- msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
+ msgstr "¿Crear un certificado de revocación para esta sinatura? "
  
 +#: g10/revoke.c:336 g10/revoke.c:727
  msgid "ASCII armored output forced.\n"
- msgstr "Forzouse unha sa�da con armadura ASCII.\n"
+ msgstr "Forzouse unha saída con armadura ASCII.\n"
  
 +#: g10/revoke.c:352 g10/revoke.c:479
  #, c-format
  msgid "make_keysig_packet failed: %s\n"
  msgstr "a chamada a make_keysig_packet fallou: %s\n"
  
 +#: g10/revoke.c:415
  msgid "Revocation certificate created.\n"
- msgstr "Creouse o certificado de revocaci�n.\n"
+ msgstr "Creouse o certificado de revocación.\n"
  
 +#: g10/revoke.c:421
  #, fuzzy, c-format
  msgid "no revocation keys found for \"%s\"\n"
- msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
+ msgstr "non se atoparon chaves de revocación para `%s'\n"
  
 +#: g10/revoke.c:551
  #, fuzzy
  msgid "This is a revocation certificate for the OpenPGP key:"
- msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
+ msgstr "¿Crear un certificado de revocación para esta sinatura? "
  
 +#: g10/revoke.c:567
  msgid ""
  "A revocation certificate is a kind of \"kill switch\" to publicly\n"
  "declare that a key shall not anymore be used.  It is not possible\n"
@@@ -6713,9 -5371,8 +6751,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
- msgstr "Creouse o certificado de revocaci�n.\n"
+ msgstr "Creouse o certificado de revocación.\n"
  
 +#: g10/revoke.c:634
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
  msgstr "non se atopou a chave secreta `%s': %s\n"
@@@ -6734,12 -5389,10 +6772,12 @@@ msgstr "
  msgid "error searching the keyring: %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
  
 +#: g10/revoke.c:711
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
- msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
+ msgstr "¿Crear un certificado de revocación para esta sinatura? "
  
 +#: g10/revoke.c:735
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6749,46 -5402,38 +6787,46 @@@
  "your media become unreadable.  But have some caution:  The print system of\n"
  "your machine might store the data and make it available to others!\n"
  msgstr ""
- "Creouse o certificado de revocaci�n.\n"
+ "Creouse o certificado de revocación.\n"
  "\n"
- "Por favor, trasl�deo a un soporte que poida agochar; se Mallory consegue\n"
- "acceso a este certificado pode empregalo para inutiliza-la s�a chave.\n"
- "� unha boa idea imprimir este certificado e armacenalo, por se o soporte\n"
- "se volve ilexible. Pero te�a coidado: o sistema de impresi�n da s�a\n"
- "m�quina poder�a armacena-los datos e deix�rllelos dispo�ibles a outros.\n"
+ "Por favor, trasládeo a un soporte que poida agochar; se Mallory consegue\n"
+ "acceso a este certificado pode empregalo para inutiliza-la súa chave.\n"
+ "É unha boa idea imprimir este certificado e armacenalo, por se o soporte\n"
+ "se volve ilexible. Pero teña coidado: o sistema de impresión da súa\n"
+ "máquina podería armacena-los datos e deixárllelos dispoñibles a outros.\n"
  
 +#: g10/revoke.c:769
  msgid "Please select the reason for the revocation:\n"
- msgstr "Por favor, escolla o motivo da revocaci�n:\n"
+ msgstr "Por favor, escolla o motivo da revocación:\n"
  
 +#: g10/revoke.c:779
  msgid "Cancel"
  msgstr "Cancelar"
  
 +#: g10/revoke.c:781
  #, c-format
  msgid "(Probably you want to select %d here)\n"
- msgstr "(probablemente queira seleccionar %d aqu�)\n"
+ msgstr "(probablemente queira seleccionar %d aquí)\n"
  
 +#: g10/revoke.c:822
  msgid "Enter an optional description; end it with an empty line:\n"
- msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
+ msgstr "Introduza unha descrición opcional; remátea cunha liña en branco:\n"
  
 +#: g10/revoke.c:850
  #, c-format
  msgid "Reason for revocation: %s\n"
- msgstr "Motivo para a revocaci�n: %s\n"
+ msgstr "Motivo para a revocación: %s\n"
  
 +#: g10/revoke.c:852
  msgid "(No description given)\n"
- msgstr "(Non se deu unha descrici�n)\n"
+ msgstr "(Non se deu unha descrición)\n"
  
 +#: g10/revoke.c:857
  #, fuzzy
  msgid "Is this okay? (y/N) "
- msgstr "�� correcto? "
+ msgstr "¿É correcto? "
  
 +#: g10/seskey.c:62 sm/encrypt.c:123
  msgid "weak key created - retrying\n"
  msgstr "creouse unha chave feble - volvendo a tentalo\n"
  
@@@ -6796,10 -5440,9 +6834,10 @@@
  #, c-format
  msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
  msgstr ""
- "non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d "
+ "non se pode evitar unha chave feble para o cifrado simétrico; tentouse %d "
  "veces\n"
  
 +#: g10/seskey.c:306
  #, c-format
  msgid "%s key %s uses an unsafe (%zu bit) hash\n"
  msgstr ""
@@@ -6809,42 -5451,35 +6847,42 @@@
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "AVISO: conflicto de resumo de sinatura na mensaxe\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr ""
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, fuzzy, c-format
  msgid "please see %s for more information\n"
- msgstr " i = amosar m�is informaci�n\n"
+ msgstr " i = amosar máis información\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
- "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
+ "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
  "se pode desfacer!\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
- msgstr[0] "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
- msgstr[1] "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
+ msgstr[0] "a chave pública %08lX é %lu segundo máis nova cá sinatura\n"
+ msgstr[1] "a chave pública %08lX é %lu segundo máis nova cá sinatura\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
- msgstr[0] "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
- msgstr[1] "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
+ msgstr[0] "a chave pública %08lX é %lu segundo máis nova cá sinatura\n"
+ msgstr[1] "a chave pública %08lX é %lu segundo máis nova cá sinatura\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6857,7 -5492,6 +6895,7 @@@ msgstr[1] "
  "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
  "reloxo)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
@@@ -6869,56 -5503,47 +6907,56 @@@ msgstr[1] "
  "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
  "reloxo)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
- msgstr "NOTA: a chave est� revocada"
+ msgstr "NOTA: a chave está revocada"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, fuzzy, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
- "asumindo unha sinatura incorrecta da chave %08lX debido a un bit cr�tico "
- "desco�ecido\n"
+ "asumindo unha sinatura incorrecta da chave %08lX debido a un bit crítico "
+ "descoñecido\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr ""
- "chave %08lX: non hai unha sub-chave para o paquete de a revocaci�n de "
+ "chave %08lX: non hai unha sub-chave para o paquete de a revocación de "
  "subchave\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
- msgstr "chave %08lX: non hai sub-chave para a sinatura da ligaz�n da chave\n"
+ msgstr "chave %08lX: non hai sub-chave para a sinatura da ligazón da chave\n"
  
 +#: g10/sign.c:88
  #, c-format
  msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
  msgstr ""
- "AVISO: non se pode expandir-%% a notaci�n (grande de m�is). �sase sen "
+ "AVISO: non se pode expandir-%% a notación (grande de máis). Úsase sen "
  "expandir.\n"
  
 +#: g10/sign.c:114
  #, fuzzy, c-format
  msgid ""
  "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
- msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
+ msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de máis).\n"
  
 +#: g10/sign.c:137
  #, fuzzy, c-format
  msgid ""
  "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
  "unexpanded.\n"
- msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
+ msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de máis).\n"
  
 +#: g10/sign.c:329
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "Sinatura %s de: \"%s\"\n"
@@@ -6939,29 -5561,24 +6977,29 @@@ msgstr "asinando:
  msgid "%s encryption will be used\n"
  msgstr "hase empregar cifrado %s\n"
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
  msgstr ""
- "a chave non est� marcada coma insegura - non se pode empregar co xerador de "
- "n�meros aleatorios falso\n"
+ "a chave non está marcada coma insegura - non se pode empregar co xerador de "
+ "números aleatorios falso\n"
  
 +#: g10/skclist.c:187
  #, fuzzy, c-format
  msgid "skipped \"%s\": duplicated\n"
- msgstr "om�tese `%s': duplicada\n"
+ msgstr "omítese `%s': duplicada\n"
  
 +#: g10/skclist.c:206
  msgid "skipped: secret key already present\n"
- msgstr "om�tese: a chave secreta xa est� presente\n"
+ msgstr "omítese: a chave secreta xa está presente\n"
  
 +#: g10/skclist.c:225
  #, fuzzy
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr ""
- "om�tese `%s': �esta � unha chave ElGamal xerada por PGP que non � segura "
+ "omítese `%s': ¡esta é unha chave ElGamal xerada por PGP que non é segura "
  "para sinaturas!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@@ -6980,21 -5595,17 +7018,21 @@@ msgstr "
  msgid "error in '%s': %s\n"
  msgstr "erro lendo `%s': %s\n"
  
 +#: g10/tdbdump.c:162
  #, fuzzy
  msgid "line too long"
- msgstr "li�a longa de m�is\n"
+ msgstr "liña longa de máis\n"
  
 +#: g10/tdbdump.c:170
  msgid "colon missing"
  msgstr ""
  
 +#: g10/tdbdump.c:176
  #, fuzzy
  msgid "invalid fingerprint"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
 +#: g10/tdbdump.c:181
  #, fuzzy
  msgid "ownertrust value missing"
  msgstr "importa-los valores de confianza no propietario"
@@@ -7009,12 -5618,10 +7047,12 @@@ msgstr "erro ao buscar un rexistro de c
  msgid "read error in '%s': %s\n"
  msgstr "erro de lectura: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
- msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
+ msgstr "base de datos de confianza: fallou a sincronización: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "non se pode crear `%s': %s\n"
@@@ -7035,26 -5639,21 +7073,26 @@@ msgid "trustdb rec %lu: write failed (n
  msgstr ""
  "rexistro da base de datos de confianza %lu: fallou a escritura (n=%d): %s\n"
  
 +#: g10/tdbio.c:352
  msgid "trustdb transaction too large\n"
- msgstr "transacci�n da base de datos de confianza demasiado grande\n"
+ msgstr "transacción da base de datos de confianza demasiado grande\n"
  
 +#: g10/tdbio.c:682
  #, c-format
  msgid "%s: directory does not exist!\n"
- msgstr "%s: �o directorio non existe!\n"
+ msgstr "%s: ¡o directorio non existe!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "non se pode pechar `%s': %s\n"
  
 +#: g10/tdbio.c:724
  #, c-format
  msgid "%s: failed to create version record: %s"
- msgstr "%s: non se puido crea-lo rexistro de versi�n: %s"
+ msgstr "%s: non se puido crea-lo rexistro de versión: %s"
  
 +#: g10/tdbio.c:729
  #, c-format
  msgid "%s: invalid trustdb created\n"
  msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
@@@ -7070,33 -5667,26 +7108,33 @@@ msgstr "%s: creouse a base de datos de 
  msgid "Note: trustdb not writable\n"
  msgstr "NOTA: non se pode escribir na base de datos de confianza\n"
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
- msgstr "%s: base de datos de confianza non v�lida\n"
+ msgstr "%s: base de datos de confianza non válida\n"
  
 +#: g10/tdbio.c:834
  #, c-format
  msgid "%s: failed to create hashtable: %s\n"
- msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
+ msgstr "%s: fallo ao crear unha táboa hash: %s\n"
  
 +#: g10/tdbio.c:842
  #, c-format
  msgid "%s: error updating version record: %s\n"
- msgstr "%s: erro ao actualiza-lo rexistro de versi�n: %s\n"
+ msgstr "%s: erro ao actualiza-lo rexistro de versión: %s\n"
  
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
  #, c-format
  msgid "%s: error reading version record: %s\n"
- msgstr "%s: erro ao le-lo rexistro de versi�n: %s\n"
+ msgstr "%s: erro ao le-lo rexistro de versión: %s\n"
  
 +#: g10/tdbio.c:938
  #, c-format
  msgid "%s: error writing version record: %s\n"
- msgstr "%s: erro ao escribi-lo rexistro de versi�n: %s\n"
+ msgstr "%s: erro ao escribi-lo rexistro de versión: %s\n"
  
 +#: g10/tdbio.c:1461
  #, c-format
  msgid "trustdb: lseek failed: %s\n"
  msgstr "base de datos de confianza: lseek fallou: %s\n"
@@@ -7106,22 -5695,18 +7144,22 @@@
  msgid "trustdb: read failed (n=%d): %s\n"
  msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
  
 +#: g10/tdbio.c:1497
  #, c-format
  msgid "%s: not a trustdb file\n"
- msgstr "%s: non � un ficheiro de base de datos de confianza\n"
+ msgstr "%s: non é un ficheiro de base de datos de confianza\n"
  
 +#: g10/tdbio.c:1522
  #, c-format
  msgid "%s: version record with recnum %lu\n"
- msgstr "%s: rexistro de versi�n con n�mero de rexistro %lu\n"
+ msgstr "%s: rexistro de versión con número de rexistro %lu\n"
  
 +#: g10/tdbio.c:1528
  #, c-format
  msgid "%s: invalid file version %d\n"
- msgstr "%s: versi�n do ficheiro incorrecta %d\n"
+ msgstr "%s: versión do ficheiro incorrecta %d\n"
  
 +#: g10/tdbio.c:1748
  #, c-format
  msgid "%s: error reading free record: %s\n"
  msgstr "%s: erro ao ler un rexistro libre: %s\n"
@@@ -7131,12 -5715,10 +7169,12 @@@
  msgid "%s: error writing dir record: %s\n"
  msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
  
 +#: g10/tdbio.c:1768
  #, c-format
  msgid "%s: failed to zero a record: %s\n"
- msgstr "%s: non se puido p�r a cero un rexistro: %s\n"
+ msgstr "%s: non se puido pór a cero un rexistro: %s\n"
  
 +#: g10/tdbio.c:1804
  #, c-format
  msgid "%s: failed to append a record: %s\n"
  msgstr "%s: non se puido engadir un rexistro: %s\n"
@@@ -7146,275 -5727,255 +7184,311 @@@
  msgid "Error: The trustdb is corrupted.\n"
  msgstr "%s: creouse a base de datos de confianza\n"
  
 +#: g10/textfilter.c:146
  #, c-format
  msgid "can't handle text lines longer than %d characters\n"
- msgstr "non � posible manexar li�as de texto maiores que %d caracteres\n"
+ msgstr "non é posible manexar liñas de texto maiores que %d caracteres\n"
  
 +#: g10/textfilter.c:241
  #, c-format
  msgid "input line longer than %d characters\n"
- msgstr "a li�a de entrada cont�n m�is de %d caracteres\n"
+ msgstr "a liña de entrada contén máis de %d caracteres\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Algoritmos soportados:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr ""
+ 
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "listar chave e IDs de usuario"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Normativa: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "ve-la lista de chaves"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
  msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1746
+ #, c-format
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "erro escribindo no chaveiro `%s': %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Borradas %d sinaturas.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
+ msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "cifrado con %lu contrasinais\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
+ msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7428,129 -5989,113 +7502,141 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "erro escribindo no chaveiro público `%s': %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
- msgstr "`%s' non � un ID longo de chave v�lido\n"
+ msgstr "`%s' non é un ID longo de chave válido\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, fuzzy, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "chave %08lX: aceptada como chave de confianza\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, fuzzy, c-format
  msgid "key %s occurs more than once in the trustdb\n"
- msgstr "a chave %08lX aparece m�is dunha vez na base de datos de confianza\n"
+ msgstr "a chave %08lX aparece máis dunha vez na base de datos de confianza\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, fuzzy, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr ""
- "chave %08lX: non hai unha chave p�blica para a chave de confianza - omitida\n"
+ "chave %08lX: non hai unha chave pública para a chave de confianza - omitida\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, fuzzy, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "chave marcada coma de confianza absoluta.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
- msgstr "rexistro de confianza %lu, tipo da petici�n %d: fallou a lectura: %s\n"
+ msgstr "rexistro de confianza %lu, tipo da petición %d: fallou a lectura: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
- msgstr "o rexistro de confianza %lu non � do tipo %d solicitado\n"
+ msgstr "o rexistro de confianza %lu non é do tipo %d solicitado\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "non se precisa comproba-la base de datos de confianza\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "hase comproba-la base de datos de confianza o %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "non se precisa comproba-la base de datos de confianza\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "non se precisa comproba-la base de datos de confianza\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
- msgstr "non se atopou a chave p�blica %08lX: %s\n"
+ msgstr "non se atopou a chave pública %08lX: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "por favor, execute con --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "comprobando a base de datos de confianza\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "%lu chaves procesadas hasta polo momento\n"
  msgstr[1] "%lu chaves procesadas hasta polo momento\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
- msgstr[0] "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
- msgstr[1] "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
+ msgstr[0] "procesáronse %d chaves (marcáronse %d contas de validez)\n"
+ msgstr[1] "procesáronse %d chaves (marcáronse %d contas de validez)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "non se atoparon chaves de confianza absoluta\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
- msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
+ msgstr "non se atopou a chave pública da clave de confianza absoluta %08lX\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@@ -7598,12 -6135,10 +7684,12 @@@ msgstr "[revocada] 
  msgid "[ expired]"
  msgstr "[caducada ]"
  
 +#: g10/trust.c:156
  #, fuzzy
  msgid "[ unknown]"
- msgstr "desco�ecido"
+ msgstr "descoñecido"
  
 +#: g10/trust.c:158
  msgid "[  undef ]"
  msgstr ""
  
@@@ -7631,177 -6161,141 +7717,179 @@@ msgid "
  "should be the first file given on the command line.\n"
  msgstr ""
  "non se puido verifica-la sinatura.\n"
- "Por favor, lembre que o ficheiro de sinatura (.sig ou .asc) deber�a\n"
- "se-lo primeiro ficheiro que se indique na li�a de comandos.\n"
+ "Por favor, lembre que o ficheiro de sinatura (.sig ou .asc) debería\n"
+ "se-lo primeiro ficheiro que se indique na liña de comandos.\n"
  
 +#: g10/verify.c:204
  #, c-format
  msgid "input line %u too long or missing LF\n"
  msgstr ""
- "a li�a de entrada %u � longa de m�is ou f�ltalle a marca de fin de li�a\n"
+ "a liña de entrada %u é longa de máis ou fáltalle a marca de fin de liña\n"
  
 +#: g10/verify.c:253
  #, fuzzy, c-format
  msgid "can't open fd %d: %s\n"
  msgstr "non se puido abrir `%s': %s\n"
  
 +#: kbx/kbxutil.c:92
  msgid "set debugging flags"
- msgstr "axusta-los valores de depuraci�n"
+ msgstr "axusta-los valores de depuración"
  
 +#: kbx/kbxutil.c:93
  msgid "enable full debugging"
- msgstr "habilitar depuraci�n total"
+ msgstr "habilitar depuración total"
  
 +#: kbx/kbxutil.c:117
  #, fuzzy
  msgid "Usage: kbxutil [options] [files] (-h for help)"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
 +#: kbx/kbxutil.c:120
  #, fuzzy
  msgid ""
  "Syntax: kbxutil [options] [files]\n"
  "List, export, import Keybox data\n"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
- msgstr "Por favor, escolla o motivo da revocaci�n:\n"
+ msgstr "Por favor, escolla o motivo da revocación:\n"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
- msgstr "Por favor, escolla o motivo da revocaci�n:\n"
+ msgstr "Por favor, escolla o motivo da revocación:\n"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
- msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
- 
- #: scd/app-openpgp.c:1286
- #, fuzzy, c-format
- msgid "reading public key failed: %s\n"
- msgstr "fallou o borrado do bloque de chaves: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr ""
+ msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
  
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "remove keys from the public keyring"
+ msgid "response does not contain the EC public key\n"
+ msgstr "borrar chaves do chaveiro público"
+ 
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1551
+ #, fuzzy, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "fallou o borrado do bloque de chaves: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
- msgstr "o env�o ao servidor de chaves fallou: %s\n"
+ msgstr "o envío ao servidor de chaves fallou: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7811,26 -6305,21 +7899,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
- msgstr "Por favor, escolla o motivo da revocaci�n:\n"
+ msgstr "Por favor, escolla o motivo da revocación:\n"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7838,122 -6327,97 +7926,122 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "cambia-lo contrasinal"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "erro ao le-lo bloque de chaves: %s\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: erro ao ler un rexistro libre: %s\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  #, fuzzy
  msgid "key already exists\n"
- msgstr "`%s' xa est� comprimido\n"
+ msgstr "`%s' xa está comprimido\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  #, fuzzy
  msgid "generating new key\n"
  msgstr "xerar un novo par de chaves"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
  msgstr "xerar un novo par de chaves"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI non soportado"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
- msgstr[0] "A xeraci�n da chave fallou: %s\n"
- msgstr[1] "A xeraci�n da chave fallou: %s\n"
+ msgstr[0] "A xeración da chave fallou: %s\n"
+ msgstr[1] "A xeración da chave fallou: %s\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "Sinatura %s, algoritmo de resumo %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
- msgstr "non se atoparon datos OpenPGP v�lidos.\n"
+ msgstr "non se atoparon datos OpenPGP válidos.\n"
  
 +#: scd/app-dinsig.c:299
  #, fuzzy
  msgid "||Please enter your PIN at the reader's pinpad"
  msgstr "cambia-lo contrasinal"
@@@ -7970,16 -6432,13 +8058,16 @@@ msgstr "Introduza o ID de usuario: 
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
  #, fuzzy
  msgid "|FILE|write a log to FILE"
- msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+ msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
 +#: scd/scdaemon.c:134
  msgid "|N|connect to reader at port N"
  msgstr ""
  
@@@ -8015,61 -6467,49 +8103,61 @@@ msgstr "comandos conflictivos\n
  msgid "use variable length input for pinpad"
  msgstr ""
  
 +#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
 +#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
 +#: sm/base64.c:327
  #, fuzzy, c-format
  msgid "invalid radix64 character %02x skipped\n"
- msgstr "car�cter radix64 non v�lido %02x omitido\n"
+ msgstr "carácter radix64 non válido %02x omitido\n"
  
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
- msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
+ msgstr "gpg-agent non está dispoñible nesta sesión\n"
  
 +#: sm/certchain.c:194
  #, c-format
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  #, fuzzy
  msgid "shell"
  msgstr "axuda"
  
 +#: sm/certchain.c:256 dirmngr/validate.c:107
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
- msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
+ msgstr "a versión %d do protocolo de gpg-agent non está soportada\n"
  
 +#: sm/certchain.c:295 dirmngr/validate.c:205
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8092,221 -6528,174 +8180,221 @@@ msgstr "gravando a chave secreta en `%s
  msgid "certificate policy not allowed"
  msgstr "gravando a chave secreta en `%s'\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
- msgstr "NOTA: a chave est� revocada"
+ msgstr "NOTA: a chave está revocada"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
- msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
+ msgstr "fallou a comprobación da sinatura creada: %s\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, fuzzy, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "problema de lectura do certificado: %s\n"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  #, fuzzy
  msgid "certificate not yet valid"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  #, fuzzy
  msgid "intermediate certificate not yet valid"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
  msgstr "problema de lectura do certificado: %s\n"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
  msgstr "problema de lectura do certificado: %s\n"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
  msgstr "problema de lectura do certificado: %s\n"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
  msgstr "problema de lectura do certificado: %s\n"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
  msgstr "         novas sinaturas: %lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
- msgstr "Creouse o certificado de revocaci�n.\n"
+ msgstr "Creouse o certificado de revocación.\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "Pegada dactilar:"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  #, fuzzy
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  "Non se atoparon certificados con confianza non definida.\n"
  "\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
  msgstr "Certificado correcto"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  #, fuzzy
  msgid "root certificate is not marked trusted"
  msgstr ""
  "Non se atoparon certificados con confianza non definida.\n"
  "\n"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
- msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
+ msgstr "fallou a comprobación da sinatura creada: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  #, fuzzy
  msgid "certificate chain too long\n"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  #, fuzzy
  msgid "issuer certificate not found"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "verificar unha sinatura"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
  msgstr "certificado duplicado - borrado"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
  msgstr ""
  "Non se atoparon certificados con confianza non definida.\n"
  "\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8325,12 -6711,10 +8413,12 @@@ msgstr "
  msgid "none"
  msgstr "non|nom"
  
 +#: sm/certdump.c:552 sm/certdump.c:617
  #, fuzzy
  msgid "[Error - invalid encoding]"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
 +#: sm/certdump.c:560
  msgid "[Error - out of core]"
  msgstr ""
  
@@@ -8338,12 -6721,10 +8426,12 @@@
  msgid "[Error - No name]"
  msgstr ""
  
 +#: sm/certdump.c:623
  #, fuzzy
  msgid "[Error - invalid DN]"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
 +#: sm/certdump.c:833
  #, fuzzy, c-format
  msgid ""
  "Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -8389,12 -6762,10 +8477,12 @@@ msgstr "
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
 +#: sm/certreqgen.c:464
  #, fuzzy, c-format
  msgid "line %d: invalid algorithm\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: sm/certreqgen.c:478
  #, c-format
  msgid "line %d: invalid key length %u (valid are %d to %d)\n"
  msgstr ""
@@@ -8404,27 -6774,22 +8492,27 @@@
  msgid "line %d: no subject name given\n"
  msgstr ""
  
 +#: sm/certreqgen.c:505
  #, fuzzy, c-format
  msgid "line %d: invalid subject name label '%.*s'\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: sm/certreqgen.c:508
  #, fuzzy, c-format
  msgid "line %d: invalid subject name '%s' at pos %d\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: sm/certreqgen.c:525
  #, fuzzy, c-format
  msgid "line %d: not a valid email address\n"
- msgstr "Non � un enderezo de e-mail v�lido\n"
+ msgstr "Non é un enderezo de e-mail válido\n"
  
 +#: sm/certreqgen.c:544
  #, fuzzy, c-format
  msgid "line %d: invalid serial number\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: sm/certreqgen.c:560
  #, c-format
  msgid "line %d: invalid issuer name label '%.*s'\n"
  msgstr ""
@@@ -8434,37 -6798,30 +8522,37 @@@
  msgid "line %d: invalid issuer name '%s' at pos %d\n"
  msgstr ""
  
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
  #, fuzzy, c-format
  msgid "line %d: invalid date given\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: sm/certreqgen.c:599
  #, fuzzy, c-format
  msgid "line %d: error getting signing key by keygrip '%s': %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
  
 +#: sm/certreqgen.c:618
  #, fuzzy, c-format
  msgid "line %d: invalid hash algorithm given\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: sm/certreqgen.c:633
  #, fuzzy, c-format
  msgid "line %d: invalid authority-key-id\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: sm/certreqgen.c:648
  #, fuzzy, c-format
  msgid "line %d: invalid subject-key-id\n"
- msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
+ msgstr "chave %08lX: ligazón de sub-chave incorrecta\n"
  
 +#: sm/certreqgen.c:686
  #, fuzzy, c-format
  msgid "line %d: invalid extension syntax\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: sm/certreqgen.c:699
  #, fuzzy, c-format
  msgid "line %d: error reading key '%s' from card: %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
@@@ -8474,28 -6830,23 +8562,28 @@@
  msgid "line %d: error getting key by keygrip '%s': %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
  
 +#: sm/certreqgen.c:729
  #, fuzzy, c-format
  msgid "line %d: key generation failed: %s <%s>\n"
- msgstr "A xeraci�n da chave fallou: %s\n"
+ msgstr "A xeración da chave fallou: %s\n"
  
 +#: sm/certreqgen.c:1324
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:162
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
- msgstr "   (%d) RSA (s� asinar)\n"
+ msgstr "   (%d) RSA (só asinar)\n"
  
 +#: sm/certreqgen-ui.c:163
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
- msgstr "   (%d) RSA (s� cifrar)\n"
+ msgstr "   (%d) RSA (só cifrar)\n"
  
 +#: sm/certreqgen-ui.c:164
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
@@@ -8525,41 -6871,34 +8613,41 @@@ msgstr "
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) RSA (asinar e cifrar)\n"
  
 +#: sm/certreqgen-ui.c:282
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
- msgstr "   (%d) DSA (s� asinar)\n"
+ msgstr "   (%d) DSA (só asinar)\n"
  
 +#: sm/certreqgen-ui.c:283
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
- msgstr "   (%d) RSA (s� cifrar)\n"
+ msgstr "   (%d) RSA (só cifrar)\n"
  
 +#: sm/certreqgen-ui.c:307
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
 +#: sm/certreqgen-ui.c:311
  #, fuzzy
  msgid "No subject name given\n"
- msgstr "(Non se deu unha descrici�n)\n"
+ msgstr "(Non se deu unha descrición)\n"
  
 +#: sm/certreqgen-ui.c:315
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
  #. TRANSLATORS: The 22 in the second string is the
  #. length of the first string up to the "%s".  Please
  #. adjust it do the length of your translation.  The
  #. second string is merely passed to atoi so you can
  #. drop everything after the number.
 +#: sm/certreqgen-ui.c:324
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: sm/certreqgen-ui.c:326
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
@@@ -8573,29 -6910,24 +8661,29 @@@ msgstr "Enderezo de E-mail: 
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
- "Introduza o ID de usuario. Remate cunha li�a en branco: "
+ "Introduza o ID de usuario. Remate cunha liña en branco: "
  
 +#: sm/certreqgen-ui.c:343
  #, fuzzy
  msgid "Enter DNS names"
  msgstr "Introduza o novo nome de ficheiro"
  
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
- msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
+ msgstr "Introduza unha descrición opcional; remátea cunha liña en branco:\n"
  
 +#: sm/certreqgen-ui.c:348
  #, fuzzy
  msgid "Enter URIs"
  msgstr "Introduza o ID de usuario: "
  
 +#: sm/certreqgen-ui.c:355
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
- msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
+ msgstr "¿Crear un certificado de revocación para esta sinatura? "
  
 +#: sm/certreqgen-ui.c:382
  msgid "These parameters are used:\n"
  msgstr ""
  
@@@ -8607,9 -6937,8 +8695,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
- msgstr "Creouse o certificado de revocaci�n.\n"
+ msgstr "Creouse o certificado de revocación.\n"
  
 +#: sm/certreqgen-ui.c:403
  msgid "This may take a while ...\n"
  msgstr ""
  
@@@ -8638,7 -6961,6 +8726,7 @@@ msgstr "
  msgid "certificate '%s' not found: %s\n"
  msgstr "non se atopou a chave `%s': %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
  msgstr "erro ao le-lo bloque de chaves: %s\n"
@@@ -8658,199 -6977,157 +8746,199 @@@ msgstr "certificado duplicado - borrado
  msgid "deleting certificate \"%s\" failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
 +#: sm/encrypt.c:328
  #, fuzzy
  msgid "no valid recipients given\n"
- msgstr "(Non se deu unha descrici�n)\n"
+ msgstr "(Non se deu unha descrición)\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
  msgstr "ve-la lista de chaves secretas"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
  msgstr "Certificado correcto"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
  msgstr "Certificado correcto"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
- msgstr "crear sa�da con armadura en ascii"
+ msgstr "crear saída con armadura en ascii"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "non usa-la terminal en absoluto"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
- msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+ msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "modo por lotes: non preguntar nunca"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
- msgstr "asumir `si' na maior�a das preguntas"
+ msgstr "asumir `si' na maioría das preguntas"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
- msgstr "asumir `non' na maior�a das preguntas"
+ msgstr "asumir `non' na maioría das preguntas"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
- msgstr "engadir este chaveiro � lista de chaveiros"
+ msgstr "engadir este chaveiro á lista de chaveiros"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOME|empregar NOME coma chave secreta por defecto"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "Sintaxe: gpg [opci�ns] [ficheiros]\n"
+ "Sintaxe: gpg [opcións] [ficheiros]\n"
  "asinar, verificar, cifrar ou descifrar\n"
- "a operaci�n por defecto depende dos datos de entrada\n"
+ "a operación por defecto depende dos datos de entrada\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "non se puido conectar a `%s': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
- msgstr "destinatario por defecto `%s' desco�ecido\n"
+ msgstr "destinatario por defecto `%s' descoñecido\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
- msgstr "(Non se deu unha descrici�n)\n"
+ msgstr "(Non se deu unha descrición)\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " o = omitir esta chave\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "non se puido analisa-lo URI do servidor de chaves\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "escribindo a `%s'\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "non se pode pechar `%s': %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
 +#: sm/import.c:127
  #, fuzzy, c-format
  msgid "total number processed: %lu\n"
- msgstr "N�mero total procesado: %lu\n"
+ msgstr "Número total procesado: %lu\n"
  
 +#: sm/import.c:246
  #, fuzzy
  msgid "error storing certificate\n"
  msgstr "Certificado correcto"
@@@ -8859,7 -7135,6 +8947,7 @@@
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -8874,32 -7147,26 +8962,32 @@@ msgstr "erro ao crea-lo contrasinal: %s
  msgid "error reading input: %s\n"
  msgstr "erro lendo `%s': %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
  msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, fuzzy, c-format
  msgid "problem re-searching certificate: %s\n"
- msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
+ msgstr "rev? problema ao comproba-la revocación: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -8912,17 -7177,14 +9000,17 @@@ msgstr "
  msgid "GPG_TTY has not been set - using maybe bogus default\n"
  msgstr ""
  
 +#: sm/qualified.c:105
  #, fuzzy, c-format
  msgid "invalid formatted fingerprint in '%s', line %d\n"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
 +#: sm/qualified.c:123
  #, fuzzy, c-format
  msgid "invalid country code in '%s', line %d\n"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
 +#: sm/qualified.c:206
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
@@@ -8947,22 -7207,18 +9035,22 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
 +#: sm/sign.c:451
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
- msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
+ msgstr "o algoritmo de protección %d%s non está soportado\n"
  
 +#: sm/sign.c:465
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
 +#: sm/sign.c:517
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
- msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
+ msgstr "fallou a comprobación da sinatura creada: %s\n"
  
 +#: sm/verify.c:450
  #, fuzzy
  msgid "Signature made "
  msgstr "A sinatura caducou o %s\n"
@@@ -8998,12 -7248,10 +9086,12 @@@ msgstr "
  "\n"
  "Esta ha ser unha auto-sinatura.\n"
  
 +#: dirmngr/certcache.c:106
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
- msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
+ msgstr "fallou a comprobación da sinatura creada: %s\n"
  
 +#: dirmngr/certcache.c:117
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
@@@ -9062,38 -7299,30 +9150,38 @@@ msgstr "
  msgid "error loading certificate '%s': %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
 +#: dirmngr/certcache.c:489
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
- msgstr "Certificado non v�lido"
+ msgstr "Certificado non válido"
  
 +#: dirmngr/certcache.c:491
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
- msgstr "Creouse o certificado de revocaci�n.\n"
+ msgstr "Creouse o certificado de revocación.\n"
  
 +#: dirmngr/certcache.c:508
  #, fuzzy
  msgid "certificate cached\n"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
 +#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
 +#: dirmngr/certcache.c:593
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -9124,12 -7348,10 +9212,12 @@@ msgstr "non se pode crea-lo directorio 
  msgid "error creating directory '%s': %s\n"
  msgstr "erro ao crea-lo chaveiro `%s': %s\n"
  
 +#: dirmngr/crlcache.c:245
  #, fuzzy, c-format
  msgid "ignoring database dir '%s'\n"
- msgstr "error nunha li�a adicional\n"
+ msgstr "error nunha liña adicional\n"
  
 +#: dirmngr/crlcache.c:254
  #, fuzzy, c-format
  msgid "error reading directory '%s': %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -9143,9 -7363,8 +9231,9 @@@ msgstr "fallou o borrado do bloque de c
  #, fuzzy, c-format
  #| msgid "enarmoring failed: %s\n"
  msgid "not removing file '%s'\n"
- msgstr "non se puido po�e-la armadura: %s\n"
+ msgstr "non se puido poñe-la armadura: %s\n"
  
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -9175,9 -7389,8 +9263,9 @@@ msgstr "erro lendo `%s': %s\n
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new cache dir file '%s' created\n"
- msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
+ msgstr " creouse un novo ficheiro de configuración `%s'\n"
  
 +#: dirmngr/crlcache.c:445
  #, fuzzy, c-format
  msgid "failed to re-open cache dir file '%s': %s\n"
  msgstr "non se pode crea-lo directorio `%s': %s\n"
@@@ -9200,12 -7409,10 +9288,12 @@@ msgstr "
  msgid "extra field detected in crl record of '%s' line %u\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:623
  #, fuzzy, c-format
  msgid "invalid line detected in '%s' line %u\n"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
 +#: dirmngr/crlcache.c:632
  #, fuzzy, c-format
  msgid "duplicate entry detected in '%s' line %u\n"
  msgstr "certificado duplicado - borrado"
@@@ -9215,28 -7421,23 +9303,28 @@@
  msgid "unsupported record type in '%s' line %u skipped\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:673
  #, fuzzy, c-format
  msgid "invalid issuer hash in '%s' line %u\n"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
 +#: dirmngr/crlcache.c:679
  #, fuzzy, c-format
  msgid "no issuer DN in '%s' line %u\n"
  msgstr "erro de lectura: %s\n"
  
 +#: dirmngr/crlcache.c:686
  #, fuzzy, c-format
  msgid "invalid timestamp in '%s' line %u\n"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
 +#: dirmngr/crlcache.c:692
  #, fuzzy, c-format
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid "WARNING: invalid cache file hash in '%s' line %u\n"
- msgstr "AVISO: tama�o do ficheiro random_seed non v�lido - non se emprega\n"
+ msgstr "AVISO: tamaño do ficheiro random_seed non válido - non se emprega\n"
  
 +#: dirmngr/crlcache.c:698
  msgid "detected errors in cache dir file\n"
  msgstr ""
  
@@@ -9275,12 -7469,10 +9363,12 @@@ msgstr "erro ao enviar a `%s': %s\n
  msgid "error hashing '%s': %s\n"
  msgstr "erro lendo `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1055
  #, fuzzy, c-format
  msgid "invalid formatted checksum for '%s'\n"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
 +#: dirmngr/crlcache.c:1108
  msgid "too many open cache files; can't open anymore\n"
  msgstr ""
  
@@@ -9307,18 -7494,15 +9395,18 @@@ msgstr "
  msgid "calling unlock_db_file on an unlocked file\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1231
  #, fuzzy, c-format
  msgid "failed to create a new cache object: %s\n"
- msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
+ msgstr "%s: fallo ao crear unha táboa hash: %s\n"
  
 +#: dirmngr/crlcache.c:1286
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "no CRL available for issuer id %s\n"
- msgstr "Non hai axuda dispo�ible para `%s'"
+ msgstr "Non hai axuda dispoñible para `%s'"
  
 +#: dirmngr/crlcache.c:1293
  #, c-format
  msgid "cached CRL for issuer id %s too old; update required\n"
  msgstr ""
@@@ -9374,9 -7548,8 +9462,9 @@@ msgstr "erro ao crea-lo contrasinal: %s
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
- msgstr "algoritmo de hash non v�lido `%s'\n"
+ msgstr "algoritmo de hash non válido `%s'\n"
  
 +#: dirmngr/crlcache.c:1549
  #, c-format
  msgid "gcry_md_open for algorithm %d failed: %s\n"
  msgstr ""
@@@ -9385,9 -7557,8 +9473,9 @@@
  #, fuzzy
  #| msgid "invalid response from agent\n"
  msgid "got an invalid S-expression from libksba\n"
- msgstr "resposta do axente non v�lida\n"
+ msgstr "resposta do axente non válida\n"
  
 +#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
  #, fuzzy, c-format
  #| msgid "changing permission of  `%s' failed: %s\n"
  msgid "converting S-expression failed: %s\n"
@@@ -9442,24 -7603,20 +9530,24 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "signature verification suppressed\n"
  msgid "CRL signature verification failed: %s\n"
- msgstr "verificaci�n de sinatura suprimida\n"
+ msgstr "verificación de sinatura suprimida\n"
  
 +#: dirmngr/crlcache.c:1858
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
- msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
+ msgstr "fallou a comprobación da sinatura creada: %s\n"
  
 +#: dirmngr/crlcache.c:2001
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
 +#: dirmngr/crlcache.c:2008
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
- msgstr "a actualizaci�n fallou: %s\n"
+ msgstr "a actualización fallou: %s\n"
  
 +#: dirmngr/crlcache.c:2042
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "non se pode crea-lo directorio `%s': %s\n"
@@@ -9478,9 -7632,8 +9566,9 @@@ msgstr "erro ao crea-lo contrasinal: %s
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
- msgstr "lid ?: a inserci�n fallou: %s\n"
+ msgstr "lid ?: a inserción fallou: %s\n"
  
 +#: dirmngr/crlcache.c:2076
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "escribindo a `%s'\n"
@@@ -9515,12 -7662,10 +9603,12 @@@ msgstr "erro lendo `%s': %s\n
  msgid "creating cache file '%s'\n"
  msgstr "erro ao crea-lo contrasinal: %s\n"
  
 +#: dirmngr/crlcache.c:2221
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
- msgstr "non se puido po�e-la armadura: %s\n"
+ msgstr "non se puido poñe-la armadura: %s\n"
  
 +#: dirmngr/crlcache.c:2235
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9554,19 -7693,16 +9642,19 @@@ msgstr "
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
- msgstr "AVISO: tama�o do ficheiro random_seed non v�lido - non se emprega\n"
+ msgstr "AVISO: tamaño do ficheiro random_seed non válido - non se emprega\n"
  
 +#: dirmngr/crlcache.c:2333
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: erro ao ler un rexistro libre: %s\n"
  
 +#: dirmngr/crlcache.c:2344
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
- msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
+ msgstr "rev? problema ao comproba-la revocación: %s\n"
  
 +#: dirmngr/crlcache.c:2375
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "erro lendo `%s': %s\n"
@@@ -9575,18 -7710,15 +9663,18 @@@
  msgid "End CRL dump\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:2499
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
- msgstr "a actualizaci�n fallou: %s\n"
+ msgstr "a actualización fallou: %s\n"
  
 +#: dirmngr/crlcache.c:2510
  #, fuzzy, c-format
  #| msgid "lid ?: insert failed: %s\n"
  msgid "crl_cache_insert via DP failed: %s\n"
- msgstr "lid ?: a inserci�n fallou: %s\n"
+ msgstr "lid ?: a inserción fallou: %s\n"
  
 +#: dirmngr/crlcache.c:2570
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
@@@ -9651,29 -7768,24 +9739,29 @@@ msgstr "
  msgid "check whether a dirmngr is running"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:73
  #, fuzzy
  msgid "add a certificate to the cache"
- msgstr "Creouse o certificado de revocaci�n.\n"
+ msgstr "Creouse o certificado de revocación.\n"
  
 +#: dirmngr/dirmngr-client.c:74
  #, fuzzy
  #| msgid "bad certificate"
  msgid "validate a certificate"
- msgstr "certificado err�neo"
+ msgstr "certificado erróneo"
  
 +#: dirmngr/dirmngr-client.c:75
  #, fuzzy
  #| msgid "bad certificate"
  msgid "lookup a certificate"
- msgstr "certificado err�neo"
+ msgstr "certificado erróneo"
  
 +#: dirmngr/dirmngr-client.c:76
  #, fuzzy
  msgid "lookup only locally stored certificates"
- msgstr "Certificado non v�lido"
+ msgstr "Certificado non válido"
  
 +#: dirmngr/dirmngr-client.c:77
  msgid "expect an URL for --lookup"
  msgstr ""
  
@@@ -9700,9 -7807,8 +9788,9 @@@ msgstr "Introduza o ID de usuario do re
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
 +#: dirmngr/dirmngr-client.c:173
  msgid ""
  "Syntax: dirmngr-client [options] [certfile|pattern]\n"
  "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9734,14 -7835,12 +9822,14 @@@ msgstr "non se puido conectar a `%s': %
  #, fuzzy, c-format
  #| msgid "update failed: %s\n"
  msgid "lookup failed: %s\n"
- msgstr "a actualizaci�n fallou: %s\n"
+ msgstr "a actualización fallou: %s\n"
  
 +#: dirmngr/dirmngr-client.c:347
  #, fuzzy, c-format
  msgid "loading CRL '%s' failed: %s\n"
- msgstr "non se puido po�e-la armadura: %s\n"
+ msgstr "non se puido poñe-la armadura: %s\n"
  
 +#: dirmngr/dirmngr-client.c:375
  msgid "a dirmngr daemon is up and running\n"
  msgstr ""
  
@@@ -9750,17 -7848,14 +9838,17 @@@
  msgid "validation of certificate failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
  #, fuzzy
  msgid "certificate is valid\n"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
  #, fuzzy
  msgid "certificate has been revoked\n"
- msgstr "NOTA: a chave est� revocada"
+ msgstr "NOTA: a chave está revocada"
  
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
  #, fuzzy, c-format
  msgid "certificate check failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
@@@ -9793,112 -7883,88 +9881,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
- msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+ msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  msgid "run without asking a user"
- msgstr "�Sa�r sin gardar? "
+ msgstr "¿Saír sin gardar? "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
- msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+ msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "non se puido analisa-lo URI do servidor de chaves\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9909,93 -7975,74 +10001,93 @@@ msgid "
  "options)\n"
  msgstr ""
  "@\n"
- "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
+ "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
- msgstr "uso: gpg [opci�ns] "
+ msgstr "uso: gpg [opcións] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
- msgstr "�%s non se admite con %s!\n"
+ msgstr "¡%s non se admite con %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
- msgstr "non se puido po�e-la armadura: %s\n"
+ msgstr "non se puido poñe-la armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
- msgstr "non se puido po�e-la armadura: %s\n"
+ msgstr "non se puido poñe-la armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
- msgstr "li�a longa de m�is\n"
+ msgstr "liña longa de máis\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
- msgstr "erro: pegada dactilar non v�lida\n"
+ msgstr "erro: pegada dactilar non válida\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "erro de lectura: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "non procesado"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10048,9 -8084,8 +10140,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
 +#: dirmngr/dirmngr_ldap.c:212
  msgid ""
  "Syntax: dirmngr_ldap [options] [URL]\n"
  "Internal LDAP helper for Dirmngr\n"
@@@ -10061,9 -8095,8 +10153,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "invalid import options\n"
  msgid "invalid port number %d\n"
- msgstr "opci�ns de importaci�n non v�lidas\n"
+ msgstr "opcións de importación non válidas\n"
  
 +#: dirmngr/dirmngr_ldap.c:413
  #, c-format
  msgid "scanning result for attribute '%s'\n"
  msgstr ""
@@@ -10133,12 -8152,10 +10225,12 @@@ msgstr "
  msgid "          attr '%s'\n"
  msgstr "               alias \""
  
 +#: dirmngr/dirmngr_ldap.c:616
  #, fuzzy, c-format
  msgid "no host name in '%s'\n"
- msgstr "(Non se deu unha descrici�n)\n"
+ msgstr "(Non se deu unha descrición)\n"
  
 +#: dirmngr/dirmngr_ldap.c:621
  #, c-format
  msgid "no attribute given for query '%s'\n"
  msgstr ""
@@@ -10147,41 -8163,29 +10239,35 @@@
  #, fuzzy
  #| msgid "WARNING: using insecure memory!\n"
  msgid "WARNING: using first attribute only\n"
- msgstr "AVISO: ��sase memoria insegura!\n"
+ msgstr "AVISO: ¡úsase memoria insegura!\n"
  
 +#: dirmngr/dirmngr_ldap.c:636
  #, fuzzy, c-format
  msgid "LDAP init to '%s:%d' failed: %s\n"
- msgstr "non se puido po�e-la armadura: %s\n"
+ msgstr "non se puido poñe-la armadura: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:659
  #, fuzzy, c-format
  msgid "binding to '%s:%d' failed: %s\n"
- msgstr "non se puido po�e-la armadura: %s\n"
+ msgstr "non se puido poñe-la armadura: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:686
  #, fuzzy, c-format
  #| msgid "dearmoring failed: %s\n"
  msgid "searching '%s' failed: %s\n"
  msgstr "non se puido quita-la armadura: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:718
  #, fuzzy, c-format
  msgid "'%s' is not an LDAP URL\n"
- msgstr "\"%s\" non � un ficheiro JPEG\n"
+ msgstr "\"%s\" non é un ficheiro JPEG\n"
  
 +#: dirmngr/dirmngr_ldap.c:724
  #, c-format
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
  msgstr "erro escribindo no chaveiro `%s': %s\n"
@@@ -10191,12 -8194,10 +10277,12 @@@
  msgid "error reading log from ldap wrapper %d: %s\n"
  msgstr "erro lendo `%s': %s\n"
  
 +#: dirmngr/ldap-wrapper.c:304
  #, fuzzy, c-format
  msgid "npth_select failed: %s - waiting 1s\n"
- msgstr "o segredo da actualizaci�n fallou: %s\n"
+ msgstr "o segredo da actualización fallou: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:343
  #, c-format
  msgid "ldap wrapper %d ready"
  msgstr ""
@@@ -10211,12 -8210,10 +10297,12 @@@ msgstr "
  msgid "ldap wrapper %d ready: exitcode=%d\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:364
  #, fuzzy, c-format
  msgid "waiting for ldap wrapper %d failed: %s\n"
- msgstr "a actualizaci�n fallou: %s\n"
+ msgstr "a actualización fallou: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:376
  #, c-format
  msgid "ldap wrapper %d stalled - killing\n"
  msgstr ""
@@@ -10259,9 -8248,8 +10345,9 @@@ msgstr "
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
- msgstr "%s: versi�n do ficheiro incorrecta %d\n"
+ msgstr "%s: versión do ficheiro incorrecta %d\n"
  
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
  msgstr "non se puido abrir un ficheiro: %s\n"
@@@ -10270,9 -8257,8 +10356,9 @@@
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
- msgstr "o segredo da actualizaci�n fallou: %s\n"
+ msgstr "o segredo da actualización fallou: %s\n"
  
 +#: dirmngr/misc.c:518
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10358,12 -8327,10 +10444,12 @@@ msgstr "erro ao crea-lo contrasinal: %s
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
 +#: dirmngr/ocsp.c:563
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
@@@ -10381,9 -8345,8 +10467,9 @@@ msgstr "non se puido inicializa-la bas
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
- msgstr "%s: non � posible acceder: %s\n"
+ msgstr "%s: non é posible acceder: %s\n"
  
 +#: dirmngr/ocsp.c:621
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
@@@ -10422,12 -8378,10 +10508,12 @@@ msgstr "
  msgid "good"
  msgstr ""
  
 +#: dirmngr/ocsp.c:708
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
- msgstr "NOTA: a chave est� revocada"
+ msgstr "NOTA: a chave está revocada"
  
 +#: dirmngr/ocsp.c:743
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
@@@ -10439,77 -8391,61 +10525,77 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "fallou a sinatura: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "fallou a sinatura: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "erro ao enviar a `%s': %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "non se pode crear `%s': %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
+ msgstr "%s: fallo ao crear unha táboa hash: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
- msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
+ msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10529,27 -8462,22 +10615,27 @@@ msgstr "comprobando a base de datos de 
  msgid "not checking CRL for"
  msgstr ""
  
 +#: dirmngr/validate.c:250
  #, fuzzy
  msgid "checking CRL for"
- msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
+ msgstr "fallou a comprobación da sinatura creada: %s\n"
  
 +#: dirmngr/validate.c:528
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "verificar unha sinatura"
  
 +#: dirmngr/validate.c:561
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
- msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
+ msgstr "fallou a comprobación da sinatura creada: %s\n"
  
 +#: dirmngr/validate.c:738
  #, fuzzy
  msgid "certificate chain is good\n"
- msgstr "Revocaci�n de certificado v�lida"
+ msgstr "Revocación de certificado válida"
  
 +#: dirmngr/validate.c:968
  msgid "DSA requires the use of a 160 bit hash algorithm\n"
  msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
  
@@@ -10557,7 -8484,6 +10643,7 @@@
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "abandonar"
@@@ -10590,21 -8509,17 +10676,21 @@@ msgstr "
  msgid "do not use extended connect mode"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:92
  #, fuzzy
  msgid "|FILE|run commands from FILE on startup"
- msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+ msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
  
 +#: tools/gpg-connect-agent.c:93
  msgid "run /subst on startup"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:205
  #, fuzzy
  msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
 +#: tools/gpg-connect-agent.c:208
  msgid ""
  "Syntax: @GPG at -connect-agent [options]\n"
  "Connect to a running agent and send commands\n"
@@@ -10626,21 -8537,17 +10712,21 @@@ msgstr "
  msgid "receiving line failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
 +#: tools/gpg-connect-agent.c:1458
  #, fuzzy
  msgid "line too long - skipped\n"
- msgstr "li�a longa de m�is\n"
+ msgstr "liña longa de máis\n"
  
 +#: tools/gpg-connect-agent.c:1462
  msgid "line shortened due to embedded Nul character\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1837
  #, fuzzy, c-format
  msgid "unknown command '%s'\n"
- msgstr "destinatario por defecto `%s' desco�ecido\n"
+ msgstr "destinatario por defecto `%s' descoñecido\n"
  
 +#: tools/gpg-connect-agent.c:1855
  #, fuzzy, c-format
  msgid "sending line failed: %s\n"
  msgstr "fallou a sinatura: %s\n"
@@@ -10660,13 -8562,10 +10746,13 @@@ msgstr "
  msgid "Options controlling the configuration"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
 +#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
  #, fuzzy
  msgid "Options useful for debugging"
- msgstr "habilitar depuraci�n total"
+ msgstr "habilitar depuración total"
  
 +#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
  msgid "Options controlling the security"
  msgstr ""
  
@@@ -10729,11 -8614,9 +10815,11 @@@ msgstr "|NOME|cifrar para NOME
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "non se puido analisa-lo URI do servidor de chaves\n"
@@@ -10767,148 -8643,121 +10853,156 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "erro de rede"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
- msgstr "contrasinal err�neo"
+ msgid "Passphrase Entry"
+ msgstr "contrasinal erróneo"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
- msgstr "non se atopou a chave p�blica"
+ msgstr "non se atopou a chave pública"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
- msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
+ msgstr " creouse un novo ficheiro de configuración `%s'\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
- msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
+ msgstr " creouse un novo ficheiro de configuración `%s'\n"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "actualiza-la base de datos de confianza"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
- msgstr "usar coma ficheiro de sa�da"
+ msgstr "usar coma ficheiro de saída"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
- msgstr "non se atopou a chave p�blica"
+ msgstr "non se atopou a chave pública"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  #, fuzzy
  msgid "No argument allowed"
  msgstr "gravando a chave secreta en `%s'\n"
@@@ -10950,31 -8792,26 +11044,31 @@@ msgstr "
  msgid "input file name (default stdin)"
  msgstr ""
  
 +#: tools/symcryptrun.c:209
  #, fuzzy
  msgid "Usage: symcryptrun [options] (-h for help)"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
 +#: tools/symcryptrun.c:212
  msgid ""
  "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
  "[options...] COMMAND [inputfile]\n"
  "Call a simple symmetric encryption tool\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:278
  #, fuzzy, c-format
  msgid "%s on %s aborted with status %i\n"
- msgstr "�%s non se admite con %s!\n"
+ msgstr "¡%s non se admite con %s!\n"
  
 +#: 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"
+ "a actualización da base de datos de confianza fallou:\n"
  "%s\n"
  
 +#: tools/symcryptrun.c:317
  #, fuzzy, c-format
  msgid "can't create temporary directory '%s': %s\n"
  msgstr "non se pode crea-lo directorio `%s': %s\n"
@@@ -10999,12 -8832,10 +11093,12 @@@ msgstr "erro lendo `%s': %s\n
  msgid "error closing %s: %s\n"
  msgstr "erro lendo `%s': %s\n"
  
 +#: tools/symcryptrun.c:490
  #, fuzzy
  msgid "no --program option provided\n"
- msgstr "non se soporta a execuci�n remota de programas\n"
+ msgstr "non se soporta a execución remota de programas\n"
  
 +#: tools/symcryptrun.c:496
  msgid "only --decrypt and --encrypt are supported\n"
  msgstr ""
  
@@@ -11031,32 -8857,26 +11125,32 @@@ msgstr "non foi posible crear %s: %s\n
  msgid "could not fork: %s\n"
  msgstr "%s: non se atopou o usuario: %s\n"
  
 +#: tools/symcryptrun.c:582
  #, fuzzy, c-format
  msgid "execv failed: %s\n"
- msgstr "a actualizaci�n fallou: %s\n"
+ msgstr "a actualización fallou: %s\n"
  
 +#: tools/symcryptrun.c:611
  #, fuzzy, c-format
  msgid "select failed: %s\n"
  msgstr "fallou o borrado do bloque de chaves: %s\n"
  
 +#: tools/symcryptrun.c:628
  #, fuzzy, c-format
  msgid "read failed: %s\n"
- msgstr "a actualizaci�n fallou: %s\n"
+ msgstr "a actualización fallou: %s\n"
  
 +#: tools/symcryptrun.c:680
  #, fuzzy, c-format
  msgid "pty read failed: %s\n"
- msgstr "a actualizaci�n fallou: %s\n"
+ msgstr "a actualización fallou: %s\n"
  
 +#: tools/symcryptrun.c:732
  #, fuzzy, c-format
  msgid "waitpid failed: %s\n"
- msgstr "a actualizaci�n fallou: %s\n"
+ msgstr "a actualización fallou: %s\n"
  
 +#: tools/symcryptrun.c:746
  #, c-format
  msgid "child aborted with status %i\n"
  msgstr ""
@@@ -11080,17 -8896,14 +11174,17 @@@ msgstr "
  msgid "no class provided\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:1018
  #, fuzzy, c-format
  msgid "class %s is not supported\n"
- msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
+ msgstr "o algoritmo de protección %d%s non está soportado\n"
  
 +#: tools/gpg-check-pattern.c:144
  #, fuzzy
  msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
- msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
  
 +#: tools/gpg-check-pattern.c:147
  msgid ""
  "Syntax: gpg-check-pattern [options] patternfile\n"
  "Check a passphrase given on stdin against the patternfile\n"
diff --cc po/gnupg2.pot
index bb5c186,e4a9afb..36ded94
--- a/po/gnupg2.pot
+++ b/po/gnupg2.pot
@@@ -1,27 -1,28 +1,27 @@@
 -# Traditional Chinese(zh-tw) messages for GnuPG
 -# Copyright (C) 2002 Free Software Foundation, Inc.
 +# SOME DESCRIPTIVE TITLE.
 +# Copyright (C) YEAR Free Software Foundation, Inc.
  # This file is distributed under the same license as the PACKAGE package.
 -# Jedi Lin <Jedi at Jedi.org>, 2003~2013.
 -#
 -# Special thanks to "Audrey Tang <audreyt at audreyt.org>".
 +# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
  #
 +#, fuzzy
  msgid ""
  msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.15\n"
 -"Project-Id-Version: GNU gnupg 2.1.0\n"
++"Project-Id-Version: GNU gnupg 2.1.16\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
 -"PO-Revision-Date: 2014-11-22 20:56+0800\n"
 -"Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
 -"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
 -"Language: zh_TW\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 +"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 +"Language-Team: LANGUAGE <LL at li.org>\n"
 +"Language: \n"
  "MIME-Version: 1.0\n"
 -"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Type: text/plain; charset=CHARSET\n"
  "Content-Transfer-Encoding: 8bit\n"
 -"X-Poedit-Basepath: gnupg-2.1.0/\n"
 -"Plural-Forms: nplurals=1; plural=0;\n"
 -"X-Generator: Poedit 1.5.7\n"
 +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
 -msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
 +msgstr ""
  
  #. TRANSLATORS: These are labels for buttons etc used in
  #. Pinentries.  An underscore indicates that the next letter
@@@ -29,47 -30,47 +29,47 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
 -msgstr "|pinentry-label|_OK"
 +msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
 -msgstr "|pinentry-label|取消 (_C)"
 +msgstr ""
  
- #: agent/call-pinentry.c:449
 -#, fuzzy
 -#| msgid "|pinentry-label|_OK"
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
 -msgstr "|pinentry-label|_OK"
 +msgstr ""
  
- #: agent/call-pinentry.c:450
 -#, fuzzy
 -#| msgid "|pinentry-label|_OK"
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
 -msgstr "|pinentry-label|_OK"
 +msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
 -msgstr "|pinentry-label|個人識別碼 (PIN):"
 +msgstr ""
  
- #: agent/call-pinentry.c:452
 -#, fuzzy
 -#| msgid "|pinentry-label|_Cancel"
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
 -msgstr "|pinentry-label|取消 (_C)"
 +msgstr ""
  
- #: agent/call-pinentry.c:453
 -#, fuzzy
 -#| msgid "Do you really want to permanently delete the OpenPGP secret key:"
++#: agent/call-pinentry.c:468
  msgid "Do you really want to make your passphrase visible on the screen?"
 -msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
 +msgstr ""
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
 -#, fuzzy
 -#| msgid "Enter new passphrase"
++#: agent/call-pinentry.c:471
  msgid "|pinentry-tt|Hide passphrase"
 -msgstr "請輸入新密語"
 +msgstr ""
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
 -msgstr "優劣程度: %s"
 +msgstr ""
  
  #. TRANSLATORS: This string is a tooltip, shown by pinentry when
  #. hovering over the quality bar.  Please use an appropriate
@@@ -77,176 -78,125 +77,166 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
 -"上列輸入文字的優劣程度.\n"
 -"關於此規範的細節, 請洽你的系統管理者."
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
 -msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開私鑰"
 +msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
 -msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
 +msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
 -msgstr "密語:"
 +msgstr ""
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
 -msgstr "前後不一致 - 請再試一次"
 +msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
 -msgstr "設定錯誤: %s (第 %d 次嘗試, 最多 %d 次)"
 +msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
 -msgstr "重複:"
 +msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
 -msgstr "個人識別碼 (PIN) 太長"
 +msgstr ""
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
 -msgstr "密語太長"
 +msgstr ""
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
 -msgstr "個人識別碼 (PIN) 含有無效的字符"
 +msgstr ""
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
 -msgstr "個人識別碼 (PIN) 太短"
 +msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
 -msgstr "不良的個人識別碼 (PIN)"
 +msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
 -msgstr "不良的密語"
 +msgstr ""
  
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
  #, c-format
  msgid "ssh keys greater than %d bits are not supported\n"
 -msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 +msgstr ""
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
 -msgstr "無法建立 '%s': %s\n"
 +msgstr ""
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, c-format
  msgid "can't open '%s': %s\n"
 -msgstr "無法開啟 '%s': %s\n"
 +msgstr ""
  
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
  #, c-format
  msgid "error getting serial number of card: %s\n"
 -msgstr "取得此卡片序號時出錯: %s\n"
 +msgstr ""
  
 +#: agent/command-ssh.c:2419
  #, c-format
  msgid "detected card with S/N: %s\n"
 -msgstr "偵測到卡片, 其序號為: %s\n"
 +msgstr ""
  
 +#: agent/command-ssh.c:2424
  #, c-format
  msgid "no authentication key for ssh on card: %s\n"
 -msgstr "卡片上沒有 ssh 用的認證金鑰: %s\n"
 +msgstr ""
  
 +#: agent/command-ssh.c:2444
  #, c-format
  msgid "no suitable card key found: %s\n"
 -msgstr "找不到合適的卡片金鑰: %s\n"
 +msgstr ""
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr ""
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr ""
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
 -"有某個 ssh 程序提出使用金鑰 %%0A  %s%%0A  (%s)%%0A 之請求, 請問是否允許?"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
 -msgstr "允許"
 +msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
 -msgstr "拒絕"
 +msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 -msgstr "請輸入此 ssh 金鑰的密語 %%0A  %F%%0A  (%c)"
 +msgstr ""
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
 -msgstr "請再次輸入密語"
 +msgstr ""
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr ""
 -"請輸入密語以保護收到的私鑰 %%0A   %s%%0A   %s%%0A 於 gpg-agent 的金鑰存放處"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
 -msgstr "從 socket 建立串流失敗: %s\n"
 +msgstr ""
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
 -msgstr "請插入下列序號的卡片:"
 +msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
 -msgstr "請移除現用中的卡片並插入下列序號的卡片:"
 +msgstr ""
  
 +#: agent/divert-scd.c:204
  msgid "Admin PIN"
 -msgstr "管理者個人識別碼 (PIN)"
 +msgstr ""
  
  #. TRANSLATORS: A PUK is the Personal Unblocking Code
  #. used to unblock a PIN.
@@@ -339,313 -271,245 +329,317 @@@ msgstr[1] "
  msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
  msgid_plural ""
  "A passphrase should contain at least %u digits or%%0Aspecial characters."
 -msgstr[0] "密語至少得要含有 %u 個數字或%%0A特別字符."
 +msgstr[0] ""
 +msgstr[1] ""
  
 -#, fuzzy, c-format
 -#| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 +#: agent/genkey.c:278
 +#, c-format
  msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 -msgstr "密語不得含有已知的詞彙, 亦不得與%%0A確知的模式吻合."
 +msgstr ""
  
 +#: agent/genkey.c:293
  msgid "Warning: You have entered an insecure passphrase."
 -msgstr "警告: 你輸入了不安全的密語."
 +msgstr ""
  
 +#: agent/genkey.c:480
  #, c-format
  msgid "Please enter the passphrase to%0Aprotect your new key"
 -msgstr "請輸入密語至%0A以保護你的新金鑰"
 +msgstr ""
  
 +#: agent/genkey.c:606
  msgid "Please enter the new passphrase"
 -msgstr "請輸入新的密語"
 +msgstr ""
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
  msgstr ""
 -"@選項:\n"
 -" "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
 -msgstr "以服務模式執行 (背景)"
 +msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
 -msgstr "以伺服器模式執行 (前景)"
 +msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
 -#, fuzzy
 -#| msgid "run in server mode"
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ msgid "run in supervised mode"
 -msgstr "以伺服器模式執行"
++msgstr ""
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
 -msgstr "囉唆模式"
 +msgstr ""
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
 -msgstr "盡量安靜些"
 +msgstr ""
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
 -msgstr "sh 樣式的指令輸出"
 +msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
 -msgstr "csh 樣式的指令輸出"
 +msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
 -msgstr "|檔案|從指定檔案中讀取選項"
 +msgstr ""
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
 -msgstr "不要從 console 分離"
 +msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
 -msgstr "不要奪取鍵盤及滑鼠"
 +msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
 -msgstr "為伺服器使用日誌檔"
 +msgstr ""
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
 -msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
 +msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
 -msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
 +msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
 -msgstr "不要使用 SCdaemon"
 +msgstr ""
  
- #: agent/gpg-agent.c:180
 -#, fuzzy
 -#| msgid "|NAME|connect to host NAME"
++#: agent/gpg-agent.c:184
  msgid "|NAME|accept some commands via NAME"
 -msgstr "|名稱|連線至位於指定名稱的主機"
 +msgstr ""
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
 -msgstr "忽略變更 TTY 的要求"
 +msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
 -msgstr "忽略變更 X display 的要求"
 +msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
 -msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
 +msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
 -msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
 +msgstr ""
  
- #: agent/gpg-agent.c:217
 -#, fuzzy
 -#| msgid "do not allow the reuse of old passphrases"
++#: agent/gpg-agent.c:221
  msgid "disallow the use of an external password cache"
 -msgstr "不允許重複使用舊密語"
 +msgstr ""
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
 -msgstr "不允許用戶端將金鑰標記為 \"已信任\""
 +msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
 -msgstr "允許預先設定密語"
 +msgstr ""
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  msgid "enable ssh support"
 -msgstr "啟用 ssh 支援"
 +msgstr ""
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
 -msgstr "啟用 putty 支援"
 +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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
 -msgstr "翻譯瑕疵請回報給 <Jedi at Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 -msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
 +msgstr ""
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
 -"語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
 -"@GNUPG@ 私鑰管理\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
 -msgstr "給定的除錯等級 '%s' 無效\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, c-format
  msgid "Note: no default option file '%s'\n"
 -msgstr "請注意: 沒有預設選項檔 '%s'\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
 -msgstr "選項檔 '%s': %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, c-format
  msgid "reading options from '%s'\n"
 -msgstr "從 '%s' 讀取選項中\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
 -msgstr "請注意: '%s' 並不當成選項\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
 -msgstr "無法建立 socket: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
 -msgstr "socket 名稱 '%s' 太長\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  msgid "a gpg-agent is already running - not starting a new one\n"
 -msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
 -msgstr "為 socket 取得 nonce 時出錯\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, c-format
  msgid "error binding socket to '%s': %s\n"
 -msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
 -#, fuzzy, c-format
 -#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
 +#, c-format
  msgid "can't set permissions of '%s': %s\n"
 -msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
 -msgstr "listen() 失敗: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, c-format
  msgid "listening on socket '%s'\n"
 -msgstr "正在候聽 socket '%s'\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
 -msgstr "無法建立目錄 '%s': %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
 -msgstr "目錄 '%s' 已建立\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, c-format
  msgid "stat() failed for '%s': %s\n"
 -msgstr "'%s' 的 stat() 失敗: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, c-format
  msgid "can't use '%s' as home directory\n"
 -msgstr "無法使用 '%s' 做為家目錄\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
 -msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
 -msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
 -msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
 -msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
 -msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
 -msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
 -msgstr "%s %s 已停止\n"
 +msgstr ""
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
 -msgstr "在此階段中沒有執行中的 gpg-agent\n"
 +msgstr ""
  
 +#: agent/preset-passphrase.c:99
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 -msgstr "用法: gpg-preset-passphrase [選項] 金鑰鑰柄 (或用 -h 求助)\n"
 +msgstr ""
  
 +#: agent/preset-passphrase.c:102
  msgid ""
  "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
  "Password cache maintenance\n"
  msgstr ""
 -"語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
 -"密碼快取維護\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
  msgstr ""
 -"@指令:\n"
 -" "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -681,54 -544,46 +675,55 @@@ msgid "
  "Please enter the passphrase or the PIN\n"
  "needed to complete this operation."
  msgstr ""
 -"請輸入完成這項操作所需的\n"
 -"密語或個人識別碼 (PIN)."
  
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
  msgid "cancelled\n"
 -msgstr "已取消\n"
 +msgstr ""
  
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
  #, c-format
  msgid "error while asking for the passphrase: %s\n"
 -msgstr "詢問密語時出錯: %s\n"
 +msgstr ""
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, c-format
  msgid "error opening '%s': %s\n"
 -msgstr "開啟 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
  #, c-format
  msgid "file '%s', line %d: %s\n"
 -msgstr "檔案 '%s', 第 %d 列: %s\n"
 +msgstr ""
  
 +#: agent/trustlist.c:192 agent/trustlist.c:200
  #, c-format
  msgid "statement \"%s\" ignored in '%s', line %d\n"
 -msgstr "陳述句 \"%s\" 忽略於 '%s', 第 %d 列\n"
 +msgstr ""
  
 +#: agent/trustlist.c:206
  #, c-format
  msgid "system trustlist '%s' not available\n"
 -msgstr "沒有系統信任清單 '%s' 可用\n"
 +msgstr ""
  
 +#: agent/trustlist.c:250
  #, c-format
  msgid "bad fingerprint in '%s', line %d\n"
 -msgstr "不良的指紋於 '%s', 第 %d 列\n"
 +msgstr ""
  
 +#: agent/trustlist.c:275 agent/trustlist.c:282
  #, c-format
  msgid "invalid keyflag in '%s', line %d\n"
 -msgstr "無效的金鑰旗標於 '%s', 第 %d 列\n"
 +msgstr ""
  
 +#: agent/trustlist.c:316 common/helpfile.c:136
  #, c-format
  msgid "error reading '%s', line %d: %s\n"
 -msgstr "讀取 '%s' 時出錯, 第 %d 列: %s\n"
 +msgstr ""
  
 +#: agent/trustlist.c:434 agent/trustlist.c:503
  msgid "error reading list of trusted root certificates\n"
 -msgstr "讀取已信任根憑證清單時出錯\n"
 +msgstr ""
  
  #. TRANSLATORS: This prompt is shown by the Pinentry
  #. and has one special property: A "%%0A" is used by
@@@ -743,16 -597,13 +738,16 @@@
  msgid ""
  "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
  "certificates?"
 -msgstr "請問你是否徹底信任%%0A  \"%s\"%%0A正確驗證使用者憑證的能力?"
 +msgstr ""
  
 +#: agent/trustlist.c:673 common/audit.c:467
  msgid "Yes"
 -msgstr "Yes"
 +msgstr ""
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
 -msgstr "No"
 +msgstr ""
  
  #. TRANSLATORS: This prompt is shown by the Pinentry and has
  #. one special property: A "%%0A" is used by Pinentry to
@@@ -772,1195 -622,946 +767,1205 @@@ msgstr "
  #. TRANSLATORS: "Correct" is the label of a button and intended
  #. to be hit if the fingerprint matches the one of the CA.  The
  #. other button is "the default "Cancel" of the Pinentry.
 +#: agent/trustlist.c:721
  msgid "Correct"
 -msgstr "正確"
 +msgstr ""
  
 +#: agent/trustlist.c:721
  msgid "Wrong"
 -msgstr "錯了"
 +msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
 -msgstr "請注意: 密語從未變更過.%0A請現在就變更."
 +msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
 -msgstr "密語從下列時刻起就沒有變更過:%%0A%.4s-%.2s-%.2s.  請現在就變更."
 +msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
 -msgstr "更改密語"
 +msgstr ""
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
 -msgstr "我稍後再變更"
 +msgstr ""
  
- #: agent/findkey.c:1429
 -#, fuzzy, c-format
 -#| msgid "Do you really want to delete the selected keys? (y/N) "
++#: agent/findkey.c:1438
 +#, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
 -msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
 +msgstr ""
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  msgid "Delete key"
 -msgstr "刪除金鑰"
 +msgstr ""
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
  msgstr ""
 -"警告: 這把金鑰同時列為 SSH 所使用!\n"
 -"刪除這把金鑰可能會讓你失去存取遠端機器的能力."
  
 +#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
  msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 -msgstr "DSA 需要 8 位元倍數的雜湊長度\n"
 +msgstr ""
  
 +#: agent/pksign.c:187 sm/certcheck.c:97
  #, c-format
  msgid "%s key uses an unsafe (%u bit) hash\n"
 -msgstr "金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
 +msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 -msgstr "%zu 位元的雜湊對 %u 位元的 %s 金鑰無效\n"
 +msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
 -msgstr "檢查已建立的簽章時出錯: %s\n"
 +msgstr ""
  
 +#: agent/cvt-openpgp.c:338
  msgid "secret key parts are not available\n"
 -msgstr "私鑰部分無法取用\n"
 +msgstr ""
  
 +#: agent/cvt-openpgp.c:344
  #, c-format
  msgid "public key algorithm %d (%s) is not supported\n"
 -msgstr "公鑰演算法 %d (%s) 未支援\n"
 +msgstr ""
  
 +#: agent/cvt-openpgp.c:448
  #, c-format
  msgid "protection algorithm %d (%s) is not supported\n"
 -msgstr "保護演算法 %d (%s) 未支援\n"
 +msgstr ""
  
 +#: agent/cvt-openpgp.c:455
  #, c-format
  msgid "protection hash algorithm %d (%s) is not supported\n"
 -msgstr "保護雜湊演算法 %d (%s) 未支援\n"
 +msgstr ""
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
 -msgstr "建立管道時出錯: %s\n"
 +msgstr ""
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
 -msgstr "建立管道串流時出錯: %s\n"
 +msgstr ""
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
 -msgstr "衍生執行程序時出錯: %s\n"
 +msgstr ""
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
  #, c-format
- msgid "waiting for processes to terminate failed: %s\n"
+ msgid "waiting for process %d to terminate failed: %s\n"
 -msgstr "等候 %d 處理程序終止時失敗: %s\n"
 +msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, c-format
  msgid "error running '%s': probably not installed\n"
 -msgstr "執行 '%s' 時出錯: 可能尚未安裝\n"
 +msgstr ""
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
 -msgstr "執行 '%s' 時出錯: 結束狀態 %d\n"
 +msgstr ""
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, c-format
  msgid "error running '%s': terminated\n"
 -msgstr "執行 '%s' 時出錯: 已終止\n"
 +msgstr ""
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
 -#, fuzzy, c-format
 -#| msgid "waiting for process %d to terminate failed: %s\n"
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
 +#, c-format
- msgid "error getting exit code of process %d: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
 -msgstr "等候 %d 處理程序終止時失敗: %s\n"
 +msgstr ""
  
- #: common/exechelp-w32ce.c:767
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "error getting exit code of process %d: %s\n"
 -msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
 +msgstr ""
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, c-format
  msgid "can't connect to '%s': %s\n"
 -msgstr "無法連接至 '%s': %s\n"
 +msgstr ""
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
 -msgstr "設定 gpg-agent 選項時發生問題\n"
 +msgstr ""
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
 -msgstr "無法讓系統停止傾印核心檔: %s\n"
 +msgstr ""
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
 -msgstr "警告: %s 的所有權 \"%s\" 並不安全\n"
 +msgstr ""
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
 -msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "waiting for the agent to come up ... (%ds)\n"
++#: common/sysutils.c:659
++#, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
 -msgstr "正在等候代理程式出現 ... (%d 秒)\n"
++msgstr ""
+ 
++#: common/sysutils.c:685
+ #, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
 -msgstr "把 '%s' 重新新命成 '%s' 時失敗: %s\n"
++msgstr ""
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
 -msgstr "yes"
 +msgstr ""
  
 +#: common/yesno.c:46 common/yesno.c:87
  msgid "yY"
 -msgstr "yY"
 +msgstr ""
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:48 common/yesno.c:84
  msgid "no"
 -msgstr "no"
 +msgstr ""
  
 +#: common/yesno.c:49 common/yesno.c:88
  msgid "nN"
 -msgstr "nN"
 +msgstr ""
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:86
  msgid "quit"
 -msgstr "quit"
 +msgstr ""
  
 +#: common/yesno.c:89
  msgid "qQ"
 -msgstr "qQ"
 +msgstr ""
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:123
  msgid "okay|okay"
 -msgstr "okay|okay"
 +msgstr ""
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:125
  msgid "cancel|cancel"
 -msgstr "cancel|cancel"
 +msgstr ""
  
 +#: common/yesno.c:126
  msgid "oO"
 -msgstr "oO"
 +msgstr ""
  
 +#: common/yesno.c:127
  msgid "cC"
 -msgstr "cC"
 +msgstr ""
  
 +#: common/miscellaneous.c:86
  #, c-format
  msgid "out of core in secure memory while allocating %lu bytes"
 -msgstr "在安全記憶體配置 %lu 位元組時超出核心"
 +msgstr ""
  
 +#: common/miscellaneous.c:89
  #, c-format
  msgid "out of core while allocating %lu bytes"
 -msgstr "配置 %lu 位元組時超出核心"
 +msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
 -msgstr "配置足夠的記憶體時出錯: %s\n"
 +msgstr ""
  
 +#: common/miscellaneous.c:143
  #, c-format
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 -msgstr "%s:%u: 廢棄的 \"%s\" 選項 - 沒有任何影響\n"
 +msgstr ""
  
 +#: common/miscellaneous.c:146
  #, c-format
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 -msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
 +msgstr ""
  
 +#: common/miscellaneous.c:554
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
 -msgstr "沒有執行中的 gpg-agent - 正在啟動 '%s'\n"
 +msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
 -msgstr "正在等候代理程式出現 ... (%d 秒)\n"
 +msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
 -msgstr "至代理程式的連線已建立\n"
 +msgstr ""
  
- #: common/asshelp.c:525
 -#, fuzzy
 -#| msgid "connection to agent established\n"
++#: common/asshelp.c:488
  msgid "connection to agent is in restricted mode\n"
 -msgstr "至代理程式的連線已建立\n"
 +msgstr ""
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
 -msgstr "沒有執行中的 Dirmngr - 正在啟動 '%s'\n"
 +msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
 -msgstr "正在等候 dirmngr 出現 ... (%d 秒)\n"
 +msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
 -msgstr "連線至 dirmngr 已建立\n"
 +msgstr ""
  
  #. TRANSLATORS: Copy the prefix between the vertical bars
  #. verbatim.  It will not be printed.
 +#: common/audit.c:474
  msgid "|audit-log-result|Good"
 -msgstr "|audit-log-result|良好"
 +msgstr ""
  
 +#: common/audit.c:477
  msgid "|audit-log-result|Bad"
 -msgstr "|audit-log-result|不良"
 +msgstr ""
  
 +#: common/audit.c:479
  msgid "|audit-log-result|Not supported"
 -msgstr "|audit-log-result|不支援"
 +msgstr ""
  
 +#: common/audit.c:481
  msgid "|audit-log-result|No certificate"
 -msgstr "|audit-log-result|沒有憑證"
 +msgstr ""
  
 +#: common/audit.c:483
  msgid "|audit-log-result|Not enabled"
 -msgstr "|audit-log-result|未啟用"
 +msgstr ""
  
 +#: common/audit.c:485
  msgid "|audit-log-result|Error"
 -msgstr "|audit-log-result|錯誤"
 +msgstr ""
  
 +#: common/audit.c:487
  msgid "|audit-log-result|Not used"
 -msgstr "|audit-log-result|未使用"
 +msgstr ""
  
 +#: common/audit.c:489
  msgid "|audit-log-result|Okay"
 -msgstr "|audit-log-result|沒問題"
 +msgstr ""
  
 +#: common/audit.c:491
  msgid "|audit-log-result|Skipped"
 -msgstr "|audit-log-result|已跳過"
 +msgstr ""
  
 +#: common/audit.c:493
  msgid "|audit-log-result|Some"
 -msgstr "|audit-log-result|有些"
 +msgstr ""
  
 +#: common/audit.c:726
  msgid "Certificate chain available"
 -msgstr "有可用的憑證鏈"
 +msgstr ""
  
 +#: common/audit.c:733
  msgid "root certificate missing"
 -msgstr "根憑證遺失"
 +msgstr ""
  
 +#: common/audit.c:759
  msgid "Data encryption succeeded"
 -msgstr "資料已加密成功"
 +msgstr ""
  
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
  msgid "Data available"
 -msgstr "有可用的資料"
 +msgstr ""
  
 +#: common/audit.c:767
  msgid "Session key created"
 -msgstr "階段金鑰已建立"
 +msgstr ""
  
 +#: common/audit.c:772 common/audit.c:912 common/audit.c:919
  #, c-format
  msgid "algorithm: %s"
 -msgstr "演算法: %s"
 +msgstr ""
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
 -msgstr "未支援的演算法: %s"
 +msgstr ""
  
 +#: common/audit.c:778 common/audit.c:925
  msgid "seems to be not encrypted"
 -msgstr "看起來未加密"
 +msgstr ""
  
 +#: common/audit.c:784 common/audit.c:933
  msgid "Number of recipients"
 -msgstr "收件者數量"
 +msgstr ""
  
 +#: common/audit.c:792 common/audit.c:956
  #, c-format
  msgid "Recipient %d"
 -msgstr "收件者 %d"
 +msgstr ""
  
 +#: common/audit.c:825
  msgid "Data signing succeeded"
 -msgstr "資料已簽署成功"
 +msgstr ""
  
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
  #, c-format
  msgid "data hash algorithm: %s"
 -msgstr "資料雜湊演算法: %s"
 +msgstr ""
  
 +#: common/audit.c:862
  #, c-format
  msgid "Signer %d"
 -msgstr "簽署者 %d"
 +msgstr ""
  
 +#: common/audit.c:866 common/audit.c:1065
  #, c-format
  msgid "attr hash algorithm: %s"
 -msgstr "屬性雜湊演算法: %s"
 +msgstr ""
  
 +#: common/audit.c:901
  msgid "Data decryption succeeded"
 -msgstr "資料已解密成功"
 +msgstr ""
  
 +#: common/audit.c:910
  msgid "Encryption algorithm supported"
 -msgstr "支援的加密演算法"
 +msgstr ""
  
 +#: common/audit.c:993
  msgid "Data verification succeeded"
 -msgstr "資料驗證成功"
 +msgstr ""
  
 +#: common/audit.c:1002
  msgid "Signature available"
 -msgstr "有可用的簽章"
 +msgstr ""
  
 +#: common/audit.c:1024
  msgid "Parsing data succeeded"
 -msgstr "剖析資料成功"
 +msgstr ""
  
 +#: common/audit.c:1036
  #, c-format
  msgid "bad data hash algorithm: %s"
 -msgstr "不良的資料雜湊演算法: %s"
 +msgstr ""
  
 +#: common/audit.c:1051
  #, c-format
  msgid "Signature %d"
 -msgstr "簽章 %d"
 +msgstr ""
  
 +#: common/audit.c:1079
  msgid "Certificate chain valid"
 -msgstr "憑證鏈有效"
 +msgstr ""
  
 +#: common/audit.c:1090
  msgid "Root certificate trustworthy"
 -msgstr "根憑證可信賴"
 +msgstr ""
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
 -msgstr "找不到用於憑證的 CRL"
 +msgstr ""
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
 -msgstr "可用的 CRL 太舊了"
 +msgstr ""
  
 +#: common/audit.c:1119
  msgid "CRL/OCSP check of certificates"
 -msgstr "CRL/OCSP 憑證檢查"
 +msgstr ""
  
 +#: common/audit.c:1139
  msgid "Included certificates"
 -msgstr "包含在內的憑證"
 +msgstr ""
  
 +#: common/audit.c:1194
  msgid "No audit log entries."
 -msgstr "沒有稽核日誌項目."
 +msgstr ""
  
 +#: common/audit.c:1243
  msgid "Unknown operation"
 -msgstr "未知的操作"
 +msgstr ""
  
 +#: common/audit.c:1261
  msgid "Gpg-Agent usable"
 -msgstr "Gpg-Agent 可以使用"
 +msgstr ""
  
 +#: common/audit.c:1271
  msgid "Dirmngr usable"
 -msgstr "Dirmngr 可以使用"
 +msgstr ""
  
 +#: common/audit.c:1307
  #, c-format
  msgid "No help available for '%s'."
 -msgstr "'%s' 沒有可用的說明."
 +msgstr ""
  
 +#: common/helpfile.c:90
  msgid "ignoring garbage line"
 -msgstr "忽略垃圾列"
 +msgstr ""
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
 -msgstr "[ 無 ]"
 +msgstr ""
  
 +#: common/argparse.c:365
  msgid "argument not expected"
 -msgstr "沒料到有引數"
 +msgstr ""
  
 +#: common/argparse.c:367
  msgid "read error"
 -msgstr "讀取錯誤"
 +msgstr ""
  
 +#: common/argparse.c:369
  msgid "keyword too long"
 -msgstr "關鍵字太長"
 +msgstr ""
  
 +#: common/argparse.c:371
  msgid "missing argument"
 -msgstr "無效的引數"
 +msgstr ""
  
 +#: common/argparse.c:373
  msgid "invalid argument"
 -msgstr "無效的引數"
 +msgstr ""
  
 +#: common/argparse.c:375
  msgid "invalid command"
 -msgstr "無效的指令"
 +msgstr ""
  
 +#: common/argparse.c:377
  msgid "invalid alias definition"
 -msgstr "無效的別名定義"
 +msgstr ""
  
 +#: common/argparse.c:379
  msgid "out of core"
 -msgstr "超出核心"
 +msgstr ""
  
 +#: common/argparse.c:381
  msgid "invalid option"
 -msgstr "無效的選項"
 +msgstr ""
  
 +#: common/argparse.c:389
  #, c-format
  msgid "missing argument for option \"%.50s\"\n"
 -msgstr "\"%.50s\" 選項遺失了引數\n"
 +msgstr ""
  
 +#: common/argparse.c:391
  #, c-format
  msgid "invalid argument for option \"%.50s\"\n"
 -msgstr "選項 \"%.50s\" 的引數無效\n"
 +msgstr ""
  
 +#: common/argparse.c:393
  #, c-format
  msgid "option \"%.50s\" does not expect an argument\n"
 -msgstr "\"%.50s\" 選項沒料到會有引數\n"
 +msgstr ""
  
 +#: common/argparse.c:395
  #, c-format
  msgid "invalid command \"%.50s\"\n"
 -msgstr "無效的指令 \"%.50s\"\n"
 +msgstr ""
  
 +#: common/argparse.c:397
  #, c-format
  msgid "option \"%.50s\" is ambiguous\n"
 -msgstr "\"%.50s\" 選項不明確\n"
 +msgstr ""
  
 +#: common/argparse.c:399
  #, c-format
  msgid "command \"%.50s\" is ambiguous\n"
 -msgstr "\"%.50s\" 指令不明確\n"
 +msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
 -msgstr "超出核心\n"
 +msgstr ""
  
 +#: common/argparse.c:403
  #, c-format
  msgid "invalid option \"%.50s\"\n"
 -msgstr "無效的選項 \"%.50s\"\n"
 +msgstr ""
  
 +#: common/utf8conv.c:123
  #, c-format
  msgid "conversion from '%s' to '%s' not available\n"
 -msgstr "沒有從 '%s' 到 '%s' 之間的轉換可用\n"
 +msgstr ""
  
 +#: common/utf8conv.c:131
  #, c-format
  msgid "iconv_open failed: %s\n"
 -msgstr "iconv_open 失敗: %s\n"
 +msgstr ""
  
 +#: common/utf8conv.c:385 common/utf8conv.c:651
  #, c-format
  msgid "conversion from '%s' to '%s' failed: %s\n"
 -msgstr "從 '%s' 轉換到 '%s' 失敗: %s\n"
 +msgstr ""
  
 +#: common/dotlock.c:707
  #, c-format
  msgid "failed to create temporary file '%s': %s\n"
 -msgstr "建立暫存檔失敗 '%s': %s\n"
 +msgstr ""
  
 +#: common/dotlock.c:771
  #, c-format
  msgid "error writing to '%s': %s\n"
 -msgstr "寫入 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: common/dotlock.c:1116
  #, c-format
  msgid "removing stale lockfile (created by %d)\n"
 -msgstr "正在移除陳腐的鎖定檔 (由 %d 所建立)\n"
 +msgstr ""
  
 +#: common/dotlock.c:1152
  #, c-format
  msgid "waiting for lock (held by %d%s) %s...\n"
 -msgstr "正在等候鎖定 (被 %d%s 持有) %s...\n"
 +msgstr ""
  
 +#: common/dotlock.c:1153
  msgid "(deadlock?) "
 -msgstr "(死結嗎?) "
 +msgstr ""
  
 +#: common/dotlock.c:1192
  #, c-format
  msgid "lock '%s' not made: %s\n"
 -msgstr "未鎖定 '%s': %s\n"
 +msgstr ""
  
 +#: common/dotlock.c:1219
  #, c-format
  msgid "waiting for lock %s...\n"
 -msgstr "正在等候 `%s' 鎖定...\n"
 +msgstr ""
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
 -msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
 +msgstr ""
  
 +#: g10/armor.c:424
  #, c-format
  msgid "armor: %s\n"
 -msgstr "封裝: %s\n"
 +msgstr ""
  
 +#: g10/armor.c:463
  msgid "invalid armor header: "
 -msgstr "無效的封裝檔頭: "
 +msgstr ""
  
 +#: g10/armor.c:474
  msgid "armor header: "
 -msgstr "封裝檔頭: "
 +msgstr ""
  
 +#: g10/armor.c:487
  msgid "invalid clearsig header\n"
 -msgstr "無效的明文簽章檔頭\n"
 +msgstr ""
  
 +#: g10/armor.c:500
  msgid "unknown armor header: "
 -msgstr "未知的封裝檔頭: "
 +msgstr ""
  
 +#: g10/armor.c:553
  msgid "nested clear text signatures\n"
 -msgstr "多層明文簽章\n"
 +msgstr ""
  
 +#: g10/armor.c:688
  msgid "unexpected armor: "
 -msgstr "未預期的封裝: "
 +msgstr ""
  
 +#: g10/armor.c:701
  msgid "invalid dash escaped line: "
 -msgstr "無效的破折號逸出列: "
 +msgstr ""
  
 +#: g10/armor.c:873 g10/armor.c:1490
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
 -msgstr "無效的 64 進位字符 %02x 已跳過\n"
 +msgstr ""
  
 +#: g10/armor.c:916
  msgid "premature eof (no CRC)\n"
 -msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
 +msgstr ""
  
 +#: g10/armor.c:950
  msgid "premature eof (in CRC)\n"
 -msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 +msgstr ""
  
 +#: g10/armor.c:958
  msgid "malformed CRC\n"
 -msgstr "格式不對的 CRC\n"
 +msgstr ""
  
 +#: g10/armor.c:962 g10/armor.c:1527
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
 -msgstr "CRC 錯誤; %06lX - %06lX\n"
 +msgstr ""
  
 +#: g10/armor.c:982
  msgid "premature eof (in trailer)\n"
 -msgstr "檔案未預期的結束 (於結尾處)\n"
 +msgstr ""
  
 +#: g10/armor.c:986
  msgid "error in trailer line\n"
 -msgstr "結尾列有問題\n"
 +msgstr ""
  
 +#: g10/armor.c:1303
  msgid "no valid OpenPGP data found.\n"
 -msgstr "找不到有效的 OpenPGP 資料.\n"
 +msgstr ""
  
 +#: g10/armor.c:1308
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
 -msgstr "無效的封裝: 列長超出 %d 字符\n"
 +msgstr ""
  
 +#: g10/armor.c:1312
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
 -msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 +msgstr ""
  
- #: g10/build-packet.c:1115
 -#, fuzzy, c-format
 -#| msgid "not human readable"
++#: g10/build-packet.c:1110
 +#, c-format
  msgid "[ not human readable (%zu bytes: %s%s) ]"
 -msgstr "不是人類能讀得懂的"
 +msgstr ""
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
 -msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
 +msgstr ""
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
 -msgstr "使用者標記名稱一定要含有 '@' 字符\n"
 +msgstr ""
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
 -msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
 +msgstr ""
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
 -msgstr "標記值一定不能使用任何的控制字符\n"
 +msgstr ""
  
- #: g10/build-packet.c:1259
 -#, fuzzy
 -#| msgid "a notation name must not contain more than one '@' character\n"
++#: g10/build-packet.c:1254
  msgid "a notation name may not contain an '=' character\n"
 -msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
 +msgstr ""
  
- #: g10/build-packet.c:1265
 -#, fuzzy
 -#| msgid ""
 -#| "a notation name must have only printable characters or spaces, and end "
 -#| "with an '='\n"
++#: g10/build-packet.c:1260
  msgid "a notation name must have only printable characters or spaces\n"
 -msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
 +msgstr ""
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
 -msgstr "警告: 找到無效的標記資料\n"
 +msgstr ""
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
 -msgstr "以 %s 代理伺服器查詢用戶端時失敗\n"
 +msgstr ""
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
 -msgstr "請輸入密語: "
 +msgstr ""
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
 -#, fuzzy, c-format
 -#| msgid "error creating keyring '%s': %s\n"
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
 +#, c-format
  msgid "error getting version from '%s': %s\n"
 -msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
 -#, fuzzy, c-format
 -#| msgid "WARNING: %s overrides %s\n"
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
 +#, c-format
  msgid "WARNING: %s\n"
 -msgstr "警告: %s 會推翻 %s\n"
 +msgstr ""
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
 -msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 +msgstr ""
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
 -msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 +msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
 -msgstr "無法在批次模式中這樣做\n"
 +msgstr ""
  
 +#: g10/card-util.c:107
  msgid "This command is only available for version 2 cards\n"
 -msgstr "祇有第二版卡片纔能用這個指令\n"
 +msgstr ""
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
 -msgstr "(再也) 沒有重設碼\n"
 +msgstr ""
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
 -msgstr "你要選哪一個? "
 +msgstr ""
  
 +#: g10/card-util.c:279 g10/card-util.c:330
  msgid "[not set]"
 -msgstr "[未設定]"
 +msgstr ""
  
 +#: g10/card-util.c:533
  msgid "male"
 -msgstr "男性"
 +msgstr ""
  
 +#: g10/card-util.c:534
  msgid "female"
 -msgstr "女性"
 +msgstr ""
  
 +#: g10/card-util.c:534
  msgid "unspecified"
 -msgstr "未特定"
 +msgstr ""
  
 +#: g10/card-util.c:561
  msgid "not forced"
 -msgstr "不強迫使用"
 +msgstr ""
  
 +#: g10/card-util.c:561
  msgid "forced"
 -msgstr "強迫使用"
 +msgstr ""
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
 -msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
 +msgstr ""
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
 -msgstr "錯誤: 不能使用 \"<\" 字符.\n"
 +msgstr ""
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
 -msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 +msgstr ""
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
 -msgstr "卡片持有者的姓氏: "
 +msgstr ""
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
 -msgstr "卡片持有者的名字: "
 +msgstr ""
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
 -msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
 +msgstr ""
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
 -msgstr "取回公鑰的 URL: "
 +msgstr ""
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
 -msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
 +msgstr ""
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, c-format
  msgid "error reading '%s': %s\n"
 -msgstr "讀取 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
 -msgstr "寫入 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
 -msgstr "登入資料 (帳號名稱): "
 +msgstr ""
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
 -msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
 +msgstr ""
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
 -msgstr "私人的 DO 資料: "
 +msgstr ""
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
 -msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
 +msgstr ""
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
 -msgstr "介面語言偏好設定: "
 +msgstr ""
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
 -msgstr "錯誤: 無效的偏好設定字串長度\n"
 +msgstr ""
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
 -msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
 +msgstr ""
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
 -msgstr "性別 ((M)男性, (F)女性或留空): "
 +msgstr ""
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
 -msgstr "錯誤: 無效的回應.\n"
 +msgstr ""
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
 -msgstr "憑證中心 (CA) 指紋: "
 +msgstr ""
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
 -msgstr "錯誤: 無效的格式化指紋.\n"
 +msgstr ""
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
 -msgstr "不可能進行金鑰操作: %s\n"
 +msgstr ""
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
 -msgstr "這不是 OpenPGP 卡片"
 +msgstr ""
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
 -msgstr "取得現用金鑰資訊時出錯: %s\n"
 +msgstr ""
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
 -msgstr "是否要取代既有的金鑰? (y/N) "
 +msgstr ""
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
 -"請注意: 我們完全無法保證卡片支援你想用的尺寸.\n"
 -"      如果金鑰產生失敗了, 煩請查閱你卡片上的文件,\n"
 -"      看看這張卡片支援哪些尺寸.\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
 -msgstr "你的簽署金鑰想要用多大的金鑰尺寸? (%u) "
 +msgstr ""
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
 -msgstr "你的加密金鑰想要用多大的金鑰尺寸? (%u) "
 +msgstr ""
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
 -msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
 +msgstr ""
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
 -msgstr "加大到 %u 位元\n"
 +msgstr ""
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
 -msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 +msgstr ""
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
 -msgstr "這張卡片將重新加以組態, 以便產生 %u 位元的金鑰\n"
 +msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
 -msgstr "將金鑰 %d 尺寸變更至 %u 位元時出錯: %s\n"
 +msgstr ""
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
 -msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 +msgstr ""
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  msgid "Note: keys are already stored on the card!\n"
 -msgstr "請注意: 金鑰已經存放在卡片上了!\n"
 +msgstr ""
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
 -msgstr "是否要取代既有的金鑰? (y/N) "
 +msgstr ""
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
  "   PIN = '%s'     Admin PIN = '%s'\n"
  "You should change them using the command --change-pin\n"
  msgstr ""
 -"請注意個人識別碼 (PIN) 的出廠設定值為\n"
 -"   PIN = '%s'     管理者 PIN = '%s'\n"
 -"你應該用 --change-pin 指令來加以變更\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
 -msgstr "請選擇你要產生的金鑰種類:\n"
 +msgstr ""
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
 -msgstr "   (1) 簽署用金鑰\n"
 +msgstr ""
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
 -msgstr "   (2) 加密用金鑰\n"
 +msgstr ""
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
 -msgstr "   (3) 憑證用金鑰\n"
 +msgstr ""
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
 -msgstr "無效的選擇.\n"
 +msgstr ""
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
 -msgstr "請選擇要把金鑰存放在哪裡:\n"
 +msgstr ""
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, c-format
  msgid "KEYTOCARD failed: %s\n"
 -msgstr "KEYTOCARD 失敗: %s\n"
 +msgstr ""
  
- #: g10/card-util.c:1700
 -#, fuzzy
 -#| msgid "This command is not allowed while in %s mode.\n"
++#: g10/card-util.c:1717
  msgid "This command is not supported by this card\n"
 -msgstr "在 %s 模式中不允許使用這個指令.\n"
 +msgstr ""
  
- #: g10/card-util.c:1705
 -#, fuzzy
 -#| msgid "Note: keys are already stored on the card!\n"
++#: g10/card-util.c:1722
  msgid "Note: This command destroys all keys stored on the card!\n"
 -msgstr "請注意: 金鑰已經存放在卡片上了!\n"
 +msgstr ""
  
- #: g10/card-util.c:1708
 -#, fuzzy
 -#| msgid "Continue? (Y/n) "
++#: g10/card-util.c:1725
  msgid "Continue? (y/N) "
 -msgstr "是否繼續? (Y/n) "
 +msgstr ""
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
 -msgstr "離開這個選單"
 +msgstr ""
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
 -msgstr "顯示管理者指令"
 +msgstr ""
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
 -msgstr "顯示這份線上說明"
 +msgstr ""
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
 -msgstr "列出所有可用的資料"
 +msgstr ""
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
 -msgstr "變更卡片持有人的名字"
 +msgstr ""
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
 -msgstr "變更取回金鑰的 URL"
 +msgstr ""
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
 -msgstr "從卡片 URL 取回指定的金鑰"
 +msgstr ""
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
 -msgstr "變更登入名稱"
 +msgstr ""
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
 -msgstr "變更介面語言偏好設定"
 +msgstr ""
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
 -msgstr "變更卡片持有者的性別"
 +msgstr ""
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
 -msgstr "變更某個憑證中心 (CA) 的指紋"
 +msgstr ""
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
 -msgstr "切換簽章是否強制使用個人識別碼 (PIN) 的旗標"
 +msgstr ""
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
 -msgstr "產生新的金鑰"
 +msgstr ""
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
 -msgstr "變更或重設個人識別碼 (PIN) 的選單"
 +msgstr ""
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
 -msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 +msgstr ""
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
 -msgstr "用重設碼來解凍個人識別碼 (PIN)"
 +msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
 -msgstr "gpg/卡片> "
 +msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
 -msgstr "限管理者使用的指令\n"
 +msgstr ""
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
 -msgstr "允許使用管理者指令\n"
 +msgstr ""
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
 -msgstr "未允許使用管理者指令\n"
 +msgstr ""
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
 -msgstr "無效的指令  (試試看 \"help\")\n"
 +msgstr ""
  
 +#: g10/decrypt.c:191 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
 -msgstr "--output 在這個指令中沒有作用\n"
 +msgstr ""
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
 -msgstr "無法開啟 '%s'\n"
 +msgstr ""
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
 -msgstr "找不到金鑰 \"%s\": %s\n"
 +msgstr ""
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
 -msgstr "讀取金鑰區塊時出錯: %s\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "key \"%s\" not found: %s\n"
 +#: g10/delkey.c:118 g10/getkey.c:579
 +#, c-format
  msgid "key \"%s\" not found\n"
 -msgstr "找不到金鑰 \"%s\": %s\n"
 +msgstr ""
  
 +#: g10/delkey.c:129 g10/delkey.c:136
  msgid "(unless you specify the key by fingerprint)\n"
 -msgstr "(除非你用指紋指定了金鑰)\n"
 +msgstr ""
  
 +#: g10/delkey.c:135
  msgid "can't do this in batch mode without \"--yes\"\n"
 -msgstr "沒有 \"--yes\" 就沒辦法在批次模式中這麼做\n"
 +msgstr ""
  
 +#: g10/delkey.c:148
  msgid "Delete this key from the keyring? (y/N) "
 -msgstr "要從鑰匙圈裡刪除這把金鑰嗎? (y/N) "
 +msgstr ""
  
 +#: g10/delkey.c:158
  msgid "This is a secret key! - really delete? (y/N) "
 -msgstr "這是一把私鑰! - 真的要刪除嗎? (y/N) "
 +msgstr ""
  
 +#: g10/delkey.c:201
  #, c-format
  msgid "deleting secret %s failed: %s\n"
 -msgstr "刪除私鑰 %s 時失敗: %s\n"
 +msgstr ""
  
 +#: g10/delkey.c:203
  msgid "key"
 -msgstr "金鑰"
 +msgstr ""
  
 +#: g10/delkey.c:203
  msgid "subkey"
 -msgstr "子鑰"
 +msgstr ""
  
 +#: g10/delkey.c:226
  #, c-format
  msgid "deleting keyblock failed: %s\n"
 -msgstr "刪除金鑰區塊時失敗: %s\n"
 +msgstr ""
  
 +#: g10/delkey.c:239
  msgid "ownertrust information cleared\n"
 -msgstr "主觀信任資訊已清除\n"
 +msgstr ""
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
 -msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 +msgstr ""
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 -msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 +msgstr ""
  
 +#: g10/encrypt.c:232 g10/sign.c:1292
  #, c-format
  msgid "error creating passphrase: %s\n"
 -msgstr "建立密語時出錯: %s\n"
 +msgstr ""
  
 +#: g10/encrypt.c:239
  msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 -msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 +msgstr ""
  
 +#: g10/encrypt.c:253
  #, c-format
  msgid "using cipher %s\n"
 -msgstr "正在使用 %s 編密法\n"
 +msgstr ""
  
 +#: g10/encrypt.c:263 g10/encrypt.c:624
  #, c-format
  msgid "'%s' already compressed\n"
 -msgstr "'%s' 已經被壓縮了\n"
 +msgstr ""
  
 +#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
  #, c-format
  msgid "WARNING: '%s' is an empty file\n"
 -msgstr "警告: '%s' 是個空檔案\n"
 +msgstr ""
  
 +#: g10/encrypt.c:557
  #, c-format
  msgid "reading from '%s'\n"
 -msgstr "正在從 '%s' 讀取\n"
 +msgstr ""
  
 +#: g10/encrypt.c:605
  #, c-format
  msgid ""
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@@ -1971,416 -1571,329 +1976,416 @@@ msgstr "
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
  "preferences\n"
 -msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
 +msgstr ""
  
 +#: g10/encrypt.c:817
  #, c-format
  msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 -msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 +msgstr ""
  
 +#: g10/encrypt.c:903
  #, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
 -msgstr "%s/%s 已加密給: \"%s\"\n"
 +msgstr ""
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
 -msgstr "你不能夠將 %s 用於 %s 模式中\n"
 +msgstr ""
  
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
  #, c-format
  msgid "%s encrypted data\n"
 -msgstr "%s 已加密的資料\n"
 +msgstr ""
  
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
  #, c-format
  msgid "encrypted with unknown algorithm %d\n"
 -msgstr "以 %d 未知演算法所加密\n"
 +msgstr ""
  
 +#: g10/decrypt-data.c:164 sm/decrypt.c:127
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 -msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
 +msgstr ""
  
 +#: g10/decrypt-data.c:176
  msgid "problem handling encrypted packet\n"
 -msgstr "處理已加密封包有問題\n"
 +msgstr ""
  
 +#: g10/exec.c:60
  msgid "no remote program execution supported\n"
 -msgstr "沒有支援的遠端程式執行\n"
 +msgstr ""
  
 +#: g10/exec.c:319
  msgid ""
  "external program calls are disabled due to unsafe options file permissions\n"
 -msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
 +msgstr ""
  
 +#: g10/exec.c:349
  msgid "this platform requires temporary files when calling external programs\n"
 -msgstr "在這個作業平台上叫用外部程式時需要暫存檔\n"
 +msgstr ""
  
 +#: g10/exec.c:427
  #, c-format
  msgid "unable to execute program '%s': %s\n"
 -msgstr "無法執行程式 '%s': %s\n"
 +msgstr ""
  
 +#: g10/exec.c:430
  #, c-format
  msgid "unable to execute shell '%s': %s\n"
 -msgstr "無法執行 shell '%s': %s\n"
 +msgstr ""
  
 +#: g10/exec.c:521
  #, c-format
  msgid "system error while calling external program: %s\n"
 -msgstr "叫用外部程式時發生系統錯誤: %s\n"
 +msgstr ""
  
 +#: g10/exec.c:532 g10/exec.c:599
  msgid "unnatural exit of external program\n"
 -msgstr "外部程式不自然地離開\n"
 +msgstr ""
  
 +#: g10/exec.c:547
  msgid "unable to execute external program\n"
 -msgstr "無法執行外部程式\n"
 +msgstr ""
  
 +#: g10/exec.c:564
  #, c-format
  msgid "unable to read external program response: %s\n"
 -msgstr "無法讀取外部程式回應: %s\n"
 +msgstr ""
  
 +#: g10/exec.c:610 g10/exec.c:617
  #, c-format
  msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 -msgstr "警告: 無法移除暫存檔 (%s) '%s': %s\n"
 +msgstr ""
  
 +#: g10/exec.c:622
  #, c-format
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
 -msgstr "警告: 無法移除暫存目錄 '%s': %s\n"
 +msgstr ""
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
 -msgstr "匯出標記為僅限本機使用的簽章"
 +msgstr ""
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
 -msgstr "匯出署名使用者 ID (通常是照片 ID)"
 +msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
 -msgstr "匯出標記為 \"機密\" 的撤銷金鑰"
 +msgstr ""
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
 -msgstr "匯出時從金鑰中移除無法使用的部分"
 +msgstr ""
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
 -msgstr "匯出時盡可能地從金鑰中移除"
 +msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  msgid " - skipped"
 -msgstr " - 已跳過"
 +msgstr ""
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, c-format
  msgid "writing to '%s'\n"
 -msgstr "正在寫入 '%s'\n"
 +msgstr ""
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
 -msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
 +msgstr ""
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
 -msgstr "不允許匯出私鑰\n"
 +msgstr ""
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
 -msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
 +msgstr ""
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
 -msgstr "警告: 沒有匯出任何東西\n"
 +msgstr ""
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, c-format
  msgid "error creating '%s': %s\n"
 -msgstr "建立 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: g10/getkey.c:257
  msgid "[User ID not found]"
 -msgstr "[找不到使用者 ID]"
 +msgstr ""
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
 -#, fuzzy, c-format
 -#| msgid "missing argument for option \"%.50s\"\n"
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
 +#, c-format
  msgid "(check argument of option '%s')\n"
 -msgstr "\"%.50s\" 選項遺失了引數\n"
 +msgstr ""
  
 +#: g10/getkey.c:516
  #, c-format
  msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
  msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "error closing %s: %s\n"
 +#: g10/getkey.c:546
 +#, c-format
  msgid "error looking up: %s\n"
 -msgstr "關閉 %s 時出錯: %s\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "error creating keyring '%s': %s\n"
 +#: g10/getkey.c:636
 +#, c-format
  msgid "Warning: %s appears in the keyring %d times\n"
 -msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, c-format
  msgid "automatically retrieved '%s' via %s\n"
 -msgstr "已自動取回 '%s' (經由 %s )\n"
 +msgstr ""
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, c-format
  msgid "error retrieving '%s' via %s: %s\n"
 -msgstr "取得 '%s' (經由 %s ) 時出錯: %s\n"
 +msgstr ""
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
 -msgstr "沒有指紋"
 +msgstr ""
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
 -msgstr "找不到私鑰 \"%s\": %s\n"
 +msgstr ""
  
- #: g10/getkey.c:1735
 -#, fuzzy, c-format
 -#| msgid "|NAME|use NAME as default secret key"
++#: g10/getkey.c:1956
 +#, c-format
  msgid "Warning: not using '%s' as default key: %s\n"
 -msgstr "|名字|使用指定名字做為預設私鑰"
 +msgstr ""
  
- #: g10/getkey.c:1743
 -#, fuzzy, c-format
 -#| msgid "|NAME|use NAME as default secret key"
++#: g10/getkey.c:1964
 +#, c-format
  msgid "using \"%s\" as default secret key for signing\n"
 -msgstr "|名字|使用指定名字做為預設私鑰"
 +msgstr ""
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 -msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 +msgstr ""
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
 -msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 +msgstr ""
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
 -msgstr "建立簽章"
 +msgstr ""
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
 -msgstr "建立明文簽章"
 +msgstr ""
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
 -msgstr "建立分離式簽章"
 +msgstr ""
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
 -msgstr "加密資料"
 +msgstr ""
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
 -msgstr "僅使用對稱式編密法來加密"
 +msgstr ""
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
 -msgstr "資料解密 (預設)"
 +msgstr ""
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
 -msgstr "驗證簽章"
 +msgstr ""
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
 -msgstr "列出金鑰"
 +msgstr ""
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
 -msgstr "列出金鑰和簽章"
 +msgstr ""
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
 -msgstr "列出並檢查金鑰簽章"
 +msgstr ""
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
 -msgstr "列出金鑰和指紋"
 +msgstr ""
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
 -msgstr "列出私鑰"
 +msgstr ""
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
 -msgstr "產生新的金鑰對"
 +msgstr ""
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  msgid "quickly generate a new key pair"
 -msgstr "快速產生新的金鑰對"
 +msgstr ""
  
- #: g10/gpg.c:442
 -#, fuzzy
 -#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:446
  msgid "quickly add a new user-id"
 -msgstr "快速產生新的金鑰對"
 +msgstr ""
  
- #: g10/gpg.c:445
 -#, fuzzy
 -#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:449
  msgid "quickly revoke a user-id"
 -msgstr "快速產生新的金鑰對"
 +msgstr ""
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
 -msgstr "全能金鑰對生成"
 +msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
 -msgstr "產生撤銷憑證"
 +msgstr ""
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
 -msgstr "從公鑰鑰匙圈裡移除金鑰"
 +msgstr ""
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
 -msgstr "從私鑰鑰匙圈裡移除金鑰"
 +msgstr ""
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  msgid "quickly sign a key"
 -msgstr "快速簽署金鑰"
 +msgstr ""
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  msgid "quickly sign a key locally"
 -msgstr "快速在本機簽署金鑰"
 +msgstr ""
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
 -msgstr "簽署金鑰"
 +msgstr ""
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
 -msgstr "僅在本機簽署金鑰"
 +msgstr ""
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
 -msgstr "簽署或編輯金鑰"
 +msgstr ""
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
 -msgstr "更改密語"
 +msgstr ""
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
 -msgstr "匯出金鑰"
 +msgstr ""
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
 -msgstr "把金鑰匯出至金鑰伺服器"
 +msgstr ""
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
 -msgstr "從金鑰伺服器匯入金鑰"
 +msgstr ""
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
 -msgstr "在金鑰伺服器上搜尋金鑰"
 +msgstr ""
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
 -msgstr "從金鑰伺服器更新所有的金鑰"
 +msgstr ""
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
 -msgstr "匯入/合併金鑰"
 +msgstr ""
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
 -msgstr "列印卡片狀態"
 +msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
 -msgstr "變更卡片上的資料"
 +msgstr ""
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
 -msgstr "變更卡片的個人識別碼 (PIN)"
 +msgstr ""
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
 -msgstr "更新信任資料庫"
 +msgstr ""
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
 -msgstr "印出訊息摘要"
 +msgstr ""
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
 -msgstr "以伺服器模式執行"
 +msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
 -msgstr "建立以 ASCII 封裝過的輸出"
 +msgstr ""
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
 -msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
 +msgstr ""
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  msgid "|USER-ID|use USER-ID to sign or decrypt"
 -msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
 +msgstr ""
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  msgid "|N|set compress level to N (0 disables)"
 -msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 +msgstr ""
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
 -msgstr "使用標準的文字模式"
 +msgstr ""
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
 -msgstr "|檔案|將輸出寫入至指定檔案"
 +msgstr ""
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
 -msgstr "不要做任何改變"
 +msgstr ""
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
 -msgstr "覆寫前先詢問"
 +msgstr ""
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
 -msgstr "使用嚴謹的 OpenPGP 行為"
 +msgstr ""
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
  msgstr ""
 -"@\n"
 -"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2391,947 -1904,773 +2396,953 @@@
  " --list-keys [names]        show keys\n"
  " --fingerprint [names]      show fingerprints\n"
  msgstr ""
 -"@\n"
 -"範例:\n"
 -"\n"
 -" -se -r Bob [檔案]          對 Bob 這個使用者簽署及加密\n"
 -" --clearsign [檔案]         做出明文簽章\n"
 -" --detach-sign [檔案]       做出分離式簽章\n"
 -" --list-keys [名字]         顯示金鑰\n"
 -" --fingerprint [名字]       顯示指紋\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
 -msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
 +msgstr ""
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
  "Default operation depends on the input data\n"
  msgstr ""
 -"語法: @GPG@ [選項] [檔案]\n"
 -"簽署, 檢查, 加密, 解密\n"
 -"預設的操作會依輸入資料而定\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
  msgstr ""
 -"\n"
 -"已支援的演算法:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
 -msgstr "公鑰: "
 +msgstr ""
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
 -msgstr "編密法: "
 +msgstr ""
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
 -msgstr "雜湊: "
 +msgstr ""
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
 -msgstr "壓縮: "
 +msgstr ""
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, c-format
  msgid "usage: %s [options] %s\n"
 -msgstr "用法: %s [選項] %s\n"
 +msgstr ""
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
 -msgstr "指令彼此矛盾\n"
 +msgstr ""
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
 -msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
 +msgstr ""
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
 -msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 -msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
 -msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
 -msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 -msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
 -msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 -msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 -msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 -msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 -msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 -msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 -msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
 +msgstr ""
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, c-format
  msgid "unknown configuration item '%s'\n"
 -msgstr "未知的組態項目 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
 -msgstr "列出金鑰時顯示照片 ID"
 +msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  msgid "show key usage information during key listings"
 -msgstr "列出金鑰時顯示金鑰用途資訊"
 +msgstr ""
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
 -msgstr "列出簽章時顯示原則 URL"
 +msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
 -msgstr "列出簽章時顯示所有的註記"
 +msgstr ""
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
 -msgstr "列出簽章時顯示 IETF 標準註記"
 +msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
 -msgstr "列出簽章時顯示使用者提供的註記"
 +msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
 -msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
 +msgstr ""
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
 -msgstr "列出金鑰時顯示使用者 ID 有效性"
 +msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
 -msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
 +msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
 -msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
 +msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
 -msgstr "在金鑰清單中顯示鑰匙圈名稱"
 +msgstr ""
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
 -msgstr "列出簽章時顯示有效期限"
 +msgstr ""
  
- #: g10/gpg.c:2011
- msgid "available TOFU policies:\n"
 -#, fuzzy, c-format
 -#| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
++#, c-format
+ msgid "valid values for option '%s':\n"
 -msgstr "選項 \"%.50s\" 的引數無效\n"
 +msgstr ""
  
- #: g10/gpg.c:2022
 -#, fuzzy, c-format
 -#| msgid "unknown option '%s'\n"
++#: g10/gpg.c:2030
 +#, c-format
  msgid "unknown TOFU policy '%s'\n"
 -msgstr "未知的選項 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
 -#, fuzzy, c-format
 -#| msgid "invalid argument for option \"%.50s\"\n"
++#: g10/gpg.c:2066
++#, c-format
+ msgid "invalid value for option '%s'\n"
 -msgstr "選項 \"%.50s\" 的引數無效\n"
++msgstr ""
+ 
++#: g10/gpg.c:2203
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
 -msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, c-format
  msgid "Note: %s is not for normal use!\n"
 -msgstr "請注意: 一般情況下不採用 %s!\n"
 +msgstr ""
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
 -msgstr "'%s' 不是有效的簽章使用期限\n"
 +msgstr ""
  
- #: g10/gpg.c:2917
 -#, fuzzy, c-format
 -#| msgid "line %d: not a valid email address\n"
++#: g10/gpg.c:3012
 +#, c-format
  msgid "\"%s\" is not a proper mail address\n"
 -msgstr "第 %d 列: 不是有效的電子郵件地址\n"
 +msgstr ""
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
 -msgstr "無效的個人識別碼項目模式 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, c-format
  msgid "'%s' is not a valid character set\n"
 -msgstr "'%s' 不是有效的字元集\n"
 +msgstr ""
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
 -msgstr "無法剖析金鑰伺服器 URL\n"
 +msgstr ""
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
 -msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
 -msgstr "無效的金鑰伺服器選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
 -msgstr "%s:%d: 無效的匯入選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
 -msgstr "無效的匯入選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
 -#, fuzzy, c-format
 -#| msgid "invalid list options\n"
++#: g10/gpg.c:3156 g10/gpg.c:3171
 +#, c-format
  msgid "invalid filter option: %s\n"
 -msgstr "無效的清單選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
 -msgstr "%s:%d: 無效的匯出選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
 -msgstr "無效的匯出選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
 -msgstr "%s:%d: 無效的清單選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
 -msgstr "無效的清單選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
 -msgstr "驗證簽章時顯示照片 ID"
 +msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
 -msgstr "驗證簽章時顯示原則 URL"
 +msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
 -msgstr "驗證簽章時顯示所有的註記"
 +msgstr ""
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
 -msgstr "驗證簽章時顯示 IETF 標準註記"
 +msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
 -msgstr "驗證簽章時顯示使用者提供的註記"
 +msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
 -msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
 +msgstr ""
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
 -msgstr "驗證簽章時顯示使用者 ID 有效性"
 +msgstr ""
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
 -msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
 +msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  msgid "show only the primary user ID in signature verification"
 -msgstr "驗證簽章時祇顯示主要的使用者 ID"
 +msgstr ""
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
 -msgstr "以 PKA 資料驗證簽章"
 +msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
 -msgstr "提高對持有有效 PKA 資料之簽章的信任"
 +msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
 -msgstr "%s:%d: 無效的驗證選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
 -msgstr "無效的驗證選項\n"
 +msgstr ""
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
 -msgstr "無法把執行檔路徑設成 %s\n"
 +msgstr ""
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
 -msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 +msgstr ""
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
 -msgstr "無效的自動金鑰定址清單\n"
 +msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
 -msgstr "警告: 程式可能會傾印出核心檔!\n"
 +msgstr ""
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
 -msgstr "警告: %s 會推翻 %s\n"
 +msgstr ""
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
 -msgstr "%s 不允許跟 %s 併用!\n"
 +msgstr ""
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
 -msgstr "%s 跟 %s 放在一起沒有意義!\n"
 +msgstr ""
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
 -msgstr "警告: 正在偽造的系統時間中執行: "
 +msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
 -msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 +msgstr ""
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
 -msgstr "所選的編密演算法無效\n"
 +msgstr ""
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
 -msgstr "所選的摘要演算法無效\n"
 +msgstr ""
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
 -msgstr "所選的壓縮演算法無效\n"
 +msgstr ""
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
 -msgstr "所選的憑證摘要演算法無效\n"
 +msgstr ""
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
 -msgstr "completes-needed 一定要大於 0\n"
 +msgstr ""
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
 -msgstr "marginals-needed 一定要大於 1\n"
 +msgstr ""
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  msgid "max-cert-depth must be in the range from 1 to 255\n"
 -msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 +msgstr ""
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 -msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 +msgstr ""
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 -msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 +msgstr ""
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 -msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
 +msgstr ""
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
 -msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 +msgstr ""
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
 -msgstr "無效的預設偏好\n"
 +msgstr ""
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
 -msgstr "無效的個人編密法偏好\n"
 +msgstr ""
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
 -msgstr "無效的個人摘要偏好\n"
 +msgstr ""
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
 -msgstr "無效的個人壓縮偏好\n"
 +msgstr ""
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
 -msgstr "%s 還沒辦法跟 %s 一起運作\n"
 +msgstr ""
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 -msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
 +msgstr ""
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
 -msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
 +msgstr ""
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
 -msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
 +msgstr ""
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
 -msgstr "信任資料庫啟始失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
 -msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 +msgstr ""
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
 -msgstr "--store [檔名]"
 +msgstr ""
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
 -msgstr "--symmetric [檔名]"
 +msgstr ""
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
 -msgstr "'%s' 對稱式加密失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
 -msgstr "--encrypt [檔名]"
 +msgstr ""
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
 -msgstr "--symmetric --encrypt [檔名]"
 +msgstr ""
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 -msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 +msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 -msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
 +msgstr ""
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
 -msgstr "--sign [檔名]"
 +msgstr ""
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
 -msgstr "--sign --encrypt [檔名]"
 +msgstr ""
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
 -msgstr "--symmetric --sign --encrypt [檔名]"
 +msgstr ""
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 -msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 +msgstr ""
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 -msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 +msgstr ""
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
 -msgstr "--sign --symmetric [檔名]"
 +msgstr ""
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
 -msgstr "--clearsign [檔名]"
 +msgstr ""
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
 -msgstr "--decrypt [檔名]"
 +msgstr ""
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
 -msgstr "--sign-key 使用者ID"
 +msgstr ""
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
 -msgstr "--lsign-key 使用者ID"
 +msgstr ""
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
 -msgstr "--edit-key 使用者ID [指令]"
 +msgstr ""
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
 -msgstr "--passwd 使用者ID"
 +msgstr ""
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
 -msgstr "送至金鑰伺服器失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
 -msgstr "從金鑰伺服器接收失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
 -msgstr "金鑰匯出失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4332
 -#, fuzzy, c-format
 -#| msgid "key export failed: %s\n"
++#: g10/gpg.c:4435
 +#, c-format
  msgid "export as ssh key failed: %s\n"
 -msgstr "金鑰匯出失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
 -msgstr "用金鑰伺服器搜尋失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
 -msgstr "從金鑰伺服器更新失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
 -msgstr "解開封裝失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
 -msgstr "進行封裝失敗: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
 -msgstr "無效的雜湊演算法 '%s'\n"
 +msgstr ""
  
- #: g10/gpg.c:4671
 -#, fuzzy, c-format
 -#| msgid "error loading certificate '%s': %s\n"
++#: g10/gpg.c:4776 g10/tofu.c:2002
 +#, c-format
  msgid "error parsing key specification '%s': %s\n"
 -msgstr "載入憑證 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
 -msgstr "[檔名]"
 +msgstr ""
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
 -msgstr "請開始輸入你的訊息 ...\n"
 +msgstr ""
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
 -msgstr "給定的的憑證原則 URL 無效\n"
 +msgstr ""
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
 -msgstr "給定的簽章原則 URL 無效\n"
 +msgstr ""
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
 -msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 +msgstr ""
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
 -msgstr "|檔案|從指定鑰匙圈檔案裡取用金鑰"
 +msgstr ""
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
 -msgstr "僅把時間戳印矛盾視為警告"
 +msgstr ""
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
 -msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
 +msgstr ""
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
 -msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
 +msgstr ""
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
  msgstr ""
 -"語法: gpgv [選項] [檔案]\n"
 -"用已知的受信任金鑰來檢查簽章\n"
  
 +#: g10/helptext.c:72
  msgid "No help available"
 -msgstr "沒有可用的說明"
 +msgstr ""
  
 +#: g10/helptext.c:82
  #, c-format
  msgid "No help available for '%s'"
 -msgstr "'%s' 沒有可用的說明"
 +msgstr ""
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
 -msgstr "匯入標記為僅限本機使用的簽章"
 +msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
 -msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
 +msgstr ""
  
- #: g10/import.c:144
 -#, fuzzy
 -#| msgid "do not update the trustdb after import"
++#: g10/import.c:157
  msgid "do not clear the ownertrust values during import"
 -msgstr "匯入後不要更新信任資料庫"
 +msgstr ""
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
 -msgstr "匯入後不要更新信任資料庫"
 +msgstr ""
  
- #: g10/import.c:150
 -#, fuzzy
 -#| msgid "show key fingerprint"
++#: g10/import.c:163
  msgid "show key during import"
 -msgstr "顯示金鑰指紋"
 +msgstr ""
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
 -msgstr "祇接受既有金鑰的更新"
 +msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
 -msgstr "匯入後從金鑰中移除無法使用的部分"
 +msgstr ""
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
 -msgstr "匯入後盡可能地從金鑰中移除"
 +msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
 -msgstr "正在跳過 %d 型態的區塊\n"
 +msgstr ""
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
 -msgstr "目前已處理 %lu 把金鑰\n"
 +msgstr ""
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
 -msgstr "處理總量: %lu\n"
 +msgstr ""
  
- #: g10/import.c:615
 -#, fuzzy, c-format
 -#| msgid "      skipped new keys: %lu\n"
++#: g10/import.c:658
 +#, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
 -msgstr "        已跳過的新金鑰: %lu\n"
 +msgstr ""
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
 -msgstr "        已跳過的新金鑰: %lu\n"
 +msgstr ""
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
 -msgstr "       沒有使用者的 ID: %lu\n"
 +msgstr ""
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
 -msgstr "                已匯入: %lu"
 +msgstr ""
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
 -msgstr "              未改變的: %lu\n"
 +msgstr ""
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
 -msgstr "         新的使用者 ID: %lu\n"
 +msgstr ""
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
 -msgstr "              新的子鑰: %lu\n"
 +msgstr ""
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
 -msgstr "              新的簽章: %lu\n"
 +msgstr ""
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
 -msgstr "          新的金鑰撤銷: %lu\n"
 +msgstr ""
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
 -msgstr "          已讀取的私鑰: %lu\n"
 +msgstr ""
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
 -msgstr "          已匯入的私鑰: %lu\n"
 +msgstr ""
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
 -msgstr "          未改變的私鑰: %lu\n"
 +msgstr ""
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
 -msgstr "              未被匯入: %lu\n"
 +msgstr ""
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
 -msgstr "      已清除的簽章: %lu\n"
 +msgstr ""
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
 -msgstr " 已清除的使用者 ID: %lu\n"
 +msgstr ""
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
 -msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
 +msgstr ""
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
 -msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
 +msgstr ""
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
 -msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
 +msgstr ""
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
 -msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
 +msgstr ""
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
 -msgstr "我們強烈建議你更新偏好設定, 並重新\n"
 +msgstr ""
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 -msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 +msgstr ""
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 -msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
 +msgstr ""
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
 -msgstr "金鑰 %s: 沒有使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, c-format
  msgid "key %s: %s\n"
 -msgstr "金鑰 %s: %s\n"
 +msgstr ""
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
 -msgstr "遭到匯入篩選程式駁回"
 +msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
 -msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 +msgstr ""
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 -msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
 +msgstr ""
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
 -msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
 -msgstr "這可能肇因於遺失自我簽章所致\n"
 +msgstr ""
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
 -msgstr "金鑰 %s: 找不到公鑰: %s\n"
 +msgstr ""
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
 -msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
 -msgstr "找不到可寫入的鑰匙圈: %s\n"
 +msgstr ""
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, c-format
  msgid "error writing keyring '%s': %s\n"
 -msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
 -msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
 +msgstr ""
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
 -msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 +msgstr ""
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
 -msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
 +msgstr ""
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
 -msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 +msgstr ""
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
 -msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
 -msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
 -msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
 +msgstr ""
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
 -msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
 +msgstr ""
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
 -msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
 +msgstr ""
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
 -msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
 +msgstr ""
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
 -msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 +msgstr ""
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
 -msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 +msgstr ""
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
 -msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
 -msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
 -msgstr "金鑰 %s: \"%s\" 未改變\n"
 +msgstr ""
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
 -msgstr "金鑰 %s: 私鑰已匯入\n"
 +msgstr ""
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, c-format
  msgid "key %s: secret key already exists\n"
 -msgstr "金鑰 %s: 私鑰已存在\n"
 +msgstr ""
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
 -msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
 +msgstr ""
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, c-format
  msgid "secret key %s: %s\n"
 -msgstr "私鑰 %s: %s\n"
 +msgstr ""
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
 -msgstr "未允許匯入私鑰\n"
 +msgstr ""
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
 -msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
 +msgstr ""
  
  #. TRANSLATORS: For smartcard, each private key on
  #. host has a reference (stub) to a smartcard and
@@@ -3343,1243 -2682,1023 +3354,1250 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
 -msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 +msgstr ""
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
 -msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 +msgstr ""
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
 -msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
 +msgstr ""
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
 -msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 +msgstr ""
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 -msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
 +msgstr ""
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 -msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
 +msgstr ""
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
 -msgstr "金鑰 %s: 未支援的公鑰演算法\n"
 +msgstr ""
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
 -msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
 +msgstr ""
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
 -msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
 +msgstr ""
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
 -msgstr "金鑰 %s: 無效的附帶子鑰\n"
 +msgstr ""
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
 -msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
 +msgstr ""
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
 -msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 +msgstr ""
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
 -msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 +msgstr ""
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
 -msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 +msgstr ""
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
 -msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
 -msgstr "金鑰 %s: 子鑰已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2609
 -#  here we violate the rfc a bit by still allowing
 -#  * to import non-exportable signature when we have the
 -#  * the secret key used to create this signature - it
 -#  * seems that this makes sense
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 -msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
 -msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
 -msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
 -msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 -msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 +msgstr ""
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
 -msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 +msgstr ""
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 -msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 +msgstr ""
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 -msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 +msgstr ""
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
 -msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 +msgstr ""
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
 -msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 +msgstr ""
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, c-format
  msgid "error creating keybox '%s': %s\n"
 -msgstr "建立金鑰鑰匙盒 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, c-format
  msgid "error creating keyring '%s': %s\n"
 -msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, c-format
  msgid "keybox '%s' created\n"
 -msgstr "鑰匙盒 '%s' 已建立\n"
 +msgstr ""
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, c-format
  msgid "keyring '%s' created\n"
 -msgstr "鑰匙圈 '%s' 已建立\n"
 +msgstr ""
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, c-format
  msgid "keyblock resource '%s': %s\n"
 -msgstr "金鑰區塊資源 '%s': %s\n"
 +msgstr ""
  
- #: g10/keydb.c:907
 -#, fuzzy, c-format
 -#| msgid "error opening '%s': %s\n"
++#: g10/keydb.c:911
 +#, c-format
  msgid "error opening key DB: %s\n"
 -msgstr "開啟 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
 -msgstr "重新建立鑰匙圈快取失敗: %s\n"
 +msgstr ""
  
 +#: g10/keyedit.c:264
  msgid "[revocation]"
 -msgstr "[撤銷]"
 +msgstr ""
  
 +#: g10/keyedit.c:264
  msgid "[self-signature]"
 -msgstr "[自我簽章]"
 +msgstr ""
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, c-format
+ msgid "error allocating memory: %s\n"
 -msgstr "配置記憶體時出錯: %s\n"
++msgstr ""
+ 
 -#, fuzzy, c-format
 -#| msgid "key %s: unsupported public key algorithm\n"
++#: g10/keyedit.c:629
 +#, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 -msgstr "金鑰 %s: 未支援的公鑰演算法\n"
 +msgstr ""
  
- #: g10/keyedit.c:627
 -#, fuzzy, c-format
 -#| msgid "card does not support digest algorithm %s\n"
++#: g10/keyedit.c:638
 +#, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
 -msgstr "卡片不支援 %s 摘要演算法\n"
 +msgstr ""
  
- #: g10/keyedit.c:789
 -#, fuzzy
 -#| msgid "Good signature from"
++#: g10/keyedit.c:800
  msgid " (reordered signatures follow)"
 -msgstr "完好的簽章來自於"
 +msgstr ""
  
- #: g10/keyedit.c:902
 -#, fuzzy, c-format
 -#| msgid "key %s: %s\n"
++#: g10/keyedit.c:913
 +#, c-format
  msgid "key %s:\n"
 -msgstr "金鑰 %s: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:905
 -#, fuzzy, c-format
 -#| msgid "User ID \"%s\": %d signature removed\n"
++#: g10/keyedit.c:916
 +#, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
 -msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyedit.c:908 g10/keylist.c:480
 -#, fuzzy, c-format
 -#| msgid "1 signature not checked due to a missing key\n"
++#: g10/keyedit.c:919 g10/keylist.c:480
 +#, c-format
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
 -msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyedit.c:912 g10/keylist.c:476
 -#, fuzzy, c-format
 -#| msgid "%d bad signatures\n"
++#: g10/keyedit.c:923 g10/keylist.c:476
 +#, c-format
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
 -msgstr[0] "%d 份損壞的簽章\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyedit.c:916
 -#, fuzzy, c-format
 -#| msgid "Good signature from"
++#: g10/keyedit.c:927
 +#, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
 -msgstr[0] "完好的簽章來自於"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
  "(by looking at passports, checking fingerprints from different sources, "
  "etc.)\n"
  msgstr ""
 -"請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
 -"(像是查對身份證, 或從不同的來源檢查指紋等...)的能力\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
 -msgstr "  %d = 我勉強信任\n"
 +msgstr ""
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
 -msgstr "  %d = 我完全信任\n"
 +msgstr ""
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
 -"請輸入此信任簽章的深度.\n"
 -"深度大於 1 的話就表示你信任這把正被簽署的金鑰,\n"
 -"同時也信任這把金鑰所簽署的信任簽章.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 -msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 +msgstr ""
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
 -msgstr "使用者 ID \"%s\" 已撤銷."
 +msgstr ""
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
 -msgstr "你仍然想要簽署它嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
 -msgstr "  無法簽署.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
 -msgstr "使用者 ID \"%s\" 已過期."
 +msgstr ""
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
 -msgstr "使用者 ID \"%s\" 未經自我簽署."
 +msgstr ""
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
 -msgstr "使用者 ID \"%s\" 可被簽署."
 +msgstr ""
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
 -msgstr "是否要簽署? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
  "is a PGP 2.x-style signature.\n"
  msgstr ""
 -"\"%s\" 裡的自我簽章\n"
 -"是 PGP 2.x 型態的簽章.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 -msgstr "你是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "has expired.\n"
  msgstr ""
 -"你目前在 \"%s\" 的簽章\n"
 -"已經過期了.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 -msgstr "你想要發佈一份新的簽章來取代已過期的那個嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "is a local signature.\n"
  msgstr ""
 -"你目前在 \"%s\" 的簽章\n"
 -"是一份本機簽章.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
 -msgstr "你是否想要把他升級成可以完全匯出的簽章? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
 -msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
 +msgstr ""
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
 -msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 +msgstr ""
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
 -msgstr "你仍然想要再次簽署它嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
 -msgstr "沒有東西可以讓金鑰 %s 簽署\n"
 +msgstr ""
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
 -msgstr "這把金鑰已經過期了!"
 +msgstr ""
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
 -msgstr "這把金鑰將在 %s 過期.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
 -msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
 +msgstr ""
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
  "to the person named above?  If you don't know what to answer, enter \"0\".\n"
  msgstr ""
 -"你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
 -"如果你不知道這個問題的答案, 請輸入 \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
 -msgstr "   (0) 我不作答.%s\n"
 +msgstr ""
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
 -msgstr "   (1) 我根本沒有檢查過.%s\n"
 +msgstr ""
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
 -msgstr "   (2) 我隨意檢查過了.%s\n"
 +msgstr ""
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
 -msgstr "   (3) 我非常小心地檢查過了.%s\n"
 +msgstr ""
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  msgid "Your selection? (enter '?' for more information): "
 -msgstr "你的選擇是? (輸入 '?' 以取得更多資訊): "
 +msgstr ""
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr ""
 -"你真的確定要用你的金鑰 \"%s\" (%s)\n"
 -"來簽署這把金鑰嗎\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
 -msgstr "這將會是一份自我簽章.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
 -msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
 -msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
 -msgstr "這份簽章會被標記成不可匯出.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
 -msgstr "這份簽章會被標記成不可撤銷.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
 -msgstr "我根本沒有檢查過這把金鑰.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
 -msgstr "我隨意檢查過這把金鑰了.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
 -msgstr "我非常小心地檢查過這把金鑰了.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
 -msgstr "真的要簽署嗎? (y/N)"
 +msgstr ""
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
 -msgstr "簽署時失敗: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 -msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
 +msgstr ""
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
 -msgstr "金鑰 %s: 變更密語時出錯: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
 -msgstr "儲存並離開"
 +msgstr ""
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
 -msgstr "顯示金鑰指紋"
 +msgstr ""
  
- #: g10/keyedit.c:1862
 -#, fuzzy
 -#| msgid "Enter the keygrip: "
++#: g10/keyedit.c:1873
  msgid "show the keygrip"
 -msgstr "請輸入金鑰鑰柄: "
 +msgstr ""
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
 -msgstr "列出金鑰和使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
 -msgstr "選擇使用者 ID N"
 +msgstr ""
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
 -msgstr "選擇子鑰 N"
 +msgstr ""
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
 -msgstr "檢查簽章"
 +msgstr ""
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
 -msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
 +msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
 -msgstr "僅在本機簽署所選的使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
 -msgstr "用信任簽章來簽署所選的使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
 -msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
 -msgstr "增加使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
 -msgstr "增加照片 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
 -msgstr "刪除所選的使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
 -msgstr "增加子鑰"
 +msgstr ""
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
 -msgstr "將金鑰加到智慧卡"
 +msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
 -msgstr "將金鑰移動到智慧卡"
 +msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
 -msgstr "將備份金鑰移動到智慧卡"
 +msgstr ""
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
 -msgstr "刪除所選的子鑰"
 +msgstr ""
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
 -msgstr "增加撤銷金鑰"
 +msgstr ""
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
 -msgstr "從所選的使用者 ID 中刪除簽章"
 +msgstr ""
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
 -msgstr "變更金鑰或所選子鑰的使用期限"
 +msgstr ""
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
 -msgstr "把所選的使用者 ID 標為主要"
 +msgstr ""
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
 -msgstr "列出偏好 (專家模式)"
 +msgstr ""
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
 -msgstr "列出偏好 (囉唆模式)"
 +msgstr ""
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
 -msgstr "設定所選使用者 ID 的偏好清單"
 +msgstr ""
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
 -msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
 +msgstr ""
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
 -msgstr "為所選的使用者 ID 設定註記"
 +msgstr ""
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
 -msgstr "更改密語"
 +msgstr ""
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
 -msgstr "更改主觀信任"
 +msgstr ""
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
 -msgstr "撤銷所選使用者 ID 的簽章"
 +msgstr ""
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
 -msgstr "撤銷所選的使用者 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
 -msgstr "撤銷金鑰或所選的子鑰"
 +msgstr ""
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
 -msgstr "啟用金鑰"
 +msgstr ""
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
 -msgstr "停用金鑰"
 +msgstr ""
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
 -msgstr "顯示所選的照片 ID"
 +msgstr ""
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
 -msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
 +msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
 -msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
 +msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
 -msgstr "私鑰可用.\n"
 +msgstr ""
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
 -msgstr "要有私鑰纔能這麼做.\n"
 +msgstr ""
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
  "  a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
 -"* 這個 'sign' 指令也可以在前面加上一個 'l' 字母, 來表示本機簽章 (lsign),\n"
 -"  加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是不可撤銷簽章\n"
 -"  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
 -msgstr "金鑰已撤銷."
 +msgstr ""
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
 -msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2255
 -#, fuzzy
 -#| msgid "Really sign all user IDs? (y/N) "
++#: g10/keyedit.c:2266
  msgid "Really sign all text user IDs? (y/N) "
 -msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
 -msgstr "提示: 選擇使用者 ID 來加以簽署\n"
 +msgstr ""
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, c-format
  msgid "Unknown signature type '%s'\n"
 -msgstr "未知的簽章種類 '%s'\n"
 +msgstr ""
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
 -msgstr "在 %s 模式中不允許使用這個指令.\n"
 +msgstr ""
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
 -msgstr "你至少得選擇一個使用者 ID.\n"
 +msgstr ""
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
 -msgstr "你不能刪除最後一個使用者 ID!\n"
 +msgstr ""
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
 -msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
 -msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 +msgstr ""
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
 -msgstr "真的要移動主鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
 -msgstr "你一定祇得選擇一把金鑰.\n"
 +msgstr ""
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
 -msgstr "這項指令要拿一個檔名來當作引數\n"
 +msgstr ""
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, c-format
  msgid "Can't open '%s': %s\n"
 -msgstr "無法開啟 '%s': %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
 -msgstr "從 '%s' 讀取備份金鑰時出錯: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
 -msgstr "你至少得選擇一把金鑰.\n"
 +msgstr ""
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
 -msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
 -msgstr "你真的想要刪除這把金鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
 -msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
 -msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
 -msgstr "你真的想要撤銷這整把金鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
 -msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
 -msgstr "你真的想要撤銷這把子鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
 -msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 +msgstr ""
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
 -msgstr "設定偏好清單至:\n"
 +msgstr ""
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
 -msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
 -msgstr "真的要更新偏好設定嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
 -msgstr "要儲存變更嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
 -msgstr "要不儲存就離開嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
 -msgstr "更新失敗: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
 -msgstr "金鑰沒有變更所以不需要更新.\n"
 +msgstr ""
  
- #: g10/keyedit.c:3025
 -#, fuzzy, c-format
 -#| msgid "Key generation failed: %s\n"
++#: g10/keyedit.c:3038
 +#, c-format
  msgid "User ID revocation failed: %s\n"
 -msgstr "產生金鑰失敗: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
 -msgstr "\"%s\" 不是指紋\n"
 +msgstr ""
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
 -msgstr "\"%s\" 不是主要指紋\n"
 +msgstr ""
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
 -#, fuzzy, c-format
 -#| msgid "invalid value\n"
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
 +#, c-format
  msgid "Invalid user ID '%s': %s\n"
 -msgstr "無效的數值\n"
 +msgstr ""
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "No matching user IDs."
 -msgstr "沒有相符的使用者 ID."
 +msgstr ""
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "Nothing to sign.\n"
 -msgstr "沒有東西可以簽署.\n"
 +msgstr ""
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
 -msgstr "摘要: "
 +msgstr ""
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
 -msgstr "特點: "
 +msgstr ""
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
 -msgstr "金鑰伺服器無修改"
 +msgstr ""
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
 -msgstr "偏好的金鑰伺服器: "
 +msgstr ""
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
 -msgstr "註記: "
 +msgstr ""
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 -msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
 +msgstr ""
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
 -msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
 +msgstr ""
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, c-format
  msgid "This key may be revoked by %s key %s"
 -msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
 +msgstr ""
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
 -msgstr "(機密)"
 +msgstr ""
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
 -msgstr "建立: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
 -msgstr "撤銷: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
 -#  of subkey
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
 -msgstr "過期: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
 -#  of subkey
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
 -msgstr "到期: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
 -msgstr "用途: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
 -msgstr "卡片編號: "
 +msgstr ""
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
 -msgstr "信任: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
 -msgstr "有效性: %s"
 +msgstr ""
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
 -msgstr "這把金鑰已經停用了"
 +msgstr ""
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  msgstr ""
 -"請注意顯示出來的金鑰有效性不需要更正,\n"
 -"除非你重新執行程式.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
 -msgstr "已撤銷"
 +msgstr ""
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
 -msgstr "已過期"
 +msgstr ""
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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 ""
 -"警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
 -"      導致不同的使用者 ID 被當成主要 ID.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
 -msgstr "警告: 你的加密子鑰很快將到期.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  msgid "You may want to change its expiration date too.\n"
 -msgstr "你可能也會想變更其使用期限.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  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 ""
 -"警告: 這是一把 PGP2 型態的金鑰.\n"
 -"      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
 -msgstr "你確定仍然想要增加嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  msgid "You may not add a photo ID to a PGP2-style key.\n"
 -msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
 -msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
 +msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
 -msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 +msgstr ""
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
 -msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 +msgstr ""
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
 -msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 +msgstr ""
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
 -msgstr "真的要刪除這份自我簽章嗎? (y/N)"
 +msgstr ""
  
- #: g10/keyedit.c:4449
 -#, fuzzy, c-format
 -#| msgid "Deleted %d signature.\n"
++#: g10/keyedit.c:4465
 +#, c-format
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
 -msgstr[0] "已經刪除了 %d 份簽章.\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
 -msgstr "沒有刪除任何東西.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
 -msgstr "無效"
 +msgstr ""
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
 -msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 +msgstr ""
  
- #: g10/keyedit.c:4496
 -#, fuzzy, c-format
 -#| msgid "User ID \"%s\": %d signature removed\n"
++#: g10/keyedit.c:4512
 +#, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
 -msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
 -msgstr "使用者 ID \"%s\": 已經最小化了\n"
 +msgstr ""
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
 -msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 +msgstr ""
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  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 ""
 -"警告: 這是一把 PGP2 型態的金鑰.\n"
 -"      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 -msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
 -msgstr "輸入指定撤銷者的使用者 ID: "
 +msgstr ""
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 -msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 +msgstr ""
  
- #: g10/keyedit.c:4642
 -#  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:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
 -msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
 +msgstr ""
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
 -msgstr "已指定這把金鑰為撤銷者了\n"
 +msgstr ""
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 -msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 +msgstr ""
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 -msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:4739
 -#, fuzzy
 -#| msgid ""
 -#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
++#: g10/keyedit.c:4755
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
 -msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
 -msgstr "正在變更子鑰的使用期限.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
 -msgstr "正在變更主鑰的使用期限.\n"
 +msgstr ""
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
 -msgstr "你不能變更 v3 金鑰的使用期限\n"
 +msgstr ""
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
 -msgstr "簽署子鑰 %s 已經交叉認證過了\n"
 +msgstr ""
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 -msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
 +msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
 -msgstr "請祇選擇一個使用者 ID.\n"
 +msgstr ""
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
 -msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 +msgstr ""
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
 -msgstr "請輸入你的偏好金鑰伺服器 URL: "
 +msgstr ""
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  msgid "Are you sure you want to replace it? (y/N) "
 -msgstr "你確定要取代它嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
 -msgstr "你確定要刪除它嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
 -msgstr "請輸入註記: "
 +msgstr ""
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
 -msgstr "是否繼續? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
 -msgstr "索引 %d 沒有對應到使用者 ID\n"
 +msgstr ""
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
 -msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 +msgstr ""
  
- #: g10/keyedit.c:5823
 -#, fuzzy, c-format
 -#| msgid "No subkey with index %d\n"
++#: g10/keyedit.c:5839
 +#, c-format
  msgid "No subkey with key ID '%s'.\n"
 -msgstr "索引 %d 沒有對應到子鑰\n"
 +msgstr ""
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
 -msgstr "索引 %d 沒有對應到子鑰\n"
 +msgstr ""
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
 -msgstr "使用者 ID: \"%s\"\n"
 +msgstr ""
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
 -msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
 +msgstr ""
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
 -msgstr " (不可匯出)"
 +msgstr ""
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
 -msgstr "這份簽章已經在 %s 過期了.\n"
 +msgstr ""
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
 -msgstr "你確定仍然想要撤銷它嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
 -msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
 -msgstr "並非由你所簽署.\n"
 +msgstr ""
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
 -msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 +msgstr ""
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
 -msgstr " (不可撤銷)"
 +msgstr ""
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
 -msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
 +msgstr ""
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
 -msgstr "你正要撤銷這些簽章:\n"
 +msgstr ""
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
 -msgstr "真的要建立撤銷憑證嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
 -msgstr "沒有私鑰\n"
 +msgstr ""
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
 -msgstr "使用者 ID \"%s\" 已撤銷\n"
 +msgstr ""
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 -msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 +msgstr ""
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
 -msgstr "金鑰 %s 已撤銷.\n"
 +msgstr ""
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
 -msgstr "子鑰 %s 已撤銷.\n"
 +msgstr ""
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 -msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
 +msgstr ""
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, c-format
  msgid "preference '%s' duplicated\n"
 -msgstr "偏好設定 '%s' 重複了\n"
 +msgstr ""
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
 -msgstr "編密偏好過多\n"
 +msgstr ""
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
 -msgstr "摘要偏好過多\n"
 +msgstr ""
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
 -msgstr "壓縮偏好過多\n"
 +msgstr ""
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, c-format
  msgid "invalid item '%s' in preference string\n"
 -msgstr "偏好字串中含有無效的項目 '%s'\n"
 +msgstr ""
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
 -msgstr "寫入直接簽章中\n"
 +msgstr ""
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
 -msgstr "寫入自我簽章中\n"
 +msgstr ""
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
 -msgstr "寫入附鑰簽章中\n"
 +msgstr ""
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
 -msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 +msgstr ""
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
 -msgstr "金鑰尺寸增大到 %u 位元\n"
 +msgstr ""
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 -msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
 +msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
 -msgstr "簽署"
 +msgstr ""
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
 -msgstr "保證"
 +msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
 -msgstr "加密"
 +msgstr ""
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
 -msgstr "鑑定"
 +msgstr ""
  
  #. TRANSLATORS: Please use only plain ASCII characters for the
  #. translation.  If this is not possible use single digits.  The
@@@ -4591,150 -3710,119 +4609,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
 -msgstr "SsEeAaQq"
 +msgstr ""
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
 -msgstr "%s 金鑰可能的動作: "
 +msgstr ""
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
 -msgstr "目前可進行的動作: "
 +msgstr ""
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
 -msgstr "   (%c) 切換簽署性能\n"
 +msgstr ""
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
 -msgstr "   (%c) 切換加密性能\n"
 +msgstr ""
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
 -msgstr "   (%c) 切換鑑定性能\n"
 +msgstr ""
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
 -msgstr "   (%c) 已完成\n"
 +msgstr ""
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
 -msgstr "請選擇你要使用的金鑰種類:\n"
 +msgstr ""
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
 -msgstr "   (%d) RSA 和 RSA (預設)\n"
 +msgstr ""
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
 -msgstr "   (%d) DSA 和 Elgamal\n"
 +msgstr ""
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
 -msgstr "   (%d) DSA (僅能用於簽署)\n"
 +msgstr ""
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
 -msgstr "   (%d) RSA (僅能用於簽署)\n"
 +msgstr ""
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
 -msgstr "   (%d) Elgamal (僅能用於加密)\n"
 +msgstr ""
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
 -msgstr "   (%d) RSA (僅能用於加密)\n"
 +msgstr ""
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
 -msgstr "   (%d) DSA (你能自己設定性能)\n"
 +msgstr ""
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
 -msgstr "   (%d) RSA (你能自己設定性能)\n"
 +msgstr ""
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, c-format
  msgid "   (%d) ECC and ECC\n"
 -msgstr "   (%d) ECC 和 ECC\n"
 +msgstr ""
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
 -msgstr "   (%d) ECC (僅能用於簽署)\n"
 +msgstr ""
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
 -msgstr "   (%d) ECC (你能自己設定性能)\n"
 +msgstr ""
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
 -msgstr "   (%d) ECC (僅能用於加密)\n"
 +msgstr ""
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, c-format
  msgid "  (%d) Existing key\n"
 -msgstr "   (%d) 現有的金鑰\n"
 +msgstr ""
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
 -msgstr "請輸入金鑰鑰柄: "
 +msgstr ""
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 -msgstr "不是有效的金鑰鑰柄 (應該要是 40 位十六進制數值)\n"
 +msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
 -msgstr "沒有金鑰有此金鑰鑰柄\n"
 +msgstr ""
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, c-format
  msgid "rounded to %u bits\n"
 -msgstr "加大到 %u 位元\n"
 +msgstr ""
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
 -msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 +msgstr ""
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
 -msgstr "你的子鑰想要用多大的金鑰尺寸? (%u) "
 +msgstr ""
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
 -msgstr "你想要用多大的金鑰尺寸? (%u) "
 +msgstr ""
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
 -msgstr "你所要求的金鑰尺寸是 %u 位元\n"
 +msgstr ""
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  msgid "Please select which elliptic curve you want:\n"
 -msgstr "請選擇你要使用的橢圓曲線:\n"
 +msgstr ""
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4743,8 -3831,13 +4761,8 @@@
  "      <n>m = key expires in n months\n"
  "      <n>y = key expires in n years\n"
  msgstr ""
 -"請指定這把金鑰的有效期限是多久.\n"
 -"         0 = 金鑰不會過期\n"
 -"      <n>  = 金鑰在 n 天後會到期\n"
 -"      <n>w = 金鑰在 n 週後會到期\n"
 -"      <n>m = 金鑰在 n 月後會到期\n"
 -"      <n>y = 金鑰在 n 年後會到期\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4753,49 -3846,47 +4771,49 @@@
  "      <n>m = signature expires in n months\n"
  "      <n>y = signature expires in n years\n"
  msgstr ""
 -"請指定這份簽章的有效期限是多久.\n"
 -"         0 = 簽章不會過期\n"
 -"      <n>  = 簽章在 n 天後會到期\n"
 -"      <n>w = 簽章在 n 週後會到期\n"
 -"      <n>m = 簽章在 n 月後會到期\n"
 -"      <n>y = 簽章在 n 年後會到期\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
 -msgstr "金鑰的有效期限是多久? (0) "
 +msgstr ""
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
 -msgstr "簽章的有效期限是多久? (%s) "
 +msgstr ""
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
 -msgstr "無效的數值\n"
 +msgstr ""
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
 -msgstr "金鑰完全不會過期\n"
 +msgstr ""
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
 -msgstr "簽章完全不會過期\n"
 +msgstr ""
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
 -msgstr "金鑰將會在 %s 到期\n"
 +msgstr ""
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
 -msgstr "簽章將會在 %s 到期.\n"
 +msgstr ""
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
 -"你的系統無法顯示 2038 年以後的日期.\n"
 -"不過, 它可以正確處理直到 2106 年之前的年份.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
 -msgstr "以上正確嗎? (y/N) "
 +msgstr ""
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4806,7 -3900,6 +4824,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -4815,60 -3908,56 +4833,60 @@@
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  msgstr ""
 -"\n"
 -"你需要一個使用者 ID 來辨識你的金鑰; 這個軟體會用真實姓名,\n"
 -"註釋和電子郵件地址組合成使用者 ID 如下:\n"
 -"    \"Ke-Huan Lin (Jedi) <Jedi at Jedi.org>\"\n"
 -"\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
 -msgstr "真實姓名: "
 +msgstr ""
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
 -msgstr "姓名含有無效的字符\n"
 +msgstr ""
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
 -msgstr "姓名不可以用數字開頭\n"
 +msgstr ""
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
 -msgstr "姓名至少要有五個字符長\n"
 +msgstr ""
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
 -msgstr "電子郵件地址: "
 +msgstr ""
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
 -msgstr "不是有效的電子郵件地址\n"
 +msgstr ""
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
 -msgstr "註釋: "
 +msgstr ""
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
 -msgstr "註釋含有無效的字符\n"
 +msgstr ""
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, c-format
  msgid "You are using the '%s' character set.\n"
 -msgstr "你正在使用 '%s' 字元集.\n"
 +msgstr ""
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
  "    \"%s\"\n"
  "\n"
  msgstr ""
 -"你選擇了這個使用者 ID:\n"
 -"    \"%s\"\n"
 -"\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
 -msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 +msgstr ""
  
  #. TRANSLATORS: These are the allowed answers in
  #. lower and uppercase.  Below you will find the matching
@@@ -4881,618 -3970,501 +4899,618 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
 -msgstr "NnCcEeOoQq"
 +msgstr ""
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 -msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 +msgstr ""
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 -msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 +msgstr ""
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
 -msgstr "變更姓名(N), 電子郵件地址(E)或退出(Q)? "
 +msgstr ""
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 -msgstr "變更姓名(N), 電子郵件地址(E)或確定(O)/退出(Q)? "
 +msgstr ""
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
 -msgstr "請先訂正錯誤\n"
 +msgstr ""
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
  "disks) during the prime generation; this gives the random number\n"
  "generator a better chance to gain enough entropy.\n"
  msgstr ""
 -"我們需要產生大量的隨機位元組. 這個時候你可以多做一些事情\n"
 -"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 -"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
 -msgstr "產生金鑰失敗: %s\n"
 +msgstr ""
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
  "    \"%s\"\n"
  "\n"
  msgstr ""
 -"即將建立用於此之金鑰:\n"
 -"    \"%s\"\n"
 -"\n"
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
 -msgstr "是否繼續? (Y/n) "
 +msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, c-format
  msgid "A key for \"%s\" already exists\n"
 -msgstr "\"%s\" 的金鑰已存在\n"
 +msgstr ""
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  msgid "Create anyway? (y/N) "
 -msgstr "無論如何還是要建立嗎? (y/N) "
 +msgstr ""
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  msgid "creating anyway\n"
 -msgstr "總之還是在建立\n"
 +msgstr ""
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 -msgstr "請注意: 如需全能金鑰產生對話框請用  \"%s %s\".\n"
 +msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
 -msgstr "金鑰產生已取消.\n"
 +msgstr ""
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, c-format
  msgid "can't create backup file '%s': %s\n"
 -msgstr "無法建立備份檔案 '%s': %s\n"
 +msgstr ""
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
 -msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
 +msgstr ""
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, c-format
  msgid "writing public key to '%s'\n"
 -msgstr "正在寫入公鑰至 '%s'\n"
 +msgstr ""
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
 -msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
 +msgstr ""
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
 -msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
 -msgstr "公鑰和私鑰已建立及簽署.\n"
 +msgstr ""
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
  msgstr ""
 -"請注意這把金鑰不能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
 -"來產生加密用的子鑰.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
 -msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 +msgstr ""
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
 -msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 +msgstr ""
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 -msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
 +msgstr ""
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
 -msgstr "主鑰的私鑰部分無法取用.\n"
 +msgstr ""
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
 -msgstr "主鑰的私鑰部分存放於卡上.\n"
 +msgstr ""
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
 -msgstr "真的要建立嗎? (y/N) "
 +msgstr ""
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
 -msgstr "永遠不過期"
 +msgstr ""
  
 +#: g10/keylist.c:331
  msgid "Critical signature policy: "
 -msgstr "關鍵簽章原則: "
 +msgstr ""
  
 +#: g10/keylist.c:333
  msgid "Signature policy: "
 -msgstr "簽章原則: "
 +msgstr ""
  
 +#: g10/keylist.c:375
  msgid "Critical preferred keyserver: "
 -msgstr "執意偏好的金鑰伺服器: "
 +msgstr ""
  
 +#: g10/keylist.c:428
  msgid "Critical signature notation: "
 -msgstr "關鍵簽章註記: "
 +msgstr ""
  
 +#: g10/keylist.c:430
  msgid "Signature notation: "
 -msgstr "簽章註記: "
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "%d bad signatures\n"
 +#: g10/keylist.c:472
 +#, c-format
  msgid "%d good signature\n"
  msgid_plural "%d good signatures\n"
 -msgstr[0] "%d 份損壞的簽章\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
 -#, fuzzy, c-format
 -#| msgid "1 signature not checked due to an error\n"
 +#: g10/keylist.c:485
 +#, c-format
  msgid "%d signature not checked due to an error\n"
  msgid_plural "%d signatures not checked due to errors\n"
 -msgstr[0] "有 1 份簽章因錯誤而未被檢查\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
 -#, fuzzy, c-format
 -#| msgid "Warning: %lu key(s) skipped due to their large size\n"
 +#: g10/keylist.c:567
 +#, c-format
  msgid "Warning: %lu key skipped due to its large size\n"
  msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
 -msgstr[0] "警告: %lu 把金鑰因尺寸太大已跳過\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
 +#: g10/keylist.c:589
  msgid "Keyring"
 -msgstr "鑰匙圈"
 +msgstr ""
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
 -msgstr "               主鑰指紋:"
 +msgstr ""
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
 -msgstr "               子鑰指紋:"
 +msgstr ""
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
 -msgstr "                主鑰指紋:"
 +msgstr ""
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
 -msgstr "                子鑰指紋:"
 +msgstr ""
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
 -#  use tty
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
 -msgstr "      金鑰指紋 ="
 +msgstr ""
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
 -msgstr "      卡片序號 ="
 +msgstr ""
  
 +#: g10/keyring.c:1498
  #, c-format
  msgid "caching keyring '%s'\n"
 -msgstr "快取鑰匙圈 '%s' 中\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "%lu keys cached so far (%lu signatures)\n"
 +#: g10/keyring.c:1572
 +#, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
 -msgstr[0] "目前已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
 -#, fuzzy, c-format
 -#| msgid "flush the cache"
 +#: g10/keyring.c:1588
 +#, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
 -msgstr[0] "清除快取"
 +msgstr[0] ""
 +msgstr[1] ""
  
 -#, fuzzy, c-format
 -#| msgid "1 bad signature\n"
 +#: g10/keyring.c:1590
 +#, c-format
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
 -msgstr[0] "1 份損壞的簽章\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
 +#: g10/keyring.c:1665
  #, c-format
  msgid "%s: keyring created\n"
 -msgstr "%s: 鑰匙圈已建立\n"
 +msgstr ""
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
 -msgstr "在搜尋結果中也包含已撤銷的金鑰"
 +msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
 -msgstr "以金鑰 ID 搜尋時也搜尋子鑰"
 +msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
 -msgstr "驗證簽章時自動取回金鑰"
 +msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
 -msgstr "尊重金鑰上所設定的偏好金鑰伺服器 URL"
 +msgstr ""
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
 -msgstr "取回金鑰時尊重金鑰所設定的 PKA 記錄"
 +msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
 -msgstr "已停用"
 +msgstr ""
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
 -msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
 +msgstr ""
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 -msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
 +msgstr ""
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
 -msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
 +msgstr ""
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
 -#, fuzzy, c-format
 -#| msgid "refreshing %d keys from %s\n"
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
 +#, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
 -msgstr[0] "更新 %d 份金鑰中 (從 %s )\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
 -msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 +msgstr ""
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
 -msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 +msgstr ""
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
 -msgstr "在金鑰伺服器上找不到金鑰\n"
 +msgstr ""
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
 -msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 +msgstr ""
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
 -msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 +msgstr ""
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
 -msgstr "正在請求金鑰 %s 自 %s\n"
 +msgstr ""
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
 -#, fuzzy
 -#| msgid "invalid keyserver options\n"
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  msgid "no keyserver known\n"
 -msgstr "無效的金鑰伺服器選項\n"
 +msgstr ""
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
 -msgstr "已跳過 \"%s\": %s\n"
 +msgstr ""
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
 -msgstr "遞送金鑰 %s 至 %s\n"
 +msgstr ""
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, c-format
  msgid "requesting key from '%s'\n"
 -msgstr "正在向 '%s' 請求金鑰\n"
 +msgstr ""
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
 -msgstr "警告: 無法抓取 URI %s: %s\n"
 +msgstr ""
  
 +#: g10/mainproc.c:254
  #, c-format
  msgid "weird size for an encrypted session key (%d)\n"
 -msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 +msgstr ""
  
 +#: g10/mainproc.c:302
  #, c-format
  msgid "%s encrypted session key\n"
 -msgstr "%s 加密過的階段金鑰\n"
 +msgstr ""
  
 +#: g10/mainproc.c:312
  #, c-format
  msgid "passphrase generated with unknown digest algorithm %d\n"
 -msgstr "密語係以未知的 %d 摘要演算法所產生\n"
 +msgstr ""
  
 +#: g10/mainproc.c:378
  #, c-format
  msgid "public key is %s\n"
 -msgstr "公鑰為 %s\n"
 +msgstr ""
  
 +#: g10/mainproc.c:456
  msgid "public key encrypted data: good DEK\n"
 -msgstr "公鑰加密過的資料: 完好的 DEK\n"
 +msgstr ""
  
 +#: g10/mainproc.c:489
  #, c-format
  msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 -msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 所加密\n"
 +msgstr ""
  
 +#: g10/mainproc.c:493 g10/pkclist.c:228
  #, c-format
  msgid "      \"%s\"\n"
 -msgstr "      \"%s\"\n"
 +msgstr ""
  
 +#: g10/mainproc.c:497
  #, c-format
  msgid "encrypted with %s key, ID %s\n"
 -msgstr "已用 %s 金鑰, ID %s 所加密\n"
 +msgstr ""
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
 -msgstr "公鑰解密失敗: %s\n"
 +msgstr ""
  
 +#: g10/mainproc.c:530
  #, c-format
  msgid "encrypted with %lu passphrases\n"
 -msgstr "已用 %lu 個密語加密了\n"
 +msgstr ""
  
 +#: g10/mainproc.c:532
  msgid "encrypted with 1 passphrase\n"
 -msgstr "已用 1 個密語加密了\n"
 +msgstr ""
  
 +#: g10/mainproc.c:566 g10/mainproc.c:587
  #, c-format
  msgid "assuming %s encrypted data\n"
 -msgstr "假定 %s 為加密過的資料\n"
 +msgstr ""
  
 +#: g10/mainproc.c:573
  #, c-format
  msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 -msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 +msgstr ""
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  msgid "WARNING: message was not integrity protected\n"
 -msgstr "警告: 訊息未受到完整的保護\n"
 +msgstr ""
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
 -msgstr "解密成功\n"
 +msgstr ""
  
 +#: g10/mainproc.c:637
  msgid "WARNING: encrypted message has been manipulated!\n"
 -msgstr "警告: 加密過的訊息已經被變造了!\n"
 +msgstr ""
  
 +#: g10/mainproc.c:653
  #, c-format
  msgid "decryption failed: %s\n"
 -msgstr "解密失敗: %s\n"
 +msgstr ""
  
 +#: g10/mainproc.c:676
  msgid "Note: sender requested \"for-your-eyes-only\"\n"
 -msgstr "請注意: 寄件者要求了 \"只准你用眼睛看\"\n"
 +msgstr ""
  
 +#: g10/mainproc.c:678
  #, c-format
  msgid "original file name='%.*s'\n"
 -msgstr "原始的檔名 ='%.*s'\n"
 +msgstr ""
  
 +#: g10/mainproc.c:748
  msgid "WARNING: multiple plaintexts seen\n"
 -msgstr "警告: 看到了多份明文\n"
 +msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
 -msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 +msgstr ""
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
 -msgstr "找不到簽章\n"
 +msgstr ""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
 -msgstr "*損壞* 的簽章來自於 \"%s\""
 +msgstr ""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
 -msgstr "過期的簽章來自於 \"%s\""
 +msgstr ""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
 -msgstr "完好的簽章來自於 \"%s\""
 +msgstr ""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
 -msgstr "簽章驗證已抑制\n"
 +msgstr ""
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
 -msgstr "無法處理這個不明確的簽章資料\n"
 +msgstr ""
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
 -msgstr "由 %s 建立的簽章\n"
 +msgstr ""
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
 -msgstr "               使用 %s 金鑰 %s\n"
 +msgstr ""
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
 -msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 +msgstr ""
  
- #: g10/mainproc.c:1755
 -#, fuzzy, c-format
 -#| msgid "                aka \"%s\""
++#: g10/mainproc.c:1772
 +#, c-format
  msgid "               issuer \"%s\"\n"
 -msgstr "                亦即 \"%s\""
 +msgstr ""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
 -msgstr "可用的金鑰於: "
 +msgstr ""
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
 -msgstr "[ 不確定 ]"
 +msgstr ""
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
 -msgstr "                亦即 \"%s\""
 +msgstr ""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
 -msgstr "這份簽署已經在 %s 過期了\n"
 +msgstr ""
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
 -msgstr "這份簽署將在 %s 到期\n"
 +msgstr ""
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
 -msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
 +msgstr ""
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
 -msgstr "二進制"
 +msgstr ""
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
 -msgstr "文字模式"
 +msgstr ""
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
 -msgstr "未知"
 +msgstr ""
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  msgid ", key algorithm "
 -msgstr ", 金鑰演算法 "
 +msgstr ""
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
 -msgstr "無法檢查簽章: %s\n"
 +msgstr ""
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
 -msgstr "不是一份分離的簽章\n"
 +msgstr ""
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 -msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 +msgstr ""
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
 -msgstr "等級 0x%02x 的獨立簽章\n"
 +msgstr ""
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
 -msgstr "舊型 (PGP 2.x) 簽章\n"
 +msgstr ""
  
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
  #, c-format
  msgid "fstat of '%s' failed in %s: %s\n"
 -msgstr "'%s' 的 fstat 失敗於 %s: %s\n"
 +msgstr ""
  
 +#: g10/misc.c:170
  #, c-format
  msgid "fstat(%d) failed in %s: %s\n"
 -msgstr "fstat(%d) 失敗於 %s: %s\n"
 +msgstr ""
  
 +#: g10/misc.c:279
  #, c-format
  msgid "WARNING: using experimental public key algorithm %s\n"
 -msgstr "警告: 正在使用實驗性的 %s 公鑰演算法\n"
 +msgstr ""
  
 +#: g10/misc.c:286
  msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
 -msgstr "警告: 已不建議使用 Elgamal 簽署暨加密金鑰\n"
 +msgstr ""
  
 +#: g10/misc.c:300
  #, c-format
  msgid "WARNING: using experimental cipher algorithm %s\n"
 -msgstr "警告: 正在使用實驗性的 %s 編密演算法\n"
 +msgstr ""
  
 +#: g10/misc.c:319
  #, c-format
  msgid "WARNING: using experimental digest algorithm %s\n"
 -msgstr "警告: 正在使用實驗性的 %s 摘要演算法\n"
 +msgstr ""
  
 +#: g10/misc.c:328
  #, c-format
  msgid "WARNING: digest algorithm %s is deprecated\n"
 -msgstr "警告: 已不建議使用 %s 摘要演算法\n"
 +msgstr ""
  
 +#: g10/misc.c:353
  #, c-format
  msgid "Note: signatures using the %s algorithm are rejected\n"
 -msgstr "請注意: 採用 %s 演算法的簽章已遭駁回\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "%s:%u: read error: %s\n"
 +#: g10/misc.c:375
 +#, c-format
  msgid "(reported error: %s)\n"
 -msgstr "%s:%u: 讀取錯誤: %s\n"
 +msgstr ""
  
 -#, fuzzy, c-format
 -#| msgid "read error in '%s': %s\n"
 +#: g10/misc.c:378
 +#, c-format
  msgid "(reported error: %s <%s>)\n"
 -msgstr "'%s' 讀取錯誤: %s\n"
 +msgstr ""
  
 +#: g10/misc.c:397
  msgid "(further info: "
  msgstr ""
  
@@@ -5525,135 -4491,107 +5543,135 @@@ msgstr "
  #, c-format
  msgid ""
  "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 -msgstr "警告: \"%s%s\" 是已廢棄的選項 - 除了對 %s 之外沒有效果\n"
 +msgstr ""
  
 +#: g10/misc.c:1147
  msgid "Uncompressed"
 -msgstr "未壓縮"
 +msgstr ""
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: g10/misc.c:1172
  msgid "uncompressed|none"
 -msgstr "uncompressed|none|未壓縮|無"
 +msgstr ""
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
 -msgstr "這個訊息對 %s 來說無法使用\n"
 +msgstr ""
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, c-format
  msgid "ambiguous option '%s'\n"
 -msgstr "不明確的選項 '%s'\n"
 +msgstr ""
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, c-format
  msgid "unknown option '%s'\n"
 -msgstr "未知的選項 '%s'\n"
 +msgstr ""
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 -msgstr "ECDSA 公鑰應該要是 8 位元倍數的 SEC 編碼\n"
 +msgstr ""
  
- #: g10/misc.c:1752
 -#, fuzzy, c-format
 -#| msgid "Unknown signature type '%s'\n"
++#: g10/misc.c:1757
 +#, c-format
  msgid "unknown weak digest '%s'\n"
 -msgstr "未知的簽章種類 '%s'\n"
 +msgstr ""
  
 +#: g10/openfile.c:84
  #, c-format
  msgid "File '%s' exists. "
 -msgstr "檔案 '%s' 已存在. "
 +msgstr ""
  
 +#: g10/openfile.c:88
  msgid "Overwrite? (y/N) "
 -msgstr "是否覆寫? (y/N) "
 +msgstr ""
  
 +#: g10/openfile.c:123
  #, c-format
  msgid "%s: unknown suffix\n"
 -msgstr "%s: 未知的副檔名\n"
 +msgstr ""
  
 +#: g10/openfile.c:147
  msgid "Enter new filename"
 -msgstr "請輸入新的檔名"
 +msgstr ""
  
 +#: g10/openfile.c:218
  msgid "writing to stdout\n"
 -msgstr "寫到標準輸出中\n"
 +msgstr ""
  
 +#: g10/openfile.c:366
  #, c-format
  msgid "assuming signed data in '%s'\n"
 -msgstr "假設被簽署的資料在 '%s'\n"
 +msgstr ""
  
 +#: g10/openfile.c:457
  #, c-format
  msgid "new configuration file '%s' created\n"
 -msgstr "新的組態檔案 '%s' 已建立\n"
 +msgstr ""
  
 +#: g10/openfile.c:498
  #, c-format
  msgid "WARNING: options in '%s' are not yet active during this run\n"
 -msgstr "警告: 在 '%s' 裡的選項於這次執行期間並沒有被啟用\n"
 +msgstr ""
  
 +#: g10/parse-packet.c:257
  #, c-format
  msgid "can't handle public key algorithm %d\n"
 -msgstr "無法操作 %d 公開金鑰演算法\n"
 +msgstr ""
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 -msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
 +msgstr ""
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
 -msgstr "%d 類別的子封包設定了關鍵位元\n"
 +msgstr ""
  
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
  #, c-format
  msgid "problem with the agent: %s\n"
 -msgstr "代理程式的問題: %s\n"
 +msgstr ""
  
 +#: g10/passphrase.c:241
  msgid "Enter passphrase\n"
 -msgstr "請輸入密語\n"
 +msgstr ""
  
 +#: g10/passphrase.c:252
  msgid "cancelled by user\n"
 -msgstr "由使用者所取消\n"
 +msgstr ""
  
 +#: g10/passphrase.c:489
  #, c-format
  msgid " (main key ID %s)"
 -msgstr " (主要金鑰 ID %s)"
 +msgstr ""
  
 +#: g10/passphrase.c:496
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 -msgstr "請輸入密語來解鎖 OpenPGP 私鑰:"
 +msgstr ""
  
 +#: g10/passphrase.c:500
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
 -msgstr "請輸入密語來匯入 OpenPGP 私鑰:"
 +msgstr ""
  
 +#: g10/passphrase.c:505
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 -msgstr "請輸入密語來匯出 OpenPGP 私子鑰:"
 +msgstr ""
  
 +#: g10/passphrase.c:508
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
 -msgstr "請輸入密語來匯出 OpenPGP 私鑰:"
 +msgstr ""
  
 +#: g10/passphrase.c:513
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 -msgstr "你是否真的想要永久刪除 OpenPGP 私鑰子鑰:"
 +msgstr ""
  
 +#: g10/passphrase.c:516
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
 -msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
 +msgstr ""
  
 +#: g10/passphrase.c:525
  #, c-format
  msgid ""
  "%s\n"
@@@ -5792,315 -4715,275 +5810,327 @@@ msgid "
  "The minimum trust level for this key is: %s\n"
  "\n"
  msgstr ""
 -"這把金鑰的最小信任等級為: %s\n"
 -"\n"
  
 +#: g10/pkclist.c:310 g10/revoke.c:786
  msgid "Your decision? "
 -msgstr "你的決定是甚麼? "
 +msgstr ""
  
 +#: g10/pkclist.c:331
  msgid "Do you really want to set this key to ultimate trust? (y/N) "
 -msgstr "請問你是否真的想把這把金鑰設成徹底信任呢? (y/N) "
 +msgstr ""
  
 +#: g10/pkclist.c:345
  msgid "Certificates leading to an ultimately trusted key:\n"
 -msgstr "被徹底信任金鑰的憑證:\n"
 +msgstr ""
  
 +#: g10/pkclist.c:434
  #, c-format
  msgid "%s: There is no assurance this key belongs to the named user\n"
 -msgstr "%s: 沒法保證這把金鑰真的屬於叫這個名字的使用者\n"
 +msgstr ""
  
 +#: g10/pkclist.c:439
  #, c-format
  msgid "%s: There is limited assurance this key belongs to the named user\n"
 -msgstr "%s: 祇能有限的保證這把金鑰真的屬於叫這個名字的使用者\n"
 +msgstr ""
  
 +#: g10/pkclist.c:445
  msgid "This key probably belongs to the named user\n"
 -msgstr "這把金鑰很可能屬於叫這個名字的使用者\n"
 +msgstr ""
  
 +#: g10/pkclist.c:450
  msgid "This key belongs to us\n"
 -msgstr "這把金鑰是屬於我們自己的\n"
 +msgstr ""
  
- #: g10/pkclist.c:476
 -#, fuzzy, c-format
 -#| msgid "root certificate has now been marked as trusted\n"
++#: g10/pkclist.c:456
++#, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
 -msgstr "根憑證現在已標記為已信任\n"
++msgstr ""
+ 
 -#, fuzzy
 -#| msgid ""
 -#| "It is NOT certain that the key belongs to the person named\n"
 -#| "in the user ID.  If you *really* know what you are doing,\n"
 -#| "you may answer the next question with yes.\n"
++#: g10/pkclist.c:484
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
 -"這把金鑰並 *不* 確定屬於使用者 ID 裡的那個人.\n"
 -"除非你 **真的** 知道自己在做甚麼,\n"
 -"否則你最好在下一個問題回答 no\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
  "you may answer the next question with yes.\n"
  msgstr ""
 -"這把金鑰並 *不* 確定屬於使用者 ID 裡的那個人.\n"
 -"除非你 **真的** 知道自己在做甚麼,\n"
 -"否則你最好在下一個問題回答 no\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
 -msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
 +msgstr ""
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
 -msgstr "警告: 正在使用不被信任的金鑰!\n"
 +msgstr ""
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
 -msgstr "警告: 這把金鑰可能已撤銷 (撤銷金鑰未出現)\n"
 +msgstr ""
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
 -msgstr "警告: 這把金鑰已被指定撤銷者所撤銷!\n"
 +msgstr ""
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
 -msgstr "警告: 這把金鑰已被其持有人所撤銷!\n"
 +msgstr ""
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
 -msgstr "         這很有可能表示此簽章是偽造的.\n"
 +msgstr ""
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
 -msgstr "警告: 這把子鑰已被其持有人所撤銷!\n"
 +msgstr ""
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
 -msgstr "請注意: 這把金鑰已停用.\n"
 +msgstr ""
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
 -msgstr "請注意: 已驗證的簽署者地址為 '%s'\n"
 +msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
 -msgstr "請注意: 簽署者地址 '%s' 與 DNS 項目並不吻合\n"
 +msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 -msgstr "信任等級因有效的 PKA 資訊而調整為 *完全*\n"
 +msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 -msgstr "信任等級因不良的 PKA 資訊而調整為 *永遠不會*\n"
 +msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
 -msgstr "請注意: 這把金鑰已經過期了!\n"
 +msgstr ""
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
 -msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 +msgstr ""
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
 -msgstr "         沒有證據指出這個簽章屬於這個持有者.\n"
 +msgstr ""
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
 -msgstr "警告: 我們 *不* 信任這把金鑰!\n"
 +msgstr ""
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
 -msgstr "         這個簽章很有可能是 *偽造的*.\n"
 +msgstr ""
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 -msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
 +msgstr ""
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
 -msgstr "         這份簽章並不屬於這個持有者\n"
 +msgstr ""
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
 -msgstr "%s: 已跳過: %s\n"
 +msgstr ""
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
 -msgstr "%s: 已跳過: 公鑰已停用\n"
 +msgstr ""
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
 -msgstr "%s: 已跳過: 公鑰已存在\n"
 +msgstr ""
  
- #: g10/pkclist.c:973
 -#, fuzzy, c-format
 -#| msgid "can't connect to '%s': %s\n"
++#: g10/pkclist.c:987
 +#, c-format
  msgid "can't encrypt to '%s'\n"
 -msgstr "無法連接至 '%s': %s\n"
 +msgstr ""
  
- #: g10/pkclist.c:988
 -#, fuzzy, c-format
 -#| msgid "line %d: invalid date given\n"
++#: g10/pkclist.c:1002
 +#, c-format
  msgid "option '%s' given, but no valid default keys given\n"
 -msgstr "第 %d 列: 無效的給定日期\n"
 +msgstr ""
  
- #: g10/pkclist.c:995
 -#, fuzzy, c-format
 -#| msgid "line %d: invalid date given\n"
++#: g10/pkclist.c:1009
 +#, c-format
  msgid "option '%s' given, but option '%s' not given\n"
 -msgstr "第 %d 列: 無效的給定日期\n"
 +msgstr ""
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
 -msgstr "你沒有指定使用者 ID. (你可能得用 \"-r\")\n"
 +msgstr ""
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
 -msgstr "目前的收件者:\n"
 +msgstr ""
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
  msgstr ""
 -"\n"
 -"請輸入使用者 ID. 以空白列結束: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
 -msgstr "沒有這個使用者 ID.\n"
 +msgstr ""
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
 -msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 +msgstr ""
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
 -msgstr "公鑰已停用.\n"
 +msgstr ""
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
 -msgstr "已跳過: 公鑰已設過\n"
 +msgstr ""
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
 -msgstr "未知的預設收件者 \"%s\"\n"
 +msgstr ""
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
 -msgstr "沒有有效的地址\n"
 +msgstr ""
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
 -msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
 +msgstr ""
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
 -msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
 +msgstr ""
  
 +#: g10/plaintext.c:84
  msgid "data not saved; use option \"--output\" to save it\n"
 -msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
 +msgstr ""
  
 +#: g10/plaintext.c:598
  msgid "Detached signature.\n"
 -msgstr "分離的簽章.\n"
 +msgstr ""
  
 +#: g10/plaintext.c:606
  msgid "Please enter name of data file: "
 -msgstr "請輸入資料檔的名稱: "
 +msgstr ""
  
 +#: g10/plaintext.c:643
  msgid "reading stdin ...\n"
 -msgstr "正在讀取標準輸入中 ...\n"
 +msgstr ""
  
 +#: g10/plaintext.c:688
  msgid "no signed data\n"
 -msgstr "沒有被簽署過的資料\n"
 +msgstr ""
  
 +#: g10/plaintext.c:706
  #, c-format
  msgid "can't open signed data '%s'\n"
 -msgstr "無法開啟被簽署過的資料 '%s'\n"
 +msgstr ""
  
 +#: g10/plaintext.c:741
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
 -msgstr "無法開啟被簽署過的資料 fd=%d: %s\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:116
  #, c-format
  msgid "anonymous recipient; trying secret key %s ...\n"
 -msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:123
  msgid "okay, we are the anonymous recipient.\n"
 -msgstr "很好, 我們就是匿名收件者.\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:282
  msgid "old encoding of the DEK is not supported\n"
 -msgstr "不支援舊式的 DEK 編碼\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
 -msgstr "%d%s 編密演算法未知或已停用\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:352
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 -msgstr "警告: 收件者偏好設定中找不到 %s 編密演算法\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:377
  #, c-format
  msgid "Note: secret key %s expired at %s\n"
 -msgstr "請注意: 私鑰 %s 已於 %s 過期\n"
 +msgstr ""
  
 +#: g10/pubkey-enc.c:384
  msgid "Note: key has been revoked"
 -msgstr "請注意: 金鑰已撤銷"
 +msgstr ""
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, c-format
  msgid "build_packet failed: %s\n"
 -msgstr "build_packet 失敗: %s\n"
 +msgstr ""
  
 +#: g10/revoke.c:144
  #, c-format
  msgid "key %s has no user IDs\n"
 -msgstr "金鑰 %s 沒有使用者 ID\n"
 +msgstr ""
  
 +#: g10/revoke.c:312
  msgid "To be revoked by:\n"
 -msgstr "將被撤銷:\n"
 +msgstr ""
  
 +#: g10/revoke.c:316
  msgid "(This is a sensitive revocation key)\n"
 -msgstr "(這是把機密的撤銷金鑰)\n"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "Secret key is available.\n"
 +#: g10/revoke.c:322
  msgid "Secret key is not available.\n"
 -msgstr "私鑰可用.\n"
 +msgstr ""
  
 +#: g10/revoke.c:327
  msgid "Create a designated revocation certificate for this key? (y/N) "
 -msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 +msgstr ""
  
 +#: g10/revoke.c:336 g10/revoke.c:727
  msgid "ASCII armored output forced.\n"
 -msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
 +msgstr ""
  
 +#: g10/revoke.c:352 g10/revoke.c:479
  #, c-format
  msgid "make_keysig_packet failed: %s\n"
 -msgstr "make_keysig_packet 失敗: %s\n"
 +msgstr ""
  
 +#: g10/revoke.c:415
  msgid "Revocation certificate created.\n"
 -msgstr "已建立撤銷憑證.\n"
 +msgstr ""
  
 +#: g10/revoke.c:421
  #, c-format
  msgid "no revocation keys found for \"%s\"\n"
 -msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 +msgstr ""
  
 +#: g10/revoke.c:551
  msgid "This is a revocation certificate for the OpenPGP key:"
 -msgstr "這把 OpenPGP 金鑰有一份撤銷憑證."
 +msgstr ""
  
 +#: g10/revoke.c:567
  msgid ""
  "A revocation certificate is a kind of \"kill switch\" to publicly\n"
  "declare that a key shall not anymore be used.  It is not possible\n"
@@@ -6160,137 -5056,123 +6190,137 @@@ msgid "
  "your media become unreadable.  But have some caution:  The print system of\n"
  "your machine might store the data and make it available to others!\n"
  msgstr ""
 -"已建立撤銷憑證.\n"
 -"\n"
 -"請把這個檔案搬移到另一個你能夠將之藏起來的媒介上;\n"
 -"如果有人能夠取得這份憑證的話, 那麼他也能夠讓你的\n"
 -"金鑰無法繼續使用. 把這份憑證列印出來再藏到別的地\n"
 -"方也是很好的方法, 以免你的儲存媒介損毀而無法讀取.\n"
 -"但是千萬小心: 你的機器上的列印系統可能會在列印過\n"
 -"程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
  
 +#: g10/revoke.c:769
  msgid "Please select the reason for the revocation:\n"
 -msgstr "請選擇撤銷的原因:\n"
 +msgstr ""
  
 +#: g10/revoke.c:779
  msgid "Cancel"
 -msgstr "取消"
 +msgstr ""
  
 +#: g10/revoke.c:781
  #, c-format
  msgid "(Probably you want to select %d here)\n"
 -msgstr "(也許你會想要在這裡選擇 %d)\n"
 +msgstr ""
  
 +#: g10/revoke.c:822
  msgid "Enter an optional description; end it with an empty line:\n"
 -msgstr "請輸入選用的描述; 以空白列結束:\n"
 +msgstr ""
  
 +#: g10/revoke.c:850
  #, c-format
  msgid "Reason for revocation: %s\n"
 -msgstr "撤銷原因: %s\n"
 +msgstr ""
  
 +#: g10/revoke.c:852
  msgid "(No description given)\n"
 -msgstr "(沒有給定描述)\n"
 +msgstr ""
  
 +#: g10/revoke.c:857
  msgid "Is this okay? (y/N) "
 -msgstr "這樣可以嗎? (y/N) "
 +msgstr ""
  
 +#: g10/seskey.c:62 sm/encrypt.c:123
  msgid "weak key created - retrying\n"
 -msgstr "建立了弱金鑰 - 重試中\n"
 +msgstr ""
  
 +#: g10/seskey.c:66
  #, c-format
  msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 -msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
 +msgstr ""
  
 +#: g10/seskey.c:306
  #, c-format
  msgid "%s key %s uses an unsafe (%zu bit) hash\n"
 -msgstr "%s 金鑰 %s 使用不安全 (%zu 位元) 的雜湊\n"
 +msgstr ""
  
 +#: g10/seskey.c:324
  #, c-format
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 -msgstr "%s 金鑰 %s 需要 %zu 位元以上的雜湊 (雜湊為 %s)\n"
 +msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
 -msgstr "警告: 簽章摘要與訊息不一致\n"
 +msgstr ""
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
 -msgstr "警告: 簽署子鑰 %s 未經交叉認證\n"
 +msgstr ""
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
 -msgstr "請參考 %s 上進一步的資訊\n"
 +msgstr ""
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 -msgstr "警告: 簽署子鑰 %s 有無效的交叉憑證\n"
 +msgstr ""
  
- #: g10/sig-check.c:277
 -#, fuzzy, c-format
 -#| msgid "public key %s is %lu second newer than the signature\n"
++#: g10/sig-check.c:281
 +#, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
 -msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/sig-check.c:286
 -#, fuzzy, c-format
 -#| msgid "public key %s is %lu second newer than the signature\n"
++#: g10/sig-check.c:290
 +#, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
 -msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/sig-check.c:300 g10/sign.c:266
 -#, fuzzy, c-format
 -#| msgid ""
 -#| "key %s was created %lu second in the future (time warp or clock problem)\n"
++#: g10/sig-check.c:304 g10/sign.c:266
 +#, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu seconds in the future (time warp or clock problem)\n"
  msgstr[0] ""
 -"金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 +msgstr[1] ""
  
- #: g10/sig-check.c:309
 -#, fuzzy, c-format
 -#| msgid ""
 -#| "key %s was created %lu second in the future (time warp or clock problem)\n"
++#: g10/sig-check.c:313
 +#, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu days in the future (time warp or clock problem)\n"
  msgstr[0] ""
 -"金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 +msgstr[1] ""
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, c-format
  msgid "Note: signature key %s expired %s\n"
 -msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
 +msgstr ""
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, c-format
  msgid "Note: signature key %s has been revoked\n"
 -msgstr "請注意: 簽章金鑰 %s 已遭撤銷\n"
 +msgstr ""
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 -msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
 +msgstr ""
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
 -msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
 +msgstr ""
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
 -msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
 +msgstr ""
  
 +#: g10/sign.c:88
  #, c-format
  msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 -msgstr "警告: 註記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 +msgstr ""
  
 +#: g10/sign.c:114
  #, c-format
  msgid ""
  "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@@ -6312,472 -5191,415 +6342,504 @@@ msgstr "
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 -msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 +msgstr ""
  
 +#: g10/sign.c:1009
  msgid "signing:"
 -msgstr "簽署:"
 +msgstr ""
  
 +#: g10/sign.c:1286
  #, c-format
  msgid "%s encryption will be used\n"
 -msgstr "%s 加密將被採用\n"
 +msgstr ""
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 -msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
 +msgstr ""
  
 +#: g10/skclist.c:187
  #, c-format
  msgid "skipped \"%s\": duplicated\n"
 -msgstr "已跳過 \"%s\": 重複了\n"
 +msgstr ""
  
 +#: g10/skclist.c:206
  msgid "skipped: secret key already present\n"
 -msgstr "已跳過: 私鑰已經存在\n"
 +msgstr ""
  
 +#: g10/skclist.c:225
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 -msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 +msgstr ""
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
 -msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbdump.c:105
  #, c-format
  msgid ""
  "# List of assigned trustvalues, created %s\n"
  "# (Use \"gpg --import-ownertrust\" to restore them)\n"
  msgstr ""
 -"# 相對應的信任值清單被建立於 %s\n"
 -"# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
  
 +#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
  #, c-format
  msgid "error in '%s': %s\n"
 -msgstr "在 '%s' 中出錯: %s\n"
 +msgstr ""
  
 +#: g10/tdbdump.c:162
  msgid "line too long"
 -msgstr "列太長"
 +msgstr ""
  
 +#: g10/tdbdump.c:170
  msgid "colon missing"
 -msgstr "冒號缺漏"
 +msgstr ""
  
 +#: g10/tdbdump.c:176
  msgid "invalid fingerprint"
 -msgstr "無效的指紋"
 +msgstr ""
  
 +#: g10/tdbdump.c:181
  msgid "ownertrust value missing"
 -msgstr "主觀信任值缺漏"
 +msgstr ""
  
 +#: g10/tdbdump.c:217
  #, c-format
  msgid "error finding trust record in '%s': %s\n"
 -msgstr "在 '%s' 中尋找信任記錄時出錯: %s\n"
 +msgstr ""
  
 +#: g10/tdbdump.c:221
  #, c-format
  msgid "read error in '%s': %s\n"
 -msgstr "'%s' 讀取錯誤: %s\n"
 +msgstr ""
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
 -msgstr "信任資料庫: 同步化失敗: %s\n"
 +msgstr ""
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, c-format
  msgid "can't create lock for '%s'\n"
 -msgstr "無法為 '%s' 建立鎖定\n"
 +msgstr ""
  
 +#: g10/tdbio.c:146
  #, c-format
  msgid "can't lock '%s'\n"
 -msgstr "無法鎖定 '%s'\n"
 +msgstr ""
  
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
  #, c-format
  msgid "trustdb rec %lu: lseek failed: %s\n"
 -msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
  #, c-format
  msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 -msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:352
  msgid "trustdb transaction too large\n"
 -msgstr "信任資料庫更動量過大\n"
 +msgstr ""
  
 +#: g10/tdbio.c:682
  #, c-format
  msgid "%s: directory does not exist!\n"
 -msgstr "%s: 目錄不存在!\n"
 +msgstr ""
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, c-format
  msgid "can't access '%s': %s\n"
 -msgstr "無法存取 '%s': %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:724
  #, c-format
  msgid "%s: failed to create version record: %s"
 -msgstr "%s: 建立版本記錄失敗: %s"
 +msgstr ""
  
 +#: g10/tdbio.c:729
  #, c-format
  msgid "%s: invalid trustdb created\n"
 -msgstr "%s: 建立了無效的信任資料庫\n"
 +msgstr ""
  
 +#: g10/tdbio.c:732
  #, c-format
  msgid "%s: trustdb created\n"
 -msgstr "%s: 建立了信任資料庫\n"
 +msgstr ""
  
 +#: g10/tdbio.c:788
  msgid "Note: trustdb not writable\n"
 -msgstr "請注意: 信任資料庫不可寫入\n"
 +msgstr ""
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
 -msgstr "%s: 無效的信任資料庫\n"
 +msgstr ""
  
 +#: g10/tdbio.c:834
  #, c-format
  msgid "%s: failed to create hashtable: %s\n"
 -msgstr "%s: 建立雜湊表失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:842
  #, c-format
  msgid "%s: error updating version record: %s\n"
 -msgstr "%s: 更新版本記錄時錯誤: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
  #, c-format
  msgid "%s: error reading version record: %s\n"
 -msgstr "%s: 讀取版本記錄時錯誤: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:938
  #, c-format
  msgid "%s: error writing version record: %s\n"
 -msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1461
  #, c-format
  msgid "trustdb: lseek failed: %s\n"
 -msgstr "信任資料庫: 本機搜尋失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1472
  #, c-format
  msgid "trustdb: read failed (n=%d): %s\n"
 -msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1497
  #, c-format
  msgid "%s: not a trustdb file\n"
 -msgstr "%s: 不是一個信任資料庫檔案\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1522
  #, c-format
  msgid "%s: version record with recnum %lu\n"
 -msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1528
  #, c-format
  msgid "%s: invalid file version %d\n"
 -msgstr "%s: 無效的檔案版本 %d\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1748
  #, c-format
  msgid "%s: error reading free record: %s\n"
 -msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1757
  #, c-format
  msgid "%s: error writing dir record: %s\n"
 -msgstr "%s: 寫入目錄記錄時出錯: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1768
  #, c-format
  msgid "%s: failed to zero a record: %s\n"
 -msgstr "%s: 記錄歸零失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1804
  #, c-format
  msgid "%s: failed to append a record: %s\n"
 -msgstr "%s: 附加記錄失敗: %s\n"
 +msgstr ""
  
 +#: g10/tdbio.c:1865
  msgid "Error: The trustdb is corrupted.\n"
 -msgstr "錯誤: 信任資料庫已毀損.\n"
 +msgstr ""
  
 +#: g10/textfilter.c:146
  #, c-format
  msgid "can't handle text lines longer than %d characters\n"
 -msgstr "無法處理長於 %d 字符的文字列\n"
 +msgstr ""
  
 +#: g10/textfilter.c:241
  #, c-format
  msgid "input line longer than %d characters\n"
 -msgstr "輸入列比 %d 字符還長\n"
 +msgstr ""
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
 -#, fuzzy, c-format
 -#| msgid "error sending standard options: %s\n"
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
 +#, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
 -msgstr "送出標準選項時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
 -#, fuzzy, c-format
 -#| msgid "unsupported algorithm: %s"
++#: g10/tofu.c:501
 +#, c-format
  msgid "unsupported TOFU database version: %s\n"
 -msgstr "未支援的演算法: %s"
 +msgstr ""
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
 -#, fuzzy, c-format
 -#| msgid "error sending data: %s\n"
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
 +#, c-format
  msgid "error reading TOFU database: %s\n"
 -msgstr "送出資料時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:500 g10/tofu.c:508
 -#, fuzzy, c-format
 -#| msgid "error writing base64 encoding: %s\n"
++#: g10/tofu.c:566 g10/tofu.c:574
 +#, c-format
  msgid "error determining TOFU database's version: %s\n"
 -msgstr "寫入 base64 編碼時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
 -#, fuzzy, c-format
 -#| msgid "error initializing reader object: %s\n"
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
 +#, c-format
  msgid "error initializing TOFU database: %s\n"
 -msgstr "啟始讀取程式物件時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:658
 -#, fuzzy, c-format
 -#| msgid "error opening '%s': %s\n"
++#: g10/tofu.c:765
 +#, c-format
  msgid "error opening TOFU database '%s': %s\n"
 -msgstr "開啟 '%s' 時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:828 g10/tofu.c:2266
 -#, fuzzy, c-format
 -#| msgid "error sending data: %s\n"
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
 +#, c-format
  msgid "error updating TOFU database: %s\n"
 -msgstr "送出資料時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr ""
+ 
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
 -#, fuzzy, c-format
 -#| msgid "error getting responder ID: %s\n"
++#: g10/tofu.c:1513
 +#, c-format
  msgid "error gathering other user IDs: %s\n"
 -msgstr "取得回應程式 ID 時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
 -#, fuzzy
 -#| msgid "list key and user IDs"
++#: g10/tofu.c:1523
+ msgid "This key's user IDs:\n"
 -msgstr "列出金鑰和使用者 ID"
 +msgstr ""
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
 -#, fuzzy, c-format
 -#| msgid "validity: %s"
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
 +#, c-format
  msgid "policy: %s"
 -msgstr "有效性: %s"
 +msgstr ""
  
- #: g10/tofu.c:1290
 -#, fuzzy, c-format
 -#| msgid "error getting stored flags: %s\n"
++#: g10/tofu.c:1630
 +#, c-format
  msgid "error gathering signature stats: %s\n"
 -msgstr "取得已存放的旗標時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
 -#, fuzzy
 -#| msgid "list keys"
++#: g10/tofu.c:1693
  msgid "this key"
 -msgstr "列出金鑰"
 +msgstr ""
  
- #: g10/tofu.c:1342
 -#, fuzzy, c-format
 -#| msgid "print message digests"
++#: g10/tofu.c:1715
 +#, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
 -msgstr[0] "印出訊息摘要"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1351
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
 +msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
 -#, fuzzy, c-format
 -#| msgid "error writing key: %s\n"
++#: g10/tofu.c:1994
++#, c-format
+ msgid "resetting keydb: %s\n"
 -msgstr "寫入金鑰時出錯: %s\n"
++msgstr ""
+ 
 -#, fuzzy, c-format
 -#| msgid "error setting OCSP target: %s\n"
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
 +#, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
 -msgstr "設定 OCSP 目標時出錯: %s\n"
 +msgstr ""
  
- #: g10/tofu.c:1727
 -#, fuzzy, c-format
 -#| msgid "error creating a pipe: %s\n"
++#: g10/tofu.c:2473
 +#, c-format
  msgid "error changing TOFU policy: %s\n"
 -msgstr "建立管道時出錯: %s\n"
 +msgstr ""
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
 -#, fuzzy, c-format
 -#| msgid "Deleted %d signatures.\n"
++#: g10/tofu.c:2806
 +#, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
+ msgid "Verified %ld signatures"
 -msgstr "已經刪除了 %d 份簽章.\n"
 +msgstr ""
  
- #: g10/tofu.c:1996
 -#, fuzzy, c-format
 -#| msgid "print message digests"
++#: g10/tofu.c:2816
++#, c-format
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
 -msgstr[0] "印出訊息摘要"
++msgstr[0] ""
++msgstr[1] ""
+ 
 -#, fuzzy, c-format
 -#| msgid "encrypted with %lu passphrases\n"
++#: g10/tofu.c:2826
 +#, c-format
- msgid "Verified %ld messages signed by \"%s\"."
+ msgid ", and encrypted %ld messages"
 -msgstr "已用 %lu 個密語加密了\n"
 +msgstr ""
  
- #: g10/tofu.c:2007
 -#, fuzzy, c-format
 -#| msgid "print message digests"
++#: g10/tofu.c:2835
 +#, c-format
- msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
 -msgstr[0] "印出訊息摘要"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2880
+ msgid ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
+ msgstr ""
+ 
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -6789,133 -5611,116 +6851,144 @@@ msgid_plural "
  "  %s\n"
  "to mark it as being bad.\n"
  msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
 -#, fuzzy, c-format
 -#| msgid "error sending data: %s\n"
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
 +#, c-format
  msgid "error opening TOFU database: %s\n"
 -msgstr "送出資料時出錯: %s\n"
 +msgstr ""
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
 -#, fuzzy, c-format
 -#| msgid "error writing public keyring '%s': %s\n"
++#: g10/tofu.c:3515
++#, c-format
+ msgid "error setting policy for key %s, user id \"%s\": %s"
 -msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
++msgstr ""
+ 
++#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
 -msgstr "'%s' 不是有效的長式金鑰 ID\n"
 +msgstr ""
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
 -msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
 +msgstr ""
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
 -msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
 +msgstr ""
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
 -msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
 +msgstr ""
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
 -msgstr "金鑰 %s 已標記成徹底信任了\n"
 +msgstr ""
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
 -msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
 +msgstr ""
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
 -msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
 +msgstr ""
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
 -msgstr "你可以試著用下列指令來重建信任資料庫:\n"
 +msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
 -msgstr "如果行不通的話, 請查閱手冊\n"
 +msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 -msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
 +msgstr ""
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
 -msgstr "正在使用 %s 信任模型\n"
 +msgstr ""
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
 -msgstr "不需要檢查信任資料庫\n"
 +msgstr ""
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
 -msgstr "下次信任資料庫檢查將於 %s 進行\n"
 +msgstr ""
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
 -msgstr "在 '%s' 信任模型中並不需要檢查信任資料庫\n"
 +msgstr ""
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
 -msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
 +msgstr ""
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
 -msgstr "找不到公鑰 %s: %s\n"
 +msgstr ""
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
 -msgstr "請做一次 --check-trustdb\n"
 +msgstr ""
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
 -msgstr "正在檢查信任資料庫\n"
 +msgstr ""
  
- #: g10/trustdb.c:1853
 -#, fuzzy, c-format
 -#| msgid "%lu keys processed so far\n"
++#: g10/trustdb.c:1883
 +#, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
 -msgstr[0] "目前已處理 %lu 把金鑰\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/trustdb.c:1856
 -#, fuzzy, c-format
 -#| msgid "%d keys processed (%d validity counts cleared)\n"
++#: g10/trustdb.c:1886
 +#, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
 -msgstr[0] "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
 -msgstr "沒有找到任何徹底信任的金鑰\n"
 +msgstr ""
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
 -msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
 +msgstr ""
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 -msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 +msgstr ""
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
 -msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
 +msgstr ""
  
 +#: g10/trust.c:105
  msgid "undefined"
  msgstr ""
  
@@@ -7013,140 -5811,113 +7086,140 @@@ msgid "
  "Syntax: kbxutil [options] [files]\n"
  "List, export, import Keybox data\n"
  msgstr ""
 -"語法: kbxutil [選項] [檔案]\n"
 -"列出, 匯出, 匯入金鑰鑰匙盒資料\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
 -msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
 +msgstr ""
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
 -msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 +msgstr ""
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
 -msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
 +msgstr ""
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
 -msgstr "NullPIN 還沒有變更過\n"
 +msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
 -msgstr "|N|請輸入標準金鑰將採用的新個人識別碼 (PIN)."
 +msgstr ""
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
 -msgstr "||請輸入標準金鑰的個人識別碼 (PIN)."
 +msgstr ""
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 -msgstr "|NP|請輸入標準金鑰將採用的 PIN 重設碼 (PUK)."
 +msgstr ""
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 -msgstr "|P|請輸入標準金鑰的 PIN 重設碼 (PUK)."
 +msgstr ""
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 -msgstr "|N|請輸入金鑰的新個人識別碼 (PIN) 以建立完善的簽章."
 +msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
 -msgstr "||請輸入金鑰的個人識別碼 (PIN) 以建立完善的簽章."
 +msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
 -msgstr "|NP|請輸入金鑰的新 PIN 重設碼 (PUK) 以建立完善的簽章."
 +msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
 -msgstr "|P|請輸入金鑰的 PIN 重設碼 (PUK) 以建立完善的簽章."
 +msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
 -msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
 -msgstr "存放指紋失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
 -msgstr "存放創生日期失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
++#: scd/app-openpgp.c:1236
+ msgid "response does not contain the RSA modulus\n"
 -msgstr "回應中未包含 RSA 系數\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
++#: scd/app-openpgp.c:1243
+ msgid "response does not contain the RSA public exponent\n"
 -msgstr "回應中未包含 RSA 公用指數\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
- msgid "response does not contain the RSA modulus\n"
 -#, fuzzy
 -#| msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ msgid "response does not contain the EC public key\n"
 -msgstr "回應中未包含 EC 公用指數\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
- msgid "response does not contain the RSA public exponent\n"
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
 -msgstr "回應中未包含公鑰資料\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
 -msgstr "讀取公鑰時失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
 -msgstr "以 %s 做為預設 PIN\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 -msgstr "使用 %s 做為預設個人識別碼 (PIN) 失敗: %s - 正在停用之後的預設使用\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 -msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 +msgstr ""
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
 -msgstr "||請輸入個人識別碼 (PIN)"
 +msgstr ""
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
 -msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
 -msgstr "驗證 CHV%d 失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
 -msgstr "從卡片取回 CHV 狀態時出錯\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
 -msgstr "卡片永久鎖定了!!\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:1877
 -#, fuzzy, c-format
 -#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
++#: scd/app-openpgp.c:2072
 +#, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
  "%d Admin PIN attempts remaining before card is permanently locked\n"
@@@ -7155,485 -5925,378 +7228,485 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 -msgstr "|A|請在上輸入管理者 PIN%%0A[剩餘嘗試次數: %d]"
 +msgstr ""
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
 -msgstr "|A|請輸入管理者 PIN"
 +msgstr ""
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
 -msgstr "管理者指令存取權限尚未組態\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
 -msgstr "||請輸入卡片的重設碼"
 +msgstr ""
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
 -msgstr "重設碼太短; 長度最少要有 %d\n"
 +msgstr ""
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
 -msgstr "|RN|新增重設碼"
 +msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
 -msgstr "|AN|新增管理者個人識別碼 (PIN)"
 +msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
 -msgstr "|N|新增個人識別碼 (PIN)"
 +msgstr ""
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  msgid "||Please enter the Admin PIN and New Admin PIN"
 -msgstr "||請輸入管理者 PIN 及新的管理者 PIN"
 +msgstr ""
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  msgid "||Please enter the PIN and New PIN"
 -msgstr "||請輸入個人識別碼及新的個人識別碼 (PIN)"
 +msgstr ""
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
 -msgstr "讀取應用程式資料時出錯\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
 -msgstr "讀取指紋 DO 時出錯\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
 -msgstr "金鑰已存在\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
 -msgstr "既有的金鑰將被取代\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
 -msgstr "正在產生新的金鑰\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
 -msgstr "正在寫入新的金鑰\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
 -msgstr "缺漏創生時間戳印\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
 -msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
 -msgstr "存放金鑰失敗: %s\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3320
 -#, fuzzy
 -#| msgid "unsupported inquiry '%s'\n"
++#: scd/app-openpgp.c:3534
  msgid "unsupported curve\n"
 -msgstr "未支援的查詢 '%s'\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
 -msgstr "正在產生金鑰中, 請稍候 ...\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
 -msgstr "產生金鑰時失敗\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3596
 -#, fuzzy, c-format
 -#| msgid "key generation completed (%d seconds)\n"
++#: scd/app-openpgp.c:3804
 +#, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
 -msgstr[0] "金鑰產生完畢 (%d 秒)\n"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 -msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
 -msgstr "卡片上的指紋與所要求的那個並不吻合\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
 -msgstr "卡片不支援 %s 摘要演算法\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
 -msgstr "目前建立的簽章: %lu\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
 -msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
 +msgstr ""
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
 -msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
 +msgstr ""
  
 +#: scd/app-dinsig.c:299
  msgid "||Please enter your PIN at the reader's pinpad"
 -msgstr "||請在讀卡機鍵盤上輸入你的個人識別碼 (PIN)"
 +msgstr ""
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
 +#: scd/app-dinsig.c:529
  msgid "|N|Initial New PIN"
 -msgstr "|N|開始新增個人識別碼 (PIN)"
 +msgstr ""
  
 +#: scd/scdaemon.c:114
  msgid "run in multi server mode (foreground)"
 -msgstr "以多重伺服器模式執行 (前景)"
 +msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
 -msgstr "|等級|設定除錯等級為指定等級"
 +msgstr ""
  
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
  msgid "|FILE|write a log to FILE"
 -msgstr "|檔案|將日誌寫入至指定檔案"
 +msgstr ""
  
 +#: scd/scdaemon.c:134
  msgid "|N|connect to reader at port N"
 -msgstr "|N|從 N 埠連線至讀卡機"
 +msgstr ""
  
 +#: scd/scdaemon.c:136
  msgid "|NAME|use NAME as ct-API driver"
 -msgstr "|名稱|使用指定名稱做為 ct-API 驅動程式"
 +msgstr ""
  
 +#: scd/scdaemon.c:138
  msgid "|NAME|use NAME as PC/SC driver"
 -msgstr "|名稱|使用指定名稱做為 PC/SC 驅動程式"
 +msgstr ""
  
 +#: scd/scdaemon.c:141
  msgid "do not use the internal CCID driver"
 -msgstr "不要使用內部的 CCID 驅動程式"
 +msgstr ""
  
 +#: scd/scdaemon.c:147
  msgid "|N|disconnect the card after N seconds of inactivity"
 -msgstr "|N|沒有活動達 N 秒後就與卡片斷線"
 +msgstr ""
  
 +#: scd/scdaemon.c:150
  msgid "do not use a reader's pinpad"
 -msgstr "不要使用讀卡機鍵盤"
 +msgstr ""
  
 +#: scd/scdaemon.c:155
  msgid "deny the use of admin card commands"
 -msgstr "禁用管理者卡片指令"
 +msgstr ""
  
 +#: scd/scdaemon.c:158
  msgid "use variable length input for pinpad"
 -msgstr "輸入 PIN 時在輸入區顯示成變動長度"
 +msgstr ""
  
 +#: scd/scdaemon.c:287
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 -msgstr "用法: @SCDAEMON@ [選項] (或用 -h 求助)"
 +msgstr ""
  
 +#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
 -"語法: scdaemon [選項] [指令 [引數]]\n"
 -"@GNUPG@ 智慧卡服務\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
 -msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
 +msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
 -msgstr "用於 fd %d 的經手程式已啟動\n"
 +msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
 -msgstr "用於 fd %d 的經手程式已終止\n"
 +msgstr ""
  
 +#: sm/base64.c:327
  #, c-format
  msgid "invalid radix64 character %02x skipped\n"
 -msgstr "已跳過無效的 radix64 字符 %02x\n"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "no gpg-agent running in this session\n"
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  msgid "no dirmngr running in this session\n"
 -msgstr "在此階段中沒有執行中的 gpg-agent\n"
 +msgstr ""
  
 +#: sm/certchain.c:194
  #, c-format
  msgid "validation model requested by certificate: %s"
 -msgstr "憑證所要求的驗證模型: %s"
 +msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
 -msgstr "chain"
 +msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
 -msgstr "shell"
 +msgstr ""
  
 +#: sm/certchain.c:256 dirmngr/validate.c:107
  #, c-format
  msgid "critical certificate extension %s is not supported"
 -msgstr "未支援關鍵憑證擴充欄位 %s"
 +msgstr ""
  
 +#: sm/certchain.c:295 dirmngr/validate.c:205
  msgid "issuer certificate is not marked as a CA"
 -msgstr "發行者憑證並未標記為 CA"
 +msgstr ""
  
 +#: sm/certchain.c:333
  msgid "critical marked policy without configured policies"
 -msgstr "關鍵已標記原則沒有已組態的原則"
 +msgstr ""
  
 +#: sm/certchain.c:343
  #, c-format
  msgid "failed to open '%s': %s\n"
 -msgstr "開啟 '%s' 失敗: %s\n"
 +msgstr ""
  
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
  msgid "Note: non-critical certificate policy not allowed"
 -msgstr "請注意: 不允許非關鍵的憑證原則"
 +msgstr ""
  
 +#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
  msgid "certificate policy not allowed"
 -msgstr "未允許憑證原則"
 +msgstr ""
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
 -msgstr "從外部位置尋找發行者\n"
 +msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
 -msgstr "吻合的發行者數量: %d\n"
 +msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
 -msgstr "從 Dirmngr 快取尋找發行者\n"
 +msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
 -msgstr "吻合的憑證數量: %d\n"
 +msgstr ""
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
 -msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
 +msgstr ""
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
 -msgstr "配置 keyDB 代號失敗\n"
 +msgstr ""
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
 -msgstr "憑證已撤銷"
 +msgstr ""
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
 -msgstr "憑證的狀態未知"
 +msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
 -msgstr "請確認 \"dirmngr\" 已安裝妥善\n"
 +msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
 -msgstr "檢查 CRL 時失敗: %s"
 +msgstr ""
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
 -msgstr "有效性無效的憑證: %s"
 +msgstr ""
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
 -msgstr "憑證尚未生效"
 +msgstr ""
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
 -msgstr "根憑證尚未生效"
 +msgstr ""
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
 -msgstr "媒介憑證尚未生效"
 +msgstr ""
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
 -msgstr "憑證已過期"
 +msgstr ""
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
 -msgstr "根憑證已過期"
 +msgstr ""
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
 -msgstr "媒介憑證已過期"
 +msgstr ""
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
 -msgstr "遺失所需的憑證屬性: %s%s%s"
 +msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
 -msgstr "有效性無效的憑證"
 +msgstr ""
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
 -msgstr "簽章並非在憑證生存時間內所造"
 +msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
 -msgstr "憑證並非在發行者生存時間內所造"
 +msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
 -msgstr "媒介憑證並非在發行者生存時間內所造"
 +msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
 -msgstr "  (            簽章建立於 "
 +msgstr ""
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
 -msgstr "  (            憑證建立於 "
 +msgstr ""
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
 -msgstr "  (憑證有效自 "
 +msgstr ""
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
 -msgstr "  (        發行者有效自 "
 +msgstr ""
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
 -msgstr "指紋=%s\n"
 +msgstr ""
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
 -msgstr "根憑證現在已標記為已信任\n"
 +msgstr ""
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
 -msgstr "在 gpg-agent 中未啟用互動式標記為已信任\n"
 +msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
 -msgstr "互動式標記為已信任在此作業階段中已停用\n"
 +msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
 -msgstr "警告: 簽章創造時間未知 - 假設為此刻"
 +msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
 -msgstr "憑證中找不到發行者"
 +msgstr ""
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
 -msgstr "自簽憑證有 不良 簽章"
 +msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
 -msgstr "根憑證未標記為已信任"
 +msgstr ""
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
 -msgstr "檢查信任清單時失敗: %s\n"
 +msgstr ""
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
 -msgstr "憑證鏈太長\n"
 +msgstr ""
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
 -msgstr "找不到發行者憑證"
 +msgstr ""
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
 -msgstr "憑證有 不良 簽章"
 +msgstr ""
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
 -msgstr "找到了另一個可能吻合的 CA 憑證 - 正再試一次"
 +msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
 -msgstr "憑證鏈比 CA 所允許的 (%d) 還長"
 +msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
 -msgstr "憑證完好\n"
 +msgstr ""
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
 -msgstr "媒介憑證良好\n"
 +msgstr ""
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
 -msgstr "根憑證完好\n"
 +msgstr ""
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
 -msgstr "切換至鏈模型"
 +msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
 -msgstr "已使用的驗證模型: %s"
 +msgstr ""
  
 +#: sm/certcheck.c:107
  #, c-format
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
 -msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
 +msgstr ""
  
 +#: sm/certcheck.c:244 sm/verify.c:202
  msgid "(this is the MD2 algorithm)\n"
 -msgstr "(這是 MD2 演算法)\n"
 +msgstr ""
  
 +#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
  msgid "none"
 -msgstr "無"
 +msgstr ""
  
 +#: sm/certdump.c:552 sm/certdump.c:617
  msgid "[Error - invalid encoding]"
 -msgstr "[錯誤 - 無效的編碼]"
 +msgstr ""
  
 +#: sm/certdump.c:560
  msgid "[Error - out of core]"
 -msgstr "[錯誤 - 超出核心]"
 +msgstr ""
  
 +#: sm/certdump.c:596
  msgid "[Error - No name]"
 -msgstr "[錯誤 - 沒有名稱]"
 +msgstr ""
  
 +#: sm/certdump.c:623
  msgid "[Error - invalid DN]"
 -msgstr "[錯誤 - 無效的 DN]"
 +msgstr ""
  
 +#: sm/certdump.c:833
  #, c-format
  msgid ""
  "Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -7839,346 -6466,270 +7912,346 @@@ msgstr "
  #. adjust it do the length of your translation.  The
  #. second string is merely passed to atoi so you can
  #. drop everything after the number.
 +#: sm/certreqgen-ui.c:324
  #, c-format
  msgid "Invalid subject name '%s'\n"
 -msgstr "無效的主旨名稱 '%s'\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:326
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 -msgstr "16"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:338
  msgid "Enter email addresses"
 -msgstr "請輸入電子郵件地址"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:339
  msgid " (end with an empty line):\n"
 -msgstr " (以空白列結束):\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:343
  msgid "Enter DNS names"
 -msgstr "請輸入 DNS 名稱"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
  msgid " (optional; end with an empty line):\n"
 -msgstr " (非必要; 以空白列結束):\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:348
  msgid "Enter URIs"
 -msgstr "請輸入 URI"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:355
  msgid "Create self-signed certificate? (y/N) "
 -msgstr "要建立自簽憑證嗎? (y/N) "
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:382
  msgid "These parameters are used:\n"
 -msgstr "採用下列這些參數:\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:400
  msgid "Now creating self-signed certificate.  "
 -msgstr "現在正在建立自簽憑證.  "
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:402
  msgid "Now creating certificate request.  "
 -msgstr "現在正在建立憑證請求.  "
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:403
  msgid "This may take a while ...\n"
 -msgstr "這可能會花點時間 ...\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:414
  msgid "Ready.\n"
 -msgstr "準備妥當.\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:417
  msgid "Ready.  You should now send this request to your CA.\n"
 -msgstr "準備好了.  你現在就該把此請求送到你的 CA.\n"
 +msgstr ""
  
 +#: sm/certreqgen-ui.c:423
  msgid "resource problem: out of core\n"
 -msgstr "資源問題: 超出核心\n"
 +msgstr ""
  
 +#: sm/decrypt.c:330
  msgid "(this is the RC2 algorithm)\n"
 -msgstr "(這是 RC2 演算法)\n"
 +msgstr ""
  
 +#: sm/decrypt.c:332
  msgid "(this does not seem to be an encrypted message)\n"
 -msgstr "(這看起來不像是個加密過的訊息)\n"
 +msgstr ""
  
 +#: sm/delete.c:51 sm/delete.c:112
  #, c-format
  msgid "certificate '%s' not found: %s\n"
 -msgstr "找不到憑證 '%s': %s\n"
 +msgstr ""
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
 -msgstr "鎖住金鑰鑰匙盒時出錯: %s\n"
 +msgstr ""
  
 +#: sm/delete.c:143
  #, c-format
  msgid "duplicated certificate '%s' deleted\n"
 -msgstr "重複的憑證 '%s' 已刪除\n"
 +msgstr ""
  
 +#: sm/delete.c:145
  #, c-format
  msgid "certificate '%s' deleted\n"
 -msgstr "憑證 '%s' 已刪除\n"
 +msgstr ""
  
 +#: sm/delete.c:175
  #, c-format
  msgid "deleting certificate \"%s\" failed: %s\n"
 -msgstr "刪除憑證 \"%s\" 時失敗: %s\n"
 +msgstr ""
  
 +#: sm/encrypt.c:328
  msgid "no valid recipients given\n"
 -msgstr "沒有給定有效的收件者\n"
 +msgstr ""
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
 -msgstr "列出外部金鑰"
 +msgstr ""
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
 -msgstr "列出憑證鏈"
 +msgstr ""
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
 -msgstr "匯入憑證"
 +msgstr ""
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
 -msgstr "匯出憑證"
 +msgstr ""
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
 -msgstr "註冊智慧卡"
 +msgstr ""
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
 -msgstr "將指令遞送給 dirmngr"
 +msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
 -msgstr "叫用 gpg-protect-tool"
 +msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
 -msgstr "建立以 base-64 編碼過的輸出"
 +msgstr ""
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
 -msgstr "假設輸入的是 PEM 格式"
 +msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
 -msgstr "假設輸入的是 base-64 格式"
 +msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
 -msgstr "假設輸入的是二進制格式"
 +msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
 -msgstr "永遠不要查閱 CRL"
 +msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
 -msgstr "用 OCSP 檢查有效性"
 +msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
 -msgstr "|N|要包含的憑證數量"
 +msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
 -msgstr "|檔案|從指定檔案中取得原則資訊"
 +msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
 -msgstr "不要檢查憑證原則"
 +msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
 -msgstr "取回遺失的發行者憑證"
 +msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
 -msgstr "完全不要使用終端機"
 +msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
 -msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
 +msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
 -msgstr "|檔案|將稽核日誌寫入至指定檔案"
 +msgstr ""
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
 -msgstr "批次模式: 永遠不詢問"
 +msgstr ""
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
 -msgstr "假設大部分的問題都回答是"
 +msgstr ""
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
 -msgstr "假設大部分的問題都回答否"
 +msgstr ""
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
 -msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
 +msgstr ""
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
 -msgstr "|使用者-ID|使用指定使用者 ID 做為預設私鑰"
 +msgstr ""
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
 -msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
 +msgstr ""
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
 -msgstr "|名稱|使用指定名稱的編密演算法"
 +msgstr ""
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
 -msgstr "|名稱|使用指定名稱的訊息摘要演算法"
 +msgstr ""
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 -msgstr "用法: @GPGSM@ [選項] [檔案] (或用 -h 求助)"
 +msgstr ""
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
  "Default operation depends on the input data\n"
  msgstr ""
 -"語法: @GPGSM@ [選項] [檔案]\n"
 -"用 S/MIME 協定來簽署, 檢查, 加密, 解密\n"
 -"預設的操作會依輸入資料而定\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
 -msgstr "請注意: 將無法加密為 '%s': %s\n"
 +msgstr ""
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, c-format
  msgid "unknown validation model '%s'\n"
 -msgstr "未知的驗證模型 '%s'\n"
 +msgstr ""
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
 -msgstr "%s:%u: 沒有給定主機名稱\n"
 +msgstr ""
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
 -msgstr "%s:%u: 給定的密碼沒有使用者\n"
 +msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
 -msgstr "%s:%u: 正在跳過這一列\n"
 +msgstr ""
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
 -msgstr "無法剖析金鑰伺服器\n"
 +msgstr ""
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, c-format
  msgid "importing common certificates '%s'\n"
 -msgstr "正在匯入通用憑證 '%s'\n"
 +msgstr ""
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, c-format
  msgid "can't sign using '%s': %s\n"
 -msgstr "無法用 '%s' 來簽署: %s\n"
 +msgstr ""
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
 -msgstr "無效的指令 (沒有這樣的指令)\n"
 +msgstr ""
  
 +#: sm/import.c:127
  #, c-format
  msgid "total number processed: %lu\n"
 -msgstr "處理總量: %lu\n"
 +msgstr ""
  
 +#: sm/import.c:246
  msgid "error storing certificate\n"
 -msgstr "存放憑證時出錯\n"
 +msgstr ""
  
 +#: sm/import.c:254
  msgid "basic certificate checks failed - not imported\n"
 -msgstr "基本的憑證檢查失敗了 - 未匯入\n"
 +msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
 -msgstr "取得已存放的旗標時出錯: %s\n"
 +msgstr ""
  
 +#: sm/import.c:526 sm/import.c:558
  #, c-format
  msgid "error importing certificate: %s\n"
 -msgstr "匯入憑證時出錯: %s\n"
 +msgstr ""
  
 +#: sm/import.c:746 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
 -msgstr "讀取輸入時出錯: %s\n"
 +msgstr ""
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
 -msgstr "取得指紋失敗\n"
 +msgstr ""
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
 -msgstr "查找既有憑證的問題: %s\n"
 +msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
 -msgstr "尋找可寫入的 keyDB 時出錯: %s\n"
 +msgstr ""
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
 -msgstr "存放憑證時出錯: %s\n"
 +msgstr ""
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
 -msgstr "重新搜尋憑證的問題: %s\n"
 +msgstr ""
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
 -msgstr "存放旗標時出錯: %s\n"
 +msgstr ""
  
 +#: sm/keylist.c:657
  msgid "Error - "
 -msgstr "錯誤 - "
 +msgstr ""
  
 +#: sm/misc.c:58
  msgid "GPG_TTY has not been set - using maybe bogus default\n"
 -msgstr "尚未設定 GPG_TTY - 使用可能是偽造的預設值\n"
 +msgstr ""
  
 +#: sm/qualified.c:105
  #, c-format
  msgid "invalid formatted fingerprint in '%s', line %d\n"
 -msgstr "無效的格式化指紋於 '%s', 第 %d 列\n"
 +msgstr ""
  
 +#: sm/qualified.c:123
  #, c-format
  msgid "invalid country code in '%s', line %d\n"
 -msgstr "無效的國家代碼於 '%s', 第 %d 列\n"
 +msgstr ""
  
 +#: sm/qualified.c:206
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
@@@ -8922,1143 -7327,912 +8995,1145 @@@ msgid "
  "The process returns 0 if the certificate is valid, 1 if it is\n"
  "not valid and other error codes for general failures\n"
  msgstr ""
 -"語法: dirmngr-client [選項] [憑證檔案|模式]\n"
 -"以 CRL 測試 X.509 憑證, 或進行 OCSP 檢查\n"
 -"如果憑證有效, 此程序將傳回 0; 如果憑證無效\n"
 -"則傳回 1; 其他錯誤代碼則代表不同的一般性失敗\n"
  
 +#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
  #, c-format
  msgid "error reading certificate from stdin: %s\n"
 -msgstr "從標準輸入讀取憑證時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:281
  #, c-format
  msgid "error reading certificate from '%s': %s\n"
 -msgstr "從 '%s' 讀取憑證時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:295
  msgid "certificate too large to make any sense\n"
 -msgstr "憑證大到全然不合理的境界\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:310
  #, c-format
  msgid "can't connect to the dirmngr: %s\n"
 -msgstr "無法連接至 dirmngr: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:332
  #, c-format
  msgid "lookup failed: %s\n"
 -msgstr "查找失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:347
  #, c-format
  msgid "loading CRL '%s' failed: %s\n"
 -msgstr "載入 CRL '%s' 時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:375
  msgid "a dirmngr daemon is up and running\n"
 -msgstr "有個 dirmngr 服務已啟動並正在執行中\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:397
  #, c-format
  msgid "validation of certificate failed: %s\n"
 -msgstr "憑證之驗證失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
  msgid "certificate is valid\n"
 -msgstr "憑證有效\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
  msgid "certificate has been revoked\n"
 -msgstr "憑證已遭撤銷\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
  #, c-format
  msgid "certificate check failed: %s\n"
 -msgstr "憑證檢查失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:428
  #, c-format
  msgid "got status: '%s'\n"
 -msgstr "得到狀態: '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:443
  #, c-format
  msgid "error writing base64 encoding: %s\n"
 -msgstr "寫入 base64 編碼時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:701
  #, c-format
  msgid "unsupported inquiry '%s'\n"
 -msgstr "未支援的查詢 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:803
  msgid "absolute file name expected\n"
 -msgstr "應該要有絕對檔名\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr-client.c:848
  #, c-format
  msgid "looking up '%s'\n"
 -msgstr "正在查找 '%s'\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
 -msgstr "列出 CRL 快取的內容"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  msgid "|FILE|load CRL from FILE into cache"
 -msgstr "|檔案|從指定檔案載入 CRL 至快取"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
 -msgstr "|網址|從指定網址取得 CRL"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
 -msgstr "關閉 dirmngr"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
 -msgstr "清除快取"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
 -msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  msgid "run without asking a user"
 -msgstr "以不詢問使用者的方式執行"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
 -msgstr "強迫載入過時的 CRL"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
 -msgstr "允許送出 OCSP 請求"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
 -msgstr "避免使用 HTTP"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
 -msgstr "避免使用 LDAP"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
 -msgstr "忽略 HTTP CRL 分布點"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
 -msgstr "忽略 LDAP CRL 分布點"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
 -msgstr "忽略含有 OCSP 伺服器網址的憑證"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
 -msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
 -msgstr "|主機|指定 LDAP 查詢主機"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
 -msgstr "不要將主機備案與 --ldap-proxy 並用"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  msgid "|FILE|read LDAP server list from FILE"
 -msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
 -msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
 -msgstr "|N|把 LDAP 逾時設成 N 秒"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  msgid "|URL|use OCSP responder at URL"
 -msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
 -msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
 -msgstr "|N|單次查詢不要傳回超過 N 筆項目"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 -msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
  "options)\n"
  msgstr ""
 -"@\n"
 -"(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 -msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
 -"語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
 -"@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
 -msgstr "有效的除錯等級為: %s\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, c-format
  msgid "usage: %s [options] "
 -msgstr "用法: %s [選項] "
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  msgid "colons are not allowed in the socket name\n"
 -msgstr "socket 名稱內不允許使用冒號\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
 -msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
 -msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
 -msgstr "%s:%u: 列太長 - 已跳過\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
 -msgstr "%s:%u: 偵測到無效的指紋\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, c-format
  msgid "%s:%u: read error: %s\n"
 -msgstr "%s:%u: 讀取錯誤: %s\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
 -msgstr "%s:%u: 列尾的垃圾已忽略\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 -msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
 -msgstr "收到 SIGUSR2 - 無定義行動\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
 -msgstr "收到 SIGTERM - 正在關閉 ...\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
 -msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  msgid "shutdown forced\n"
 -msgstr "已強迫關閉\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
 -msgstr "收到 SIGINT - 立即關閉\n"
 +msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
 -msgstr "收到訊號 %d - 無定義行動\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:138
  msgid "return all values in a record oriented format"
 -msgstr "以記錄導向格式傳回所有數值"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:141
  msgid "|NAME|ignore host part and connect through NAME"
 -msgstr "|名稱|忽略主機的部份並改以指定名稱連線"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:142
  msgid "|NAME|connect to host NAME"
 -msgstr "|名稱|連線至位於指定名稱的主機"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:143
  msgid "|N|connect to port N"
 -msgstr "|N|連線至 N 連接埠"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:144
  msgid "|NAME|use user NAME for authentication"
 -msgstr "|名字|使用指定名字做為認證用的使用者名稱"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:145
  msgid "|PASS|use password PASS for authentication"
 -msgstr "|密碼|使用指定密碼作為認證"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:147
  msgid "take password from $DIRMNGR_LDAP_PASS"
 -msgstr "從 $DIRMNGR_LDAP_PASS 取得密碼使用"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:148
  msgid "|STRING|query DN STRING"
 -msgstr "|字串|以只指定字串查詢 DN"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:149
  msgid "|STRING|use STRING as filter expression"
 -msgstr "|字串|以指定字串作為過濾器表示式"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:150
  msgid "|STRING|return the attribute STRING"
 -msgstr "|字串|以指定字串傳回屬性"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:209
  msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
 -msgstr "用法: dirmngr_ldap [選項] [網址] (或用 -h 求助)\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:212
  msgid ""
  "Syntax: dirmngr_ldap [options] [URL]\n"
  "Internal LDAP helper for Dirmngr\n"
  "Interface and options may change without notice\n"
  msgstr ""
 -"語法: dirmngr_ldap [選項] [網址]\n"
 -"Dirmngr 的內部 LDAP 協助程式\n"
 -"介面及選項均可能未經通知即變更\n"
  
 +#: dirmngr/dirmngr_ldap.c:337
  #, c-format
  msgid "invalid port number %d\n"
 -msgstr "無效的連接埠號碼 %d\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:413
  #, c-format
  msgid "scanning result for attribute '%s'\n"
 -msgstr "正在掃描屬性 '%s' 之結果\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
 +#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
 +#: dirmngr/dirmngr_ldap.c:677
  #, c-format
  msgid "error writing to stdout: %s\n"
 -msgstr "寫入標準輸出時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:437
  #, c-format
  msgid "          available attribute '%s'\n"
 -msgstr "          可用屬性 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:475
  #, c-format
  msgid "attribute '%s' not found\n"
 -msgstr "找不到屬性 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:482
  #, c-format
  msgid "found attribute '%s'\n"
 -msgstr "找到屬性 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:591
  #, c-format
  msgid "processing url '%s'\n"
 -msgstr "正在處理網址 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:593
  #, c-format
  msgid "          user '%s'\n"
 -msgstr "          使用者 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:595
  #, c-format
  msgid "          pass '%s'\n"
 -msgstr "          密碼 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:597
  #, c-format
  msgid "          host '%s'\n"
 -msgstr "          主機 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:598
  #, c-format
  msgid "          port %d\n"
 -msgstr "          連接埠 %d\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:600
  #, c-format
  msgid "            DN '%s'\n"
 -msgstr "            域名 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:602
  #, c-format
  msgid "        filter '%s'\n"
 -msgstr "        過濾器 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
  #, c-format
  msgid "          attr '%s'\n"
 -msgstr "          屬性 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:616
  #, c-format
  msgid "no host name in '%s'\n"
 -msgstr "'%s' 中沒有主機名稱\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:621
  #, c-format
  msgid "no attribute given for query '%s'\n"
 -msgstr "查詢 '%s' 無給定屬性\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:627
  msgid "WARNING: using first attribute only\n"
 -msgstr "警告: 僅使用第一個屬性\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:636
  #, c-format
  msgid "LDAP init to '%s:%d' failed: %s\n"
 -msgstr "LDAP 初始至 '%s:%d' 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:659
  #, c-format
  msgid "binding to '%s:%d' failed: %s\n"
 -msgstr "綁定至 '%s:%d' 時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:686
  #, c-format
  msgid "searching '%s' failed: %s\n"
 -msgstr "搜尋 '%s' 時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:718
  #, c-format
  msgid "'%s' is not an LDAP URL\n"
 -msgstr "'%s' 不是一個 LDAP 位址\n"
 +msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:724
  #, c-format
  msgid "'%s' is an invalid LDAP URL\n"
 -msgstr "'%s' 是無效的 LDAP 網址\n"
 +msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, c-format
- msgid "error allocating memory: %s\n"
- msgstr ""
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, c-format
  msgid "error printing log line: %s\n"
 -msgstr "印出日誌記錄列時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:236
  #, c-format
  msgid "error reading log from ldap wrapper %d: %s\n"
 -msgstr "從 ldap 封裝程式 %d 讀取日誌記錄時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:304
  #, c-format
  msgid "npth_select failed: %s - waiting 1s\n"
 -msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:343
  #, c-format
  msgid "ldap wrapper %d ready"
 -msgstr "ldap 封裝程式 %d 準備妥當"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:352
  #, c-format
  msgid "ldap wrapper %d ready: timeout\n"
 -msgstr "ldap 封裝程式 %d 準備妥當: 逾時\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:355
  #, c-format
  msgid "ldap wrapper %d ready: exitcode=%d\n"
 -msgstr "ldap 封裝程式 %d 準備妥當: 離開代碼=%d\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:364
  #, c-format
  msgid "waiting for ldap wrapper %d failed: %s\n"
 -msgstr "等候 ldap 封裝程式 %d 時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:376
  #, c-format
  msgid "ldap wrapper %d stalled - killing\n"
 -msgstr "ldap 封裝程式 %d 已卡住 - 正在中止\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:444
  #, c-format
  msgid "error spawning ldap wrapper reaper thread: %s\n"
 -msgstr "繁衍 ldap 封裝程式收割執行緒時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
  #, c-format
  msgid "reading from ldap wrapper %d failed: %s\n"
 -msgstr "從 ldap 封裝程式 %d 讀取時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ldap.c:91
  #, c-format
  msgid "invalid char 0x%02x in host name - not added\n"
 -msgstr "主機名稱中有無效的字符 0x%02x - 不予加入\n"
 +msgstr ""
  
 +#: dirmngr/ldap.c:95
  #, c-format
  msgid "adding '%s:%d' to the ldap server list\n"
 -msgstr "正在加入 '%s:%d' 至 ldap 伺服器清單\n"
 +msgstr ""
  
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
  #, c-format
  msgid "malloc failed: %s\n"
 -msgstr "動態記憶體配置失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ldap.c:627
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
 -msgstr "start_cert_fetch: 無效的模式 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/ldap.c:840
  msgid "ldap_search hit the size limit of the server\n"
 -msgstr "ldap_search 達到伺服器的尺寸限制\n"
 +msgstr ""
  
 +#: dirmngr/misc.c:170
  msgid "invalid canonical S-expression found\n"
 -msgstr "發現無效的標準型 S-表示式\n"
 +msgstr ""
  
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
  #, c-format
  msgid "gcry_md_open failed: %s\n"
 -msgstr "gcry_md_open 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
  #, c-format
  msgid "oops: ksba_cert_hash failed: %s\n"
 -msgstr "糟了: ksba_cert_hash 失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/misc.c:518
  msgid "bad URL encoding detected\n"
 -msgstr "偵測到不良的網址編碼\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:80
  #, c-format
  msgid "error reading from responder: %s\n"
 -msgstr "從回應程式讀取時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:98
  #, c-format
  msgid "response from server too large; limit is %d bytes\n"
 -msgstr "來自伺服器的回應太大; 上限是 %d 位元組\n"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "OCSP request not possible due to disabled HTTP\n"
 +#: dirmngr/ocsp.c:139
  msgid "OCSP request not possible due to Tor mode\n"
 -msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:145
  msgid "OCSP request not possible due to disabled HTTP\n"
 -msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:152
  #, c-format
  msgid "error setting OCSP target: %s\n"
 -msgstr "設定 OCSP 目標時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:170
  #, c-format
  msgid "error building OCSP request: %s\n"
 -msgstr "建立 OCSP 請求時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:181
  #, c-format
  msgid "error connecting to '%s': %s\n"
 -msgstr "連線至 '%s' 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
  #, c-format
  msgid "error reading HTTP response for '%s': %s\n"
 -msgstr "讀取 '%s' HTTP 回應時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:240
  #, c-format
  msgid "error accessing '%s': http status %u\n"
 -msgstr "存取 '%s' 時出錯: http 狀態 %u\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:265
  #, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
 -msgstr "剖析 '%s' OCSP 回應時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
 -msgstr "位於 '%s' 的 OSCP 回應程式狀態: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:293
  #, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
 -msgstr "計算 '%s' OSCP 回應雜湊時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:328
  msgid "not signed by a default OCSP signer's certificate"
 -msgstr "並未由預設 OCSP 簽署者的憑證所簽署"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:413
  msgid "only SHA-1 is supported for OCSP responses\n"
 -msgstr "OCSP 回應僅支援 SHA-1\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:464
  #, c-format
  msgid "allocating list item failed: %s\n"
 -msgstr "配置清單項目時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:479
  #, c-format
  msgid "error getting responder ID: %s\n"
 -msgstr "取得回應程式 ID 時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:514
  msgid "no suitable certificate found to verify the OCSP response\n"
 -msgstr "找不到適合用來驗證 OCSP 回應的憑證\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
  #, c-format
  msgid "issuer certificate not found: %s\n"
 -msgstr "找不到發行者憑證: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:563
  msgid "caller did not return the target certificate\n"
 -msgstr "叫用者未傳為目標憑證\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:570
  msgid "caller did not return the issuing certificate\n"
 -msgstr "叫用者未傳回發行的憑證\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:580
  #, c-format
  msgid "failed to allocate OCSP context: %s\n"
 -msgstr "配置 OCSP 脈絡失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:614
  #, c-format
  msgid "can't get authorityInfoAccess: %s\n"
 -msgstr "無法取得 authorityInfoAccess: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:621
  msgid "no default OCSP responder defined\n"
 -msgstr "無定義預設 OCSP 回應程式\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:627
  msgid "no default OCSP signer defined\n"
 -msgstr "未定義預設的 OCSP 簽署程式\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:634
  #, c-format
  msgid "using default OCSP responder '%s'\n"
 -msgstr "正在使用預設的 OCSP 回應程式 '%s'\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:639
  #, c-format
  msgid "using OCSP responder '%s'\n"
 -msgstr "正在使用 %s OCSP 回應程式\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:646
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
 -msgstr "對 OCSP 建立雜湊脈絡失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:676
  #, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
 -msgstr "取得目標憑證 OCSP 狀態時出錯: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:701
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
 -msgstr "憑證狀態為: %s  (本次=%s  下次=%s)\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:702
  msgid "good"
 -msgstr "良好"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:708
  #, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
 -msgstr "憑證已撤銷於 %s 因: %s\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:743
  msgid "OCSP responder returned a status in the future\n"
 -msgstr "OCSP 回應程式傳回未來的狀態\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:755
  msgid "OCSP responder returned a non-current status\n"
 -msgstr "OCSP 回應程式傳回非當下的狀態\n"
 +msgstr ""
  
 +#: dirmngr/ocsp.c:770
  msgid "OCSP responder returned an too old status\n"
 -msgstr "OCSP 回應程式傳回老舊的狀態\n"
 +msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
 -msgstr "assuan_inquire(%s) 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
 -msgstr "遺失 ldapserver"
 +msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
 -msgstr "憑證 ID 中遺失 serialno"
 +msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, c-format
  msgid "assuan_inquire failed: %s\n"
 -msgstr "assuan_inquire 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
 -msgstr "fetch_cert_by_url 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, c-format
  msgid "error sending data: %s\n"
 -msgstr "送出資料時出錯: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
 -msgstr "start_cert_fetch 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
 -msgstr "fetch_next_cert 失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
 -msgstr "max_replies %d 已超出\n"
 +msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, c-format
  msgid "can't allocate control structure: %s\n"
 -msgstr "無法配置控制結構: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
 -msgstr "配置 assuan 脈絡失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, c-format
  msgid "failed to initialize the server: %s\n"
 -msgstr "伺服器啟始失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
 -msgstr "向 Assuan 註冊指令時失敗: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
 -msgstr "Assuan 接受問題: %s\n"
 +msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, c-format
  msgid "Assuan processing failed: %s\n"
 -msgstr "Assuan 處理時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/validate.c:201
  msgid "accepting root CA not marked as a CA"
 -msgstr "接受未標示為 CA 的根 CA"
 +msgstr ""
  
 +#: dirmngr/validate.c:227
  msgid "CRL checking too deeply nested\n"
 -msgstr "檢查 CRL 時遭遇太深層次的巢狀結構\n"
 +msgstr ""
  
 +#: dirmngr/validate.c:245
  msgid "not checking CRL for"
 -msgstr "不對此檢查 CRL:"
 +msgstr ""
  
 +#: dirmngr/validate.c:250
  msgid "checking CRL for"
 -msgstr "檢查 CRL: "
 +msgstr ""
  
 +#: dirmngr/validate.c:528
  msgid "selfsigned certificate has a BAD signature"
 -msgstr "自簽憑證有 不良 簽章"
 +msgstr ""
  
 +#: dirmngr/validate.c:561
  #, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
 -msgstr "檢查根憑證可信度時失敗: %s\n"
 +msgstr ""
  
 +#: dirmngr/validate.c:738
  msgid "certificate chain is good\n"
 -msgstr "憑證鏈完好\n"
 +msgstr ""
  
 +#: dirmngr/validate.c:968
  msgid "DSA requires the use of a 160 bit hash algorithm\n"
 -msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
 +msgstr ""
  
 +#: dirmngr/validate.c:1116
  msgid "certificate should not have been used for CRL signing\n"
 -msgstr "憑證應該還未被用於 CRL 簽署\n"
 +msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
 -msgstr "安靜模式"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:79
  msgid "print data out hex encoded"
 -msgstr "列印資料超出十六進制編碼範圍"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:80
  msgid "decode received data lines"
 -msgstr "對已收到的資料列解碼"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:81
  msgid "connect to the dirmngr"
 -msgstr "連線至 dirmngr"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:84
  msgid "|NAME|connect to Assuan socket NAME"
 -msgstr "|名稱|連線至指定名稱的 Assuan socket"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:86
  msgid "|ADDR|connect to Assuan server at ADDR"
 -msgstr "|ADDR|連線至位於 ADDR 的 Assuan 伺服器"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:88
  msgid "run the Assuan server given on the command line"
 -msgstr "執行命令列所給定的 Assuan 伺服器"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:90
  msgid "do not use extended connect mode"
 -msgstr "不要使用延伸連線模式"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:92
  msgid "|FILE|run commands from FILE on startup"
 -msgstr "|檔案|啟動時執行指定檔案中的指令"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:93
  msgid "run /subst on startup"
 -msgstr "啟動時執行 /subst"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:205
  msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
 -msgstr "用法: @GPG at -connect-agent [選項] (或用 -h 求助)"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:208
  msgid ""
  "Syntax: @GPG at -connect-agent [options]\n"
  "Connect to a running agent and send commands\n"
  msgstr ""
 -"語法: @GPG at -connect-agent [選項]\n"
 -"連線至運作中的代理程式並送出指令\n"
  
 +#: tools/gpg-connect-agent.c:1247
  #, c-format
  msgid "option \"%s\" requires a program and optional arguments\n"
 -msgstr "\"%s\" 選項需要有程式及選用的引數\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
 +#: tools/gpg-connect-agent.c:1270
  #, c-format
  msgid "option \"%s\" ignored due to \"%s\"\n"
 -msgstr "\"%s\" 選項因為 \"%s\" 而被忽略了\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
  #, c-format
  msgid "receiving line failed: %s\n"
 -msgstr "接收列時失敗: %s\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:1458
  msgid "line too long - skipped\n"
 -msgstr "列太長 - 已跳過\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:1462
  msgid "line shortened due to embedded Nul character\n"
 -msgstr "列因嵌入的 Nul 字符而縮短了\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:1837
  #, c-format
  msgid "unknown command '%s'\n"
 -msgstr "未知的指令 '%s'\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:1855
  #, c-format
  msgid "sending line failed: %s\n"
 -msgstr "送出列時失敗: %s\n"
 +msgstr ""
  
 +#: tools/gpg-connect-agent.c:2251
  #, c-format
  msgid "error sending standard options: %s\n"
 -msgstr "送出標準選項時出錯: %s\n"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
 +#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
  msgid "Options controlling the diagnostic output"
 -msgstr "控制著診斷性輸出的選項"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
 +#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
  msgid "Options controlling the configuration"
 -msgstr "控制著組態的選項"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
 +#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
  msgid "Options useful for debugging"
 -msgstr "對除錯有幫助的選項"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
  msgid "Options controlling the security"
 -msgstr "控制著安全性的選項"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:528
  msgid "|N|expire SSH keys after N seconds"
 -msgstr "|N|在 N 秒之後讓 SSH 金鑰過期"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:532
  msgid "|N|set maximum PIN cache lifetime to N seconds"
 -msgstr "|N|把個人識別碼 (PIN) 快取最大生存時間設成 N 秒"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:536
  msgid "|N|set maximum SSH key lifetime to N seconds"
 -msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:560
  msgid "Options enforcing a passphrase policy"
 -msgstr "強制執行密語原則的選項"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:563
  msgid "do not allow bypassing the passphrase policy"
 -msgstr "不允許略過密語原則"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:567
  msgid "|N|set minimal required length for new passphrases to N"
 -msgstr "|N|把新密語所需的最短長度設成 N"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:571
  msgid "|N|require at least N non-alpha characters for a new passphrase"
 -msgstr "|N|新密語至少要有 N 個非字母的字符"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:575
  msgid "|FILE|check new passphrases against pattern in FILE"
 -msgstr "|檔案|用指定檔案中的樣式來檢查新密語"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:579
  msgid "|N|expire the passphrase after N days"
 -msgstr "|N|在 N 天之後讓密語過期"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:583
  msgid "do not allow the reuse of old passphrases"
 -msgstr "不允許重複使用舊密語"
 +msgstr ""
  
 -#, fuzzy
 -#| msgid "|N|set LDAP timeout to N seconds"
 +#: tools/gpgconf-comp.c:587
  msgid "|N|set the Pinentry timeout to N seconds"
 -msgstr "|N|把 LDAP 逾時設成 N 秒"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
  msgid "|NAME|use NAME as default secret key"
 -msgstr "|名字|使用指定名字做為預設私鑰"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
  msgid "|NAME|encrypt to user ID NAME as well"
 -msgstr "|名字|也加密給指定名字的使用者 ID"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:704
  msgid "|SPEC|set up email aliases"
 -msgstr "|SPEC|設定電子郵件別名"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
 -msgstr "金鑰伺服器組態"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
 -msgstr "|URL|使用位於 URL 的金鑰伺服器"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:735
  msgid "allow PKA lookups (DNS requests)"
 -msgstr "允許 PKA 查找 (DNS 請求)"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:738
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 -msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地址找出金鑰"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:787
  msgid "disable all access to the dirmngr"
 -msgstr "停用所有的 dirmngr 存取"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:790
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 -msgstr "|名稱|將指定名稱的編碼用於 PKCS#12 密語"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:820
  msgid "do not check CRLs for root certificates"
 -msgstr "不要為根憑證檢查 CRL"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:869
  msgid "Options controlling the format of the output"
 -msgstr "控制著輸出格式的選項"
 +msgstr ""
  
 +#: tools/gpgconf-comp.c:905
  msgid "Options controlling the interactivity and enforcement"
 -msgstr "控制著互動及強制執行的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:915
 -#, fuzzy
 -#| msgid "Options controlling the security"
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
 -msgstr "控制著安全性的選項"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
 -msgstr "HTTP 伺服器組態"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
 -msgstr "使用系統的 HTTP 代理伺服器設定"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
 -msgstr "要用的 LDAP 伺服器組態"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
 -msgstr "LDAP 伺服器清單"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
 -msgstr "OCSP 組態"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
 -#, fuzzy
 -#| msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
 -msgstr "OpenPGP 版 GPG"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
 -#, fuzzy
 -#| msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
 -msgstr "智慧卡服務"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
 -#, fuzzy
 -#| msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
 -msgstr "S/MIME 版 GPG"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
++#: tools/gpgconf-comp.c:1070
+ msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
- msgid "PIN and Passphrase Entry"
 -#, fuzzy
 -#| msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1071
+ msgid "Passphrase Entry"
 -msgstr "個人識別碼及密語項目"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  msgid "Component not suitable for launching"
 -msgstr "元件不適合啟動"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
 -msgstr "元件 %s 的外部驗證失敗"
 +msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
 -msgstr "請注意群組規格已忽略\n"
 +msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
 -msgstr "列出所有的元件"
 +msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
 -msgstr "檢查所有的程式"
 +msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
 -msgstr "|元件|列出選項"
 +msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
 -msgstr "|元件|變更選項"
 +msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
 -msgstr "|元件|檢查選項"
 +msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
 -msgstr "套用全域預設值"
 +msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
 -msgstr "取得 @GPGCONF@ 的組態目錄"
 +msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
 -msgstr "列出全域組態檔"
 +msgstr ""
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
 -msgstr "檢查全域組態檔案"
 +msgstr ""
  
- #: tools/gpgconf.c:82
 -#, fuzzy
 -#| msgid "update the trust database"
++#: tools/gpgconf.c:85
+ msgid "query the software version database"
 -msgstr "更新信任資料庫"
++msgstr ""
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
 -msgstr "重新載入所有或給定的元件"
 +msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
 -msgstr "啟動給定的元件"
 +msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
 -msgstr "刪除給定的元件"
 +msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
 -msgstr "當作輸出檔案來使用"
 +msgstr ""
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
 -msgstr "如果可能的話, 在執行期啟用變更"
 +msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
 -msgstr "用法: @GPGCONF@ [選項] (或用 -h 求助)"
 +msgstr ""
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
 -"語法: @GPGCONF@ [選項]\n"
 -"管理 @GNUPG@ 系統工具的組態選項\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
 -msgstr "需要一個元件引數"
 +msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
 -msgstr "找不到元件"
 +msgstr ""
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
 -msgstr "未允許使用引數"
 +msgstr ""
  
 +#: tools/symcryptrun.c:154
  msgid ""
  "@\n"
  "Commands:\n"
diff --cc po/hu.po
index 69b7d89,18228f6..223c47f
--- a/po/hu.po
+++ b/po/hu.po
@@@ -6,19 -6,17 +6,19 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.2.5\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2004-06-19 21:53+0200\n"
- "Last-Translator: Nagy Ferenc L�szl� <nfl at nfllab.com>\n"
+ "Last-Translator: Nagy Ferenc László <nfl at nfllab.com>\n"
  "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
  "Language: hu\n"
  "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-2\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
- msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+ msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
  #. TRANSLATORS: These are labels for buttons etc used in
  #. Pinentries.  An underscore indicates that the next letter
@@@ -26,40 -24,31 +26,40 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
- msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
+ msgstr "Valóban törli a kiválasztott kulcsokat? "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -67,7 -56,6 +67,7 @@@ msgstr "érvénytelen jelszó
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr ""
  
@@@ -77,180 -65,126 +77,170 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, 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"
+ msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
- msgstr "rossz jelsz�"
+ msgstr "rossz jelszó"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
- msgstr "A sor t�l hossz�!\n"
+ msgstr "A sor túl hosszú!\n"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
- msgstr "A jelsz� t�l hossz�!\n"
+ msgstr "A jelszó túl hosszú!\n"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
- msgstr "�rv�nytelen karakter a n�vben!\n"
+ msgstr "Érvénytelen karakter a névben!\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
- msgstr "hib�s MPI"
+ msgstr "hibás MPI"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
- msgstr "rossz jelsz�"
+ msgstr "rossz jelszó"
  
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
  #, fuzzy, c-format
  msgid "ssh keys greater than %d bits are not supported\n"
- msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
+ msgstr "%d%s védő algoritmus nem támogatott.\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
- msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
- msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
  
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: agent/command-ssh.c:2419
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
 +#: agent/command-ssh.c:2424
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
- msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
+ msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
  
 +#: agent/command-ssh.c:2444
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
- msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
+ msgstr "Nem írható titkoskulcs-karikát találtam: %s\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
- msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+ msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
- msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+ msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
- msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
+ msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -273,62 -203,50 +263,62 @@@ msgstr "
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
 +#: agent/divert-scd.c:291
  #, fuzzy
  msgid "Repeat this Reset Code"
- msgstr "Ism�telje meg a jelsz�t: "
+ msgstr "Ismételje meg a jelszót: "
  
 +#: agent/divert-scd.c:293
  #, fuzzy
  msgid "Repeat this PUK"
- msgstr "Ism�telje meg a jelsz�t: "
+ msgstr "Ismételje meg a jelszót: "
  
 +#: agent/divert-scd.c:294
  #, fuzzy
  msgid "Repeat this PIN"
- msgstr "Ism�telje meg a jelsz�t: "
+ msgstr "Ismételje meg a jelszót: "
  
 +#: agent/divert-scd.c:299
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
- msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
+ msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
  
 +#: agent/divert-scd.c:301
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
- msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
+ msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
  
 +#: agent/divert-scd.c:302
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
- msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
+ msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
  
 +#: agent/divert-scd.c:314
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
 +#: agent/genkey.c:110 sm/certreqgen-ui.c:394
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: agent/genkey.c:117
  #, fuzzy, c-format
  msgid "error writing to temporary file: %s\n"
- msgstr "�rok a \"%s\" �llom�nyba.\n"
+ msgstr "Írok a \"%s\" állományba.\n"
  
 +#: agent/genkey.c:158 agent/genkey.c:164
  #, fuzzy
  msgid "Enter new passphrase"
- msgstr "�rja be a jelsz�t!\n"
+ msgstr "Írja be a jelszót!\n"
  
 +#: agent/genkey.c:172
  #, fuzzy
  msgid "Take this one anyway"
- msgstr "M�gis haszn�ljuk ezt a kulcsot? "
+ msgstr "Mégis használjuk ezt a kulcsot? "
  
 +#: agent/genkey.c:202
  #, c-format
  msgid ""
  "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@@ -350,10 -265,9 +340,10 @@@ msgstr "
  #| msgid "Name must be at least 5 characters long\n"
  msgid "A passphrase should be at least %u character long."
  msgid_plural "A passphrase should be at least %u characters long."
- msgstr[0] "A n�v legal�bb 5 karakter kell legyen!\n"
- msgstr[1] "A n�v legal�bb 5 karakter kell legyen!\n"
+ msgstr[0] "A név legalább 5 karakter kell legyen!\n"
+ msgstr[1] "A név legalább 5 karakter kell legyen!\n"
  
 +#: agent/genkey.c:252
  #, c-format
  msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
  msgid_plural ""
@@@ -374,137 -285,108 +364,143 @@@ msgstr "
  #, fuzzy, c-format
  msgid "Please enter the passphrase to%0Aprotect your new key"
  msgstr ""
- "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
+ "Most szükség van egy jelszóra (vagy mondatra), amely a titkos kulcsát védi.\n"
  "\n"
  
 +#: agent/genkey.c:606
  #, fuzzy
  msgid "Please enter the new passphrase"
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
  " "
  msgstr ""
  "@\n"
- "Opci�k:\n"
+ "Opciók:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "A kulcsot lecserélték."
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
- msgstr "b�besz�d� m�d"
+ msgstr "bőbeszédű mód"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
- msgstr "m�g sz�kszav�bb m�d"
+ msgstr "még szűkszavúbb mód"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
- msgstr "|f�jl|b�v�t� modul bet�lt�se"
+ msgstr "|fájl|bővítő modul betöltése"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
- msgstr "kulcsok keres�se kulcsszerveren"
+ msgstr "kulcsok keresése kulcsszerveren"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
- msgstr "bizalmi adatb�zis friss�t�se"
+ msgstr "bizalmi adatbázis frissítése"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|accept some commands via NAME"
- msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
+ msgstr "|NÉV|terminál karakterkódolásának megadása"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
- msgstr "nem t�mogatott"
+ msgstr "nem támogatott"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -513,179 -395,133 +509,179 @@@ msgstr "nem támogatott
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
- msgstr "A hib�kat (angolul) a <gnupg-bugs at gnu.org> c�mre �rja meg!\n"
+ msgstr "A hibákat (angolul) a <gnupg-bugs at gnu.org> címre írja meg!\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
- msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
+ msgstr "MEGJEGYZÉS: Nincs alapértelmezett opciós fájl (%s).\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
- msgstr "\"%s\" opci�s f�jl: %s\n"
+ msgstr "\"%s\" opciós fájl: %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
- msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
+ msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
- msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+ msgstr "FIGYELEM: \"%s\" elavult opció!\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
- msgstr "%s nem hozhat� l�tre: %s\n"
+ msgstr "%s nem hozható létre: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, 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"
+ msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
- msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
- msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
+ msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
- msgstr "Friss�t�s sikertelen: %s.\n"
+ msgstr "Frissítés sikertelen: %s.\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
- msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
- msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
+ msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
- msgstr "%s: K�nyvt�rat l�trehoztam.\n"
+ msgstr "%s: Könyvtárat létrehoztam.\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
- msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
+ msgstr "Bizalmi adatbázis: olvasás sikertelen (n=%d): %s.\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
- msgstr "%s: Nem tudom a k�nyvt�rat l�trehozni: %s.\n"
+ msgstr "%s: Nem tudom a könyvtárat létrehozni: %s.\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
- msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
+ msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: kihagyva: %s\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
- msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
+ msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
  
 +#: agent/preset-passphrase.c:99
  #, fuzzy
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
 +#: agent/preset-passphrase.c:102
  msgid ""
  "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -693,40 -529,32 +689,40 @@@ msgstr "
  "@Parancsok:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
  " "
  msgstr ""
  "@\n"
- "Opci�k:\n"
+ "Opciók:\n"
  " "
  
 +#: agent/protect-tool.c:154
  #, fuzzy
  msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
 +#: agent/protect-tool.c:156
  msgid ""
  "Syntax: gpg-protect-tool [options] [args]\n"
  "Secret key maintenance tool\n"
  msgstr ""
  
 +#: agent/protect-tool.c:693
  #, fuzzy
  msgid "Please enter the passphrase to unprotect the PKCS#12 object."
- msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+ msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
 +#: agent/protect-tool.c:698
  #, fuzzy
  msgid "Please enter the passphrase to protect the new PKCS#12 object."
- msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+ msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
 +#: agent/protect-tool.c:704
  msgid ""
  "Please enter the passphrase to protect the imported object within the GnuPG "
  "system."
@@@ -737,54 -564,44 +733,55 @@@ msgstr "
  msgid ""
  "Please enter the passphrase or the PIN\n"
  "needed to complete this operation."
- msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+ msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
  #, fuzzy
  msgid "cancelled\n"
- msgstr "M�gsem"
+ msgstr "Mégsem"
  
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
  #, fuzzy, c-format
  msgid "error while asking for the passphrase: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
  #, fuzzy, c-format
  msgid "file '%s', line %d: %s\n"
- msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" kulcs nem található: %s\n"
  
 +#: agent/trustlist.c:192 agent/trustlist.c:200
  #, fuzzy, c-format
  msgid "statement \"%s\" ignored in '%s', line %d\n"
- msgstr "Olvas�si hiba: %s.\n"
+ msgstr "Olvasási hiba: %s.\n"
  
 +#: agent/trustlist.c:206
  #, fuzzy, c-format
  msgid "system trustlist '%s' not available\n"
- msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
+ msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
  
 +#: agent/trustlist.c:250
  #, fuzzy, c-format
  msgid "bad fingerprint in '%s', line %d\n"
- msgstr "Olvas�si hiba: %s.\n"
+ msgstr "Olvasási hiba: %s.\n"
  
 +#: agent/trustlist.c:275 agent/trustlist.c:282
  #, fuzzy, c-format
  msgid "invalid keyflag in '%s', line %d\n"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
 +#: agent/trustlist.c:316 common/helpfile.c:136
  #, fuzzy, c-format
  msgid "error reading '%s', line %d: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: agent/trustlist.c:434 agent/trustlist.c:503
  msgid "error reading list of trusted root certificates\n"
  msgstr ""
  
@@@ -808,8 -623,6 +805,8 @@@ msgstr "
  msgid "Yes"
  msgstr "igen"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -839,40 -649,33 +836,40 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
- msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
+ msgstr "Valóban törli a kiválasztott kulcsokat? "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  msgid "Delete key"
- msgstr "kulcs enged�lyez�se"
+ msgstr "kulcs engedélyezése"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -887,116 -688,98 +884,127 @@@ msgstr "
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
- msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
 +#: agent/cvt-openpgp.c:338
  msgid "secret key parts are not available\n"
- msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
+ msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
  
 +#: agent/cvt-openpgp.c:344
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "public key algorithm %d (%s) is not supported\n"
- msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
+ msgstr "%d%s védő algoritmus nem támogatott.\n"
  
 +#: agent/cvt-openpgp.c:448
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection algorithm %d (%s) is not supported\n"
- msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
+ msgstr "%d%s védő algoritmus nem támogatott.\n"
  
 +#: agent/cvt-openpgp.c:455
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection hash algorithm %d (%s) is not supported\n"
- msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
+ msgstr "%d%s védő algoritmus nem támogatott.\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "Friss�t�s sikertelen: %s.\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
  #, fuzzy, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "Frissítés sikertelen: %s.\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
+ #, fuzzy, c-format
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
- msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
+ msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  #, fuzzy
  msgid "problem setting the gpg-agent options\n"
- msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
+ msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
- msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
+ msgstr "Nem tudom letiltani a core fájlokat: %s.\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
- msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
+ msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
- msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
+ msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
+ 
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "Frissítés sikertelen: %s.\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "Páncélozás nem sikerült: %s\n"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "igen"
  
@@@ -1014,11 -794,9 +1022,11 @@@ msgid "nN
  msgstr "nN"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:86
  msgid "quit"
- msgstr "kil�p�s|kilepes"
+ msgstr "kilépés|kilepes"
  
 +#: common/yesno.c:89
  msgid "qQ"
  msgstr "kK"
  
@@@ -1051,56 -823,45 +1059,56 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
 +#: common/miscellaneous.c:143
  #, c-format
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
  msgstr ""
  
 +#: common/miscellaneous.c:146
  #, fuzzy, c-format
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
- msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+ msgstr "FIGYELEM: \"%s\" elavult opció!\n"
  
 +#: common/miscellaneous.c:554
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  msgid "connection to agent is in restricted mode\n"
- msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
+ msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1118,83 -876,66 +1126,83 @@@ msgstr "
  msgid "|audit-log-result|Not supported"
  msgstr ""
  
 +#: common/audit.c:481
  #, fuzzy
  msgid "|audit-log-result|No certificate"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: common/audit.c:483
  #, fuzzy
  msgid "|audit-log-result|Not enabled"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: common/audit.c:485
  msgid "|audit-log-result|Error"
  msgstr ""
  
 +#: common/audit.c:487
  #, fuzzy
  msgid "|audit-log-result|Not used"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: common/audit.c:489
  #, fuzzy
  msgid "|audit-log-result|Okay"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: common/audit.c:491
  #, fuzzy
  msgid "|audit-log-result|Skipped"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: common/audit.c:493
  #, fuzzy
  msgid "|audit-log-result|Some"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: common/audit.c:726
  #, fuzzy
  msgid "Certificate chain available"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: common/audit.c:733
  #, fuzzy
  msgid "root certificate missing"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: common/audit.c:759
  msgid "Data encryption succeeded"
  msgstr ""
  
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
  #, fuzzy
  msgid "Data available"
- msgstr "Kulcs tal�lhat�: "
+ msgstr "Kulcs található: "
  
 +#: common/audit.c:767
  #, fuzzy
  msgid "Session key created"
- msgstr "%s: Kulcskarik�t l�trehoztam.\n"
+ msgstr "%s: Kulcskarikát létrehoztam.\n"
  
 +#: common/audit.c:772 common/audit.c:912 common/audit.c:919
  #, fuzzy, c-format
  msgid "algorithm: %s"
- msgstr "P�nc�l: %s\n"
+ msgstr "Páncél: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
  "\n"
- "T�mogatott algoritmusok:\n"
+ "Támogatott algoritmusok:\n"
  
 +#: common/audit.c:778 common/audit.c:925
  #, fuzzy
  msgid "seems to be not encrypted"
- msgstr "nem titkos�tott"
+ msgstr "nem titkosított"
  
 +#: common/audit.c:784 common/audit.c:933
  msgid "Number of recipients"
  msgstr ""
  
@@@ -1207,95 -946,76 +1215,95 @@@ msgstr "
  msgid "Data signing succeeded"
  msgstr ""
  
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
  #, fuzzy, c-format
  msgid "data hash algorithm: %s"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: common/audit.c:862
  #, fuzzy, c-format
  msgid "Signer %d"
- msgstr "Az al��r�s lej�rt: %s.\n"
+ msgstr "Az aláírás lejárt: %s.\n"
  
 +#: common/audit.c:866 common/audit.c:1065
  #, fuzzy, c-format
  msgid "attr hash algorithm: %s"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: common/audit.c:901
  msgid "Data decryption succeeded"
  msgstr ""
  
 +#: common/audit.c:910
  #, fuzzy
  msgid "Encryption algorithm supported"
- msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
+ msgstr "%d%s védő algoritmus nem támogatott.\n"
  
 +#: common/audit.c:993
  #, fuzzy
  msgid "Data verification succeeded"
- msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
+ msgstr "Aláírás-ellenőrzés elnyomva.\n"
  
 +#: common/audit.c:1002
  #, fuzzy
  msgid "Signature available"
- msgstr "Az al��r�s lej�rt: %s.\n"
+ msgstr "Az aláírás lejárt: %s.\n"
  
 +#: common/audit.c:1024
  #, fuzzy
  msgid "Parsing data succeeded"
- msgstr "J� al��r�s a k�vetkez�t�l: \""
+ msgstr "Jó aláírás a következőtől: \""
  
 +#: common/audit.c:1036
  #, fuzzy, c-format
  msgid "bad data hash algorithm: %s"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: common/audit.c:1051
  #, fuzzy, c-format
  msgid "Signature %d"
- msgstr "Az al��r�s lej�rt: %s.\n"
+ msgstr "Az aláírás lejárt: %s.\n"
  
 +#: common/audit.c:1079
  #, fuzzy
  msgid "Certificate chain valid"
- msgstr "Ez a kulcs lej�rt!"
+ msgstr "Ez a kulcs lejárt!"
  
 +#: common/audit.c:1090
  #, fuzzy
  msgid "Root certificate trustworthy"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
- msgstr "Kulcs tal�lhat�: "
+ msgstr "Kulcs található: "
  
 +#: common/audit.c:1119
  #, fuzzy
  msgid "CRL/OCSP check of certificates"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: common/audit.c:1139
  #, fuzzy
  msgid "Included certificates"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: common/audit.c:1194
  msgid "No audit log entries."
  msgstr ""
  
 +#: common/audit.c:1243
  #, fuzzy
  msgid "Unknown operation"
- msgstr "ismeretlen verzi�"
+ msgstr "ismeretlen verzió"
  
 +#: common/audit.c:1261
  msgid "Gpg-Agent usable"
  msgstr ""
  
@@@ -1303,88 -1022,71 +1311,88 @@@
  msgid "Dirmngr usable"
  msgstr ""
  
 +#: common/audit.c:1307
  #, fuzzy, c-format
  msgid "No help available for '%s'."
- msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
+ msgstr "Nem áll rendelkezésre segítség \"%s\" témához."
  
 +#: common/helpfile.c:90
  #, fuzzy
  msgid "ignoring garbage line"
- msgstr "Hiba a z�r� sorban!\n"
+ msgstr "Hiba a záró sorban!\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
- msgstr "Ismeretlen m�d�"
+ msgstr "Ismeretlen módú"
  
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
- msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
 +#: common/argparse.c:367
  #, fuzzy
  msgid "read error"
- msgstr "�llom�nyolvas�si hiba"
+ msgstr "állományolvasási hiba"
  
 +#: common/argparse.c:369
  #, fuzzy
  msgid "keyword too long"
- msgstr "A sor t�l hossz�!\n"
+ msgstr "A sor túl hosszú!\n"
  
 +#: common/argparse.c:371
  #, fuzzy
  msgid "missing argument"
- msgstr "�rv�nytelen argumentum"
+ msgstr "érvénytelen argumentum"
  
 +#: common/argparse.c:373
  #, fuzzy
  #| msgid "invalid armor"
  msgid "invalid argument"
- msgstr "�rv�nytelen p�nc�l"
+ msgstr "érvénytelen páncél"
  
 +#: common/argparse.c:375
  #, fuzzy
  msgid "invalid command"
- msgstr "Egym�snak ellentmond� parancsok!\n"
+ msgstr "Egymásnak ellentmondó parancsok!\n"
  
 +#: common/argparse.c:377
  #, fuzzy
  msgid "invalid alias definition"
- msgstr "�rv�nytelen import opci�k!\n"
+ msgstr "Érvénytelen import opciók!\n"
  
 +#: common/argparse.c:379
  #, fuzzy
  msgid "out of core"
  msgstr "nem feldolgozott"
  
 +#: common/argparse.c:381
  #, fuzzy
  msgid "invalid option"
- msgstr "�rv�nytelen import opci�k!\n"
+ msgstr "Érvénytelen import opciók!\n"
  
 +#: common/argparse.c:389
  #, c-format
  msgid "missing argument for option \"%.50s\"\n"
  msgstr ""
  
 +#: common/argparse.c:391
  #, fuzzy, c-format
  msgid "invalid argument for option \"%.50s\"\n"
- msgstr "�rv�nytelen import opci�k!\n"
+ msgstr "Érvénytelen import opciók!\n"
  
 +#: common/argparse.c:393
  #, c-format
  msgid "option \"%.50s\" does not expect an argument\n"
  msgstr ""
  
 +#: common/argparse.c:395
  #, fuzzy, c-format
  msgid "invalid command \"%.50s\"\n"
- msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
+ msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n"
  
 +#: common/argparse.c:397
  #, c-format
  msgid "option \"%.50s\" is ambiguous\n"
  msgstr ""
@@@ -1394,259 -1095,202 +1402,258 @@@
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
  msgstr "nem feldolgozott"
  
 +#: common/argparse.c:403
  #, fuzzy, c-format
  msgid "invalid option \"%.50s\"\n"
- msgstr "�rv�nytelen import opci�k!\n"
+ msgstr "Érvénytelen import opciók!\n"
  
 +#: common/utf8conv.c:123
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' not available\n"
- msgstr "P�nc�loz�s nem siker�lt: %s\n"
+ msgstr "Páncélozás nem sikerült: %s\n"
  
 +#: common/utf8conv.c:131
  #, fuzzy, c-format
  msgid "iconv_open failed: %s\n"
- msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
+ msgstr "Nem tudom megnyitni az állományt: %s.\n"
  
 +#: common/utf8conv.c:385 common/utf8conv.c:651
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' failed: %s\n"
- msgstr "P�nc�loz�s nem siker�lt: %s\n"
+ msgstr "Páncélozás nem sikerült: %s\n"
  
 +#: common/dotlock.c:707
  #, fuzzy, c-format
  msgid "failed to create temporary file '%s': %s\n"
- msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
+ msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
  
 +#: common/dotlock.c:771
  #, fuzzy, c-format
  msgid "error writing to '%s': %s\n"
- msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
+ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
  
 +#: common/dotlock.c:1116
  #, c-format
  msgid "removing stale lockfile (created by %d)\n"
  msgstr ""
  
 +#: common/dotlock.c:1152
  #, fuzzy, c-format
  msgid "waiting for lock (held by %d%s) %s...\n"
- msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
 +#: common/dotlock.c:1153
  msgid "(deadlock?) "
  msgstr ""
  
 +#: common/dotlock.c:1192
  #, fuzzy, c-format
  msgid "lock '%s' not made: %s\n"
- msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
+ msgstr "A(z) %08lX nyilvános kulcsot nem találom: %s.\n"
  
 +#: common/dotlock.c:1219
  #, fuzzy, c-format
  msgid "waiting for lock %s...\n"
- msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
  
 +#: g10/armor.c:424
  #, c-format
  msgid "armor: %s\n"
- msgstr "P�nc�l: %s\n"
+ msgstr "Páncél: %s\n"
  
 +#: g10/armor.c:463
  msgid "invalid armor header: "
- msgstr "�rv�nytelen p�nc�lfejl�c: "
+ msgstr "Érvénytelen páncélfejléc: "
  
 +#: g10/armor.c:474
  msgid "armor header: "
- msgstr "P�nc�lfejl�c: "
+ msgstr "Páncélfejléc: "
  
 +#: g10/armor.c:487
  msgid "invalid clearsig header\n"
- msgstr "�rv�nytelen al��r�sfejl�c!\n"
+ msgstr "Érvénytelen aláírásfejléc!\n"
  
 +#: g10/armor.c:500
  #, fuzzy
  msgid "unknown armor header: "
- msgstr "P�nc�lfejl�c: "
+ msgstr "Páncélfejléc: "
  
 +#: g10/armor.c:553
  msgid "nested clear text signatures\n"
- msgstr "Egym�sba �gyazott olvashat�sz�veg-al��r�sok!\n"
+ msgstr "Egymásba ágyazott olvashatószöveg-aláírások!\n"
  
 +#: g10/armor.c:688
  #, fuzzy
  msgid "unexpected armor: "
- msgstr "V�ratlan p�nc�l:"
+ msgstr "Váratlan páncél:"
  
 +#: g10/armor.c:701
  msgid "invalid dash escaped line: "
- msgstr "�rv�nytelen k�t�jeles sor: "
+ msgstr "Érvénytelen kötőjeles sor: "
  
 +#: g10/armor.c:873 g10/armor.c:1490
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
- msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
+ msgstr "Kihagytam a %02x kódú érvénytelen radix64 karaktert.\n"
  
 +#: g10/armor.c:916
  msgid "premature eof (no CRC)\n"
- msgstr "Korai �llom�nyv�g (nincs CRC).\n"
+ msgstr "Korai állományvég (nincs CRC).\n"
  
 +#: g10/armor.c:950
  msgid "premature eof (in CRC)\n"
- msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
+ msgstr "Korai állományvég (a CRC-ben).\n"
  
 +#: g10/armor.c:958
  msgid "malformed CRC\n"
- msgstr "Hib�s form�j� CRC.\n"
+ msgstr "Hibás formájú CRC.\n"
  
 +#: g10/armor.c:962 g10/armor.c:1527
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "CRC hiba; %06lx - %06lx\n"
  
 +#: g10/armor.c:982
  #, fuzzy
  msgid "premature eof (in trailer)\n"
- msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
+ msgstr "Korai állományvég (a lezárásban).\n"
  
 +#: g10/armor.c:986
  msgid "error in trailer line\n"
- msgstr "Hiba a z�r� sorban!\n"
+ msgstr "Hiba a záró sorban!\n"
  
 +#: g10/armor.c:1303
  msgid "no valid OpenPGP data found.\n"
- msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
+ msgstr "Nem találtam érvényes OpenPGP adatot.\n"
  
 +#: g10/armor.c:1308
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
- msgstr "�rv�nytelen p�nc�l: %d karaktern�l hosszabb sor.\n"
+ msgstr "Érvénytelen páncél: %d karakternél hosszabb sor.\n"
  
 +#: g10/armor.c:1312
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
- "quoted printable karakter a p�nc�lban - val�sz�n�leg egy bugos MTA b�ne.\n"
+ "quoted printable karakter a páncélban - valószínűleg egy bugos MTA bűne.\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
- msgstr "nem olvashat� forma"
+ msgstr "nem olvasható forma"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr ""
- "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
- "jellel kell befejez�dj�n.\n"
+ "Egy jelölés neve csak nyomtatható karaktereket és szóközt tartalmazhat, és = "
+ "jellel kell befejeződjön.\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
- msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
+ msgstr "Egy felhasználójelölésnek tartalmaznia kell a \"@\" karaktert!\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  #, fuzzy
  msgid "a notation name must not contain more than one '@' character\n"
- msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
+ msgstr "Egy felhasználójelölésnek tartalmaznia kell a \"@\" karaktert!\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
- msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
+ msgstr "Egy jelölés értékében nem szerepelhet vezérlőkarakter!\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  msgid "a notation name may not contain an '=' character\n"
- msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
+ msgstr "Egy felhasználójelölésnek tartalmaznia kell a \"@\" karaktert!\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
  #| "with an '='\n"
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr ""
- "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
- "jellel kell befejez�dj�n.\n"
+ "Egy jelölés neve csak nyomtatható karaktereket és szóközt tartalmazhat, és = "
+ "jellel kell befejeződjön.\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
- msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
+ msgstr "FIGYELEM: Érvénytelen jelölő adatot találtam.\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr ""
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
- msgstr "�rja be a jelsz�t: "
+ msgstr "Írja be a jelszót: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
- msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
+ msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, fuzzy, c-format
  msgid "OpenPGP card not available: %s\n"
- msgstr "titkos kulcs nem �ll rendelkez�sre"
+ msgstr "titkos kulcs nem áll rendelkezésre"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  #, fuzzy
  msgid "can't do this in batch mode\n"
- msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
+ msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
  
 +#: g10/card-util.c:107
  #, fuzzy
  msgid "This command is only available for version 2 cards\n"
- msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
+ msgstr "Ez a parancs %s módban nem engedélyezett.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
- msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
+ msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
- msgstr "Mit v�laszt? "
+ msgstr "Mit választ? "
  
 +#: g10/card-util.c:279 g10/card-util.c:330
  msgid "[not set]"
  msgstr ""
  
@@@ -1674,184 -1313,142 +1681,184 @@@ msgstr "nem feldolgozott
  msgid "forced"
  msgstr ""
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr ""
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr ""
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr ""
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  #, fuzzy
  msgid "URL to retrieve public key: "
- msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
+ msgstr "Nincs hozzá tartozó nyilvános kulcs: %s\n"
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
- msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
+ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr ""
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr ""
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  #, fuzzy
  msgid "Language preferences: "
- msgstr "preferenci�k friss�t�se"
+ msgstr "preferenciák frissítése"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  #, fuzzy
  msgid "Error: invalid length of preference string.\n"
- msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
+ msgstr "Érvénytelen karakter a preferenciák között!\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  #, fuzzy
  msgid "Error: invalid characters in preference string.\n"
- msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
+ msgstr "Érvénytelen karakter a preferenciák között!\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr ""
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  #, fuzzy
  msgid "Error: invalid response.\n"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  #, fuzzy
  msgid "CA fingerprint: "
  msgstr "megmutatja az ujjlenyomatot"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  #, fuzzy
  msgid "Error: invalid formatted fingerprint.\n"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, fuzzy, c-format
  msgid "key operation not possible: %s\n"
- msgstr "Kulcsgener�l�s sikertelen: %s\n"
+ msgstr "Kulcsgenerálás sikertelen: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  #, fuzzy
  msgid "not an OpenPGP card"
- msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
+ msgstr "Nem találtam érvényes OpenPGP adatot.\n"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
- msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
+ msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
- msgstr "Milyen kulcsm�retet szeretne? (1024) "
+ msgstr "Milyen kulcsméretet szeretne? (1024) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
- msgstr "Milyen kulcsm�retet szeretne? (1024) "
+ msgstr "Milyen kulcsméretet szeretne? (1024) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
- msgstr "Milyen kulcsm�retet szeretne? (1024) "
+ msgstr "Milyen kulcsméretet szeretne? (1024) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
- msgstr "Felkerek�tve %u bitre.\n"
+ msgstr "Felkerekítve %u bitre.\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
- msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
- msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
+ msgstr "Kihagytam: titkos kulcs már jelen van.\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1859,213 -1456,162 +1866,213 @@@
  "You should change them using the command --change-pin\n"
  msgstr ""
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  #, fuzzy
  msgid "Please select the type of key to generate:\n"
- msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
+ msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  #, fuzzy
  msgid "   (1) Signature key\n"
- msgstr "Az al��r�s lej�rt: %s.\n"
+ msgstr "Az aláírás lejárt: %s.\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  #, fuzzy
  msgid "   (2) Encryption key\n"
- msgstr "   (%d) RSA (csak titkos�t�s)\n"
+ msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
- msgstr "�rv�nytelen v�laszt�s.\n"
+ msgstr "Érvénytelen választás.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  #, fuzzy
  msgid "Please select where to store the key:\n"
- msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
+ msgstr "Kérem, válassza ki a visszavonás okát:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
- msgstr "Friss�t�s sikertelen: %s.\n"
+ msgstr "Frissítés sikertelen: %s.\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
- msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
+ msgstr "Ez a parancs %s módban nem engedélyezett.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
- msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
+ msgstr "Kihagytam: titkos kulcs már jelen van.\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  msgid "Continue? (y/N) "
- msgstr "Val�ban al��rja? "
+ msgstr "Valóban aláírja? "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
- msgstr "kil�p�s ebb�l a men�b�l"
+ msgstr "kilépés ebből a menüből"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  #, fuzzy
  msgid "show admin commands"
- msgstr "Egym�snak ellentmond� parancsok!\n"
+ msgstr "Egymásnak ellentmondó parancsok!\n"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
- msgstr "megmutatja ezt a s�g�t"
+ msgstr "megmutatja ezt a súgót"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  #, fuzzy
  msgid "list all available data"
- msgstr "Kulcs tal�lhat�: "
+ msgstr "Kulcs található: "
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr ""
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr ""
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr ""
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  #, fuzzy
  msgid "change the login name"
- msgstr "lej�rat megv�ltoztat�sa"
+ msgstr "lejárat megváltoztatása"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  #, fuzzy
  msgid "change the language preferences"
- msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
+ msgstr "kulcstulajdonos megbízhatóságának beállítása"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr ""
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  #, fuzzy
  msgid "change a CA fingerprint"
  msgstr "megmutatja az ujjlenyomatot"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr ""
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  #, fuzzy
  msgid "generate new keys"
- msgstr "�j kulcsp�r l�trehoz�sa"
+ msgstr "új kulcspár létrehozása"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr ""
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr ""
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  #, fuzzy
  msgid "Admin-only command\n"
- msgstr "Egym�snak ellentmond� parancsok!\n"
+ msgstr "Egymásnak ellentmondó parancsok!\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  #, fuzzy
  msgid "Admin commands are allowed\n"
- msgstr "Egym�snak ellentmond� parancsok!\n"
+ msgstr "Egymásnak ellentmondó parancsok!\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  #, fuzzy
  msgid "Admin commands are not allowed\n"
- msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
- msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
+ msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n"
  
 +#: g10/decrypt.c:191 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
- msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
+ msgstr "Az --output opció nem működik ehhez a parancshoz.\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "Nem tudom megnyitni %s-t!\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
- msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" kulcs nem található: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
- msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
+ msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
  
 +#: g10/delkey.c:118 g10/getkey.c:579
  #, fuzzy, c-format
  msgid "key \"%s\" not found\n"
- msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" kulcs nem található: %s\n"
  
 +#: g10/delkey.c:129 g10/delkey.c:136
  msgid "(unless you specify the key by fingerprint)\n"
- msgstr "(Kiv�ve, ha megad egy kulcsot az ujjlenyomat�val.)\n"
+ msgstr "(Kivéve, ha megad egy kulcsot az ujjlenyomatával.)\n"
  
 +#: g10/delkey.c:135
  #, fuzzy
  msgid "can't do this in batch mode without \"--yes\"\n"
- msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban \"--yes\" n�lk�l.\n"
+ msgstr "Nem tudom ezt megcsinálni kötegelt módban \"--yes\" nélkül.\n"
  
 +#: g10/delkey.c:148
  #, fuzzy
  msgid "Delete this key from the keyring? (y/N) "
- msgstr "T�r�ljem ezt a kulcsot a kulcskarik�r�l? "
+ msgstr "Töröljem ezt a kulcsot a kulcskarikáról? "
  
 +#: g10/delkey.c:158
  #, fuzzy
  msgid "This is a secret key! - really delete? (y/N) "
- msgstr "Ez egy titkos kulcs! Val�ban t�r�ljem? "
+ msgstr "Ez egy titkos kulcs! Valóban töröljem? "
  
 +#: g10/delkey.c:201
  #, fuzzy, c-format
  msgid "deleting secret %s failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: g10/delkey.c:203
  msgid "key"
  msgstr "key"
  
@@@ -2073,525 -1618,415 +2080,525 @@@
  #, fuzzy
  #| msgid "Pubkey: "
  msgid "subkey"
- msgstr "Nyilv�nos kulcs� (pubkey): "
+ msgstr "Nyilvános kulcsú (pubkey): "
  
 +#: g10/delkey.c:226
  #, c-format
  msgid "deleting keyblock failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: g10/delkey.c:239
  msgid "ownertrust information cleared\n"
- msgstr "Kulcstulajdonos megb�zhat�s�gi adatait t�r�ltem.\n"
+ msgstr "Kulcstulajdonos megbízhatósági adatait töröltem.\n"
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
- msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
+ msgstr "Van egy titkos kulcs a \"%s\" nyilvános kulcshoz!\n"
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
- msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
+ msgstr "Először azt törölje a \"--delete-secret-keys\" opcióval!\n"
  
 +#: g10/encrypt.c:232 g10/sign.c:1292
  #, c-format
  msgid "error creating passphrase: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: g10/encrypt.c:239
  msgid "can't use a symmetric ESK packet due to the S2K mode\n"
- msgstr "Nem tudok szimmetrikus ESK csomagot haszn�lni a S2K m�d miatt!\n"
+ msgstr "Nem tudok szimmetrikus ESK csomagot használni a S2K mód miatt!\n"
  
 +#: g10/encrypt.c:253
  #, c-format
  msgid "using cipher %s\n"
- msgstr "%s rejtjelez�st haszn�lok.\n"
+ msgstr "%s rejtjelezést használok.\n"
  
 +#: g10/encrypt.c:263 g10/encrypt.c:624
  #, fuzzy, c-format
  #| msgid "`%s' already compressed\n"
  msgid "'%s' already compressed\n"
- msgstr "\"%s\" m�r t�m�r�tett.\n"
+ msgstr "\"%s\" már tömörített.\n"
  
 +#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
- msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
+ msgstr "FIGYELEM: A(z) \"%s\" állomány üres.\n"
  
 +#: g10/encrypt.c:557
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "reading from '%s'\n"
- msgstr "Olvasok a \"%s\" �llom�nyb�l.\n"
+ msgstr "Olvasok a \"%s\" állományból.\n"
  
 +#: g10/encrypt.c:605
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
- msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
+ msgstr "A %s (%d) rejtjelező használata sérti a címzett preferenciáit!\n"
  
 +#: g10/encrypt.c:707 g10/sign.c:984
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
  "preferences\n"
- msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
+ msgstr "A %s (%d) tömörítés használata sérti a címzett preferenciáit!\n"
  
 +#: g10/encrypt.c:817
  #, c-format
  msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
- msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
+ msgstr "A %s (%d) rejtjelező használata sérti a címzett preferenciáit!\n"
  
 +#: g10/encrypt.c:903
  #, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
- msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
+ msgstr "%s/%s titkosítva \"%s\" számára\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
- msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
+ msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
  
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
  #, c-format
  msgid "%s encrypted data\n"
- msgstr "%s titkos�tott adat.\n"
+ msgstr "%s titkosított adat.\n"
  
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
  #, c-format
  msgid "encrypted with unknown algorithm %d\n"
- msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
+ msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
  
 +#: g10/decrypt-data.c:164 sm/decrypt.c:127
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
- "FIGYELEM: Az �zenet szimmetrikus titkos�t�s�t gyenge kulccsal v�gezt�k.\n"
+ "FIGYELEM: Az üzenet szimmetrikus titkosítását gyenge kulccsal végezték.\n"
  
 +#: g10/decrypt-data.c:176
  msgid "problem handling encrypted packet\n"
- msgstr "Probl�ma a titkos�tott csomag kezel�sekor!\n"
+ msgstr "Probléma a titkosított csomag kezelésekor!\n"
  
 +#: g10/exec.c:60
  msgid "no remote program execution supported\n"
- msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
+ msgstr "Külső program meghívása nem támogatott.\n"
  
 +#: g10/exec.c:319
  msgid ""
  "external program calls are disabled due to unsafe options file permissions\n"
  msgstr ""
- "A k�ls� programok h�v�sa tiltott, mert az \"options\" �llom�ny enged�lyei\n"
- "nem biztons�gosak.\n"
+ "A külső programok hívása tiltott, mert az \"options\" állomány engedélyei\n"
+ "nem biztonságosak.\n"
  
 +#: g10/exec.c:349
  #, fuzzy
  msgid "this platform requires temporary files when calling external programs\n"
  msgstr ""
- "Ez a platform �tmeneti �llom�nyokat ig�nyel k�ls� programok h�v�s�hoz.\n"
+ "Ez a platform átmeneti állományokat igényel külső programok hívásához.\n"
  
 +#: g10/exec.c:427
  #, fuzzy, c-format
  msgid "unable to execute program '%s': %s\n"
- msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
+ msgstr "Nem tudom végrehajtani a következő \"%s\"-t: \"%s\": %s.\n"
  
 +#: g10/exec.c:430
  #, fuzzy, c-format
  msgid "unable to execute shell '%s': %s\n"
- msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
+ msgstr "Nem tudom végrehajtani a következő \"%s\"-t: \"%s\": %s.\n"
  
 +#: g10/exec.c:521
  #, c-format
  msgid "system error while calling external program: %s\n"
- msgstr "Rendszerhiba k�ls� program h�v�sakor: %s.\n"
+ msgstr "Rendszerhiba külső program hívásakor: %s.\n"
  
 +#: g10/exec.c:532 g10/exec.c:599
  msgid "unnatural exit of external program\n"
- msgstr "A k�ls� program nem term�szetes m�don �rt v�get.\n"
+ msgstr "A külső program nem természetes módon ért véget.\n"
  
 +#: g10/exec.c:547
  msgid "unable to execute external program\n"
- msgstr "Nem tudom a v�grehajtani a k�ls� programot.\n"
+ msgstr "Nem tudom a végrehajtani a külső programot.\n"
  
 +#: g10/exec.c:564
  #, c-format
  msgid "unable to read external program response: %s\n"
- msgstr "Nem tudom beolvasni a k�ls� program v�lasz�t: %s\n"
+ msgstr "Nem tudom beolvasni a külső program válaszát: %s\n"
  
 +#: g10/exec.c:610 g10/exec.c:617
  #, fuzzy, c-format
  #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
  msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
  msgstr ""
- "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
+ "FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n"
  
 +#: g10/exec.c:622
  #, fuzzy, c-format
  #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
- msgstr "FIGYELEM: nem tudom t�r�lni a \"%s\" �tmeneti k�nyvt�rat: %s\n"
+ msgstr "FIGYELEM: nem tudom törölni a \"%s\" átmeneti könyvtárat: %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  #, fuzzy
  msgid "export signatures that are marked as local-only"
  msgstr ""
  "\n"
- "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
+ "Az aláírást \"nem visszavonhatónak\" jelöljük.\n"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  #, fuzzy
  msgid "export revocation keys marked as \"sensitive\""
- msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
+ msgstr "Nem találtam visszavonó kulcsot a következőhöz: \"%s\".\n"
  
- #: g10/export.c:108
++#: g10/export.c:112
  #, fuzzy
  msgid "remove unusable parts from key during export"
- msgstr "haszn�lhatatlan titkos kulcs"
+ msgstr "használhatatlan titkos kulcs"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: kihagyva: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
- msgstr "�rok a \"%s\" �llom�nyba.\n"
+ msgstr "Írok a \"%s\" állományba.\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
- msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
+ msgstr "%08lX kulcs: Alkulcsaláírás rossz helyen - kihagytam.\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
- msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
- msgstr "%08lX kulcs: PGP 2.x st�lus� kulcs - kihagytam.\n"
+ msgstr "%08lX kulcs: PGP 2.x stílusú kulcs - kihagytam.\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
- msgstr "FIGYELEM: Semmit sem export�ltam.\n"
+ msgstr "FIGYELEM: Semmit sem exportáltam.\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
- msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
+ msgstr "Hiba \"%s\" létrehozásakor: %s\n"
  
 +#: g10/getkey.c:257
  #, fuzzy
  msgid "[User ID not found]"
  msgstr "[ismeretlen kulcs]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
- msgstr "�rv�nytelen import opci�k!\n"
+ msgstr "Érvénytelen import opciók!\n"
  
 +#: g10/getkey.c:516
  #, c-format
  msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
  msgstr ""
  
 +#: g10/getkey.c:546
  #, fuzzy, c-format
  msgid "error looking up: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: g10/getkey.c:636
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "Warning: %s appears in the keyring %d times\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  msgid "automatically retrieved '%s' via %s\n"
- msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
+ msgstr "Hiba \"%s\" létrehozásakor: %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
- msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
+ msgstr "Hiba \"%s\" létrehozásakor: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
  msgstr "megmutatja az ujjlenyomatot"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
- msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" titkos kulcs nem található: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
- msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
+ msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
- msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
+ msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, fuzzy, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
- "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
- "--allow-non-selfsigned-uid opci�val.\n"
+ "%08lX érvénytelen kulcsot érvényesítettük az\n"
+ "--allow-non-selfsigned-uid opcióval.\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, fuzzy, c-format
  msgid "using subkey %s instead of primary key %s\n"
- msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
+ msgstr "A %08lX másodlagos kulcsot használjuk a %08lX elsődleges helyett.\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
- msgstr "k�l�n�ll� al��r�s k�sz�t�se"
+ msgstr "különálló aláírás készítése"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
- msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
+ msgstr "|[fájl]|olvasható szöveg aláírása"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
- msgstr "k�l�n�ll� al��r�s k�sz�t�se"
+ msgstr "különálló aláírás készítése"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
- msgstr "adat titkos�t�sa"
+ msgstr "adat titkosítása"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
- msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
+ msgstr "titkosítás csak szimmetrikus rejtjelezővel"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
- msgstr "adat visszafejt�se (alap�rtelmez�s)"
+ msgstr "adat visszafejtése (alapértelmezés)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
- msgstr "al��r�s ellen�rz�se"
+ msgstr "aláírás ellenőrzése"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
- msgstr "kulcsok list�z�sa"
+ msgstr "kulcsok listázása"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
- msgstr "kulcsok �s al��r�sok list�z�sa"
+ msgstr "kulcsok és aláírások listázása"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  #, fuzzy
  msgid "list and check key signatures"
- msgstr "kulcsal��r�sok ellen�rz�se"
+ msgstr "kulcsaláírások ellenőrzése"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
- msgstr "kulcsok �s ujjlenyomatok list�z�sa"
+ msgstr "kulcsok és ujjlenyomatok listázása"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
- msgstr "titkos kulcsok list�z�sa"
+ msgstr "titkos kulcsok listázása"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
- msgstr "�j kulcsp�r l�trehoz�sa"
+ msgstr "új kulcspár létrehozása"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
- msgstr "�j kulcsp�r l�trehoz�sa"
+ msgstr "új kulcspár létrehozása"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
- msgstr "�j kulcsp�r l�trehoz�sa"
+ msgstr "új kulcspár létrehozása"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
- msgstr "�j kulcsp�r l�trehoz�sa"
+ msgstr "új kulcspár létrehozása"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
- msgstr "visszavon�si igazol�s k�sz�t�se"
+ msgstr "visszavonási igazolás készítése"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
- msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
+ msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
- msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
+ msgstr "kulcsok eltávolítása a titkoskulcs-karikáról"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
- msgstr "kulcs al��r�sa"
+ msgstr "kulcs aláírása"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
- msgstr "kulcs al��r�sa helyileg"
+ msgstr "kulcs aláírása helyileg"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
- msgstr "kulcs al��r�sa"
+ msgstr "kulcs aláírása"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
- msgstr "kulcs al��r�sa helyileg"
+ msgstr "kulcs aláírása helyileg"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
- msgstr "kulcs al��r�sa vagy szerkeszt�se"
+ msgstr "kulcs aláírása vagy szerkesztése"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
- msgstr "kulcsok export�l�sa"
+ msgstr "kulcsok exportálása"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
- msgstr "kulcsok export�l�sa kulcsszerverre"
+ msgstr "kulcsok exportálása kulcsszerverre"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
- msgstr "kulcsok import�l�sa kulcsszerverr�l"
+ msgstr "kulcsok importálása kulcsszerverről"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
- msgstr "kulcsok keres�se kulcsszerveren"
+ msgstr "kulcsok keresése kulcsszerveren"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
- msgstr "minden kulcs friss�t�se kulcsszerverr�l"
+ msgstr "minden kulcs frissítése kulcsszerverről"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
- msgstr "kulcsok import�l�sa/�sszef�z�se"
+ msgstr "kulcsok importálása/összefűzése"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
- msgstr "bizalmi adatb�zis friss�t�se"
+ msgstr "bizalmi adatbázis frissítése"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
- msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
+ msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
- msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
+ msgstr "ascii páncélozott kimenet létrehozása"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
- msgstr "|N�V|titkos�t�s N�V r�sz�re"
+ msgstr "|NÉV|titkosítás NÉV részére"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
- msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
+ msgstr "felh. azonosító aláíráshoz és visszafejtéshez"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  #, 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)"
+ msgstr "|N|tömörítési szint beállítása N-re (0: tiltás)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
- msgstr "kanonikus sz�veges m�d haszn�lata"
+ msgstr "kanonikus szöveges mód használata"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
- msgstr "|f�jl|b�v�t� modul bet�lt�se"
+ msgstr "|fájl|bővítő modul betöltése"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
- msgstr "ne csin�ljon semmi v�ltoztat�st"
+ msgstr "ne csináljon semmi változtatást"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
- msgstr "fel�l�r�s el�tt r�k�rdez�s"
+ msgstr "felülírás előtt rákérdezés"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
  msgstr ""
  "@\n"
- "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
+ "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2603,21 -2038,19 +2610,21 @@@
  " --fingerprint [names]      show fingerprints\n"
  msgstr ""
  "@\n"
- "P�ld�k:\n"
+ "Példák:\n"
  "\n"
- " -se -r Bob [f�jl]          titkos�t�s �s al��r�s Bob r�sz�re\n"
- " --clearsign [f�jl]         olvashat� sz�veg al��r�sa\n"
- " --detach-sign [f�jl]       k�l�n�ll� al��r�s k�sz�t�se\n"
- " --list-keys [nevek]        kulcsok ki�rat�sa\n"
- " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
+ " -se -r Bob [fájl]          titkosítás és aláírás Bob részére\n"
+ " --clearsign [fájl]         olvasható szöveg aláírása\n"
+ " --detach-sign [fájl]       különálló aláírás készítése\n"
+ " --list-keys [nevek]        kulcsok kiíratása\n"
+ " --fingerprint [nevek]      ujjlenyomatok kiíratása\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2628,980 -2061,780 +2635,985 @@@ msgid "
  "Sign, check, encrypt or decrypt\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "Szintaxis: gpg [opci�k] [f�jlok]\n"
- "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"
+ "Szintaxis: gpg [opciók] [fájlok]\n"
+ "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:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
  msgstr ""
  "\n"
- "T�mogatott algoritmusok:\n"
+ "Támogatott algoritmusok:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
- msgstr "Nyilv�nos kulcs� (pubkey): "
+ msgstr "Nyilvános kulcsú (pubkey): "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
- msgstr "Rejtjelez� (cipher): "
+ msgstr "Rejtjelező (cipher): "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
- msgstr "Kivonatol� (hash): "
+ msgstr "Kivonatoló (hash): "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
- msgstr "T�m�r�t� (compression): "
+ msgstr "Tömörítő (compression): "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
- msgstr "Haszn�lat: gpg [opci�k] "
+ msgstr "Használat: gpg [opciók] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
- msgstr "Egym�snak ellentmond� parancsok!\n"
+ msgstr "Egymásnak ellentmondó parancsok!\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  msgid "no = sign found in group definition '%s'\n"
- msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
+ msgstr "Nem találtam = jelet a \"%s\" csoportdefinícióban!\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
- msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
+ msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
- msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
+ msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
- msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
+ msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
- msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
+ msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
- msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
+ msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
- msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
+ msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
- msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
+ msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, 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"
+ msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
- msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
+ msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, 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"
+ msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, 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"
+ msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, 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"
+ msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
- msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
+ msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  msgid "show key usage information during key listings"
- msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
+ msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  #, fuzzy
  msgid "show all notations during signature listings"
- msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
+ msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
- msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
+ msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  #, fuzzy
  msgid "show the keyring name in key listings"
- msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
+ msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  #, fuzzy
  msgid "show expiration dates during signature listings"
- msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
+ msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "kulcs tilt�sa"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
- msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
+ msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "Érvénytelen import opciók!\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
- msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
+ msgstr "MEGJEGYZÉS: Figyelmen kívül hagytam a régi opciókat (%s).\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
- msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
+ msgstr "MEGJEGYZÉS: %s nem normál használatra van!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
- msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
+ msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
- msgstr "Ez nem �rv�nyes e-mail c�m.\n"
+ msgstr "Ez nem érvényes e-mail cím.\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
- msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
+ msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  #, fuzzy
  msgid "could not parse keyserver URL\n"
- msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
+ msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
- msgstr "%s:%d: �rv�nytelen export opci�k!\n"
+ msgstr "%s:%d: Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  #, fuzzy
  msgid "invalid keyserver options\n"
- msgstr "�rv�nytelen export opci�k!\n"
+ msgstr "Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
- msgstr "%s:%d: �rv�nytelen import opci�k!\n"
+ msgstr "%s:%d: Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
- msgstr "�rv�nytelen import opci�k!\n"
+ msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
- msgstr "�rv�nytelen import opci�k!\n"
+ msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
- msgstr "%s:%d: �rv�nytelen export opci�k!\n"
+ msgstr "%s:%d: Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
- msgstr "�rv�nytelen export opci�k!\n"
+ msgstr "Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
- msgstr "%s:%d: �rv�nytelen import opci�k!\n"
+ msgstr "%s:%d: Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  #, fuzzy
  msgid "invalid list options\n"
- msgstr "�rv�nytelen import opci�k!\n"
+ msgstr "Érvénytelen import opciók!\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  #, fuzzy
  msgid "show all notations during signature verification"
- msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
+ msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
- msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
+ msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "show user ID validity during signature verification"
- msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
+ msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
- msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
+ msgstr "%s nem érvényes karakterkiosztás!\n"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
- msgstr "%s:%d: �rv�nytelen export opci�k!\n"
+ msgstr "%s:%d: Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  #, fuzzy
  msgid "invalid verify options\n"
- msgstr "�rv�nytelen export opci�k!\n"
+ msgstr "Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, 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"
+ msgstr "Nem tudom a végrehajtási elérési utat %s értékre állítani!\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
- msgstr "%s:%d: �rv�nytelen export opci�k!\n"
+ msgstr "%s:%d: Érvénytelen export opciók!\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
- msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
+ msgstr "FIGYELEM: A program core állományt hozhat létre!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
- msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
+ msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
- msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
+ msgstr "%s és %s nem használható együtt!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
- msgstr "%s �rtelmetlen %s mellett!\n"
+ msgstr "%s értelmetlen %s mellett!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
- msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
- msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
+ msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
- msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
+ msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
- msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
+ msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
- msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
+ msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
- msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
+ msgstr "completes-needed nagyobb kell legyen 0-nál!\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
- msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
+ msgstr "marginals-needed nagyobb kell legyen 1-nél!\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  #, 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"
+ msgstr "max-cert-depth 1 és 255 közé kell essen!\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  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"
+ msgstr "Érvénytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  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"
+ msgstr "Érvénytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
- msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
+ msgstr "MEGJEGYZÉS: Egyszerű S2K mód (0) erősen ellenjavallt!\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
- msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
+ msgstr "Érvénytelen S2K mód; 0, 1 vagy 3 lehet.\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
- msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
+ msgstr "Érvénytelen alapértelmezett preferenciák!\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
- msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
+ msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
- msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
+ msgstr "Érvénytelen személyes kivonatolópreferenciák!\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
- msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
+ msgstr "Érvénytelen személyes tömörítőpreferenciák!\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
- msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
+ msgstr "%s és %s egyelőre nem használható együtt!\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, 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"
+ "Lehet, hogy nem használhatja \"%s\" rejtjelező algoritmust %s módban!\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, 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"
+ "Lehet, hogy nem használhatja \"%s\" kivonatoló algoritmust %s módban!\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, 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"
+ msgstr "Lehet, hogy nem használhatja \"%s\" tömörítő algoritmust %s módban!\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
- msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+ msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  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"
+ "FIGYELEM: Címzett megadva (-r), de nincs nyilvános kulcsú titkosítás!\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
- msgstr "--store [f�jln�v]"
+ msgstr "--store [fájlnév]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
- msgstr "--symmetric [f�jln�v]"
+ msgstr "--symmetric [fájlnév]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
- msgstr "Visszafejt�s sikertelen: %s.\n"
+ msgstr "Visszafejtés sikertelen: %s.\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
- msgstr "--encrypt [f�jln�v]"
+ msgstr "--encrypt [fájlnév]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  #, fuzzy
  msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [f�jln�v]"
+ msgstr "--sign --encrypt [fájlnév]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, 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"
+ msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
- msgstr "--sign [f�jln�v]"
+ msgstr "--sign [fájlnév]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [f�jln�v]"
+ msgstr "--sign --encrypt [fájlnév]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  #, fuzzy
  msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [f�jln�v]"
+ msgstr "--sign --encrypt [fájlnév]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, 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"
+ msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [f�jln�v]"
+ msgstr "--sign --symmetric [fájlnév]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
- msgstr "--clearsign [f�jln�v]"
+ msgstr "--clearsign [fájlnév]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
- msgstr "--decrypt [f�jln�v]"
+ msgstr "--decrypt [fájlnév]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
- msgstr "--sign-key felh-azonos�t�"
+ msgstr "--sign-key felh-azonosító"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
- msgstr "--lsign-key felh-azonos�t�"
+ msgstr "--lsign-key felh-azonosító"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
- msgstr "--edit-key felh-azonos�t� [parancsok]"
+ msgstr "--edit-key felh-azonosító [parancsok]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
- msgstr "--sign-key felh-azonos�t�"
+ msgstr "--sign-key felh-azonosító"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
- msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
+ msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
- msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
+ msgstr "Vétel a kulcsszerverről sikertelen: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
- msgstr "Kulcsexport�l�s sikertelen: %s\n"
+ msgstr "Kulcsexportálás sikertelen: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
- msgstr "Kulcsexport�l�s sikertelen: %s\n"
+ msgstr "Kulcsexportálás sikertelen: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
- msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
+ msgstr "Keresés a kulcsszerveren sikertelen: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
- msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
+ msgstr "Frissítés a kulcsszerverről sikertelen: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
- msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
+ msgstr "Páncél eltávolítása nem sikerült: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
- msgstr "P�nc�loz�s nem siker�lt: %s\n"
+ msgstr "Páncélozás nem sikerült: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
- msgstr "[f�jln�v]"
+ msgstr "[fájlnév]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
- msgstr "Kezdheti g�pelni az �zenetet...\n"
+ msgstr "Kezdheti gépelni az üzenetet...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
- msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
+ msgstr "A megadott igazolási eljárásmód URL-je érvénytelen!\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
- msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
+ msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  #, 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"
+ msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
- msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
+ msgstr "a megadott kulcskarikáról vegye a kulcsokat"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
- msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
+ msgstr "időbélyeg-konfliktus esetén csak figyelmeztessen"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
- msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
+ msgstr "|ÁL|állapotinformációk írása ÁL állományleíróra"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
- msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpgv [opciók] [fájlok] (-h a súgóhoz)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
  msgstr ""
- "Szintaxis: gpg [opci�k] [f�jlok]\n"
- "Ellen�rzi az al��r�sokat az ismert, megb�zhat� kulcsok seg�ts�g�vel.\n"
+ "Szintaxis: gpg [opciók] [fájlok]\n"
+ "Ellenőrzi az aláírásokat az ismert, megbízható kulcsok segítségével.\n"
  
 +#: g10/helptext.c:72
  msgid "No help available"
- msgstr "Nem �ll rendelkez�sre seg�ts�g."
+ msgstr "Nem áll rendelkezésre segítség."
  
 +#: g10/helptext.c:82
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "No help available for '%s'"
- msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
+ msgstr "Nem áll rendelkezésre segítség \"%s\" témához."
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
- msgstr "bizalmi adatb�zis friss�t�se"
+ msgstr "bizalmi adatbázis frissítése"
  
- #: g10/import.c:147
++#: g10/import.c:160
  #, fuzzy
  msgid "do not update the trustdb after import"
- msgstr "bizalmi adatb�zis friss�t�se"
+ msgstr "bizalmi adatbázis frissítése"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  msgid "show key during import"
  msgstr "megmutatja az ujjlenyomatot"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  #, fuzzy
  msgid "remove unusable parts from key after import"
- msgstr "haszn�lhatatlan titkos kulcs"
+ msgstr "használhatatlan titkos kulcs"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
- msgstr "%d t�pus� blokkot kihagyom.\n"
+ msgstr "%d típusú blokkot kihagyom.\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
- msgstr "     �sszesen feldolgoztam: %lu\n"
+ msgstr "     Összesen feldolgoztam: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
- msgstr "       �j kulcsok kihagyva: %lu\n"
+ msgstr "       új kulcsok kihagyva: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
- msgstr "       �j kulcsok kihagyva: %lu\n"
+ msgstr "       új kulcsok kihagyva: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
- msgstr "    felh. azonos�t� n�lk�l: %lu\n"
+ msgstr "    felh. azonosító nélkül: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
- msgstr "                import�lva: %lu"
+ msgstr "                importálva: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
- msgstr "               v�ltozatlan: %lu\n"
+ msgstr "               változatlan: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
- msgstr "       �j felh. azonos�t�k: %lu\n"
+ msgstr "       új felh. azonosítók: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
- msgstr "              �j alkulcsok: %lu\n"
+ msgstr "              új alkulcsok: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
- msgstr "              �j al��r�sok: %lu\n"
+ msgstr "              új aláírások: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
- msgstr "     �j kulcsvisszavon�sok: %lu\n"
+ msgstr "     új kulcsvisszavonások: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "   olvasott titkos kulcsok: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
- msgstr "  import�lt titkos kulcsok: %lu\n"
+ msgstr "  importált titkos kulcsok: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
- msgstr "v�ltozatlan titkos kulcsok: %lu\n"
+ msgstr "változatlan titkos kulcsok: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
- msgstr "             nem import�lt: %lu\n"
+ msgstr "             nem importált: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
- msgstr "              �j al��r�sok: %lu\n"
+ msgstr "              új aláírások: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "   olvasott titkos kulcsok: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
- msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+ msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
- msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
+ msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "Kihagytam \"%s\"-t: %s.\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
- msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
+ msgstr "%08lX kulcs: HKP alkulcssérülés kijavítva.\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
- msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
+ msgstr "%08lX kulcs: Nem önaláírt felh. azonosító (\"%s\") elfogadva.\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
- msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
+ msgstr "%08lX kulcs: Nincs érvényes felhasználói azonosító.\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
- msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
+ msgstr "Ezt okozhatja egy hiányzó önaláírás.\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
- msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
+ msgstr "%08lX kulcs: Nyilvános kulcs nem található: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
- msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
+ msgstr "%08lX kulcs: új kulcs - kihagytam.\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
- msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
+ msgstr "Nem írható kulcskarikát találtam: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
- msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
+ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
- msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
+ msgstr "%08lX kulcs: \"%s\" nyilvános kulcs importálva.\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
- msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
+ msgstr "%08lX kulcs: Nem egyezik a mi másolatunkkal!\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
- msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
+ msgstr "%08lX kulcs: Nem találom az eredeti kulcsblokkot: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
- msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
+ msgstr "%08lX kulcs: \"%s\" 1 új felhasználói azonosító.\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
- msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
+ msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
- msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
+ msgstr "%08lX kulcs: \"%s\" 1 új aláírás.\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
- msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
+ msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
- msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
+ msgstr "%08lX kulcs: \"%s\" 1 új alkulcs.\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
- msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
+ msgstr "%08lX kulcs: \"%s\" %d új alkulcs.\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
- msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
+ msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
- msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
+ msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
- msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
+ msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
- msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
+ msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
- msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
+ msgstr "%08lX kulcs: \"%s\" nem változott.\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
- msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
+ msgstr "%08lX kulcs: Titkos kulcs importálva.\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
- msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
+ msgstr "Kihagytam: titkos kulcs már jelen van.\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
- msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
- msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" titkos kulcs nem található: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  #, fuzzy
  msgid "importing secret keys not allowed\n"
- msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr ""
@@@ -3617,251 -2850,209 +3629,257 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
- msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
+ msgstr "%08lX kulcs: Nincs nyilvános kulcs - nem tudok visszavonni.\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
- msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
+ msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - visszautasítva.\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
- msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
+ msgstr "%08lX kulcs: \"%s\" visszavonó igazolást importáltam.\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
- msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
+ msgstr "%08lX kulcs: Nincs felhasználói azonosító ehhez az aláíráshoz!\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
- "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
- "azonos�t�n!\n"
+ "%08lX kulcs: Nem támogatott nyilvános kulcsú alg. a \"%s\" felh. "
+ "azonosítón!\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
- msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
+ msgstr "%08lX kulcs: Érvénytelen önaláírás a \"%s\" felh. azonosítón!\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
- msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
+ msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
- msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
+ msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
- msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
+ msgstr "%08lX kulcs: Nincs alkulcs a kulcskötéshez!\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
- msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
+ msgstr "%08lX kulcs: Érvénytelen alkulcskötés!\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
- msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
+ msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcskötést.\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
- msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
+ msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavonáshoz.\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
- msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
+ msgstr "%08lX kulcs: Érvénytelen alkulcsvisszavonás.\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
- msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
+ msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcsvisszavonást.\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
- msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
+ msgstr "%08lX kulcs: Kihagytam a felh. azonosítót: '"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
- msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
+ msgstr "%08lX kulcs: Nem exportálható aláírás (%02x. osztály) - kihagytam.\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
- msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
+ msgstr "%08lX kulcs: Visszavonó igazolás rossz helyen - kihagytam.\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
- msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
+ msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - kihagytam.\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
- msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
+ msgstr "%08lX kulcs: Alkulcsaláírás rossz helyen - kihagytam.\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
- msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
+ msgstr "%08lX kulcs: Váratlan aláírásosztály (0x%02X) - kihagytam.\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
- msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
+ msgstr "%08lX kulcs: Duplázott felh. azonosítót találtam - összefűztem.\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
- "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
- "leh�vom a %08lX visszavon� kulcsot.\n"
+ "FIGYELEM: %08lX kulcsot visszavonhatták:\n"
+ "lehívom a %08lX visszavonó kulcsot.\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
- "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
- "visszavon� kulcs (%08lX) nincs jelen.\n"
+ "FIGYELEM: %08lX kulcsot visszavonhatták:\n"
+ "visszavonó kulcs (%08lX) nincs jelen.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
- msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
+ msgstr "%08lX kulcs: \"%s\" visszavonó igazolást hozzáadtam.\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
- msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
+ msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
- msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
+ msgstr "\"%s\" kulcskarikát létrehoztam.\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
- msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
+ msgstr "\"%s\" kulcskarikát létrehoztam.\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  msgid "keyblock resource '%s': %s\n"
- msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
+ msgstr "Hiba \"%s\" létrehozásakor: %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
- msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
+ msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
  
 +#: g10/keyedit.c:264
  msgid "[revocation]"
- msgstr "[visszavon�s]"
+ msgstr "[visszavonás]"
  
 +#: g10/keyedit.c:264
  msgid "[self-signature]"
- msgstr "[�nal��r�s]"
+ msgstr "[önaláírás]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
+ msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+ msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  msgid " (reordered signatures follow)"
- msgstr "J� al��r�s a k�vetkez�t�l: \""
+ msgstr "Jó aláírás a következőtől: \""
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "Kihagytam \"%s\"-t: %s.\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
- msgstr[1] "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+ msgstr[0] "\"%s\" felhasználói azonosítót visszavonták."
+ msgstr[1] "\"%s\" felhasználói azonosítót visszavonták."
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
- msgstr[1] "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
+ msgstr[0] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
+ msgstr[1] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
- msgstr[0] "%d rossz al��r�s.\n"
- msgstr[1] "%d rossz al��r�s.\n"
+ msgstr[0] "%d rossz aláírás.\n"
+ msgstr[1] "%d rossz aláírás.\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
- msgstr[0] "J� al��r�s a k�vetkez�t�l: \""
- msgstr[1] "J� al��r�s a k�vetkez�t�l: \""
+ msgstr[0] "Jó aláírás a következőtől: \""
+ msgstr[1] "Jó aláírás a következőtől: \""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3869,445 -3060,357 +3887,445 @@@
  "(by looking at passports, checking fingerprints from different sources, "
  "etc.)\n"
  msgstr ""
- "K�rem, d�ntse el, hogy mennyire b�zik meg ebben a felhaszn�l�ban,\n"
- "hogy megfelel�en ellen�rzi m�sok kulcsait (�tlevelek ellen�rz�s�vel,\n"
- "k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
+ "Kérem, döntse el, hogy mennyire bízik meg ebben a felhasználóban,\n"
+ "hogy megfelelően ellenőrzi mások kulcsait (útlevelek ellenőrzésével,\n"
+ "különböző forrásból származó digitális ujjlenyomatokkal...)!\n"
  "\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
- msgstr " %d = r�szlegesen megb�zom benne\n"
+ msgstr " %d = részlegesen megbízom benne\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
- msgstr " %d = teljesen megb�zom benne\n"
+ msgstr " %d = teljesen megbízom benne\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
- msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+ msgstr "\"%s\" felhasználói azonosítót visszavonták."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
- msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
+ msgstr "Biztos abban, hogy továbbra is alá akarja írni? (i/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
- msgstr "  Nem tudom al��rni.\n"
+ msgstr "  Nem tudom aláírni.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
- msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
+ msgstr "\"%s\" felhasználói azonosító lejárt."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
- msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
+ msgstr "\"%s\" felhasználóazonosítón nincs önaláírás."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
- msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
+ msgstr "\"%s\" felhasználóazonosítón nincs önaláírás."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  #, fuzzy
  msgid "Sign it? (y/N) "
- msgstr "Val�ban al��rja? "
+ msgstr "Valóban aláírja? "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
  "is a PGP 2.x-style signature.\n"
  msgstr ""
- "\"%s\" �nal��r�sa\n"
- "PGP 2.x st�lus�.\n"
+ "\"%s\" önaláírása\n"
+ "PGP 2.x stílusú.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
- msgstr "Szeretn� �talak�tani OpenPGP �nal��r�ss�? (i/N) "
+ msgstr "Szeretné átalakítani OpenPGP önaláírássá? (i/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "has expired.\n"
  msgstr ""
- "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
- "kulcson lej�rt.\n"
+ "Az Ön jelenlegi aláírása a(z) \"%s\"\n"
+ "kulcson lejárt.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
- msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
+ msgstr "Szeretne kiadni egy új aláírást, amellyel lecseréli a lejártat? (i/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "is a local signature.\n"
  msgstr ""
- "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
- "kulcson helyi al��r�s.\n"
+ "Az Ön jelenlegi aláírása a(z) \"%s\"\n"
+ "kulcson helyi aláírás.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
- msgstr "Szeretn� �talak�tani teljes, export�lhat� al��r�ss�? (i/N) "
+ msgstr "Szeretné átalakítani teljes, exportálható aláírássá? (i/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
- msgstr "\"%s\" m�r al� lett �rva helyileg a %08lX kulccsal!\n"
+ msgstr "\"%s\" már alá lett írva helyileg a %08lX kulccsal!\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
- msgstr "\"%s\" m�r al� lett �rva a %08lX kulccsal!\n"
+ msgstr "\"%s\" már alá lett írva a %08lX kulccsal!\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
- msgstr "M�g egyszer al� akarja �rni? (i/N) "
+ msgstr "Még egyszer alá akarja írni? (i/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
- msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
+ msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
- msgstr "Ez a kulcs lej�rt!"
+ msgstr "Ez a kulcs lejárt!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
- msgstr "Ez a kulcs lej�r: %s.\n"
+ msgstr "Ez a kulcs lejár: %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
- msgstr "Szeretn�, ha az al��r�sa ugyanekkor j�rna le? (I/n) "
+ msgstr "Szeretné, ha az aláírása ugyanekkor járna le? (I/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
  "to the person named above?  If you don't know what to answer, enter \"0\".\n"
  msgstr ""
- "Mennyire gondosan ellen�rizte, hogy a kulcs, melyet al��rni k�sz�l, val�ban\n"
- "a fent nevezett szem�lyhez tartozik? Ha nem tudja a v�laszt, �rjon \"0\"-t!\n"
+ "Mennyire gondosan ellenőrizte, hogy a kulcs, melyet aláírni készül, valóban\n"
+ "a fent nevezett személyhez tartozik? Ha nem tudja a választ, írjon \"0\"-t!\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
- msgstr "   (0) Nem v�laszolok.%s\n"
+ msgstr "   (0) Nem válaszolok.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
- msgstr "   (1) Egy�ltal�n nem ellen�riztem.%s\n"
+ msgstr "   (1) Egyáltalán nem ellenőriztem.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
- msgstr "   (2) A szok�sos ellen�rz�seket v�geztem.%s\n"
+ msgstr "   (2) A szokásos ellenőrzéseket végeztem.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
- msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
+ msgstr "   (3) Nagyon alaposan ellenőriztem.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
- msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
+ msgstr "Mi a válasza? (Adjon meg \"?\"-et magyarázathoz!): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr ""
- "Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
- "az �n kulcs�val: \""
+ "Teljesen biztos abban, hogy alá akarja írni ezt a kulcsot\n"
+ "az Ön kulcsával: \""
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
- "Ez egy �nal��r�s lesz.\n"
+ "Ez egy önaláírás lesz.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
- "FIGYELEM: Az al��r�s nem lesz \"nem export�lhat�k�nt\" megjel�lve.\n"
+ "FIGYELEM: Az aláírás nem lesz \"nem exportálhatóként\" megjelölve.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
- "FIGYELEM: Az al��r�s nem lesz \"nem visszavonhat�k�nt\" megjel�lve.\n"
+ "FIGYELEM: Az aláírás nem lesz \"nem visszavonhatóként\" megjelölve.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
- "Az al��r�st \"nem export�lhat�nak\" jel�lj�k.\n"
+ "Az aláírást \"nem exportálhatónak\" jelöljük.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
- "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
+ "Az aláírást \"nem visszavonhatónak\" jelöljük.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
- "Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
+ "Egyáltalán nem ellenőriztem ezt a kulcsot.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
- "A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
+ "A szokásos módon ellenőriztem ezt a kulcsot.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
- "Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
+ "Nagyon gondosan ellenőriztem ezt a kulcsot.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  #, fuzzy
  msgid "Really sign? (y/N) "
- msgstr "Val�ban al��rja? "
+ msgstr "Valóban aláírja? "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
- msgstr "Al��r�s sikertelen: %s\n"
+ msgstr "Aláírás sikertelen: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
- msgstr "ment�s �s kil�p�s"
+ msgstr "mentés és kilépés"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "megmutatja az ujjlenyomatot"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
- msgstr "Al��r�s-jel�l�s: "
+ msgstr "Aláírás-jelölés: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
- msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
+ msgstr "kilistázza a kulcs- és felhasználóazonosítókat"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
- msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
+ msgstr "N. felhasználói azonosító kiválasztása"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  #, fuzzy
  msgid "select subkey N"
- msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
+ msgstr "N. felhasználói azonosító kiválasztása"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "check signatures"
- msgstr "al��r�sok visszavon�sa"
+ msgstr "aláírások visszavonása"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  #, fuzzy
  msgid "sign selected user IDs locally"
- msgstr "kulcs helyi al��r�sa"
+ msgstr "kulcs helyi aláírása"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
- msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
+ msgstr "Javaslat: Válassza ki az aláírni kívánt felhasználóazonosítókat!\n"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
- msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
+ msgstr "felhasználói azonosító hozzáadása"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
- msgstr "fot�azonos�t� hozz�ad�sa"
+ msgstr "fotóazonosító hozzáadása"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  #, fuzzy
  msgid "delete selected user IDs"
- msgstr "felhaszn�l�i azonos�t� t�rl�se"
+ msgstr "felhasználói azonosító törlése"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  #, fuzzy
  msgid "delete selected subkeys"
- msgstr "m�sodlagos kulcs t�rl�se"
+ msgstr "másodlagos kulcs törlése"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
- msgstr "visszavon� kulcs hozz�ad�sa"
+ msgstr "visszavonó kulcs hozzáadása"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
- msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
+ msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
- msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
+ msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  #, fuzzy
  msgid "flag the selected user ID as primary"
- msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
+ msgstr "felhasználóazonosító megjelölése elsődlegesként"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
- msgstr "preferenci�k list�z�sa (szak�rt�)"
+ msgstr "preferenciák listázása (szakértő)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
- msgstr "preferenci�k list�z�sa (r�szletes)"
+ msgstr "preferenciák listázása (részletes)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  #, fuzzy
  msgid "set preference list for the selected user IDs"
- msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
+ msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
- msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
+ msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  #, fuzzy
  msgid "set a notation for the selected user IDs"
- msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
+ msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
- msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
+ msgstr "kulcstulajdonos megbízhatóságának beállítása"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
- msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
+ msgstr "Valóban visszavonja az összes kijelölt felhasználóazonosítót? "
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  #, fuzzy
  msgid "revoke selected user IDs"
- msgstr "felhaszn�l�i azonos�t� visszavon�sa"
+ msgstr "felhasználói azonosító visszavonása"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  #, fuzzy
  msgid "revoke key or selected subkeys"
- msgstr "m�sodlagos kulcs visszavon�sa"
+ msgstr "másodlagos kulcs visszavonása"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  #, fuzzy
  msgid "enable key"
- msgstr "kulcs enged�lyez�se"
+ msgstr "kulcs engedélyezése"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "disable key"
- msgstr "kulcs tilt�sa"
+ msgstr "kulcs tiltása"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  #, fuzzy
  msgid "show selected photo IDs"
- msgstr "fot�azonos�t� megmutat�sa"
+ msgstr "fotóazonosító megmutatása"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
- msgstr "Titkos kulcs rendelkez�sre �ll.\n"
+ msgstr "Titkos kulcs rendelkezésre áll.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
- msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
+ msgstr "Ehhez szükség van a titkos kulcsra.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4315,677 -3418,536 +4333,678 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
- msgstr "A kulcsot visszavont�k."
+ msgstr "A kulcsot visszavonták."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
- msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
+ msgstr "Valóban aláírja az összes felhasználóazonosítót? "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
- msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
+ msgstr "Valóban aláírja az összes felhasználóazonosítót? "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
- msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
+ msgstr "Javaslat: Válassza ki az aláírni kívánt felhasználóazonosítókat!\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
- msgstr "ismeretlen al��r�soszt�ly"
+ msgstr "ismeretlen aláírásosztály"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
- msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
+ msgstr "Ez a parancs %s módban nem engedélyezett.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
- msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
+ msgstr "Legalább egy felhasználóazonosítót ki kell választania!\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
- msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
+ msgstr "Nem törölheti az utolsó felhasználóazonosítót!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
- msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
+ msgstr "Valóban eltávolítja az összes kijelölt felhasználóazonosítót? "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
- msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
+ msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
- msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
+ msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  #, fuzzy
  msgid "You must select exactly one key.\n"
- msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
+ msgstr "Legalább egy kulcsot ki kell választania!\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
- msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
- msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
+ msgstr "Legalább egy kulcsot ki kell választania!\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
- msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
+ msgstr "Valóban törli a kiválasztott kulcsokat? "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
- msgstr "Val�ban t�rli ezt a kulcsot? "
+ msgstr "Valóban törli ezt a kulcsot? "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
- msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
+ msgstr "Valóban visszavonja az összes kijelölt felhasználóazonosítót? "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
- msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
+ msgstr "Valóban visszavonja ezt a felhasználóazonosítót? "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
- msgstr "Val�ban visszavonja ezt a kulcsot? "
+ msgstr "Valóban visszavonja ezt a kulcsot? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
+ msgstr "Valóban visszavonja a kijelölt kulcsokat? "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
- msgstr "Val�ban visszavonja ezt a kulcsot? "
+ msgstr "Valóban visszavonja ezt a kulcsot? "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  #, fuzzy
  msgid "Set preference list to:\n"
- msgstr "preferencialista be�ll�t�sa"
+ msgstr "preferencialista beállítása"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
- msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
+ msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
- msgstr "Val�ban friss�tsem a preferenci�kat? "
+ msgstr "Valóban frissítsem a preferenciákat? "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  #, fuzzy
  msgid "Save changes? (y/N) "
- msgstr "Mentsem a v�ltoztat�sokat? "
+ msgstr "Mentsem a változtatásokat? "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  #, fuzzy
  msgid "Quit without saving? (y/N) "
- msgstr "Kil�pjek ment�s n�lk�l? "
+ msgstr "Kilépjek mentés nélkül? "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
- msgstr "Friss�t�s sikertelen: %s.\n"
+ msgstr "Frissítés sikertelen: %s.\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
- msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
+ msgstr "A kulcs nem változott, nincs szükség frissítésre.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
- msgstr "Kulcsgener�l�s sikertelen: %s\n"
+ msgstr "Kulcsgenerálás sikertelen: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
- msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+ msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
- msgstr "�rv�nytelen �rt�k!\n"
+ msgstr "Érvénytelen érték!\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
- msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
+ msgstr "Nincs ilyen felhasználói azonosító.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  msgid "Nothing to sign.\n"
- msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
+ msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Kivonat: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
- msgstr "Jellemz�k: "
+ msgstr "Jellemzők: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  #, fuzzy
  msgid "Notations: "
- msgstr "Jel�l�s: "
+ msgstr "Jelölés: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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"
+ msgstr "Nincsenek preferenciák egy PGP 2.x felhasználóazonosítón!\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
- msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
+ msgstr "Ezt a kulcsot a következő %s kulcs visszavonhatja: "
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, fuzzy, c-format
  msgid "This key may be revoked by %s key %s"
- msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
+ msgstr "Ezt a kulcsot a következő %s kulcs visszavonhatja: "
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  #, fuzzy
  msgid "(sensitive)"
- msgstr " (�rz�keny)"
+ msgstr " (érzékeny)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
- msgstr "%s nem hozhat� l�tre: %s\n"
+ msgstr "%s nem hozható létre: %s\n"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[visszavont] "
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
- msgstr " [lej�r: %s]"
+ msgstr " [lejár: %s]"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
- msgstr " [lej�r: %s]"
+ msgstr " [lejár: %s]"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " bizalom: %c/%c"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " bizalom: %c/%c"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Ez a kulcs tiltott."
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  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"
+ "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:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[visszavont] "
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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 ""
- "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"
+ "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:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
- msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
+ msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  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 ""
- "FIGYELEM: Ez egy PGP2 st�lus� kulcs. Fot�azonos�t� hozz�ad�sa azt "
+ "FIGYELEM: Ez egy PGP2 stílusú kulcs. Fotóazonosító hozzáadása azt "
  "okozhatja,\n"
- "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
+ "          hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
- msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
+ msgstr "Továbbra is hozzá akarja adni? (i/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  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"
+ msgstr "Lehet, hogy nem adhat fotóazonosítót egy PGP2 stílusú kulcshoz!\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
- msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
+ msgstr "Törli ezt a jó aláírást? (i/N/k)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
- msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
+ msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
- msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
+ msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
- msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
+ msgstr "Valóban törli ezt az önaláírást? (i/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
- msgstr[0] "T�r�ltem %d al��r�st.\n"
- msgstr[1] "T�r�ltem %d al��r�st.\n"
+ msgstr[0] "Töröltem %d aláírást.\n"
+ msgstr[1] "Töröltem %d aláírást.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
- msgstr "Nem t�r�ltem semmit.\n"
+ msgstr "Nem töröltem semmit.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  #, fuzzy
  msgid "invalid"
- msgstr "�rv�nytelen p�nc�l"
+ msgstr "érvénytelen páncél"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
- msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+ msgstr "\"%s\" felhasználói azonosítót visszavonták."
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
- msgstr[0] "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
- msgstr[1] "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+ msgstr[0] "\"%s\" felhasználói azonosítót visszavonták."
+ msgstr[1] "\"%s\" felhasználói azonosítót visszavonták."
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
- msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
+ msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
- msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
+ msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  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 ""
- "FIGYELEM: Ez egy PGP 2.x st�lus� kulcs. Kijel�lt visszavon� hozz�ad�sa\n"
- "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
+ "FIGYELEM: Ez egy PGP 2.x stílusú kulcs. Kijelölt visszavonó hozzáadása\n"
+ "          azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a "
  "kulcsot!\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  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"
+ "Lehet, hogy nem adhat kijelölt visszavonót egy PGP 2.x-stílusú kulcshoz.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
- msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
+ msgstr "Írja be a kijelölt visszavonó felhasználóazonosítóját: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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"
+ msgstr "Nem adhat meg PGP 2.x stílusú kulcsot kijelölt visszavonónak!\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  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"
+ msgstr "Nem adhat meg egy kulcsot saját kijelölt visszavonójának!\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  #, fuzzy
  msgid "this key has already been designated as a revoker\n"
- msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
+ msgstr "FIGYELEM: Ezt a kulcsot a kijelölt visszavonó visszavonta!\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  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"
+ "FIGYELEM: A kijelölt visszavonó kulcs megadása nem csinálható vissza!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  #, 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): "
+ msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
- msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
+ msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
- msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
+ msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
- msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
+ msgstr "Elsődleges kulcs lejárati idejének változtatása.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  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"
+ msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
- msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
+ msgstr "FIGYELEM: %08lX aláíró alkulcs nem kereszthitelesített.\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
- msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
+ msgstr "Kérem, válasszon ki pontosan egy felhasználóazonosítót!\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, 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"
+ msgstr "Kihagyom a v3 önaláírást a \"%s\" felhasználóazonosítón.\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
- msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
+ msgstr "Biztos abban, hogy használni akarja (i/N)? "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
- msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
+ msgstr "Biztos abban, hogy használni akarja (i/N)? "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  #, fuzzy
  msgid "Enter the notation: "
- msgstr "Al��r�s-jel�l�s: "
+ msgstr "Aláírás-jelölés: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  #, fuzzy
  msgid "Proceed? (y/N) "
- msgstr "Fel�l�rjam (i/N)? "
+ msgstr "Felülírjam (i/N)? "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
- msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
+ msgstr "Nincs %d indexű felhasználóazonosító!\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
- msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
+ msgstr "Nincs %d indexű felhasználóazonosító!\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
- msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
+ msgstr "Nincs %d indexű felhasználóazonosító!\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
- msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
+ msgstr "Nincs %d indexű felhasználóazonosító!\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
- msgstr "Felhaszn�l�azonos�t�: \""
+ msgstr "Felhasználóazonosító: \""
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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"
+ msgstr "   aláírva %08lX által %s%s%s időpontban.\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
- msgstr " (nem export�lhat�)"
+ msgstr " (nem exportálható)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
- msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
+ msgstr "Ez az aláírás lejárt %s időpontban.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
- msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
+ msgstr "Biztos benne, hogy mégis visszavonja? (i/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
- msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
+ msgstr "Csináljunk egy visszavonó igazolást ehhez az aláíráshoz? (i/N) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  #, fuzzy
  msgid "Not signed by you.\n"
- msgstr "   al��rva %08lX �ltal %s%s id�pontban.\n"
+ msgstr "   aláírva %08lX által %s%s időpontban.\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, 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"
+ msgstr "Ön aláírta a következő felhasználóazonosítókat:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  #, fuzzy
  msgid " (non-revocable)"
- msgstr " (nem export�lhat�)"
+ msgstr " (nem exportálható)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
- msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
+ msgstr "   visszavonva %08lX által %s időpontban.\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
- msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
+ msgstr "A következő aláírásokat fogja visszavonni:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
- msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
+ msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "Nincs titkos kulcs.\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
- msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
+ msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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"
+ "FIGYELEM: A felhasználóazonosítót %d másodperccel a jövőben írták alá.\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
- msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
+ msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
- msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
+ msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, 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"
+ msgstr "%s fotóazonosító (méret: %ld, kulcs: 0x%08lX, felh: %d) mutatása.\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
- msgstr "%c%lu preferencia k�tszer szerepel!\n"
+ msgstr "%c%lu preferencia kétszer szerepel!\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  #, fuzzy
  msgid "too many cipher preferences\n"
- msgstr "T�l sok \"%c\" preferencia.\n"
+ msgstr "Túl sok \"%c\" preferencia.\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  #, fuzzy
  msgid "too many digest preferences\n"
- msgstr "T�l sok \"%c\" preferencia.\n"
+ msgstr "Túl sok \"%c\" preferencia.\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  #, fuzzy
  msgid "too many compression preferences\n"
- msgstr "T�l sok \"%c\" preferencia.\n"
+ msgstr "Túl sok \"%c\" preferencia.\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
- msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
+ msgstr "Érvénytelen karakter a preferenciák között!\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
- msgstr "Sima al��r�st �rok.\n"
+ msgstr "Sima aláírást írok.\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
- msgstr "�nal��r�st �rok.\n"
+ msgstr "Önaláírást írok.\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
- msgstr "�sszef�z� al��r�st �rok.\n"
+ msgstr "Összefűző aláírást írok.\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
- msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
+ msgstr "Kulcsméret érvénytelen; %u bitet használok.\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
- msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
+ msgstr "Kulcsméretet felkerekítettem %u bitre.\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  #, fuzzy
  msgid "Encrypt"
- msgstr "adat titkos�t�sa"
+ msgstr "adat titkosítása"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr ""
  
@@@ -4999,157 -3961,126 +5018,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
- msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
+ msgstr "   (%d) ElGamal (csak titkosítás)\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
- msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
+ msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
- msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
+ msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
- msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
+ msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
- msgstr "   (%d) DSA (csak al��r�s)\n"
+ msgstr "   (%d) DSA (csak aláírás)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
- msgstr "   (%d) RSA (csak al��r�s)\n"
+ msgstr "   (%d) RSA (csak aláírás)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
- msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
+ msgstr "   (%d) ElGamal (csak titkosítás)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
- msgstr "   (%d) RSA (csak titkos�t�s)\n"
+ msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (csak titkos�t�s)\n"
+ msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (csak titkos�t�s)\n"
+ msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
- msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
+ msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
- msgstr "   (%d) DSA (csak al��r�s)\n"
+ msgstr "   (%d) DSA (csak aláírás)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
- msgstr "   (%d) RSA (csak titkos�t�s)\n"
+ msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
- msgstr "   (%d) RSA (csak titkos�t�s)\n"
+ msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
- msgstr "   (%d) RSA (csak titkos�t�s)\n"
+ msgstr "   (%d) RSA (csak titkosítás)\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
- msgstr "Al��r�s-jel�l�s: "
+ msgstr "Aláírás-jelölés: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
- msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
+ msgstr "Nincs %d indexű felhasználóazonosító!\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
- msgstr "Felkerek�tve %u bitre.\n"
+ msgstr "Felkerekítve %u bitre.\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
- msgstr "Milyen kulcsm�retet szeretne? (1024) "
+ msgstr "Milyen kulcsméretet szeretne? (1024) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
- msgstr "Milyen kulcsm�retet szeretne? (1024) "
+ msgstr "Milyen kulcsméretet szeretne? (1024) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
- msgstr "A k�v�nt kulcsm�ret %u bit.\n"
+ msgstr "A kívánt kulcsméret %u bit.\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
- msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
+ msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5158,14 -4089,13 +5177,14 @@@
  "      <n>m = key expires in n months\n"
  "      <n>y = key expires in n years\n"
  msgstr ""
- "K�rem, adja meg, meddig legyen �rv�nyes a kulcs!\n"
- "         0 = a kulcs soha nem j�r le\n"
- "      <n>  = a kulcs n napig �rv�nyes\n"
- "      <n>w = a kulcs n h�tig �rv�nyes\n"
- "      <n>m = a kulcs n h�napig �rv�nyes\n"
- "      <n>y = a kulcs n �vig �rv�nyes\n"
+ "Kérem, adja meg, meddig legyen érvényes a kulcs!\n"
+ "         0 = a kulcs soha nem jár le\n"
+ "      <n>  = a kulcs n napig érvényes\n"
+ "      <n>w = a kulcs n hétig érvényes\n"
+ "      <n>m = a kulcs n hónapig érvényes\n"
+ "      <n>y = a kulcs n évig érvényes\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5174,60 -4104,50 +5193,60 @@@
  "      <n>m = signature expires in n months\n"
  "      <n>y = signature expires in n years\n"
  msgstr ""
- "K�rem, adja meg, meddig legyen �rv�nyes az al��r�s!\n"
- "         0 = az al��r�s soha nem j�r le\n"
- "      <n>  = az al��r�s n napig �rv�nyes\n"
- "      <n>w = az al��r�s n h�tig �rv�nyes\n"
- "      <n>m = az al��r�s n h�napig �rv�nyes\n"
- "      <n>y = az al��r�s n �vig �rv�nyes\n"
+ "Kérem, adja meg, meddig legyen érvényes az aláírás!\n"
+ "         0 = az aláírás soha nem jár le\n"
+ "      <n>  = az aláírás n napig érvényes\n"
+ "      <n>w = az aláírás n hétig érvényes\n"
+ "      <n>m = az aláírás n hónapig érvényes\n"
+ "      <n>y = az aláírás n évig érvényes\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
- msgstr "Meddig �rv�nyes a kulcs? (0) "
+ msgstr "Meddig érvényes a kulcs? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
- msgstr "Meddig �rv�nyes az al��r�s? (0) "
+ msgstr "Meddig érvényes az aláírás? (0) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
- msgstr "�rv�nytelen �rt�k!\n"
+ msgstr "Érvénytelen érték!\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  #, fuzzy
  msgid "Key does not expire at all\n"
- msgstr "%s soha nem j�r le.\n"
+ msgstr "%s soha nem jár le.\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  #, fuzzy
  msgid "Signature does not expire at all\n"
- msgstr "%s soha nem j�r le.\n"
+ msgstr "%s soha nem jár le.\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
- msgstr "%s lej�r: %s\n"
+ msgstr "%s lejár: %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
- msgstr "Az al��r�s lej�r: %s.\n"
+ msgstr "Az aláírás lejár: %s.\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
- "Az �n rendszere nem tud megjelen�teni 2038 ut�ni d�tumokat.\n"
- "Azonban kezelni helyesen tudja �ket eg�szen 2106-ig.\n"
+ "Az Ön rendszere nem tud megjeleníteni 2038 utáni dátumokat.\n"
+ "Azonban kezelni helyesen tudja őket egészen 2106-ig.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  #, fuzzy
  msgid "Is this correct? (y/N) "
- msgstr "Ez �gy helyes (i/n)? "
+ msgstr "Ez így helyes (i/n)? "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5238,7 -4158,6 +5257,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  #, fuzzy
  msgid ""
  "\n"
@@@ -5249,56 -4168,45 +5268,56 @@@
  "\n"
  msgstr ""
  "\n"
- "Sz�ks�ge lesz egy felhaszn�l�i azonos�t�ra a kulcsa azonos�t�s�hoz;\n"
- "a szoftver ezt a teljes n�vb�l, megjegyz�sb�l �s e-mail c�mb�l �ll�tja\n"
- "el� a k�vetkez� form�ban:\n"
- "    \"Heinrich Heine (a k�lt�) <heinrichh at duesseldorf.de>\"\n"
+ "Szüksége lesz egy felhasználói azonosítóra a kulcsa azonosításához;\n"
+ "a szoftver ezt a teljes névből, megjegyzésből és e-mail címből állítja\n"
+ "elő a következő formában:\n"
+ "    \"Heinrich Heine (a költő) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
- msgstr "Teljes n�v: "
+ msgstr "Teljes név: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
- msgstr "�rv�nytelen karakter a n�vben!\n"
+ msgstr "Érvénytelen karakter a névben!\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
- msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
+ msgstr "A név lehet, hogy nem kezdődhet számmal!\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
- msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
+ msgstr "A név legalább 5 karakter kell legyen!\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
- msgstr "E-mail c�m: "
+ msgstr "E-mail cím: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
- msgstr "Ez nem �rv�nyes e-mail c�m.\n"
+ msgstr "Ez nem érvényes e-mail cím.\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
- msgstr "Megjegyz�s: "
+ msgstr "Megjegyzés: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
- msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
+ msgstr "Érvénytelen karakter a megjegyzésben!\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
- msgstr "�n a(z) %s karakterk�dol�st haszn�lja.\n"
+ msgstr "Ön a(z) %s karakterkódolást használja.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5309,9 -4217,8 +5328,9 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
- msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
+ msgstr "Kérem, ne rakja az e-mail címet a teljes névbe vagy a megjegyzésbe!\n"
  
  #. TRANSLATORS: These are the allowed answers in
  #. lower and uppercase.  Below you will find the matching
@@@ -5324,55 -4231,45 +5343,55 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnMmEeRrKk"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
- msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
+ msgstr "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (K)ilépés? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
- "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
+ "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (R)endben/(K)ilépés? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
- msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
+ msgstr "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (K)ilépés? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr ""
- "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
+ "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (R)endben/(K)ilépés? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
- msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
+ msgstr "Kérem, előbb javítsa ki a hibát!\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
  "disks) during the prime generation; this gives the random number\n"
  "generator a better chance to gain enough entropy.\n"
  msgstr ""
- "Nagyon sok v�letlen b�jtra van sz�ks�g�nk. J� �tlet, ha csin�l valami\n"
- "egy�b m�veletet (g�pel a billenty�zeten, mozgatja az egeret, haszn�lja\n"
- "a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
- "gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
+ "Nagyon sok véletlen bájtra van szükségünk. Jó ötlet, ha csinál valami\n"
+ "egyéb műveletet (gépel a billentyűzeten, mozgatja az egeret, használja\n"
+ "a lemezeket) a prímszám generálása alatt. Ez segíti a véletlenszám-\n"
+ "generátort, hogy entrópiát tudjon gyűjteni.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
- msgstr "Kulcsgener�l�s sikertelen: %s\n"
+ msgstr "Kulcsgenerálás sikertelen: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5380,153 -4277,125 +5399,153 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
- msgstr "\"%s\" m�r t�m�r�tett.\n"
+ msgstr "\"%s\" már tömörített.\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
- msgstr "M�gis l�trehozzam? "
+ msgstr "Mégis létrehozzam? "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
- msgstr "M�gis l�trehozzam? "
+ msgstr "Mégis létrehozzam? "
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
- msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
+ msgstr "Kulcs létrehozása megszakítva.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
- msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
- msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
+ msgstr "MEGJEGYZÉS: %08lX titkos kulcs %s-kor lejárt.\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
- msgstr "�rom a kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a kulcsot a %s állományba.\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
- msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
+ msgstr "Nem írható nyilvánoskulcs-karikát találtam: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
- msgstr "Hiba a(z) \"%s\" nyilv�noskulcs-karika �r�sakor: %s.\n"
+ msgstr "Hiba a(z) \"%s\" nyilvánoskulcs-karika írásakor: %s.\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
- msgstr "A nyilv�nos �s titkos kulcsokat l�trehoztam �s al��rtam.\n"
+ msgstr "A nyilvános és titkos kulcsokat létrehoztam és aláírtam.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
  msgstr ""
- "Ez a kulcs nem haszn�lhat� titkos�t�sra. Ha egy m�sodlagos kulcsot\n"
- "k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
+ "Ez a kulcs nem használható titkosításra. Ha egy másodlagos kulcsot\n"
+ "kíván ilyen célra létrehozni, azt az \"--edit-key\" parancs segítségével\n"
  "teheti meg.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr ""
- "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
+ "A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr ""
- "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
+ "A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr ""
- "MEGJEGYZ�S: Alkulcsok l�trehoz�sa v3 kulcsokhoz nem OpenPGP-megfelel�.\n"
+ "MEGJEGYZÉS: Alkulcsok létrehozása v3 kulcsokhoz nem OpenPGP-megfelelő.\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
- msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
+ msgstr "Az elsődleges kulcs titkos részei nem elérhetők.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
- msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
+ msgstr "Az elsődleges kulcs titkos részei nem elérhetők.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  #, fuzzy
  msgid "Really create? (y/N) "
- msgstr "Val�ban l�trehozzam? "
+ msgstr "Valóban létrehozzam? "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "soha      "
  
 +#: g10/keylist.c:331
  msgid "Critical signature policy: "
- msgstr "Kritikus al��r�si elj�r�sm�d: "
+ msgstr "Kritikus aláírási eljárásmód: "
  
 +#: g10/keylist.c:333
  msgid "Signature policy: "
- msgstr "Al��r�si elj�r�sm�d: "
+ msgstr "Aláírási eljárásmód: "
  
 +#: g10/keylist.c:375
  msgid "Critical preferred keyserver: "
  msgstr ""
  
 +#: g10/keylist.c:428
  msgid "Critical signature notation: "
- msgstr "Kritikus al��r�s-jel�l�s: "
+ msgstr "Kritikus aláírás-jelölés: "
  
 +#: g10/keylist.c:430
  msgid "Signature notation: "
- msgstr "Al��r�s-jel�l�s: "
+ msgstr "Aláírás-jelölés: "
  
 +#: g10/keylist.c:472
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d good signature\n"
  msgid_plural "%d good signatures\n"
- msgstr[0] "%d rossz al��r�s.\n"
- msgstr[1] "%d rossz al��r�s.\n"
+ msgstr[0] "%d rossz aláírás.\n"
+ msgstr[1] "%d rossz aláírás.\n"
  
 +#: g10/keylist.c:485
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to an error\n"
  msgid "%d signature not checked due to an error\n"
  msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 al��r�st nem ellen�riztem hiba miatt.\n"
- msgstr[1] "1 al��r�st nem ellen�riztem hiba miatt.\n"
+ msgstr[0] "1 aláírást nem ellenőriztem hiba miatt.\n"
+ msgstr[1] "1 aláírást nem ellenőriztem hiba miatt.\n"
  
 +#: g10/keylist.c:567
  #, c-format
  msgid "Warning: %lu key skipped due to its large size\n"
  msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@@ -5537,46 -4405,37 +5556,46 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "Kulcskarika"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
- msgstr "Els�dlegeskulcs-ujjlenyomat:"
+ msgstr "Elsődlegeskulcs-ujjlenyomat:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "         Alkulcsujjlenyomat:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
- msgstr "Els�dlegeskulcs-ujjlenyomat:"
+ msgstr "Elsődlegeskulcs-ujjlenyomat:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "         Alkulcsujjlenyomat:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  #, fuzzy
  msgid "      Key fingerprint ="
  msgstr " Kulcs ujjlenyomata ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr ""
  
 +#: g10/keyring.c:1498
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
- msgstr "Ellen�rz�m a(z) \"%s\" kulcskarik�t.\n"
+ msgstr "Ellenőrzöm a(z) \"%s\" kulcskarikát.\n"
  
 +#: g10/keyring.c:1572
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
- msgstr[0] "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
- msgstr[1] "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
+ msgstr[0] "%lu kulcsot ellenőriztem (%lu aláírással).\n"
+ msgstr[1] "%lu kulcsot ellenőriztem (%lu aláírással).\n"
  
 +#: g10/keyring.c:1588
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
@@@ -5588,586 -4446,469 +5607,586 @@@ msgstr[1] "
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
- msgstr[0] "1 rossz al��r�s.\n"
- msgstr[1] "1 rossz al��r�s.\n"
+ msgstr[0] "1 rossz aláírás.\n"
+ msgstr[1] "1 rossz aláírás.\n"
  
 +#: g10/keyring.c:1665
  #, c-format
  msgid "%s: keyring created\n"
- msgstr "%s: Kulcskarik�t l�trehoztam.\n"
+ msgstr "%s: Kulcskarikát létrehoztam.\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  #, fuzzy
  msgid "honor the preferred keyserver URL set on the key"
- msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
+ msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  #, fuzzy
  msgid "disabled"
  msgstr "disable"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr ""
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, fuzzy, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
- msgstr "�rv�nytelen export opci�k!\n"
+ msgstr "Érvénytelen export opciók!\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr ""
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
- msgstr[0] "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
- msgstr[1] "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
+ msgstr[0] "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
+ msgstr[1] "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, fuzzy, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr ""
- "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
+ "FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, fuzzy, c-format
  msgid "key \"%s\" not found on keyserver\n"
- msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" kulcs nem található: %s\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  #, fuzzy
  msgid "key not found on keyserver\n"
- msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" kulcs nem található: %s\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr ""
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, fuzzy, c-format
  msgid "requesting key %s from %s server %s\n"
- msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
+ msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, fuzzy, c-format
  msgid "requesting key %s from %s\n"
- msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
+ msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  msgid "no keyserver known\n"
- msgstr "�rv�nytelen export opci�k!\n"
+ msgstr "Érvénytelen export opciók!\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, fuzzy, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "Kihagytam \"%s\"-t: %s.\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, fuzzy, c-format
  msgid "sending key %s to %s\n"
  msgstr ""
  "\"\n"
- "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
+ "Aláírva az Ön %08lX kulcsával %s időpontban.\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  msgid "requesting key from '%s'\n"
- msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
+ msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, fuzzy, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr ""
- "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
+ "FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n"
  
 +#: g10/mainproc.c:254
  #, c-format
  msgid "weird size for an encrypted session key (%d)\n"
- msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
+ msgstr "Furcsa méretű (%d) titkosított munkafolyamatkulcs.\n"
  
 +#: g10/mainproc.c:302
  #, c-format
  msgid "%s encrypted session key\n"
- msgstr "%s titkos�tott munkafolyamatkulcs\n"
+ msgstr "%s titkosított munkafolyamatkulcs\n"
  
 +#: g10/mainproc.c:312
  #, fuzzy, c-format
  msgid "passphrase generated with unknown digest algorithm %d\n"
- msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
+ msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
  
 +#: g10/mainproc.c:378
  #, fuzzy, c-format
  msgid "public key is %s\n"
- msgstr "Nyilv�nos kulcs: %08lX\n"
+ msgstr "Nyilvános kulcs: %08lX\n"
  
 +#: g10/mainproc.c:456
  msgid "public key encrypted data: good DEK\n"
- msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
+ msgstr "Nyilvános kulccsal titkosított adat: jó DEK.\n"
  
 +#: g10/mainproc.c:489
  #, fuzzy, c-format
  msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
- msgstr "Titkos�tva %u bites %s kulccsal, azonos�t�: %08lX, l�trehozva: %s\n"
+ msgstr "Titkosítva %u bites %s kulccsal, azonosító: %08lX, létrehozva: %s\n"
  
 +#: g10/mainproc.c:493 g10/pkclist.c:228
  #, fuzzy, c-format
  msgid "      \"%s\"\n"
  msgstr "               azaz \""
  
 +#: g10/mainproc.c:497
  #, fuzzy, c-format
  msgid "encrypted with %s key, ID %s\n"
- msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
+ msgstr "Titkosítva %s kulccsal, azonosító: %08lX\n"
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
- msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
+ msgstr "Nyilvános kulcsú visszafejtés sikertelen: %s\n"
  
 +#: g10/mainproc.c:530
  #, c-format
  msgid "encrypted with %lu passphrases\n"
- msgstr "%lu jelsz�val rejtjelezve\n"
+ msgstr "%lu jelszóval rejtjelezve\n"
  
 +#: g10/mainproc.c:532
  msgid "encrypted with 1 passphrase\n"
- msgstr "1 jelsz�val rejtjelezve\n"
+ msgstr "1 jelszóval rejtjelezve\n"
  
 +#: g10/mainproc.c:566 g10/mainproc.c:587
  #, c-format
  msgid "assuming %s encrypted data\n"
- msgstr "%s titkos�tott adatot felt�telezek.\n"
+ msgstr "%s titkosított adatot feltételezek.\n"
  
 +#: g10/mainproc.c:573
  #, c-format
  msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
  msgstr ""
- "IDEA rejtjelez� nem �ll rendelkez�sre, optimista m�don megpr�b�lok\n"
- "%s-t haszn�lni helyette.\n"
+ "IDEA rejtjelező nem áll rendelkezésre, optimista módon megpróbálok\n"
+ "%s-t használni helyette.\n"
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  msgid "WARNING: message was not integrity protected\n"
- msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
+ msgstr "FIGYELEM: Az üzenetet nem látták el integritásvédelemmel.\n"
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
- msgstr "Visszafejt�s rendben.\n"
+ msgstr "Visszafejtés rendben.\n"
  
 +#: g10/mainproc.c:637
  msgid "WARNING: encrypted message has been manipulated!\n"
- msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
+ msgstr "FIGYELEM: A titkosított üzenetet manipulálták!\n"
  
 +#: g10/mainproc.c:653
  #, c-format
  msgid "decryption failed: %s\n"
- msgstr "Visszafejt�s sikertelen: %s.\n"
+ msgstr "Visszafejtés sikertelen: %s.\n"
  
 +#: g10/mainproc.c:676
  #, fuzzy
  #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
  msgid "Note: sender requested \"for-your-eyes-only\"\n"
- msgstr "MEGJEGYZ�S: A felad� k�r�se: \"csak az �n szemeinek\".\n"
+ msgstr "MEGJEGYZÉS: A feladó kérése: \"csak az Ön szemeinek\".\n"
  
 +#: g10/mainproc.c:678
  #, c-format
  msgid "original file name='%.*s'\n"
- msgstr "Eredeti f�jln�v: '%.*s'.\n"
+ msgstr "Eredeti fájlnév: '%.*s'.\n"
  
 +#: g10/mainproc.c:748
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr ""
- "K�l�n�ll� visszavon�s. Haszn�lja a \"gpg --import\"-ot az alkalmaz�s�hoz!\n"
+ "Különálló visszavonás. Használja a \"gpg --import\"-ot az alkalmazásához!\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  #, fuzzy
  msgid "no signature found\n"
- msgstr "J� al��r�s a k�vetkez�t�l: \""
+ msgstr "Jó aláírás a következőtől: \""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
- msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
+ msgstr "ROSSZ aláírás a következőtől: \""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
- msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
+ msgstr "Lejárt aláírás a következőtől: \""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
- msgstr "J� al��r�s a k�vetkez�t�l: \""
+ msgstr "Jó aláírás a következőtől: \""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
- msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
+ msgstr "Aláírás-ellenőrzés elnyomva.\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
- msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
+ msgstr "Nem tudom kezelni ezeket a többszörös aláírásokat!\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, fuzzy, c-format
  msgid "Signature made %s\n"
- msgstr "Az al��r�s lej�rt: %s.\n"
+ msgstr "Az aláírás lejárt: %s.\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "               azaz \""
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
- msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
+ msgstr "Aláírva: %.*s; kulcs: %s, %08lX.\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "               azaz \""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
- msgstr "Kulcs tal�lhat�: "
+ msgstr "Kulcs található: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[bizonytalan]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "               azaz \""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
- msgstr "Az al��r�s lej�rt: %s.\n"
+ msgstr "Az aláírás lejárt: %s.\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
- msgstr "Az al��r�s lej�r: %s.\n"
+ msgstr "Az aláírás lejár: %s.\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
- msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+ msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
- msgstr "Bin�ris"
+ msgstr "Bináris"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
- msgstr "Sz�vegm�d�"
+ msgstr "Szövegmódú"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
- msgstr "Ismeretlen m�d�"
+ msgstr "Ismeretlen módú"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
- msgstr "ismeretlen nyilv�nos kulcs� algoritmus"
+ msgstr "ismeretlen nyilvános kulcsú algoritmus"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
- msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
+ msgstr "Nem tudom ellenőrizni az aláírást: %s.\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
- msgstr "Nem k�l�n�ll� al��r�s.\n"
+ msgstr "Nem különálló aláírás.\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
- msgstr "FIGYELEM: T�bbsz�r�s al��r�st �rz�keltem. Csak az els�t ellen�rz�m.\n"
+ msgstr "FIGYELEM: Többszörös aláírást érzékeltem. Csak az elsőt ellenőrzöm.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
- msgstr "0x%02x oszt�ly� k�l�n�ll� al��r�s.\n"
+ msgstr "0x%02x osztályú különálló aláírás.\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
- msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
+ msgstr "Régi stílusú (PGP 2.x) aláírás.\n"
  
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
  #, fuzzy, c-format
  msgid "fstat of '%s' failed in %s: %s\n"
- msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
+ msgstr "Nem tudom megnyitni az állományt: %s.\n"
  
 +#: g10/misc.c:170
  #, fuzzy, c-format
  msgid "fstat(%d) failed in %s: %s\n"
- msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
+ msgstr "Bizalmi adatbázis: olvasás sikertelen (n=%d): %s.\n"
  
 +#: g10/misc.c:279
  #, fuzzy, c-format
  msgid "WARNING: using experimental public key algorithm %s\n"
- msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
+ msgstr "Nem tudom kezelni a(z) %d. számú nyilvános kulcsú algoritmust!\n"
  
 +#: g10/misc.c:286
  #, fuzzy
  msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
  msgstr ""
- "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
- "a c�mzett preferenci�ival.\n"
+ "%s (%d) kivonatoló algoritmus használatának erőltetése ellentétes\n"
+ "a címzett preferenciáival.\n"
  
 +#: g10/misc.c:300
  #, fuzzy, c-format
  msgid "WARNING: using experimental cipher algorithm %s\n"
- msgstr "nem megval�s�tott rejtjelez� algoritmus"
+ msgstr "nem megvalósított rejtjelező algoritmus"
  
 +#: g10/misc.c:319
  #, fuzzy, c-format
  msgid "WARNING: using experimental digest algorithm %s\n"
- msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+ msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
  
 +#: g10/misc.c:328
  #, fuzzy, c-format
  msgid "WARNING: digest algorithm %s is deprecated\n"
  msgstr ""
- "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
- "a c�mzett preferenci�ival.\n"
+ "%s (%d) kivonatoló algoritmus használatának erőltetése ellentétes\n"
+ "a címzett preferenciáival.\n"
  
 +#: g10/misc.c:353
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "Note: signatures using the %s algorithm are rejected\n"
- msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+ msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
  
 +#: g10/misc.c:375
  #, fuzzy, c-format
  msgid "(reported error: %s)\n"
- msgstr "Olvas�si hiba: %s.\n"
+ msgstr "Olvasási hiba: %s.\n"
  
 +#: g10/misc.c:378
  #, fuzzy, c-format
  msgid "(reported error: %s <%s>)\n"
- msgstr "Olvas�si hiba: %s.\n"
+ msgstr "Olvasási hiba: %s.\n"
  
 +#: g10/misc.c:397
  msgid "(further info: "
  msgstr ""
  
 +#: g10/misc.c:1056
  #, c-format
  msgid "%s:%d: deprecated option \"%s\"\n"
- msgstr "%s:%d: Elavult opci�: \"%s\"\n"
+ msgstr "%s:%d: Elavult opció: \"%s\"\n"
  
 +#: g10/misc.c:1060
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated option\n"
- msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+ msgstr "FIGYELEM: \"%s\" elavult opció!\n"
  
 +#: g10/misc.c:1062
  #, c-format
  msgid "please use \"%s%s\" instead\n"
- msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
+ msgstr "Kérem, ezt használja helyette: \"%s%s\"\n"
  
 +#: g10/misc.c:1069
  #, fuzzy, c-format
  msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
- msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+ msgstr "FIGYELEM: \"%s\" elavult opció!\n"
  
 +#: g10/misc.c:1079
  #, fuzzy, c-format
  msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
- msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+ msgstr "FIGYELEM: \"%s\" elavult opció!\n"
  
 +#: g10/misc.c:1083
  #, fuzzy, c-format
  msgid ""
  "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
- msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+ msgstr "FIGYELEM: \"%s\" elavult opció!\n"
  
 +#: g10/misc.c:1147
  msgid "Uncompressed"
- msgstr "t�m�r�tetlen"
+ msgstr "tömörítetlen"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: g10/misc.c:1172
  #, fuzzy
  msgid "uncompressed|none"
- msgstr "t�m�r�tetlen"
+ msgstr "tömörítetlen"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
- msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
+ msgstr "Lehet, hogy ez az üzenet használhatatlan a %s számára!\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  msgid "ambiguous option '%s'\n"
- msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
+ msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  msgid "unknown option '%s'\n"
- msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
+ msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  msgid "unknown weak digest '%s'\n"
- msgstr "ismeretlen al��r�soszt�ly"
+ msgstr "ismeretlen aláírásosztály"
  
 +#: g10/openfile.c:84
  #, fuzzy, c-format
  #| msgid "File `%s' exists. "
  msgid "File '%s' exists. "
- msgstr "\"%s\" �llom�ny l�tezik. "
+ msgstr "\"%s\" állomány létezik. "
  
 +#: g10/openfile.c:88
  #, fuzzy
  msgid "Overwrite? (y/N) "
- msgstr "Fel�l�rjam (i/N)? "
+ msgstr "Felülírjam (i/N)? "
  
 +#: g10/openfile.c:123
  #, c-format
  msgid "%s: unknown suffix\n"
- msgstr "%s: ismeretlen v�gz�d�s.\n"
+ msgstr "%s: ismeretlen végződés.\n"
  
 +#: g10/openfile.c:147
  msgid "Enter new filename"
- msgstr "�rja be az �j �llom�nynevet"
+ msgstr "Írja be az új állománynevet"
  
 +#: g10/openfile.c:218
  msgid "writing to stdout\n"
- msgstr "�rok a szabv�nyos kimenetre.\n"
+ msgstr "Írok a szabványos kimenetre.\n"
  
 +#: g10/openfile.c:366
  #, fuzzy, c-format
  #| msgid "assuming signed data in `%s'\n"
  msgid "assuming signed data in '%s'\n"
- msgstr "Azt felt�telezem, hogy az al��rt adat a %s �llom�nyban van.\n"
+ msgstr "Azt feltételezem, hogy az aláírt adat a %s állományban van.\n"
  
 +#: g10/openfile.c:457
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new configuration file '%s' created\n"
- msgstr "\"%s\" �j konfigur�ci�s �llom�nyt l�trehoztam.\n"
+ msgstr "\"%s\" új konfigurációs állományt létrehoztam.\n"
  
 +#: g10/openfile.c:498
  #, fuzzy, c-format
  #| msgid "WARNING: options in `%s' are not yet active during this run\n"
  msgid "WARNING: options in '%s' are not yet active during this run\n"
  msgstr ""
- "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
+ "FIGYELEM: \"%s\" opciói csak a következő futáskor lesznek érvényesek!\n"
  
 +#: g10/parse-packet.c:257
  #, c-format
  msgid "can't handle public key algorithm %d\n"
- msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
+ msgstr "Nem tudom kezelni a(z) %d. számú nyilvános kulcsú algoritmust!\n"
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
  msgstr ""
- "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
+ "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztonságos!\n"
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
- msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
+ msgstr "A %d típusú alcsomag kritikus bitje beállított.\n"
  
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
- msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
+ msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n"
  
 +#: g10/passphrase.c:241
  msgid "Enter passphrase\n"
- msgstr "�rja be a jelsz�t!\n"
+ msgstr "Írja be a jelszót!\n"
  
 +#: g10/passphrase.c:252
  msgid "cancelled by user\n"
- msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
+ msgstr "A felhasználó megszakította a műveletet.\n"
  
 +#: g10/passphrase.c:489
  #, fuzzy, c-format
  msgid " (main key ID %s)"
  msgstr ""
  " \n"
- "  (f� kulcsazonos�t�: %08lX)"
+ "  (fő kulcsazonosító: %08lX)"
  
 +#: g10/passphrase.c:496
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
- msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+ msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
 +#: g10/passphrase.c:500
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
- msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+ msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
 +#: g10/passphrase.c:505
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
- msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+ msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
 +#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
- msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+ msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
  
 +#: g10/passphrase.c:513
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
- msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
+ msgstr "Valóban törli a kiválasztott kulcsokat? "
  
 +#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
- msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
+ msgstr "Valóban törli a kiválasztott kulcsokat? "
  
 +#: g10/passphrase.c:525
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6175,9 -4916,8 +6194,9 @@@
  "%u-bit %s key, ID %s,\n"
  "created %s%s.\n"
  "%s"
- msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
+ msgstr "%u bites %s kulcs, azonosító: %08lX, létrehozva: %s."
  
 +#: g10/photoid.c:77
  msgid ""
  "\n"
  "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@@ -6186,70 -4926,56 +6205,70 @@@
  "Keeping the image close to 240x288 is a good size to use.\n"
  msgstr ""
  "\n"
- "V�lasszon egy k�pet a fot�azonos�t�j�hoz! A k�p JPEG form�tum� legyen!\n"
- "Eml�keztetj�k, hogy a k�p a nyilv�nos kulcs�ban t�rol�dik. Ha nagyon nagy\n"
- "k�pet haszn�l, a kulcsa is nagyon nagy lesz!\n"
- "A 240x288 k�r�li k�pm�ret j�l haszn�lhat�.\n"
+ "Válasszon egy képet a fotóazonosítójához! A kép JPEG formátumú legyen!\n"
+ "Emlékeztetjük, hogy a kép a nyilvános kulcsában tárolódik. Ha nagyon nagy\n"
+ "képet használ, a kulcsa is nagyon nagy lesz!\n"
+ "A 240x288 körüli képméret jól használható.\n"
  
 +#: g10/photoid.c:99
  msgid "Enter JPEG filename for photo ID: "
- msgstr "Adja meg egy JPEG f�jl nev�t a fot�azonos�t�hoz: "
+ msgstr "Adja meg egy JPEG fájl nevét a fotóazonosítóhoz: "
  
 +#: g10/photoid.c:120
  #, fuzzy, c-format
  msgid "unable to open JPEG file '%s': %s\n"
- msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
+ msgstr "Nem tudom megnyitni az állományt: %s.\n"
  
 +#: g10/photoid.c:131
  #, c-format
  msgid "This JPEG is really large (%d bytes) !\n"
  msgstr ""
  
 +#: g10/photoid.c:133
  #, fuzzy
  msgid "Are you sure you want to use it? (y/N) "
- msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
+ msgstr "Biztos abban, hogy használni akarja (i/N)? "
  
 +#: g10/photoid.c:149
  #, fuzzy, c-format
  msgid "'%s' is not a JPEG file\n"
- msgstr "\"%s\" nem JPEG �llom�ny.\n"
+ msgstr "\"%s\" nem JPEG állomány.\n"
  
 +#: g10/photoid.c:168
  msgid "Is this photo correct (y/N/q)? "
- msgstr "Ez a fot� megfelel� (i/N/k)? "
+ msgstr "Ez a fotó megfelelő (i/N/k)? "
  
 +#: g10/photoid.c:380
  msgid "unable to display photo ID!\n"
- msgstr "Nem tudom megjelen�teni a fot�azonos�t�t!\n"
+ msgstr "Nem tudom megjeleníteni a fotóazonosítót!\n"
  
 +#: g10/pkclist.c:72 g10/revoke.c:757
  msgid "No reason specified"
  msgstr "Nincs megadva ok."
  
 +#: g10/pkclist.c:74 g10/revoke.c:759
  msgid "Key is superseded"
- msgstr "A kulcsot lecser�lt�k."
+ msgstr "A kulcsot lecserélték."
  
 +#: g10/pkclist.c:76 g10/revoke.c:758
  msgid "Key has been compromised"
- msgstr "A kulcs kompromitt�l�dott."
+ msgstr "A kulcs kompromittálódott."
  
 +#: g10/pkclist.c:78 g10/revoke.c:760
  msgid "Key is no longer used"
- msgstr "A kulcs m�r nem haszn�latos."
+ msgstr "A kulcs már nem használatos."
  
 +#: g10/pkclist.c:80 g10/revoke.c:761
  msgid "User ID is no longer valid"
- msgstr "A felhaszn�l�i azonos�t� m�r nem �rv�nyes."
+ msgstr "A felhasználói azonosító már nem érvényes."
  
 +#: g10/pkclist.c:84
  msgid "reason for revocation: "
- msgstr "Visszavon�s oka: "
+ msgstr "Visszavonás oka: "
  
 +#: g10/pkclist.c:100
  msgid "revocation comment: "
- msgstr "Megjegyz�s a visszavon�shoz: "
+ msgstr "Megjegyzés a visszavonáshoz: "
  
  #. TRANSLATORS: These are the allowed answers in lower and
  #. uppercase.  Below you will find the matching strings which
@@@ -6269,10 -4993,9 +6288,10 @@@ msgstr "iIfFkKhH
  #, fuzzy
  msgid "No trust value assigned to:\n"
  msgstr ""
- "Nincs megb�zhat�s�gi �rt�k rendelve:\n"
+ "Nincs megbízhatósági érték rendelve:\n"
  "%4u%c/%08lX %s \""
  
 +#: g10/pkclist.c:257
  #, fuzzy, c-format
  msgid "  aka \"%s\"\n"
  msgstr "               azaz \""
@@@ -6281,59 -5003,48 +6300,59 @@@
  #, fuzzy
  msgid ""
  "How much do you trust that this key actually belongs to the named user?\n"
- msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
+ msgstr "Ez a kulcs valószínűleg a jelzett tulajdonoshoz tartozik.\n"
  
 +#: g10/pkclist.c:282
  #, fuzzy, c-format
  msgid "  %d = I don't know or won't say\n"
  msgstr " %d = Nem tudom\n"
  
 +#: g10/pkclist.c:284
  #, fuzzy, c-format
  msgid "  %d = I do NOT trust\n"
- msgstr " %d = NEM b�zom benne\n"
+ msgstr " %d = NEM bízom benne\n"
  
 +#: g10/pkclist.c:290
  #, fuzzy, c-format
  msgid "  %d = I trust ultimately\n"
- msgstr " %d = alapvet�en megb�zom benne\n"
+ msgstr " %d = alapvetően megbízom benne\n"
  
 +#: g10/pkclist.c:296
  #, fuzzy
  msgid "  m = back to the main menu\n"
- msgstr " f = visszat�r�s a f�men�be\n"
+ msgstr " f = visszatérés a főmenübe\n"
  
 +#: g10/pkclist.c:299
  #, fuzzy
  msgid "  s = skip this key\n"
- msgstr " h = kulcs kihagy�sa\n"
+ msgstr " h = kulcs kihagyása\n"
  
 +#: g10/pkclist.c:300
  #, fuzzy
  msgid "  q = quit\n"
- msgstr " k = kil�p�s\n"
+ msgstr " k = kilépés\n"
  
 +#: g10/pkclist.c:304
  #, c-format
  msgid ""
  "The minimum trust level for this key is: %s\n"
  "\n"
  msgstr ""
  
 +#: g10/pkclist.c:310 g10/revoke.c:786
  msgid "Your decision? "
- msgstr "Mit v�laszt? "
+ msgstr "Mit választ? "
  
 +#: g10/pkclist.c:331
  #, fuzzy
  msgid "Do you really want to set this key to ultimate trust? (y/N) "
- msgstr "T�nyleg be akarja �ll�tani ezt a kulcsot alapvet�en megb�zhat�ra? "
+ msgstr "Tényleg be akarja állítani ezt a kulcsot alapvetően megbízhatóra? "
  
 +#: g10/pkclist.c:345
  msgid "Certificates leading to an ultimately trusted key:\n"
- msgstr "Alapvet�en megb�zhat� kulcshoz vezet� igazol�sok:\n"
+ msgstr "Alapvetően megbízható kulcshoz vezető igazolások:\n"
  
 +#: g10/pkclist.c:434
  #, fuzzy, c-format
  msgid "%s: There is no assurance this key belongs to the named user\n"
  msgstr ""
@@@ -6345,315 -5055,264 +6364,332 @@@ msgid "%s: There is limited assurance t
  msgstr ""
  "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
  
 +#: g10/pkclist.c:445
  #, fuzzy
  msgid "This key probably belongs to the named user\n"
- msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
+ msgstr "Ez a kulcs valószínűleg a jelzett tulajdonoshoz tartozik.\n"
  
 +#: g10/pkclist.c:450
  msgid "This key belongs to us\n"
- msgstr "Ez a kulcs hozz�nk tartozik.\n"
+ msgstr "Ez a kulcs hozzánk tartozik.\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "NEM biztos, hogy a kulcs a felhasználói azonosítóban szereplő\n"
+ "személyhez tartozik. Ha Ön *valóban* tudja, hogy mit csinál,\n"
+ "a következő kérdésre válaszolhat igennel.\n"
+ "\n"
+ 
++#: g10/pkclist.c:489
  #, fuzzy
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
  "you may answer the next question with yes.\n"
  msgstr ""
- "NEM biztos, hogy a kulcs a felhaszn�l�i azonos�t�ban szerepl�\n"
- "szem�lyhez tartozik. Ha �n *val�ban* tudja, hogy mit csin�l,\n"
- "a k�vetkez� k�rd�sre v�laszolhat igennel.\n"
+ "NEM biztos, hogy a kulcs a felhasználói azonosítóban szereplő\n"
+ "személyhez tartozik. Ha Ön *valóban* tudja, hogy mit csinál,\n"
+ "a következő kérdésre válaszolhat igennel.\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  #, fuzzy
  msgid "Use this key anyway? (y/N) "
- msgstr "M�gis haszn�ljuk ezt a kulcsot? "
+ msgstr "Mégis használjuk ezt a kulcsot? "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
- msgstr "FIGYELEM: Nem b�zunk a kulcsban, amit haszn�lunk!\n"
+ msgstr "FIGYELEM: Nem bízunk a kulcsban, amit használunk!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
- msgstr "FIGYELEM: a kulcsot visszavonhatt�k (visszavon� kulcs nincs jelen).\n"
+ msgstr "FIGYELEM: a kulcsot visszavonhatták (visszavonó kulcs nincs jelen).\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
- msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
+ msgstr "FIGYELEM: Ezt a kulcsot a kijelölt visszavonó visszavonta!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  #, fuzzy
  msgid "         This could mean that the signature is forged.\n"
- msgstr "         Ez jelentheti azt, hogy az al��r�s hamis.\n"
+ msgstr "         Ez jelentheti azt, hogy az aláírás hamis.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
- msgstr "Megjegyz�s: Ez a kulcs le lett tiltva.\n"
+ msgstr "Megjegyzés: Ez a kulcs le lett tiltva.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
- msgstr "Megjegyz�s: Ez a kulcs lej�rt!\n"
+ msgstr "Megjegyzés: Ez a kulcs lejárt!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
- msgstr "FIGYELEM: Ez a kulcs nincs hiteles�tve megb�zhat� al��r�ssal!\n"
+ msgstr "FIGYELEM: Ez a kulcs nincs hitelesítve megbízható aláírással!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
  "          Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
- msgstr "FIGYELEM: NEM b�zunk ebben a kulcsban!\n"
+ msgstr "FIGYELEM: NEM bízunk ebben a kulcsban!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
- msgstr "         Az al��r�s val�sz�n�leg HAMIS.\n"
+ msgstr "         Az aláírás valószínűleg HAMIS.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
- "FIGYELEM: Ez a kulcs nincs igazolva kell�k�ppen megb�zhat� al��r�ssal!\n"
+ "FIGYELEM: Ez a kulcs nincs igazolva kellőképpen megbízható aláírással!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
- msgstr "         Nem biztos, hogy az al��r�s a tulajdonoshoz tartozik.\n"
+ msgstr "         Nem biztos, hogy az aláírás a tulajdonoshoz tartozik.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: kihagyva: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
- msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
+ msgstr "%s: Kihagyva: Nyilvános kulcs nincs engedélyezve.\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
- msgstr "%s: kihagyva: nyilv�nos kulcs m�r szerepel\n"
+ msgstr "%s: kihagyva: nyilvános kulcs már szerepel\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
- msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
+ msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr ""
- "Nem adott meg felhaszn�l�i azonos�t�t! (Haszn�lhatja a \"-r\" opci�t.)\n"
+ "Nem adott meg felhasználói azonosítót! (Használhatja a \"-r\" opciót.)\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr ""
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
  msgstr ""
  "\n"
- "Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
+ "Adja meg a felhasználói azonosítót! Üres sorral fejezze be: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
- msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
+ msgstr "Nincs ilyen felhasználói azonosító.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr ""
- "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva alap�rtelmezett c�mzettnek.\n"
+ "Kihagyva: Nyilvános kulcs már be lett állítva alapértelmezett címzettnek.\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
- msgstr "Nyilv�nos kulcs nincs enged�lyezve.\n"
+ msgstr "Nyilvános kulcs nincs engedélyezve.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
- msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
+ msgstr "Kihagyva: Nyilvános kulcs már be lett állítva.\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
- msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
+ msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
- msgstr "Nincsenek �rv�nyes c�mzettek!\n"
+ msgstr "Nincsenek érvényes címzettek!\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
- msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
+ msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
- msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
+ msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
  
 +#: g10/plaintext.c:84
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr ""
- "Az adatot nem mentettem el. Haszn�lja az \"--output\" opci�t a ment�shez!\n"
+ "Az adatot nem mentettem el. Használja az \"--output\" opciót a mentéshez!\n"
  
 +#: g10/plaintext.c:598
  msgid "Detached signature.\n"
- msgstr "K�l�n�ll� al��r�s.\n"
+ msgstr "Különálló aláírás.\n"
  
 +#: g10/plaintext.c:606
  msgid "Please enter name of data file: "
- msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
+ msgstr "Kérem, adja meg az adatállomány nevét: "
  
 +#: g10/plaintext.c:643
  msgid "reading stdin ...\n"
- msgstr "Olvasom a szabv�nyos bemenetet...\n"
+ msgstr "Olvasom a szabványos bemenetet...\n"
  
 +#: g10/plaintext.c:688
  msgid "no signed data\n"
- msgstr "Nincs al��rt adat.\n"
+ msgstr "Nincs aláírt adat.\n"
  
 +#: g10/plaintext.c:706
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
- msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
+ msgstr "Nem tudom megnyitni a(z) \"%s\" aláírt adatot!\n"
  
 +#: g10/plaintext.c:741
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
- msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
+ msgstr "Nem tudom megnyitni a(z) \"%s\" aláírt adatot!\n"
  
 +#: g10/pubkey-enc.c:116
  #, fuzzy, c-format
  msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr "Anonim c�mzett. A %08lX titkos kulcsot pr�b�lom...\n"
+ msgstr "Anonim címzett. A %08lX titkos kulcsot próbálom...\n"
  
 +#: g10/pubkey-enc.c:123
  msgid "okay, we are the anonymous recipient.\n"
- msgstr "Rendben, mi vagyunk az anonim c�mzett.\n"
+ msgstr "Rendben, mi vagyunk az anonim címzett.\n"
  
 +#: g10/pubkey-enc.c:282
  msgid "old encoding of the DEK is not supported\n"
- msgstr "A DEK r�gi k�dol�sa nem t�mogatott.\n"
+ msgstr "A DEK régi kódolása nem támogatott.\n"
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
- msgstr "A %d%s rejtjelez� algoritmus ismeretlen vagy tiltott.\n"
+ msgstr "A %d%s rejtjelező algoritmus ismeretlen vagy tiltott.\n"
  
 +#: g10/pubkey-enc.c:352
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
- msgstr "MEGJEGYZ�S: %d rejtjelez� algoritmus nincs a preferenci�k k�z�tt.\n"
+ msgstr "MEGJEGYZÉS: %d rejtjelező algoritmus nincs a preferenciák között.\n"
  
 +#: g10/pubkey-enc.c:377
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
- msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
+ msgstr "MEGJEGYZÉS: %08lX titkos kulcs %s-kor lejárt.\n"
  
 +#: g10/pubkey-enc.c:384
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
- msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
+ msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, c-format
  msgid "build_packet failed: %s\n"
  msgstr "build_packet sikertelen: %s.\n"
  
 +#: g10/revoke.c:144
  #, fuzzy, c-format
  msgid "key %s has no user IDs\n"
- msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
+ msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
  
 +#: g10/revoke.c:312
  msgid "To be revoked by:\n"
  msgstr "Visszavonja:\n"
  
 +#: g10/revoke.c:316
  msgid "(This is a sensitive revocation key)\n"
- msgstr "(Ez egy �rz�keny visszavon� kulcs.)\n"
+ msgstr "(Ez egy érzékeny visszavonó kulcs.)\n"
  
 +#: g10/revoke.c:322
  #, fuzzy
  #| msgid "Secret key is available.\n"
  msgid "Secret key is not available.\n"
- msgstr "Titkos kulcs rendelkez�sre �ll.\n"
+ msgstr "Titkos kulcs rendelkezésre áll.\n"
  
 +#: g10/revoke.c:327
  #, fuzzy
  msgid "Create a designated revocation certificate for this key? (y/N) "
- msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
+ msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
  
 +#: g10/revoke.c:336 g10/revoke.c:727
  msgid "ASCII armored output forced.\n"
- msgstr "ASCII-p�nc�lozott kimenet kiv�lasztva.\n"
+ msgstr "ASCII-páncélozott kimenet kiválasztva.\n"
  
 +#: g10/revoke.c:352 g10/revoke.c:479
  #, c-format
  msgid "make_keysig_packet failed: %s\n"
  msgstr "make_keysig_packet sikertelen: %s\n"
  
 +#: g10/revoke.c:415
  msgid "Revocation certificate created.\n"
- msgstr "Visszavon� igazol�s l�trehozva.\n"
+ msgstr "Visszavonó igazolás létrehozva.\n"
  
 +#: g10/revoke.c:421
  #, fuzzy, c-format
  msgid "no revocation keys found for \"%s\"\n"
- msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
+ msgstr "Nem találtam visszavonó kulcsot a következőhöz: \"%s\".\n"
  
 +#: g10/revoke.c:551
  #, fuzzy
  msgid "This is a revocation certificate for the OpenPGP key:"
- msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
+ msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
  
 +#: g10/revoke.c:567
  msgid ""
  "A revocation certificate is a kind of \"kill switch\" to publicly\n"
  "declare that a key shall not anymore be used.  It is not possible\n"
@@@ -6680,12 -5336,11 +6716,12 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
- msgstr "Visszavon� igazol�s l�trehozva.\n"
+ msgstr "Visszavonó igazolás létrehozva.\n"
  
 +#: g10/revoke.c:634
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
- msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" titkos kulcs nem található: %s\n"
  
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
@@@ -6699,14 -5352,12 +6735,14 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
 +#: g10/revoke.c:711
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
- msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
+ msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
  
 +#: g10/revoke.c:735
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6716,57 -5367,47 +6752,57 @@@
  "your media become unreadable.  But have some caution:  The print system of\n"
  "your machine might store the data and make it available to others!\n"
  msgstr ""
- "A visszavon� igazol�st l�trehoztam.\n"
+ "A visszavonó igazolást létrehoztam.\n"
  "\n"
- "K�rem, tegye olyan helyre, ahol m�s nem f�r hozz�! Ha valaki megszerzi\n"
- "ezt az igazol�st, haszn�lhatatlann� teheti vele az �n kulcs�t. Okos dolog\n"
- "kinyomtatni �s meg�rizni ezt az igazol�st, arra az esetre, ha az\n"
- "adathordoz� olvashatatlann� v�lik. De vigy�zat: az �n g�p�nek nyomtat�si\n"
- "rendszere is t�rolhatja az adatot, �s m�sok esetleg hozz�f�rhetnek ehhez!\n"
+ "Kérem, tegye olyan helyre, ahol más nem fér hozzá! Ha valaki megszerzi\n"
+ "ezt az igazolást, használhatatlanná teheti vele az Ön kulcsát. Okos dolog\n"
+ "kinyomtatni és megőrizni ezt az igazolást, arra az esetre, ha az\n"
+ "adathordozó olvashatatlanná válik. De vigyázat: az Ön gépének nyomtatási\n"
+ "rendszere is tárolhatja az adatot, és mások esetleg hozzáférhetnek ehhez!\n"
  
 +#: g10/revoke.c:769
  msgid "Please select the reason for the revocation:\n"
- msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
+ msgstr "Kérem, válassza ki a visszavonás okát:\n"
  
 +#: g10/revoke.c:779
  msgid "Cancel"
- msgstr "M�gsem"
+ msgstr "Mégsem"
  
 +#: g10/revoke.c:781
  #, c-format
  msgid "(Probably you want to select %d here)\n"
- msgstr "(Val�sz�n�leg a(z) %d. lehet�s�get akarja v�lasztani.)\n"
+ msgstr "(Valószínűleg a(z) %d. lehetőséget akarja választani.)\n"
  
 +#: g10/revoke.c:822
  msgid "Enter an optional description; end it with an empty line:\n"
- msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
+ msgstr "Adjon meg egy nem kötelező leírást! Üres sorral fejezze be:\n"
  
 +#: g10/revoke.c:850
  #, c-format
  msgid "Reason for revocation: %s\n"
- msgstr "Visszavon�s oka: %s\n"
+ msgstr "Visszavonás oka: %s\n"
  
 +#: g10/revoke.c:852
  msgid "(No description given)\n"
- msgstr "(Nincs le�r�s.)\n"
+ msgstr "(Nincs leírás.)\n"
  
 +#: g10/revoke.c:857
  #, fuzzy
  msgid "Is this okay? (y/N) "
- msgstr "Ez �gy rendben van? "
+ msgstr "Ez így rendben van? "
  
 +#: g10/seskey.c:62 sm/encrypt.c:123
  msgid "weak key created - retrying\n"
- msgstr "Gyenge kulcs j�tt l�tre. �jrapr�b�lom.\n"
+ msgstr "Gyenge kulcs jött létre. Újrapróbálom.\n"
  
 +#: g10/seskey.c:66
  #, c-format
  msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
  msgstr ""
- "Nem tudom elker�lni a gyenge kulcsot a szimmetrikus titkos�t�hoz.\n"
- "%d alkalommal pr�b�ltam!\n"
+ "Nem tudom elkerülni a gyenge kulcsot a szimmetrikus titkosítóhoz.\n"
+ "%d alkalommal próbáltam!\n"
  
 +#: g10/seskey.c:306
  #, c-format
  msgid "%s key %s uses an unsafe (%zu bit) hash\n"
  msgstr ""
@@@ -6776,610 -5416,529 +6812,646 @@@
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
- msgstr "FIGYELEM: Al��r�skivonat-konfliktus az �zenetben.\n"
+ msgstr "FIGYELEM: Aláíráskivonat-konfliktus az üzenetben.\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
- msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
+ msgstr "FIGYELEM: %08lX aláíró alkulcs nem kereszthitelesített.\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, fuzzy, c-format
  msgid "please see %s for more information\n"
- msgstr " i = tov�bbi inform�ci�kat k�rek\n"
+ msgstr " i = további információkat kérek\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
- msgstr "FIGYELEM: %08lX al��r� alkulcson �rv�nytelen kereszthiteles�t�s van.\n"
+ msgstr "FIGYELEM: %08lX aláíró alkulcson érvénytelen kereszthitelesítés van.\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
- msgstr[0] "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
- msgstr[1] "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
+ msgstr[0] "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n"
+ msgstr[1] "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
- msgstr[0] "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
- msgstr[1] "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
+ msgstr[0] "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n"
+ msgstr[1] "A(z) %08lX nyilvános kulcs %lu másodperccel újabb az aláírásnál!\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu seconds in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
+ "A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
  msgstr[1] ""
- "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
+ "A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu days in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
+ "A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
  msgstr[1] ""
- "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
+ "A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  msgid "Note: signature key %s expired %s\n"
- msgstr "MEGJEGYZ�S: Al��r� kulcs (%08lX) lej�rt: %s\n"
+ msgstr "MEGJEGYZÉS: Aláíró kulcs (%08lX) lejárt: %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
- msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
+ msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, fuzzy, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
- "Rossz al��r�st felt�telezek a %08lX kulcst�l egy ismeretlen\n"
+ "Rossz aláírást feltételezek a %08lX kulcstól egy ismeretlen\n"
  "kritikus bit miatt.\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
- msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavon� csomaghoz.\n"
+ msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavonó csomaghoz.\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
- msgstr "%08lX kulcs: Nincs alkulcs az alkulcsk�t� al��r�shoz!\n"
+ msgstr "%08lX kulcs: Nincs alkulcs az alkulcskötő aláíráshoz!\n"
  
 +#: g10/sign.c:88
  #, c-format
  msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
  msgstr ""
- "FIGYELEM: Nem tudom kifejteni a %% jeleket a jel�l�sben (t�l hossz�).\n"
- "Kifejt�s n�lk�l haszn�lom.\n"
+ "FIGYELEM: Nem tudom kifejteni a %% jeleket a jelölésben (túl hosszú).\n"
+ "Kifejtés nélkül használom.\n"
  
 +#: g10/sign.c:114
  #, fuzzy, c-format
  msgid ""
  "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
  msgstr ""
- "FIGYELEM: Nem tudom kifejteni a %% jeleket az elj�r�sm�d URL-ben (t�l "
- "hossz�).\n"
- "Kifejt�s n�lk�l haszn�lom.\n"
+ "FIGYELEM: Nem tudom kifejteni a %% jeleket az eljárásmód URL-ben (túl "
+ "hosszú).\n"
+ "Kifejtés nélkül használom.\n"
  
 +#: g10/sign.c:137
  #, fuzzy, c-format
  msgid ""
  "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
  "unexpanded.\n"
  msgstr ""
- "FIGYELEM: Nem tudom kifejteni a %% jeleket az elj�r�sm�d URL-ben (t�l "
- "hossz�).\n"
- "Kifejt�s n�lk�l haszn�lom.\n"
+ "FIGYELEM: Nem tudom kifejteni a %% jeleket az eljárásmód URL-ben (túl "
+ "hosszú).\n"
+ "Kifejtés nélkül használom.\n"
  
 +#: g10/sign.c:329
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
- msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
+ msgstr "%s aláírás a következőtől: \"%s\"\n"
  
 +#: g10/sign.c:878
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
- "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
- "a c�mzett preferenci�ival.\n"
+ "%s (%d) kivonatoló algoritmus használatának erőltetése ellentétes\n"
+ "a címzett preferenciáival.\n"
  
 +#: g10/sign.c:1009
  msgid "signing:"
- msgstr "Al��rom:"
+ msgstr "Aláírom:"
  
 +#: g10/sign.c:1286
  #, c-format
  msgid "%s encryption will be used\n"
- msgstr "%s titkos�t�st fogok haszn�lni.\n"
+ msgstr "%s titkosítást fogok használni.\n"
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
  msgstr ""
- "A kulcs nincs \"nem biztons�gosnak\" jel�lve,\n"
- "nem tudom a p�tl� v�letlensz�m-gener�torral haszn�lni!\n"
+ "A kulcs nincs \"nem biztonságosnak\" jelölve,\n"
+ "nem tudom a pótló véletlenszám-generátorral használni!\n"
  
 +#: g10/skclist.c:187
  #, fuzzy, c-format
  msgid "skipped \"%s\": duplicated\n"
- msgstr "\"%s\"-t kihagytam: m�sodp�ld�ny.\n"
+ msgstr "\"%s\"-t kihagytam: másodpéldány.\n"
  
 +#: g10/skclist.c:206
  msgid "skipped: secret key already present\n"
- msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
+ msgstr "Kihagytam: titkos kulcs már jelen van.\n"
  
 +#: g10/skclist.c:225
  #, fuzzy
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr ""
- "Kihagytam \"%s\"-t: ez egy PGP �ltal l�trehozott ElGamal kulcs, amely nem\n"
- "biztons�gos al��r�sokhoz!\n"
+ "Kihagytam \"%s\"-t: ez egy PGP által létrehozott ElGamal kulcs, amely nem\n"
+ "biztonságos aláírásokhoz!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
- msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
+ msgstr "%lu bizalmi rekord, %d típus: írás sikertelen: %s.\n"
  
 +#: g10/tdbdump.c:105
  #, c-format
  msgid ""
  "# List of assigned trustvalues, created %s\n"
  "# (Use \"gpg --import-ownertrust\" to restore them)\n"
  msgstr ""
- "# Meghat�rozott bizalmi �rt�kek list�ja, %s.\n"
- "# (Haszn�lja a \"gpg --import-ownertrust\" parancsot a vissza�ll�t�shoz!)\n"
+ "# Meghatározott bizalmi értékek listája, %s.\n"
+ "# (Használja a \"gpg --import-ownertrust\" parancsot a visszaállításhoz!)\n"
  
 +#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
  #, fuzzy, c-format
  msgid "error in '%s': %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: g10/tdbdump.c:162
  #, fuzzy
  msgid "line too long"
- msgstr "A sor t�l hossz�!\n"
+ msgstr "A sor túl hosszú!\n"
  
 +#: g10/tdbdump.c:170
  msgid "colon missing"
  msgstr ""
  
 +#: g10/tdbdump.c:176
  #, fuzzy
  msgid "invalid fingerprint"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
 +#: g10/tdbdump.c:181
  #, fuzzy
  msgid "ownertrust value missing"
- msgstr "bizalmi �rt�kek importja"
+ msgstr "bizalmi értékek importja"
  
 +#: g10/tdbdump.c:217
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
- msgstr "Hiba bizalmi rekord keres�sekor: %s.\n"
+ msgstr "Hiba bizalmi rekord keresésekor: %s.\n"
  
 +#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
- msgstr "Olvas�si hiba: %s.\n"
+ msgstr "Olvasási hiba: %s.\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
- msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
+ msgstr "Bizalmi adatbázis: szinkronizáció sikertelen: %s.\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  msgid "can't create lock for '%s'\n"
- msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
  
 +#: g10/tdbio.c:146
  #, fuzzy, c-format
  msgid "can't lock '%s'\n"
  msgstr "Nem tudom megnyitni %s-t!\n"
  
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
  #, c-format
  msgid "trustdb rec %lu: lseek failed: %s\n"
- msgstr "Bizalmi adatb�zis %lu. rekord: lseek sikertelen: %s.\n"
+ msgstr "Bizalmi adatbázis %lu. rekord: lseek sikertelen: %s.\n"
  
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
  #, c-format
  msgid "trustdb rec %lu: write failed (n=%d): %s\n"
- msgstr "Bizalmi adatb�zis %lu. rekord: �r�s sikertelen (n=%d): %s.\n"
+ msgstr "Bizalmi adatbázis %lu. rekord: írás sikertelen (n=%d): %s.\n"
  
 +#: g10/tdbio.c:352
  msgid "trustdb transaction too large\n"
- msgstr "Bizalmi adatb�zis tranzakci�ja t�l nagy.\n"
+ msgstr "Bizalmi adatbázis tranzakciója túl nagy.\n"
  
 +#: g10/tdbio.c:682
  #, c-format
  msgid "%s: directory does not exist!\n"
- msgstr "%s: K�nyvt�r nem l�tezik!\n"
+ msgstr "%s: Könyvtár nem létezik!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
- msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
  
 +#: g10/tdbio.c:724
  #, c-format
  msgid "%s: failed to create version record: %s"
- msgstr "%s: Nem siker�lt verzi�rekordot l�trehoznom: %s"
+ msgstr "%s: Nem sikerült verziórekordot létrehoznom: %s"
  
 +#: g10/tdbio.c:729
  #, c-format
  msgid "%s: invalid trustdb created\n"
- msgstr "%s: �rv�nytelen bizalmi adatb�zis j�tt l�tre.\n"
+ msgstr "%s: Érvénytelen bizalmi adatbázis jött létre.\n"
  
 +#: g10/tdbio.c:732
  #, c-format
  msgid "%s: trustdb created\n"
- msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
+ msgstr "%s: Bizalmi adatbázis létrejött.\n"
  
 +#: g10/tdbio.c:788
  #, fuzzy
  #| msgid "NOTE: trustdb not writable\n"
  msgid "Note: trustdb not writable\n"
- msgstr "MEGJEGYZ�S: Bizalmi adatb�zis nem �rhat�.\n"
+ msgstr "MEGJEGYZÉS: Bizalmi adatbázis nem írható.\n"
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
- msgstr "%s: �rv�nytelen bizalmi adatb�zis.\n"
+ msgstr "%s: Érvénytelen bizalmi adatbázis.\n"
  
 +#: g10/tdbio.c:834
  #, c-format
  msgid "%s: failed to create hashtable: %s\n"
- msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
+ msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
  
 +#: g10/tdbio.c:842
  #, c-format
  msgid "%s: error updating version record: %s\n"
- msgstr "%s: Hiba a verzi�rekord friss�t�sekor: %s.\n"
+ msgstr "%s: Hiba a verziórekord frissítésekor: %s.\n"
  
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
  #, c-format
  msgid "%s: error reading version record: %s\n"
- msgstr "%s: Hiba a verzi�rekord olvas�sakor: %s.\n"
+ msgstr "%s: Hiba a verziórekord olvasásakor: %s.\n"
  
 +#: g10/tdbio.c:938
  #, c-format
  msgid "%s: error writing version record: %s\n"
- msgstr "%s: Hiba a verzi�rekord �r�sakor: %s.\n"
+ msgstr "%s: Hiba a verziórekord írásakor: %s.\n"
  
 +#: g10/tdbio.c:1461
  #, c-format
  msgid "trustdb: lseek failed: %s\n"
- msgstr "Bizalmi adatb�zis: lseek sikertelen: %s.\n"
+ msgstr "Bizalmi adatbázis: lseek sikertelen: %s.\n"
  
 +#: g10/tdbio.c:1472
  #, c-format
  msgid "trustdb: read failed (n=%d): %s\n"
- msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
+ msgstr "Bizalmi adatbázis: olvasás sikertelen (n=%d): %s.\n"
  
 +#: g10/tdbio.c:1497
  #, c-format
  msgid "%s: not a trustdb file\n"
- msgstr "%s: Nem bizalmi adatb�zis.\n"
+ msgstr "%s: Nem bizalmi adatbázis.\n"
  
 +#: g10/tdbio.c:1522
  #, c-format
  msgid "%s: version record with recnum %lu\n"
- msgstr "%s: Verzi�rekord, rekordsz�m: %lu.\n"
+ msgstr "%s: Verziórekord, rekordszám: %lu.\n"
  
 +#: g10/tdbio.c:1528
  #, c-format
  msgid "%s: invalid file version %d\n"
- msgstr "%s: �rv�nytelen �llom�nyverzi� (%d).\n"
+ msgstr "%s: Érvénytelen állományverzió (%d).\n"
  
 +#: g10/tdbio.c:1748
  #, c-format
  msgid "%s: error reading free record: %s\n"
- msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
+ msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
  
 +#: g10/tdbio.c:1757
  #, c-format
  msgid "%s: error writing dir record: %s\n"
- msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
+ msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n"
  
 +#: g10/tdbio.c:1768
  #, c-format
  msgid "%s: failed to zero a record: %s\n"
- msgstr "%s: Nem siker�lt egy rekord null�z�sa: %s.\n"
+ msgstr "%s: Nem sikerült egy rekord nullázása: %s.\n"
  
 +#: g10/tdbio.c:1804
  #, c-format
  msgid "%s: failed to append a record: %s\n"
- msgstr "%s: Nem siker�lt egy rekord hozz�ad�sa: %s.\n"
+ msgstr "%s: Nem sikerült egy rekord hozzáadása: %s.\n"
  
 +#: g10/tdbio.c:1865
  #, fuzzy
  msgid "Error: The trustdb is corrupted.\n"
- msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
+ msgstr "%s: Bizalmi adatbázis létrejött.\n"
  
 +#: g10/textfilter.c:146
  #, c-format
  msgid "can't handle text lines longer than %d characters\n"
- msgstr "Nem tudok %d karaktern�l hosszabb sz�vegsorokat kezelni!\n"
+ msgstr "Nem tudok %d karakternél hosszabb szövegsorokat kezelni!\n"
  
 +#: g10/textfilter.c:241
  #, c-format
  msgid "input line longer than %d characters\n"
  msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
- msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
- "T�mogatott algoritmusok:\n"
+ "Támogatott algoritmusok:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
- msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
- msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
+ msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
- msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
+ msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
- msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
+ msgstr ""
+ 
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "kilistázza a kulcs- és felhasználóazonosítókat"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
- msgstr "Elj�r�sm�d: "
+ msgstr "Eljárásmód: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
- msgstr "kulcsok list�z�sa"
+ msgstr "kulcsok listázása"
+ 
++#: g10/tofu.c:1715
+ #, fuzzy, c-format
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
+ msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
  
- #: g10/tofu.c:1342
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1351
- #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
- msgstr[1] "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
- 
- #: g10/tofu.c:1357
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Töröltem %d aláírást.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
+ msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "%lu jelszóval rejtjelezve\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
+ msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7393,134 -5952,117 +7465,146 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
- msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
+ 
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "Hiba a(z) \"%s\" nyilvánoskulcs-karika írásakor: %s.\n"
  
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
- msgstr "\"%s\" nem egy �rv�nyes hossz� kulcsazonos�t�.\n"
+ msgstr "\"%s\" nem egy érvényes hosszú kulcsazonosító.\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, fuzzy, c-format
  msgid "key %s: accepted as trusted key\n"
- msgstr "%08lX kulcs: Elfogadva megb�zhat� kulcsk�nt.\n"
+ msgstr "%08lX kulcs: Elfogadva megbízható kulcsként.\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, fuzzy, c-format
  msgid "key %s occurs more than once in the trustdb\n"
- msgstr "A(z) %08lX kulcs egyn�l t�bbsz�r szerepel a bizalmi adatb�zisban.\n"
+ msgstr "A(z) %08lX kulcs egynél többször szerepel a bizalmi adatbázisban.\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, fuzzy, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr ""
- "%08lX kulcs: Nincs nyilv�nos kulcs a megb�zhat� kulcshoz - kihagytam.\n"
+ "%08lX kulcs: Nincs nyilvános kulcs a megbízható kulcshoz - kihagytam.\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, fuzzy, c-format
  msgid "key %s marked as ultimately trusted\n"
- msgstr "A kulcsot alapvet�en megb�zhat�nak jel�ltem.\n"
+ msgstr "A kulcsot alapvetően megbízhatónak jelöltem.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
- msgstr "%lu bizalmi rekord, %d k�r�st�pus: olvas�s sikertelen: %s.\n"
+ msgstr "%lu bizalmi rekord, %d kéréstípus: olvasás sikertelen: %s.\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
- msgstr "%lu bizalmi rekord nem a k�rt t�pus� (%d).\n"
+ msgstr "%lu bizalmi rekord nem a kért típusú (%d).\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
- msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
+ msgstr "Nincs szükség a bizalmi adatbázis ellenőrzésére.\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
- msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
+ msgstr "A bizalmi adatbázis következő ellenőrzése: %s.\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
- msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
+ msgstr "Nincs szükség a bizalmi adatbázis ellenőrzésére.\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
- msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
+ msgstr "Nincs szükség a bizalmi adatbázis ellenőrzésére.\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
- msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
+ msgstr "A(z) %08lX nyilvános kulcsot nem találom: %s.\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
- msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
+ msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
- msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
+ msgstr "Ellenőrzöm a bizalmi adatbázist.\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "Eddig %lu kulcsot dolgoztam fel.\n"
  msgstr[1] "Eddig %lu kulcsot dolgoztam fel.\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
- msgstr[0] "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
- msgstr[1] "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
+ msgstr[0] "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n"
+ msgstr[1] "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
- msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
+ msgstr "Nem találtam alapvetően megbízható kulcsot.\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
- msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
+ msgstr "Nem találom az alapvetően megbízható %08lX kulcs nyilvános kulcsát!\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
- msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
+ msgstr "%lu bizalmi rekord, %d típus: írás sikertelen: %s.\n"
  
 +#: g10/trust.c:105
  msgid "undefined"
  msgstr ""
  
@@@ -7558,17 -6094,14 +7642,17 @@@ msgstr "
  msgid "[ revoked]"
  msgstr "[visszavont] "
  
 +#: g10/trust.c:151 g10/trust.c:157
  #, fuzzy
  msgid "[ expired]"
- msgstr "[lej�rt]     "
+ msgstr "[lejárt]     "
  
 +#: g10/trust.c:156
  #, fuzzy
  msgid "[ unknown]"
- msgstr "Ismeretlen m�d�"
+ msgstr "Ismeretlen módú"
  
 +#: g10/trust.c:158
  msgid "[  undef ]"
  msgstr ""
  
@@@ -7595,21 -6123,18 +7679,21 @@@ msgid "
  "Please remember that the signature file (.sig or .asc)\n"
  "should be the first file given on the command line.\n"
  msgstr ""
- "Nem tudom ellen�rizni az al��r�st.\n"
- "Ne felejtse el, hogy az al��r�st tartalmaz� �llom�nyt (.sig vagy .asc)\n"
- "kell az els� helyre �rni a parancssorban!\n"
+ "Nem tudom ellenőrizni az aláírást.\n"
+ "Ne felejtse el, hogy az aláírást tartalmazó állományt (.sig vagy .asc)\n"
+ "kell az első helyre írni a parancssorban!\n"
  
 +#: g10/verify.c:204
  #, c-format
  msgid "input line %u too long or missing LF\n"
- msgstr "A bemeneti sor (%u) t�l hossz�, vagy hi�nyzik a soremel�s.\n"
+ msgstr "A bemeneti sor (%u) túl hosszú, vagy hiányzik a soremelés.\n"
  
 +#: g10/verify.c:253
  #, fuzzy, c-format
  msgid "can't open fd %d: %s\n"
- msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
  
 +#: kbx/kbxutil.c:92
  msgid "set debugging flags"
  msgstr ""
  
@@@ -7617,155 -6141,123 +7701,157 @@@
  msgid "enable full debugging"
  msgstr ""
  
 +#: kbx/kbxutil.c:117
  #, fuzzy
  msgid "Usage: kbxutil [options] [files] (-h for help)"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
 +#: kbx/kbxutil.c:120
  #, fuzzy
  msgid ""
  "Syntax: kbxutil [options] [files]\n"
  "List, export, import Keybox data\n"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
- msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
+ msgstr "Kérem, válassza ki a visszavonás okát:\n"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
- msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
+ msgstr "Kérem, válassza ki a visszavonás okát:\n"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
- msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+ msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
- msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
- 
- #: scd/app-openpgp.c:1286
- #, fuzzy, c-format
- msgid "reading public key failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
  
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "remove keys from the public keyring"
+ msgid "response does not contain the EC public key\n"
+ msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
+ 
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1551
+ #, fuzzy, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
- msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
+ msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7775,26 -6267,21 +7861,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
- msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
+ msgstr "Kérem, válassza ki a visszavonás okát:\n"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7802,125 -6289,100 +7888,125 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  #, fuzzy
  msgid "error reading application data\n"
- msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
+ msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  #, fuzzy
  msgid "error reading fingerprint DO\n"
- msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
+ msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  #, fuzzy
  msgid "key already exists\n"
- msgstr "\"%s\" m�r t�m�r�tett.\n"
+ msgstr "\"%s\" már tömörített.\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  #, fuzzy
  msgid "generating new key\n"
- msgstr "�j kulcsp�r l�trehoz�sa"
+ msgstr "új kulcspár létrehozása"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
- msgstr "�j kulcsp�r l�trehoz�sa"
+ msgstr "új kulcspár létrehozása"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
- msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+ msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
- msgstr "nem t�mogatott URI"
+ msgstr "nem támogatott URI"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  #, fuzzy
  msgid "generating key failed\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
- msgstr[0] "Kulcsgener�l�s sikertelen: %s\n"
- msgstr[1] "Kulcsgener�l�s sikertelen: %s\n"
+ msgstr[0] "Kulcsgenerálás sikertelen: %s\n"
+ msgstr[1] "Kulcsgenerálás sikertelen: %s\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
- msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+ msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
- msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
+ msgstr "Nem találtam érvényes OpenPGP adatot.\n"
  
 +#: scd/app-dinsig.c:299
  #, fuzzy
  msgid "||Please enter your PIN at the reader's pinpad"
- msgstr "jelsz�v�ltoztat�s"
+ msgstr "jelszóváltoztatás"
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
@@@ -7933,35 -6393,28 +8019,35 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
  #, fuzzy
  msgid "|FILE|write a log to FILE"
- msgstr "|f�jl|b�v�t� modul bet�lt�se"
+ msgstr "|fájl|bővítő modul betöltése"
  
 +#: scd/scdaemon.c:134
  msgid "|N|connect to reader at port N"
  msgstr ""
  
 +#: scd/scdaemon.c:136
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
- msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
+ msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
  
 +#: scd/scdaemon.c:138
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
- msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
+ msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
  
 +#: scd/scdaemon.c:141
  #, fuzzy
  msgid "do not use the internal CCID driver"
- msgstr "ne haszn�lja a termin�lt egy�ltal�n"
+ msgstr "ne használja a terminált egyáltalán"
  
 +#: scd/scdaemon.c:147
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
@@@ -7969,70 -6421,56 +8055,70 @@@
  msgid "do not use a reader's pinpad"
  msgstr ""
  
 +#: scd/scdaemon.c:155
  #, fuzzy
  msgid "deny the use of admin card commands"
- msgstr "Egym�snak ellentmond� parancsok!\n"
+ msgstr "Egymásnak ellentmondó parancsok!\n"
  
 +#: scd/scdaemon.c:158
  msgid "use variable length input for pinpad"
  msgstr ""
  
 +#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
 +#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
 +#: sm/base64.c:327
  #, fuzzy, c-format
  msgid "invalid radix64 character %02x skipped\n"
- msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
+ msgstr "Kihagytam a %02x kódú érvénytelen radix64 karaktert.\n"
  
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
- msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
+ msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
  
 +#: sm/certchain.c:194
  #, c-format
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  #, fuzzy
  msgid "shell"
  msgstr "help"
  
 +#: sm/certchain.c:256 dirmngr/validate.c:107
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
- msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
+ msgstr "%d gpg-agent protokollverzió nem támogatott!\n"
  
 +#: sm/certchain.c:295 dirmngr/validate.c:205
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8040,224 -6477,174 +8126,224 @@@
  msgid "critical marked policy without configured policies"
  msgstr ""
  
 +#: sm/certchain.c:343
  #, fuzzy, c-format
  msgid "failed to open '%s': %s\n"
- msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
  
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
- msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
 +#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
  #, fuzzy
  msgid "certificate policy not allowed"
- msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
- msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+ msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
- msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
+ msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
- msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
- msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
- msgstr "Ez a kulcs lej�rt!"
+ msgstr "Ez a kulcs lejárt!"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
- msgstr "Ez a kulcs lej�rt!"
+ msgstr "Ez a kulcs lejárt!"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
- msgstr "Ez a kulcs lej�rt!"
+ msgstr "Ez a kulcs lejárt!"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
- msgstr "Ez a kulcs lej�rt!"
+ msgstr "Ez a kulcs lejárt!"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
- msgstr "              �j al��r�sok: %lu\n"
+ msgstr "              új aláírások: %lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
- msgstr "Visszavon� igazol�s l�trehozva.\n"
+ msgstr "Visszavonó igazolás létrehozva.\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "megmutatja az ujjlenyomatot"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
- msgstr "visszavon�si igazol�s k�sz�t�se"
+ msgstr "visszavonási igazolás készítése"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr ""
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
- msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
- msgstr "al��r�s ellen�rz�se"
+ msgstr "aláírás ellenőrzése"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
- msgstr "%c%lu preferencia k�tszer szerepel!\n"
+ msgstr "%c%lu preferencia kétszer szerepel!\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
- msgstr "Visszavon� igazol�s l�trehozva.\n"
+ msgstr "Visszavonó igazolás létrehozva.\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8276,12 -6660,10 +8362,12 @@@ msgstr "
  msgid "none"
  msgstr "nem"
  
 +#: sm/certdump.c:552 sm/certdump.c:617
  #, fuzzy
  msgid "[Error - invalid encoding]"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
 +#: sm/certdump.c:560
  msgid "[Error - out of core]"
  msgstr ""
  
@@@ -8289,12 -6670,10 +8375,12 @@@
  msgid "[Error - No name]"
  msgstr ""
  
 +#: sm/certdump.c:623
  #, fuzzy
  msgid "[Error - invalid DN]"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
 +#: sm/certdump.c:833
  #, fuzzy, c-format
  msgid ""
  "Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -8303,21 -6682,18 +8389,21 @@@
  "S/N %s, ID 0x%08lX,\n"
  "created %s, expires %s.\n"
  msgstr ""
- "Most meg kell adnia a jelsz�t, mellyel a k�vetkez� felhaszn�l�\n"
- "titkos kulcsa haszn�latba vehet�:\n"
+ "Most meg kell adnia a jelszót, mellyel a következő felhasználó\n"
+ "titkos kulcsa használatba vehető:\n"
  "\"%.*s\"\n"
- "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
+ "%u bites %s key, azonosító: %08lX, létrehozva: %s%s\n"
  
 +#: sm/certlist.c:122 dirmngr/validate.c:1075
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
 +#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
- msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
+ msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
  
 +#: sm/certlist.c:142 dirmngr/validate.c:1095
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
@@@ -8341,12 -6712,10 +8427,12 @@@ msgstr "
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
 +#: sm/certreqgen.c:464
  #, fuzzy, c-format
  msgid "line %d: invalid algorithm\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: sm/certreqgen.c:478
  #, c-format
  msgid "line %d: invalid key length %u (valid are %d to %d)\n"
  msgstr ""
@@@ -8356,27 -6724,22 +8442,27 @@@
  msgid "line %d: no subject name given\n"
  msgstr ""
  
 +#: sm/certreqgen.c:505
  #, fuzzy, c-format
  msgid "line %d: invalid subject name label '%.*s'\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: sm/certreqgen.c:508
  #, fuzzy, c-format
  msgid "line %d: invalid subject name '%s' at pos %d\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: sm/certreqgen.c:525
  #, fuzzy, c-format
  msgid "line %d: not a valid email address\n"
- msgstr "Ez nem �rv�nyes e-mail c�m.\n"
+ msgstr "Ez nem érvényes e-mail cím.\n"
  
 +#: sm/certreqgen.c:544
  #, fuzzy, c-format
  msgid "line %d: invalid serial number\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: sm/certreqgen.c:560
  #, c-format
  msgid "line %d: invalid issuer name label '%.*s'\n"
  msgstr ""
@@@ -8386,167 -6748,135 +8472,167 @@@
  msgid "line %d: invalid issuer name '%s' at pos %d\n"
  msgstr ""
  
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
  #, fuzzy, c-format
  msgid "line %d: invalid date given\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: sm/certreqgen.c:599
  #, fuzzy, c-format
  msgid "line %d: error getting signing key by keygrip '%s': %s\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
 +#: sm/certreqgen.c:618
  #, fuzzy, c-format
  msgid "line %d: invalid hash algorithm given\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: sm/certreqgen.c:633
  #, fuzzy, c-format
  msgid "line %d: invalid authority-key-id\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: sm/certreqgen.c:648
  #, fuzzy, c-format
  msgid "line %d: invalid subject-key-id\n"
- msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
+ msgstr "%08lX kulcs: Érvénytelen alkulcskötés!\n"
  
 +#: sm/certreqgen.c:686
  #, fuzzy, c-format
  msgid "line %d: invalid extension syntax\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: sm/certreqgen.c:699
  #, fuzzy, c-format
  msgid "line %d: error reading key '%s' from card: %s\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
 +#: sm/certreqgen.c:712
  #, fuzzy, c-format
  msgid "line %d: error getting key by keygrip '%s': %s\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
 +#: sm/certreqgen.c:729
  #, fuzzy, c-format
  msgid "line %d: key generation failed: %s <%s>\n"
- msgstr "Kulcsgener�l�s sikertelen: %s\n"
+ msgstr "Kulcsgenerálás sikertelen: %s\n"
  
 +#: sm/certreqgen.c:1324
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:162
  #, fuzzy, c-format
  msgid "   (%d) RSA\n"
- msgstr "   (%d) RSA (csak al��r�s)\n"
+ msgstr "   (%d) RSA (csak aláírás)\n"
  
 +#: sm/certreqgen-ui.c:163
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
- msgstr "   (%d) RSA (csak titkos�t�s)\n"
+ msgstr "   (%d) RSA (csak titkosítás)\n"
  
 +#: sm/certreqgen-ui.c:164
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
- msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
+ msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
  
 +#: sm/certreqgen-ui.c:237
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: sm/certreqgen-ui.c:249
  #, fuzzy
  msgid "Available keys:\n"
- msgstr "kulcs tilt�sa"
+ msgstr "kulcs tiltása"
  
 +#: sm/certreqgen-ui.c:280
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:281
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
- msgstr "   (%d) RSA (al��r�s �s titkos�t�s)\n"
+ msgstr "   (%d) RSA (aláírás és titkosítás)\n"
  
 +#: sm/certreqgen-ui.c:282
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
- msgstr "   (%d) DSA (csak al��r�s)\n"
+ msgstr "   (%d) DSA (csak aláírás)\n"
  
 +#: sm/certreqgen-ui.c:283
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
- msgstr "   (%d) RSA (csak titkos�t�s)\n"
+ msgstr "   (%d) RSA (csak titkosítás)\n"
  
 +#: sm/certreqgen-ui.c:307
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
 +#: sm/certreqgen-ui.c:311
  #, fuzzy
  msgid "No subject name given\n"
- msgstr "(Nincs le�r�s.)\n"
+ msgstr "(Nincs leírás.)\n"
  
 +#: sm/certreqgen-ui.c:315
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
  #. TRANSLATORS: The 22 in the second string is the
  #. length of the first string up to the "%s".  Please
  #. adjust it do the length of your translation.  The
  #. second string is merely passed to atoi so you can
  #. drop everything after the number.
 +#: sm/certreqgen-ui.c:324
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: sm/certreqgen-ui.c:326
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:338
  #, fuzzy
  msgid "Enter email addresses"
- msgstr "E-mail c�m: "
+ msgstr "E-mail cím: "
  
 +#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
- "Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
+ "Adja meg a felhasználói azonosítót! Üres sorral fejezze be: "
  
 +#: sm/certreqgen-ui.c:343
  #, fuzzy
  msgid "Enter DNS names"
- msgstr "�rja be az �j �llom�nynevet"
+ msgstr "Írja be az új állománynevet"
  
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
- msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
+ msgstr "Adjon meg egy nem kötelező leírást! Üres sorral fejezze be:\n"
  
 +#: sm/certreqgen-ui.c:348
  msgid "Enter URIs"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:355
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
- msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
+ msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
  
 +#: sm/certreqgen-ui.c:382
  msgid "These parameters are used:\n"
  msgstr ""
  
@@@ -8558,9 -6886,8 +8644,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
- msgstr "Visszavon� igazol�s l�trehozva.\n"
+ msgstr "Visszavonó igazolás létrehozva.\n"
  
 +#: sm/certreqgen-ui.c:403
  msgid "This may take a while ...\n"
  msgstr ""
  
@@@ -8584,278 -6906,220 +8670,278 @@@ msgstr "
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
 +#: sm/delete.c:51 sm/delete.c:112
  #, fuzzy, c-format
  msgid "certificate '%s' not found: %s\n"
- msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" kulcs nem található: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
- msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
+ msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
  
 +#: sm/delete.c:143
  #, fuzzy, c-format
  msgid "duplicated certificate '%s' deleted\n"
- msgstr "Visszavon� igazol�s l�trehozva.\n"
+ msgstr "Visszavonó igazolás létrehozva.\n"
  
 +#: sm/delete.c:145
  #, fuzzy, c-format
  msgid "certificate '%s' deleted\n"
- msgstr "%c%lu preferencia k�tszer szerepel!\n"
+ msgstr "%c%lu preferencia kétszer szerepel!\n"
  
 +#: sm/delete.c:175
  #, fuzzy, c-format
  msgid "deleting certificate \"%s\" failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: sm/encrypt.c:328
  #, fuzzy
  msgid "no valid recipients given\n"
- msgstr "(Nincs le�r�s.)\n"
+ msgstr "(Nincs leírás.)\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
- msgstr "titkos kulcsok list�z�sa"
+ msgstr "titkos kulcsok listázása"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
- msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
+ msgstr "ascii páncélozott kimenet létrehozása"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
- msgstr "ne haszn�lja a termin�lt egy�ltal�n"
+ msgstr "ne használja a terminált egyáltalán"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
- msgstr "|f�jl|b�v�t� modul bet�lt�se"
+ msgstr "|fájl|bővítő modul betöltése"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
- msgstr "k�tegelt m�d: soha nem k�rdez"
+ msgstr "kötegelt mód: soha nem kérdez"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
- msgstr "igen v�lasz felt�telez�se a legt�bb k�rd�sre"
+ msgstr "igen válasz feltételezése a legtöbb kérdésre"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
- msgstr "nem v�lasz felt�telez�se a legt�bb k�rd�sre"
+ msgstr "nem válasz feltételezése a legtöbb kérdésre"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
- msgstr "kulcskarika hozz�ad�sa a kulcskarikalist�hoz"
+ msgstr "kulcskarika hozzáadása a kulcskarikalistához"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
- msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
+ msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
- msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
+ msgstr "|GÉPNÉV|kulcsszerver beállítása kulcsok kereséséhez"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
- msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
+ msgstr "|NÉV|NÉV rejtjelező algoritmus használata"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
- msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
+ msgstr "|NÉV|NÉV kivonatoló algoritmus használata"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "Szintaxis: gpg [opci�k] [f�jlok]\n"
- "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"
+ "Szintaxis: gpg [opciók] [fájlok]\n"
+ "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"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
- msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
+ msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
- msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
+ msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
- msgstr "(Nincs le�r�s.)\n"
+ msgstr "(Nincs leírás.)\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
- msgstr " h = kulcs kihagy�sa\n"
+ msgstr " h = kulcs kihagyása\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, fuzzy
  msgid "could not parse keyserver\n"
- msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
+ msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
- msgstr "�rok a \"%s\" �llom�nyba.\n"
+ msgstr "Írok a \"%s\" állományba.\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
- msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
 +#: sm/import.c:127
  #, fuzzy, c-format
  msgid "total number processed: %lu\n"
- msgstr "     �sszesen feldolgoztam: %lu\n"
+ msgstr "     Összesen feldolgoztam: %lu\n"
  
 +#: sm/import.c:246
  #, fuzzy
  msgid "error storing certificate\n"
- msgstr "visszavon�si igazol�s k�sz�t�se"
+ msgstr "visszavonási igazolás készítése"
  
 +#: sm/import.c:254
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: sm/import.c:526 sm/import.c:558
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: sm/import.c:746 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
- msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+ msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, fuzzy, c-format
  msgid "problem re-searching certificate: %s\n"
- msgstr "rev? Nem tudom ellen�rizni a visszavon�st: %s.\n"
+ msgstr "rev? Nem tudom ellenőrizni a visszavonást: %s.\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: sm/keylist.c:657
  msgid "Error - "
  msgstr ""
  
@@@ -8863,17 -7126,14 +8949,17 @@@
  msgid "GPG_TTY has not been set - using maybe bogus default\n"
  msgstr ""
  
 +#: sm/qualified.c:105
  #, fuzzy, c-format
  msgid "invalid formatted fingerprint in '%s', line %d\n"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
 +#: sm/qualified.c:123
  #, fuzzy, c-format
  msgid "invalid country code in '%s', line %d\n"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
 +#: sm/qualified.c:206
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
@@@ -8898,46 -7156,37 +8984,46 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
 +#: sm/sign.c:451
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
- msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
+ msgstr "%d%s védő algoritmus nem támogatott.\n"
  
 +#: sm/sign.c:465
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
 +#: sm/sign.c:517
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
- msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
 +#: sm/verify.c:450
  #, fuzzy
  msgid "Signature made "
- msgstr "Az al��r�s lej�rt: %s.\n"
+ msgstr "Az aláírás lejárt: %s.\n"
  
 +#: sm/verify.c:454
  msgid "[date not given]"
  msgstr ""
  
 +#: sm/verify.c:455
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: sm/verify.c:474
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
 +#: sm/verify.c:595
  #, fuzzy
  msgid "Good signature from"
- msgstr "J� al��r�s a k�vetkez�t�l: \""
+ msgstr "Jó aláírás a következőtől: \""
  
 +#: sm/verify.c:596
  #, fuzzy
  msgid "                aka"
  msgstr "               azaz \""
@@@ -8947,14 -7195,12 +9033,14 @@@
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
- "Ez egy �nal��r�s lesz.\n"
+ "Ez egy önaláírás lesz.\n"
  
 +#: dirmngr/certcache.c:106
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
- msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
 +#: dirmngr/certcache.c:117
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
@@@ -8978,24 -7220,20 +9064,24 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
- msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
  
 +#: dirmngr/certcache.c:395
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
- msgstr "%c%lu preferencia k�tszer szerepel!\n"
+ msgstr "%c%lu preferencia kétszer szerepel!\n"
  
 +#: dirmngr/certcache.c:399
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
- msgstr "Visszavon� igazol�s l�trehozva.\n"
+ msgstr "Visszavonó igazolás létrehozva.\n"
  
 +#: dirmngr/certcache.c:401
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
- msgstr "%c%lu preferencia k�tszer szerepel!\n"
+ msgstr "%c%lu preferencia kétszer szerepel!\n"
  
 +#: dirmngr/certcache.c:405
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "megmutatja az ujjlenyomatot"
@@@ -9008,132 -7244,106 +9094,132 @@@ msgstr "
  msgid "  subject ="
  msgstr ""
  
 +#: dirmngr/certcache.c:413
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/certcache.c:489
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: dirmngr/certcache.c:491
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
- msgstr "Visszavon� igazol�s l�trehozva.\n"
+ msgstr "Visszavonó igazolás létrehozva.\n"
  
 +#: dirmngr/certcache.c:508
  #, fuzzy
  msgid "certificate cached\n"
- msgstr "%c%lu preferencia k�tszer szerepel!\n"
+ msgstr "%c%lu preferencia kétszer szerepel!\n"
  
 +#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/certcache.c:593
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
  #, fuzzy
  msgid "no issuer found in certificate\n"
- msgstr "visszavon�si igazol�s k�sz�t�se"
+ msgstr "visszavonási igazolás készítése"
  
 +#: dirmngr/certcache.c:1325
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/crlcache.c:213
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "creating directory '%s'\n"
- msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
+ msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
  
 +#: dirmngr/crlcache.c:217
  #, fuzzy, c-format
  msgid "error creating directory '%s': %s\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
 +#: dirmngr/crlcache.c:245
  #, fuzzy, c-format
  msgid "ignoring database dir '%s'\n"
- msgstr "Hiba a z�r� sorban!\n"
+ msgstr "Hiba a záró sorban!\n"
  
 +#: dirmngr/crlcache.c:254
  #, fuzzy, c-format
  msgid "error reading directory '%s': %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/crlcache.c:275
  #, fuzzy, c-format
  msgid "removing cache file '%s'\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: dirmngr/crlcache.c:284
  #, fuzzy, c-format
  #| msgid "enarmoring failed: %s\n"
  msgid "not removing file '%s'\n"
- msgstr "P�nc�loz�s nem siker�lt: %s\n"
+ msgstr "Páncélozás nem sikerült: %s\n"
  
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
  #, fuzzy, c-format
  msgid "failed to open cache dir file '%s': %s\n"
- msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
  
 +#: dirmngr/crlcache.c:421
  #, fuzzy, c-format
  msgid "error creating new cache dir file '%s': %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/crlcache.c:428
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing new cache dir file '%s': %s\n"
- msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
+ msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
  
 +#: dirmngr/crlcache.c:435
  #, fuzzy, c-format
  msgid "error closing new cache dir file '%s': %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/crlcache.c:440
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new cache dir file '%s' created\n"
- msgstr "\"%s\" �j konfigur�ci�s �llom�nyt l�trehoztam.\n"
+ msgstr "\"%s\" új konfigurációs állományt létrehoztam.\n"
  
 +#: dirmngr/crlcache.c:445
  #, fuzzy, c-format
  msgid "failed to re-open cache dir file '%s': %s\n"
- msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
+ msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
  
 +#: dirmngr/crlcache.c:473
  #, c-format
  msgid "first record of '%s' is not the version\n"
  msgstr ""
@@@ -9151,43 -7358,35 +9237,43 @@@ msgstr "
  msgid "extra field detected in crl record of '%s' line %u\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:623
  #, fuzzy, c-format
  msgid "invalid line detected in '%s' line %u\n"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
 +#: dirmngr/crlcache.c:632
  #, fuzzy, c-format
  msgid "duplicate entry detected in '%s' line %u\n"
- msgstr "Visszavon� igazol�s l�trehozva.\n"
+ msgstr "Visszavonó igazolás létrehozva.\n"
  
 +#: dirmngr/crlcache.c:647
  #, c-format
  msgid "unsupported record type in '%s' line %u skipped\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:673
  #, fuzzy, c-format
  msgid "invalid issuer hash in '%s' line %u\n"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
 +#: dirmngr/crlcache.c:679
  #, fuzzy, c-format
  msgid "no issuer DN in '%s' line %u\n"
- msgstr "Olvas�si hiba: %s.\n"
+ msgstr "Olvasási hiba: %s.\n"
  
 +#: dirmngr/crlcache.c:686
  #, fuzzy, c-format
  msgid "invalid timestamp in '%s' line %u\n"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
 +#: dirmngr/crlcache.c:692
  #, fuzzy, c-format
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid "WARNING: invalid cache file hash in '%s' line %u\n"
- msgstr "FIGYELEM: �rv�nytelen m�ret� random_seed �llom�ny. Nem haszn�lom.\n"
+ msgstr "FIGYELEM: Érvénytelen méretű random_seed állomány. Nem használom.\n"
  
 +#: dirmngr/crlcache.c:698
  msgid "detected errors in cache dir file\n"
  msgstr ""
  
@@@ -9195,57 -7393,46 +9281,57 @@@
  msgid "please check the reason and manually delete that file\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
  #, fuzzy, c-format
  msgid "failed to create temporary cache dir file '%s': %s\n"
- msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
+ msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
  
 +#: dirmngr/crlcache.c:937
  #, fuzzy, c-format
  msgid "error closing '%s': %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/crlcache.c:949
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error renaming '%s' to '%s': %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/crlcache.c:1003
  #, fuzzy, c-format
  msgid "can't hash '%s': %s\n"
- msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
  
 +#: dirmngr/crlcache.c:1011
  #, fuzzy, c-format
  msgid "error setting up MD5 hash context: %s\n"
- msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
 +#: dirmngr/crlcache.c:1027
  #, fuzzy, c-format
  msgid "error hashing '%s': %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/crlcache.c:1055
  #, fuzzy, c-format
  msgid "invalid formatted checksum for '%s'\n"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
 +#: dirmngr/crlcache.c:1108
  msgid "too many open cache files; can't open anymore\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1126
  #, fuzzy, c-format
  msgid "opening cache file '%s'\n"
- msgstr "Al��r�s sikertelen: %s\n"
+ msgstr "Aláírás sikertelen: %s\n"
  
 +#: dirmngr/crlcache.c:1145
  #, fuzzy, c-format
  msgid "error opening cache file '%s': %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/crlcache.c:1154
  #, c-format
  msgid "error initializing cache file '%s' for reading: %s\n"
  msgstr ""
@@@ -9258,18 -7443,15 +9344,18 @@@ msgstr "
  msgid "calling unlock_db_file on an unlocked file\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1231
  #, fuzzy, c-format
  msgid "failed to create a new cache object: %s\n"
- msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
+ msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
  
 +#: dirmngr/crlcache.c:1286
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "no CRL available for issuer id %s\n"
- msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
+ msgstr "Nem áll rendelkezésre segítség \"%s\" témához."
  
 +#: dirmngr/crlcache.c:1293
  #, c-format
  msgid "cached CRL for issuer id %s too old; update required\n"
  msgstr ""
@@@ -9300,12 -7477,10 +9386,12 @@@ msgstr "
  msgid "WARNING: invalid cache record length for S/N "
  msgstr ""
  
 +#: dirmngr/crlcache.c:1357
  #, fuzzy, c-format
  msgid "problem reading cache record for S/N %s: %s\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
  
 +#: dirmngr/crlcache.c:1360
  #, c-format
  msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
  msgstr ""
@@@ -9315,18 -7489,15 +9401,18 @@@
  msgid "S/N %s is valid, it is not listed in the CRL\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1379
  #, fuzzy, c-format
  msgid "error getting data from cache file: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
- msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
  
 +#: dirmngr/crlcache.c:1549
  #, c-format
  msgid "gcry_md_open for algorithm %d failed: %s\n"
  msgstr ""
@@@ -9335,30 -7505,25 +9421,30 @@@
  #, fuzzy
  #| msgid "invalid response from agent\n"
  msgid "got an invalid S-expression from libksba\n"
- msgstr "�rv�nytelen v�lasz az �gyn�kt�l!\n"
+ msgstr "Érvénytelen válasz az ügynöktől!\n"
  
 +#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
- msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
+ msgstr "Nem tudom megnyitni az állományt: %s.\n"
  
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: dirmngr/crlcache.c:1699
  #, fuzzy, c-format
  #| msgid "build_packet failed: %s\n"
  msgid "ksba_crl_parse failed: %s\n"
  msgstr "build_packet sikertelen: %s.\n"
  
 +#: dirmngr/crlcache.c:1714
  #, fuzzy, c-format
  msgid "error getting update times of CRL: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/crlcache.c:1721
  #, c-format
  msgid "update times of this CRL: this=%s next=%s\n"
  msgstr ""
@@@ -9367,22 -7531,18 +9453,22 @@@
  msgid "nextUpdate not given; assuming a validity period of one day\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1745
  #, fuzzy, c-format
  msgid "error getting CRL item: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/crlcache.c:1760
  #, fuzzy, c-format
  msgid "error inserting item into temporary cache file: %s\n"
- msgstr "�rok a \"%s\" �llom�nyba.\n"
+ msgstr "Írok a \"%s\" állományba.\n"
  
 +#: dirmngr/crlcache.c:1787
  #, fuzzy, c-format
  msgid "no CRL issuer found in CRL: %s\n"
- msgstr "visszavon�si igazol�s k�sz�t�se"
+ msgstr "visszavonási igazolás készítése"
  
 +#: dirmngr/crlcache.c:1802
  msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
  msgstr ""
  
@@@ -9390,55 -7549,45 +9476,55 @@@
  #, fuzzy, c-format
  #| msgid "signature verification suppressed\n"
  msgid "CRL signature verification failed: %s\n"
- msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
+ msgstr "Aláírás-ellenőrzés elnyomva.\n"
  
 +#: dirmngr/crlcache.c:1858
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
- msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
 +#: dirmngr/crlcache.c:2001
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: dirmngr/crlcache.c:2008
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
- msgstr "Friss�t�s sikertelen: %s.\n"
+ msgstr "Frissítés sikertelen: %s.\n"
  
 +#: dirmngr/crlcache.c:2042
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
- msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
+ msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
  
 +#: dirmngr/crlcache.c:2046
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
- msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
+ msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
  
 +#: dirmngr/crlcache.c:2056
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/crlcache.c:2066
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
- msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
+ msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
  
 +#: dirmngr/crlcache.c:2076
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
- msgstr "�rok a \"%s\" �llom�nyba.\n"
+ msgstr "Írok a \"%s\" állományba.\n"
  
 +#: dirmngr/crlcache.c:2083
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/crlcache.c:2108
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
@@@ -9453,22 -7600,18 +9539,22 @@@ msgstr "
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:2138
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/crlcache.c:2189
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/crlcache.c:2221
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
- msgstr "P�nc�loz�s nem siker�lt: %s\n"
+ msgstr "Páncélozás nem sikerült: %s\n"
  
 +#: dirmngr/crlcache.c:2235
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9502,43 -7639,35 +9588,43 @@@ msgstr "
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
- msgstr "FIGYELEM: �rv�nytelen m�ret� random_seed �llom�ny. Nem haszn�lom.\n"
+ msgstr "FIGYELEM: Érvénytelen méretű random_seed állomány. Nem használom.\n"
  
 +#: dirmngr/crlcache.c:2333
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
- msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
+ msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
  
 +#: dirmngr/crlcache.c:2344
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
- msgstr "rev? Nem tudom ellen�rizni a visszavon�st: %s.\n"
+ msgstr "rev? Nem tudom ellenőrizni a visszavonást: %s.\n"
  
 +#: dirmngr/crlcache.c:2375
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/crlcache.c:2378
  msgid "End CRL dump\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:2499
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
- msgstr "Friss�t�s sikertelen: %s.\n"
+ msgstr "Frissítés sikertelen: %s.\n"
  
 +#: dirmngr/crlcache.c:2510
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
- msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
 +#: dirmngr/crlcache.c:2570
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: dirmngr/crlfetch.c:74
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
@@@ -9557,40 -7681,32 +9643,40 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
- msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
+ msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n"
  
 +#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
  #, fuzzy
  msgid "too many redirections\n"
- msgstr "T�l sok \"%c\" preferencia.\n"
+ msgstr "Túl sok \"%c\" preferencia.\n"
  
 +#: dirmngr/crlfetch.c:274
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
- msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
+ msgstr "Hiba \"%s\" létrehozásakor: %s\n"
  
 +#: dirmngr/crlfetch.c:279
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
- msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" kulcs nem található: %s\n"
  
 +#: dirmngr/crlfetch.c:386
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
- msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" kulcs nem található: %s\n"
  
 +#: dirmngr/dirmngr-client.c:71
  msgid "use OCSP instead of CRLs"
  msgstr ""
  
@@@ -9598,27 -7713,22 +9684,27 @@@
  msgid "check whether a dirmngr is running"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:73
  #, fuzzy
  msgid "add a certificate to the cache"
- msgstr "Visszavon� igazol�s l�trehozva.\n"
+ msgstr "Visszavonó igazolás létrehozva.\n"
  
 +#: dirmngr/dirmngr-client.c:74
  #, fuzzy
  msgid "validate a certificate"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: dirmngr/dirmngr-client.c:75
  #, fuzzy
  msgid "lookup a certificate"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: dirmngr/dirmngr-client.c:76
  #, fuzzy
  msgid "lookup only locally stored certificates"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: dirmngr/dirmngr-client.c:77
  msgid "expect an URL for --lookup"
  msgstr ""
  
@@@ -9630,24 -7738,20 +9716,24 @@@ msgstr "
  msgid "special mode for use by Squid"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:80
  #, fuzzy
  msgid "expect certificates in PEM format"
- msgstr "rossz igazol�s"
+ msgstr "rossz igazolás"
  
 +#: dirmngr/dirmngr-client.c:82
  #, fuzzy
  #| msgid "Enter the user ID of the designated revoker: "
  msgid "force the use of the default OCSP responder"
- msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
+ msgstr "Írja be a kijelölt visszavonó felhasználóazonosítóját: "
  
 +#: dirmngr/dirmngr-client.c:169
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
 +#: dirmngr/dirmngr-client.c:173
  msgid ""
  "Syntax: dirmngr-client [options] [certfile|pattern]\n"
  "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9655,17 -7759,14 +9741,17 @@@
  "not valid and other error codes for general failures\n"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
  #, fuzzy, c-format
  msgid "error reading certificate from stdin: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/dirmngr-client.c:281
  #, fuzzy, c-format
  msgid "error reading certificate from '%s': %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/dirmngr-client.c:295
  msgid "certificate too large to make any sense\n"
  msgstr ""
  
@@@ -9673,63 -7773,52 +9759,63 @@@
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to the dirmngr: %s\n"
- msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
+ msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
  
 +#: dirmngr/dirmngr-client.c:332
  #, fuzzy, c-format
  #| msgid "update failed: %s\n"
  msgid "lookup failed: %s\n"
- msgstr "Friss�t�s sikertelen: %s.\n"
+ msgstr "Frissítés sikertelen: %s.\n"
  
 +#: dirmngr/dirmngr-client.c:347
  #, fuzzy, c-format
  msgid "loading CRL '%s' failed: %s\n"
- msgstr "P�nc�loz�s nem siker�lt: %s\n"
+ msgstr "Páncélozás nem sikerült: %s\n"
  
 +#: dirmngr/dirmngr-client.c:375
  msgid "a dirmngr daemon is up and running\n"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:397
  #, fuzzy, c-format
  msgid "validation of certificate failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
  #, fuzzy
  msgid "certificate is valid\n"
- msgstr "%c%lu preferencia k�tszer szerepel!\n"
+ msgstr "%c%lu preferencia kétszer szerepel!\n"
  
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
  #, fuzzy
  msgid "certificate has been revoked\n"
- msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
+ msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
  
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
  #, fuzzy, c-format
  msgid "certificate check failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: dirmngr/dirmngr-client.c:428
  #, fuzzy, c-format
  #| msgid "can't stat `%s': %s\n"
  msgid "got status: '%s'\n"
- msgstr "Nem tudom a stat m�veletet elv�gezni a(z) \"%s\" �llom�nyon: %s.\n"
+ msgstr "Nem tudom a stat műveletet elvégezni a(z) \"%s\" állományon: %s.\n"
  
 +#: dirmngr/dirmngr-client.c:443
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing base64 encoding: %s\n"
- msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
+ msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
  
 +#: dirmngr/dirmngr-client.c:701
  #, fuzzy, c-format
  msgid "unsupported inquiry '%s'\n"
  msgstr ""
  "\n"
- "T�mogatott algoritmusok:\n"
+ "Támogatott algoritmusok:\n"
  
 +#: dirmngr/dirmngr-client.c:803
  msgid "absolute file name expected\n"
  msgstr ""
  
@@@ -9738,112 -7826,88 +9824,116 @@@
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
- msgstr "|f�jl|b�v�t� modul bet�lt�se"
+ msgstr "|fájl|bővítő modul betöltése"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  msgid "run without asking a user"
- msgstr "Kil�pjek ment�s n�lk�l? "
+ msgstr "Kilépjek mentés nélkül? "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
- msgstr "|f�jl|b�v�t� modul bet�lt�se"
+ msgstr "|fájl|bővítő modul betöltése"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
- msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
+ msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9854,93 -7918,74 +9944,93 @@@ msgid "
  "options)\n"
  msgstr ""
  "@\n"
- "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
+ "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
- msgstr "Haszn�lat: gpg [opci�k] "
+ msgstr "Használat: gpg [opciók] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
- msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
+ msgstr "%s és %s nem használható együtt!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
- msgstr "P�nc�loz�s nem siker�lt: %s\n"
+ msgstr "Páncélozás nem sikerült: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
- msgstr "P�nc�loz�s nem siker�lt: %s\n"
+ msgstr "Páncélozás nem sikerült: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
- msgstr "A sor t�l hossz�!\n"
+ msgstr "A sor túl hosszú!\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
- msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+ msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
- msgstr "Olvas�si hiba: %s.\n"
+ msgstr "Olvasási hiba: %s.\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "nem feldolgozott"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -9957,9 -7999,8 +10047,9 @@@ msgstr "
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|connect to host NAME"
- msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
+ msgstr "|NÉV|terminál karakterkódolásának megadása"
  
 +#: dirmngr/dirmngr_ldap.c:143
  msgid "|N|connect to port N"
  msgstr ""
  
@@@ -9967,9 -8007,8 +10057,9 @@@
  #, fuzzy
  #| msgid "|NAME|use NAME as default recipient"
  msgid "|NAME|use user NAME for authentication"
- msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
+ msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
  
 +#: dirmngr/dirmngr_ldap.c:145
  msgid "|PASS|use password PASS for authentication"
  msgstr ""
  
@@@ -9993,9 -8027,8 +10083,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
 +#: dirmngr/dirmngr_ldap.c:212
  msgid ""
  "Syntax: dirmngr_ldap [options] [URL]\n"
  "Internal LDAP helper for Dirmngr\n"
@@@ -10006,31 -8038,24 +10096,31 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "invalid import options\n"
  msgid "invalid port number %d\n"
- msgstr "�rv�nytelen import opci�k!\n"
+ msgstr "Érvénytelen import opciók!\n"
  
 +#: dirmngr/dirmngr_ldap.c:413
  #, c-format
  msgid "scanning result for attribute '%s'\n"
  msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
 +#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
 +#: dirmngr/dirmngr_ldap.c:677
  #, fuzzy, c-format
  msgid "error writing to stdout: %s\n"
- msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
+ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:437
  #, c-format
  msgid "          available attribute '%s'\n"
  msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:475
  #, fuzzy, c-format
  msgid "attribute '%s' not found\n"
- msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" kulcs nem található: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:482
  #, c-format
  msgid "found attribute '%s'\n"
  msgstr ""
@@@ -10039,15 -8063,13 +10129,15 @@@
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "processing url '%s'\n"
- msgstr "Olvasok a \"%s\" �llom�nyb�l.\n"
+ msgstr "Olvasok a \"%s\" állományból.\n"
  
 +#: dirmngr/dirmngr_ldap.c:593
  #, fuzzy, c-format
  #| msgid "          w/o user IDs: %lu\n"
  msgid "          user '%s'\n"
- msgstr "    felh. azonos�t� n�lk�l: %lu\n"
+ msgstr "    felh. azonosító nélkül: %lu\n"
  
 +#: dirmngr/dirmngr_ldap.c:595
  #, fuzzy, c-format
  msgid "          pass '%s'\n"
  msgstr "               azaz \""
@@@ -10061,9 -8081,8 +10151,9 @@@ msgstr "               azaz \"
  #, fuzzy, c-format
  #| msgid "          not imported: %lu\n"
  msgid "          port %d\n"
- msgstr "             nem import�lt: %lu\n"
+ msgstr "             nem importált: %lu\n"
  
 +#: dirmngr/dirmngr_ldap.c:600
  #, fuzzy, c-format
  msgid "            DN '%s'\n"
  msgstr "               azaz \""
@@@ -10078,12 -8095,10 +10168,12 @@@ msgstr "
  msgid "          attr '%s'\n"
  msgstr "               azaz \""
  
 +#: dirmngr/dirmngr_ldap.c:616
  #, fuzzy, c-format
  msgid "no host name in '%s'\n"
- msgstr "(Nincs le�r�s.)\n"
+ msgstr "(Nincs leírás.)\n"
  
 +#: dirmngr/dirmngr_ldap.c:621
  #, c-format
  msgid "no attribute given for query '%s'\n"
  msgstr ""
@@@ -10092,56 -8106,41 +10182,50 @@@
  #, fuzzy
  #| msgid "WARNING: using insecure memory!\n"
  msgid "WARNING: using first attribute only\n"
- msgstr "FIGYELEM: Nem biztons�gos mem�ri�t haszn�lunk!\n"
+ msgstr "FIGYELEM: Nem biztonságos memóriát használunk!\n"
  
 +#: dirmngr/dirmngr_ldap.c:636
  #, fuzzy, c-format
  msgid "LDAP init to '%s:%d' failed: %s\n"
- msgstr "P�nc�loz�s nem siker�lt: %s\n"
+ msgstr "Páncélozás nem sikerült: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:659
  #, fuzzy, c-format
  msgid "binding to '%s:%d' failed: %s\n"
- msgstr "P�nc�loz�s nem siker�lt: %s\n"
+ msgstr "Páncélozás nem sikerült: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:686
  #, fuzzy, c-format
  #| msgid "dearmoring failed: %s\n"
  msgid "searching '%s' failed: %s\n"
- msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
+ msgstr "Páncél eltávolítása nem sikerült: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:718
  #, fuzzy, c-format
  msgid "'%s' is not an LDAP URL\n"
- msgstr "\"%s\" nem JPEG �llom�ny.\n"
+ msgstr "\"%s\" nem JPEG állomány.\n"
  
 +#: dirmngr/dirmngr_ldap.c:724
  #, c-format
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
- msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
+ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:236
  #, fuzzy, c-format
  msgid "error reading log from ldap wrapper %d: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:304
  #, fuzzy, c-format
  msgid "npth_select failed: %s - waiting 1s\n"
- msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
+ msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:343
  #, c-format
  msgid "ldap wrapper %d ready"
  msgstr ""
@@@ -10156,12 -8153,10 +10240,12 @@@ msgstr "
  msgid "ldap wrapper %d ready: exitcode=%d\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:364
  #, fuzzy, c-format
  msgid "waiting for ldap wrapper %d failed: %s\n"
- msgstr "Friss�t�s sikertelen: %s.\n"
+ msgstr "Frissítés sikertelen: %s.\n"
  
 +#: dirmngr/ldap-wrapper.c:376
  #, c-format
  msgid "ldap wrapper %d stalled - killing\n"
  msgstr ""
@@@ -10171,12 -8165,10 +10255,12 @@@
  msgid "error spawning ldap wrapper reaper thread: %s\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
  #, fuzzy, c-format
  msgid "reading from ldap wrapper %d failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: dirmngr/ldap.c:91
  #, c-format
  msgid "invalid char 0x%02x in host name - not added\n"
  msgstr ""
@@@ -10186,12 -8177,10 +10270,12 @@@
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
  
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: dirmngr/ldap.c:627
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
@@@ -10204,83 -8191,67 +10288,83 @@@ msgstr "
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
- msgstr "%s: �rv�nytelen �llom�nyverzi� (%d).\n"
+ msgstr "%s: Érvénytelen állományverzió (%d).\n"
  
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
- msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
+ msgstr "Nem tudom megnyitni az állományt: %s.\n"
  
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
- msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
+ msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
  
 +#: dirmngr/misc.c:518
  msgid "bad URL encoding detected\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:80
  #, fuzzy, c-format
  msgid "error reading from responder: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/ocsp.c:98
  #, c-format
  msgid "response from server too large; limit is %d bytes\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:139
  #, fuzzy
  msgid "OCSP request not possible due to Tor mode\n"
- msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" kulcs nem található: %s\n"
  
 +#: dirmngr/ocsp.c:145
  msgid "OCSP request not possible due to disabled HTTP\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:152
  #, fuzzy, c-format
  msgid "error setting OCSP target: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/ocsp.c:170
  #, fuzzy, c-format
  msgid "error building OCSP request: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/ocsp.c:181
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
- msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
+ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
  
 +#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/ocsp.c:240
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: dirmngr/ocsp.c:265
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
- msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
 +#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:293
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
- msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
 +#: dirmngr/ocsp.c:328
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
@@@ -10288,46 -8258,37 +10372,46 @@@
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:464
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: dirmngr/ocsp.c:479
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/ocsp.c:514
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
- msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+ msgstr "\"%s\" kulcs nem található: %s\n"
  
 +#: dirmngr/ocsp.c:563
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:570
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
- msgstr "visszavon�si igazol�s k�sz�t�se"
+ msgstr "visszavonási igazolás készítése"
  
 +#: dirmngr/ocsp.c:580
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
- msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+ msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
 +#: dirmngr/ocsp.c:614
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
- msgstr "%s: Nem tudom el�rni: %s.\n"
+ msgstr "%s: Nem tudom elérni: %s.\n"
  
 +#: dirmngr/ocsp.c:621
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
@@@ -10335,9 -8295,8 +10419,9 @@@
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
- msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
+ msgstr "Nincs alapértelmezett titkoskulcs-karika: %s\n"
  
 +#: dirmngr/ocsp.c:634
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
@@@ -10346,19 -8304,16 +10430,19 @@@
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
- msgstr "%s rejtjelez�st haszn�lok.\n"
+ msgstr "%s rejtjelezést használok.\n"
  
 +#: dirmngr/ocsp.c:646
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:676
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: dirmngr/ocsp.c:701
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
@@@ -10367,12 -8321,10 +10451,12 @@@
  msgid "good"
  msgstr ""
  
 +#: dirmngr/ocsp.c:708
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
- msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
+ msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
  
 +#: dirmngr/ocsp.c:743
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
@@@ -10384,83 -8334,66 +10468,83 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
- msgstr "Al��r�s sikertelen: %s\n"
+ msgstr "Aláírás sikertelen: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
- msgstr "Al��r�s sikertelen: %s\n"
+ msgstr "Aláírás sikertelen: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
- msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
- msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
+ msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
- msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+ msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
- msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
+ msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
- msgstr "Al��r�s sikertelen: %s\n"
+ msgstr "Aláírás sikertelen: %s\n"
  
 +#: dirmngr/validate.c:201
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
@@@ -10468,46 -8400,37 +10552,46 @@@
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
- msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
+ msgstr "Ellenőrzöm a bizalmi adatbázist.\n"
  
 +#: dirmngr/validate.c:245
  msgid "not checking CRL for"
  msgstr ""
  
 +#: dirmngr/validate.c:250
  #, fuzzy
  msgid "checking CRL for"
- msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
 +#: dirmngr/validate.c:528
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
- msgstr "al��r�s ellen�rz�se"
+ msgstr "aláírás ellenőrzése"
  
 +#: dirmngr/validate.c:561
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
- msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
  
 +#: dirmngr/validate.c:738
  #, fuzzy
  msgid "certificate chain is good\n"
- msgstr "%c%lu preferencia k�tszer szerepel!\n"
+ msgstr "%c%lu preferencia kétszer szerepel!\n"
  
 +#: dirmngr/validate.c:968
  msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
+ msgstr "A DSA 160 bites hash (kivonatoló) algoritmust igényel.\n"
  
 +#: dirmngr/validate.c:1116
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
- msgstr "kil�p�s|kilepes"
+ msgstr "kilépés|kilepes"
  
 +#: tools/gpg-connect-agent.c:79
  msgid "print data out hex encoded"
  msgstr ""
  
@@@ -10535,21 -8452,17 +10619,21 @@@ msgstr "
  msgid "do not use extended connect mode"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:92
  #, fuzzy
  msgid "|FILE|run commands from FILE on startup"
- msgstr "|f�jl|b�v�t� modul bet�lt�se"
+ msgstr "|fájl|bővítő modul betöltése"
  
 +#: tools/gpg-connect-agent.c:93
  msgid "run /subst on startup"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:205
  #, fuzzy
  msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
 +#: tools/gpg-connect-agent.c:208
  msgid ""
  "Syntax: @GPG at -connect-agent [options]\n"
  "Connect to a running agent and send commands\n"
@@@ -10566,37 -8476,29 +10650,37 @@@ msgstr "
  msgid "option \"%s\" ignored due to \"%s\"\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
  #, fuzzy, c-format
  msgid "receiving line failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: tools/gpg-connect-agent.c:1458
  #, fuzzy
  msgid "line too long - skipped\n"
- msgstr "A sor t�l hossz�!\n"
+ msgstr "A sor túl hosszú!\n"
  
 +#: tools/gpg-connect-agent.c:1462
  msgid "line shortened due to embedded Nul character\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1837
  #, fuzzy, c-format
  msgid "unknown command '%s'\n"
- msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
+ msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
  
 +#: tools/gpg-connect-agent.c:1855
  #, fuzzy, c-format
  msgid "sending line failed: %s\n"
- msgstr "Al��r�s sikertelen: %s\n"
+ msgstr "Aláírás sikertelen: %s\n"
  
 +#: tools/gpg-connect-agent.c:2251
  #, fuzzy, c-format
  msgid "error sending standard options: %s\n"
- msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
 +#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
@@@ -10646,43 -8535,34 +10730,43 @@@ msgstr "
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:579
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
- msgstr "|N|N. sorsz�m� jelsz�m�d haszn�lata"
+ msgstr "|N|N. sorszámú jelszómód használata"
  
 +#: tools/gpgconf-comp.c:583
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
- msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
  
 +#: tools/gpgconf-comp.c:587
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
  msgid "|NAME|use NAME as default secret key"
- msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
+ msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
  
 +#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
- msgstr "|N�V|titkos�t�s N�V r�sz�re"
+ msgstr "|NÉV|titkosítás NÉV részére"
  
 +#: tools/gpgconf-comp.c:704
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
- msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
+ msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
  
 +#: tools/gpgconf-comp.c:735
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
@@@ -10694,12 -8572,10 +10778,12 @@@ msgstr "
  msgid "disable all access to the dirmngr"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:790
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
- msgstr "|N�V|N�V rejtjelez� algoritmus haszn. jelszavakhoz"
+ msgstr "|NÉV|NÉV rejtjelező algoritmus haszn. jelszavakhoz"
  
 +#: tools/gpgconf-comp.c:820
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
@@@ -10711,153 -8585,125 +10795,161 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "hálózati hiba"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
- msgstr "rossz jelsz�"
+ msgid "Passphrase Entry"
+ msgstr "rossz jelszó"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
- msgstr "nyilv�nos kulcs nem tal�lhat�"
+ msgstr "nyilvános kulcs nem található"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
- msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
+ msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
- msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
+ msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "bizalmi adatbázis frissítése"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
- msgstr "kimeneti �llom�ny megad�sa"
+ msgstr "kimeneti állomány megadása"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
- msgstr "nyilv�nos kulcs nem tal�lhat�"
+ msgstr "nyilvános kulcs nem található"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  #, fuzzy
  msgid "No argument allowed"
- msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+ msgstr "Írom a titkos kulcsot a %s állományba.\n"
  
 +#: tools/symcryptrun.c:154
  #, fuzzy
  msgid ""
  "@\n"
@@@ -10867,26 -8713,21 +10959,26 @@@ msgstr "
  "@Parancsok:\n"
  " "
  
 +#: tools/symcryptrun.c:156
  #, fuzzy
  msgid "decryption modus"
- msgstr "Visszafejt�s rendben.\n"
+ msgstr "Visszafejtés rendben.\n"
  
 +#: tools/symcryptrun.c:157
  #, fuzzy
  msgid "encryption modus"
- msgstr "Visszafejt�s rendben.\n"
+ msgstr "Visszafejtés rendben.\n"
  
 +#: tools/symcryptrun.c:161
  msgid "tool class (confucius)"
  msgstr ""
  
 +#: tools/symcryptrun.c:162
  #, fuzzy
  msgid "program filename"
- msgstr "--store [f�jln�v]"
+ msgstr "--store [fájlnév]"
  
 +#: tools/symcryptrun.c:164
  msgid "secret key file (required)"
  msgstr ""
  
@@@ -10894,59 -8734,48 +10986,59 @@@
  msgid "input file name (default stdin)"
  msgstr ""
  
 +#: tools/symcryptrun.c:209
  #, fuzzy
  msgid "Usage: symcryptrun [options] (-h for help)"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
 +#: tools/symcryptrun.c:212
  msgid ""
  "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
  "[options...] COMMAND [inputfile]\n"
  "Call a simple symmetric encryption tool\n"
  msgstr ""
  
 +#: 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"
+ msgstr "%s és %s nem használható együtt!\n"
  
 +#: 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"
+ msgstr "Nem tudom megnyitni az állományt: %s.\n"
  
 +#: tools/symcryptrun.c:317
  #, fuzzy, c-format
  msgid "can't create temporary directory '%s': %s\n"
- msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
+ msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
  
 +#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
  #, fuzzy, c-format
  msgid "could not open %s for writing: %s\n"
  msgstr "Nem tudom megnyitni %s-t: %s\n"
  
 +#: tools/symcryptrun.c:385
  #, fuzzy, c-format
  msgid "error writing to %s: %s\n"
- msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
+ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
  
 +#: tools/symcryptrun.c:392
  #, fuzzy, c-format
  msgid "error reading from %s: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
  #, fuzzy, c-format
  msgid "error closing %s: %s\n"
- msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+ msgstr "Hiba \"%s\" olvasásakor: %s\n"
  
 +#: tools/symcryptrun.c:490
  #, fuzzy
  msgid "no --program option provided\n"
- msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
+ msgstr "Külső program meghívása nem támogatott.\n"
  
 +#: tools/symcryptrun.c:496
  msgid "only --decrypt and --encrypt are supported\n"
  msgstr ""
  
@@@ -10958,62 -8785,50 +11050,62 @@@ msgstr "
  msgid "cannot allocate args vector\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:531
  #, fuzzy, c-format
  msgid "could not create pipe: %s\n"
- msgstr "%s nem hozhat� l�tre: %s\n"
+ msgstr "%s nem hozható létre: %s\n"
  
 +#: tools/symcryptrun.c:538
  #, fuzzy, c-format
  msgid "could not create pty: %s\n"
- msgstr "%s nem hozhat� l�tre: %s\n"
+ msgstr "%s nem hozható létre: %s\n"
  
 +#: tools/symcryptrun.c:554
  #, c-format
  msgid "could not fork: %s\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:582
  #, fuzzy, c-format
  msgid "execv failed: %s\n"
- msgstr "Friss�t�s sikertelen: %s.\n"
+ msgstr "Frissítés sikertelen: %s.\n"
  
 +#: tools/symcryptrun.c:611
  #, fuzzy, c-format
  msgid "select failed: %s\n"
- msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
  
 +#: tools/symcryptrun.c:628
  #, fuzzy, c-format
  msgid "read failed: %s\n"
- msgstr "Friss�t�s sikertelen: %s.\n"
+ msgstr "Frissítés sikertelen: %s.\n"
  
 +#: tools/symcryptrun.c:680
  #, fuzzy, c-format
  msgid "pty read failed: %s\n"
- msgstr "Friss�t�s sikertelen: %s.\n"
+ msgstr "Frissítés sikertelen: %s.\n"
  
 +#: tools/symcryptrun.c:732
  #, fuzzy, c-format
  msgid "waitpid failed: %s\n"
- msgstr "Friss�t�s sikertelen: %s.\n"
+ msgstr "Frissítés sikertelen: %s.\n"
  
 +#: tools/symcryptrun.c:746
  #, c-format
  msgid "child aborted with status %i\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:801
  #, fuzzy, c-format
  msgid "cannot allocate infile string: %s\n"
- msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
  
 +#: tools/symcryptrun.c:814
  #, fuzzy, c-format
  msgid "cannot allocate outfile string: %s\n"
- msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+ msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
  
 +#: tools/symcryptrun.c:987
  #, c-format
  msgid "either %s or %s must be given\n"
  msgstr ""
@@@ -11022,17 -8836,14 +11114,17 @@@
  msgid "no class provided\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:1018
  #, fuzzy, c-format
  msgid "class %s is not supported\n"
- msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
+ msgstr "%d%s védő algoritmus nem támogatott.\n"
  
 +#: tools/gpg-check-pattern.c:144
  #, fuzzy
  msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
- msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
  
 +#: tools/gpg-check-pattern.c:147
  msgid ""
  "Syntax: gpg-check-pattern [options] patternfile\n"
  "Check a passphrase given on stdin against the patternfile\n"
diff --cc po/id.po
index 7104986,fc9af08..9c24705
--- a/po/id.po
+++ b/po/id.po
@@@ -10,7 -10,6 +10,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg-id\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2004-06-17 16:32+0700\n"
  "Last-Translator: Tedi Heriyanto <tedi_h at gmx.net>\n"
  "Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@@ -20,7 -19,6 +20,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "X-Generator: KBabel 1.3\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
@@@ -31,40 -29,31 +31,40 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Anda ingin menghapus kunci terpilih ini? "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -72,7 -61,6 +72,7 @@@ msgstr "passphrase tidak valid
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr ""
  
@@@ -82,75 -70,59 +82,75 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, 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:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "passphrase yang buruk"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
  msgstr "baris terlalu panjang\n"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "passphrase terlalu panjang\n"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Karakter tidak valid dalam nama\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
  msgstr "MPI yang buruk"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "passphrase yang buruk"
@@@ -160,25 -131,11 +160,25 @@@
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "algoritma proteksi %d%s tidak didukung\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -204,58 -157,39 +204,48 @@@ msgstr "kesalahan menulis keyring rahas
  msgid "no suitable card key found: %s\n"
  msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "gagal menghapus keyblok: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "kesalahan menulis keyring `%s': %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "ubah passphrase"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: gagal membuat hashtable: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -387,8 -297,6 +377,8 @@@ msgstr "
  msgid "Please enter the new passphrase"
  msgstr "ubah passphrase"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
@@@ -398,118 -306,92 +388,124 @@@ msgstr "
  "Pilihan:\n"
  "  "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "Kunci dilampaui"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "detil"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "lebih diam"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
  msgstr "cari kunci di keyserver"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
  msgstr "perbarui database trust"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NAMA|set charset terminal ke NAMA"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
  msgstr "tidak didukung"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -518,162 -400,120 +514,162 @@@ msgstr "tidak didukung
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Laporkan bug ke <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "file pilihan `%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "membaca pilihan dari `%s'\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
  msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, 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:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "gagal memperbarui: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "tidak dapat membuat direktori `%s': %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: direktori tercipta\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "trustdb: read failed (n=%d): %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: tidak dapat membuat direktori: %s\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "gagal perbarui rahasia: %s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: dilewati: %s\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
@@@ -689,8 -527,6 +685,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -698,9 -534,6 +694,9 @@@ msgstr "
  "@Perintah:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -754,7 -579,6 +750,8 @@@ msgstr "Batal
  msgid "error while asking for the passphrase: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
@@@ -813,8 -628,6 +810,8 @@@ msgstr "
  msgid "Yes"
  msgstr "y|ya"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -844,40 -654,33 +841,40 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
  msgstr "ubah passphrase"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Anda ingin menghapus kunci terpilih ini? "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  msgid "Delete key"
  msgstr "aktifkan kunci"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -892,12 -693,10 +889,12 @@@ msgstr "
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
@@@ -924,84 -719,72 +921,95 @@@ msgstr "algoritma proteksi %d%s tidak d
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "algoritma proteksi %d%s tidak didukung\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "gagal memperbarui: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "gagal memperbarui: %s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
  msgstr "tidak dapat terkoneksi ke `%s': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  #, fuzzy
  msgid "problem setting the gpg-agent options\n"
  msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "tidak dapat meniadakan core dump: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "gagal memperbarui: %s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "gagal enarmoring: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "y|ya"
  
@@@ -1056,7 -828,6 +1064,7 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
@@@ -1076,36 -844,29 +1084,36 @@@ msgstr "WARNING: \"%s\" adalah opsi ter
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  msgid "connection to agent is in restricted mode\n"
  msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1186,8 -931,6 +1194,8 @@@ msgstr "%s: keyring tercipta\n
  msgid "algorithm: %s"
  msgstr "armor: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1271,12 -998,10 +1279,12 @@@ msgstr "Kunci ini telah berakhir!
  msgid "Root certificate trustworthy"
  msgstr "sertifikat yang buruk"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
  msgstr "sertifikat yang buruk"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
  msgstr "Kunci tersedia di:"
@@@ -1318,7 -1035,6 +1326,7 @@@ msgstr "Tidak tersedia bantuan untuk `%
  msgid "ignoring garbage line"
  msgstr "kesalahan dalam garis trailer\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
  msgstr "tidak dikenal"
@@@ -1399,7 -1100,6 +1407,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
  msgstr "tidak diproses"
@@@ -1458,8 -1147,6 +1466,8 @@@ msgstr "kunci publik %08lX tidak ditemu
  msgid "waiting for lock %s...\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1546,13 -1215,11 +1554,13 @@@ msgstr "
  "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
  "mengandung bug\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "tidak dapat dibaca manusia"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1560,25 -1227,20 +1568,25 @@@ msgstr "
  "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
  "dan diakhiri dengan sebuah '='\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  #, fuzzy
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  msgid "a notation name may not contain an '=' character\n"
  msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
@@@ -1588,49 -1250,38 +1596,48 @@@ msgstr "
  "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
  "dan diakhiri dengan sebuah '='\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr ""
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Masukkan passphrase: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
  msgstr "PERINGATAN: %s menimpa %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, fuzzy, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "kunci rahasia tidak tersedia"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
@@@ -1640,15 -1290,10 +1647,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "bagian kunci rahasia tidak tersedia\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Pilihan anda? "
  
@@@ -1680,184 -1319,142 +1687,184 @@@ msgstr "tidak diproses
  msgid "forced"
  msgstr ""
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr ""
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr ""
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr ""
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  #, fuzzy
  msgid "URL to retrieve public key: "
  msgstr "tidak ada kunci publik yang sesuai: %s\n"
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr ""
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr ""
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  #, fuzzy
  msgid "Language preferences: "
  msgstr "perbarui preferensi"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  #, fuzzy
  msgid "Error: invalid length of preference string.\n"
  msgstr "Karakter tidak valid dalam string preferensi\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  #, fuzzy
  msgid "Error: invalid characters in preference string.\n"
  msgstr "Karakter tidak valid dalam string preferensi\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr ""
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  #, fuzzy
  msgid "Error: invalid response.\n"
  msgstr "kesalahan: fingerprint tidak valid\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  #, fuzzy
  msgid "CA fingerprint: "
  msgstr "tampilkan fingerprint"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  #, fuzzy
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "kesalahan: fingerprint tidak valid\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, fuzzy, c-format
  msgid "key operation not possible: %s\n"
  msgstr "Pembuatan kunci gagal: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  #, fuzzy
  msgid "not an OpenPGP card"
  msgstr "tidak ditemukan data OpenPGP yang valid.\n"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Keysize yang anda inginkan? (1024) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "Keysize yang anda inginkan? (1024) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Keysize yang anda inginkan? (1024) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "dibulatkan hingga %u bit\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
  msgstr "dilewati: kunci pribadi telah ada\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1865,155 -1462,120 +1872,155 @@@
  "You should change them using the command --change-pin\n"
  msgstr ""
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  #, fuzzy
  msgid "Please select the type of key to generate:\n"
  msgstr "Silakan pilih kunci yang anda inginkan:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  #, fuzzy
  msgid "   (1) Signature key\n"
  msgstr "Signature kadaluwarsa %s\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  #, fuzzy
  msgid "   (2) Encryption key\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Pilihan tidak valid.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  #, fuzzy
  msgid "Please select where to store the key:\n"
  msgstr "Silakan pilih alasan untuk pembatalan:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "gagal memperbarui: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
  msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "dilewati: kunci pribadi telah ada\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  msgid "Continue? (y/N) "
  msgstr "Ditandai? "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "berhenti dari menu ini"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  #, fuzzy
  msgid "show admin commands"
  msgstr "perintah saling konflik\n"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "tampilkan bantuan"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  #, fuzzy
  msgid "list all available data"
  msgstr "Kunci tersedia di:"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr ""
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr ""
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr ""
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  #, fuzzy
  msgid "change the login name"
  msgstr "ubah tanggal kadaluarsa"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  #, fuzzy
  msgid "change the language preferences"
  msgstr "ubah ownertrust"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr ""
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  #, fuzzy
  msgid "change a CA fingerprint"
  msgstr "tampilkan fingerprint"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr ""
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  #, fuzzy
  msgid "generate new keys"
  msgstr "buat sepasang kunci baru"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr ""
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr ""
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  #, fuzzy
  msgid "Admin-only command\n"
  msgstr "perintah saling konflik\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  #, fuzzy
  msgid "Admin commands are allowed\n"
  msgstr "perintah saling konflik\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  #, fuzzy
  msgid "Admin commands are not allowed\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Perintah tidak valid (coba \"help\")\n"
  
@@@ -2021,23 -1582,15 +2028,23 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output tidak berfungsi untuk perintah ini\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "tidak dapat membuka `%s'\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "kunci '%s' tidak ditemukan: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "gagal membaca keyblock: %s\n"
@@@ -2154,7 -1685,6 +2161,7 @@@ msgstr "memaksa cipher simetrik %s (%d
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s dienkripsi untuk: %s\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
@@@ -2236,65 -1751,51 +2243,65 @@@ msgstr "PERINGATAN: tidak dapat menghap
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  #, fuzzy
  msgid "export signatures that are marked as local-only"
  msgstr ""
  "\n"
  "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  #, fuzzy
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
  
- #: g10/export.c:108
++#: g10/export.c:112
  #, fuzzy
  msgid "remove unusable parts from key during export"
  msgstr "kunci rahasia tidak dapat dipakai"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: dilewati: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "menulis ke `%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "PERINGATAN: tidak ada yang diekspor\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2305,8 -1805,6 +2312,8 @@@ msgstr "kesalahan penciptaan : `%s': %s
  msgid "[User ID not found]"
  msgstr "[User id tidak ditemukan]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
  msgstr "opsi impor tidak valid\n"
@@@ -2327,266 -1822,207 +2334,266 @@@ msgstr "kesalahan membaca `%s': %s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "kesalahan penciptaan : `%s': %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "kesalahan penciptaan : `%s': %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
  msgstr "tampilkan fingerprint"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, fuzzy, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, fuzzy, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "buat detached signature"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[file]|buat signature teks"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "buat detached signature"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "enkripsi data"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "enkripsi hanya dengan symmetric cipher"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "dekripsi data (default)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verifikasi signature"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "tampilkan kunci"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "tampilkan kunci dan signature"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "periksa signature kunci"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "tampilkan kunci dan fingerprint"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "tampilkan kunci rahasia"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "buat sepasang kunci baru"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "buat sepasang kunci baru"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "buat sepasang kunci baru"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "buat sepasang kunci baru"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "buat sertifikat revokasi"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "hapus kunci dari keyring publik"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "hapus kunci dari keyring pribadi"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "tandai kunci"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "tandai kunci secara lokal"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "tandai kunci"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "tandai kunci secara lokal"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "tandai atau edit kunci"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
  msgstr "ubah passphrase"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "ekspor kunci"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "ekspor kunci ke keyserver"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "impor kunci dari keyserver"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "cari kunci di keyserver"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "update semua kunci dari keyserver"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "impor/gabung kunci"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "perbarui database trust"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [file]|cetak digest pesan"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "ciptakan output ascii"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NAMA|enkripsi untuk NAMA"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "gunakan id-user ini untuk menandai/dekripsi"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|set tingkat kompresi N (0 tidak ada)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "gunakan mode teks kanonikal"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "jangan buat perubahan"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "tanya sebelum menimpa"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2594,7 -2030,6 +2601,7 @@@ msgstr "
  "@\n"
  "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2614,13 -2049,11 +2621,13 @@@ msgstr "
  " --list-keys [nama]      tampilkan kunci\n"
  " --fingerprint [nama]    tampilkan fingerprint\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2635,7 -2068,6 +2642,7 @@@ msgstr "
  "tandai, cek, enkripsi atau dekripsi\n"
  "operasi baku tergantung pada data input\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2643,630 -2075,499 +2650,635 @@@ msgstr "
  "\n"
  "Algoritma yang didukung:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "Pubkey: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Cipher: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Kompresi: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "pemakaian: gpg [pilihan] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "perintah saling konflik\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, 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:1556
++#: g10/gpg.c:1564
  #, 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:1559
++#: g10/gpg.c:1567
  #, 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:1565
++#: g10/gpg.c:1573
  #, 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:1568
++#: g10/gpg.c:1576
  #, 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:1571
++#: g10/gpg.c:1579
  #, 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:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Tidak ada signature koresponden di ring rahasia\n"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Tidak ada signature koresponden di ring rahasia\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "tampilkan keyring tempat kunci yang dipilih berada"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Tidak ada signature koresponden di ring rahasia\n"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "tiadakan kunci"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "penerima baku tidak dikenal `%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "opsi impor tidak valid\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
  msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "Bukan alamat email yang valid\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "algoritma hash tidak valid `%s'\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "tidak dapat memparsing URI keyserver\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opsi impor tidak valid\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opsi impor tidak valid\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opsi impor tidak valid\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  #, fuzzy
  msgid "show all notations during signature verification"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "show user ID validity during signature verification"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "%s bukanlah set karakter yang valid\n"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "tidak dapat menset path exec ke %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: opsi ekspor tidak valid\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "PERINGATAN: program mungkin membuat file core!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "PERINGATAN: %s menimpa %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s tidak dibolehkan dengan %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s tidak masuk akal dengan %s!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "algoritma cipher yang dipilih tidak valid\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "algoritma digest yang dipilih tidak valid\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
  msgstr "algoritma cipher yang dipilih tidak valid\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed harus lebih dari 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed harus lebih dari 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  #, 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:3588
++#: g10/gpg.c:3686
  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:3590
++#: g10/gpg.c:3688
  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:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  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:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "preferensi baku tidak valid\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "preferensi cipher personal tidak valid\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "preferensi digest personal tidak valid\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "preferensi kompresi personal tidak valid\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s belum dapat dipakai dengan %s\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, 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:3704
++#: g10/gpg.c:3802
  #, 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:3709
++#: g10/gpg.c:3807
  #, 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:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  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:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [namafile]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [namafile]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "dekripsi gagal: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [namafile]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  #, fuzzy
  msgid "--symmetric --encrypt [filename]"
  msgstr "--sign --encrypt [namafile]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, 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:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [namafile]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [namafile]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  #, fuzzy
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--sign --encrypt [namafile]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, 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:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [namafile]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [namafile]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [namafile]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key id-user"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key id-user"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key id-user [perintah]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
  msgstr "--sign-key id-user"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "Pengiriman keyserver gagal: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "Penerimaan keyserver gagal: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "Ekspor kunci gagal: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "Ekspor kunci gagal: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "Pencarian keyserver gagal: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "Refresh keyserver gagal: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "gagal dearmoring: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "gagal enarmoring: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "algoritma hash tidak valid `%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[namafile]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Teruskan dan ketikkan pesan anda ....\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "mengambil kunci ini dari keyring"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "buat timestamp konflik hanya sebagai peringatan"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|tulis info status ke FD ini"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -3285,328 -2584,262 +3297,328 @@@ msgstr "Tidak tersedia bantuan
  msgid "No help available for '%s'"
  msgstr "Tidak tersedia bantuan untuk `%s'"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "perbarui database trust"
  
- #: g10/import.c:147
++#: g10/import.c:160
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "perbarui database trust"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  msgid "show key during import"
  msgstr "tampilkan fingerprint"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "kunci rahasia tidak dapat dipakai"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "melewati blok tipe %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu kunci telah diproses\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Jumlah yang telah diproses: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "        lewati kunci baru: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "        lewati kunci baru: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "         tanpa ID user: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "             diimpor: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "            tidak berubah: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "         ID user baru: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "          subkey baru: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "       signature baru: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "  pembatalan kunci baru: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "     kunci rahasia dibaca: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  kunci rahasia diimpor: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " kunci rahasia tidak berubah: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "            tidak diimpor: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "       signature baru: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "     kunci rahasia dibaca: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "%s signature, algoritma digest %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "kunci %08lX: tidak ada ID user\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "melewati `%s': %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "kunci %08lX: tidak ada ID user yang valid\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "kunci %08lX: kunci baru - dilewati\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "kunci %08lX: \"%s\" %d signature baru\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "kunci %08lX: \"%s\" %d signature baru\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "kunci %08lX: \"%s\" %d signature baru\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "kunci %08lX: \"%s\" tidak berubah\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "kunci %08lX: kunci rahasia diimpor\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "dilewati: kunci pribadi telah ada\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
@@@ -3621,178 -2854,144 +3633,178 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
  "pembatalan\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "kunci %08lX: subkey binding tidak valid\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "kunci %08lX: hapus subkey binding ganda\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "kunci %08lX: melewati ID user "
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "kunci %08lX: melewati subkey\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
  msgstr "%s: keyring tercipta\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
  msgstr "%s: keyring tercipta\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "kesalahan penciptaan : `%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "gagal membuat kembali cache keyring: %s\n"
@@@ -3805,35 -3002,33 +3817,41 @@@ msgstr "[pembatalan]
  msgid "[self-signature]"
  msgstr "[self-signature]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "kesalahan menulis keyring `%s': %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "%s signature, algoritma digest %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Signature baik dari \""
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "melewati `%s': %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "User ID \"%s\" dibatalkan."
  msgstr[1] "User ID \"%s\" dibatalkan."
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3841,7 -3036,6 +3859,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 signature tidak diperiksa karena tidak ada kunci\n"
  msgstr[1] "1 signature tidak diperiksa karena tidak ada kunci\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3849,21 -3043,18 +3867,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d signature yang buruk\n"
  msgstr[1] "%d signature yang buruk\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Signature baik dari \""
  msgstr[1] "Signature baik dari \""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3876,68 -3067,53 +3894,68 @@@ msgstr "
  "memeriksa fingerprint dari berbagai sumber...)?\n"
  "\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Saya cukup percaya\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Saya sangat percaya\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "User ID \"%s\" dibatalkan."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "..Tidak dapat menandai.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "User ID \"%s\" kadaluwarsa."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "User ID \"%s\" bukan self-signed."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "User ID \"%s\" bukan self-signed."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Ditandai? "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3946,11 -3122,9 +3964,11 @@@ msgstr "
  "Self-signature pada \"%s\"\n"
  "adalah signature bergaya PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3959,13 -3133,11 +3977,13 @@@ msgstr "
  "Signature anda saat ini pada \"%s\"\n"
  "telah habis berlaku.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
  "berlaku? (y/N)"
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3974,43 -3146,34 +3992,43 @@@ msgstr "
  "Signature anda saat ini pada \"%s\"\n"
  "adalah signature.lokal \n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Apakah anda ingin menandainya lagi? (y/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "Kunci ini telah berakhir!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Kunci ini akan kadaluarsa pada %s \n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4020,32 -3183,26 +4038,32 @@@ msgstr "
  "menandai benar benar milik\n"
  "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Saya tidak akan menjawab.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Saya belum memeriksanya.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4054,265 -3211,211 +4072,265 @@@ msgstr "
  "Apakah anda yakin untuk menandai kunci ini \n"
  "dengan kunci anda: "
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
  "Ini akan jadi self-signature.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
  "Signature akan ditandai sebagai tidak dapat diekspor.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
  "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "Saya belum memeriksa kunci ini sama sekali.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Saya telah memeriksa kunci ini.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Ditandai? "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "gagal menandai: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "simpan dan berhenti"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "tampilkan fingerprint"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Notasi signature: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "tampilkan kunci dan ID user"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "pilih ID user N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  #, fuzzy
  msgid "select subkey N"
  msgstr "pilih ID user N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "check signatures"
  msgstr "batalkan signature"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "tandai kunci secara lokal"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "tambah sebuah ID user"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "tambah sebuah photo ID"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "hapus ID user"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "hapus kunci sekunder"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "tambah kunci pembatalan"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr "Perbarui preferensi untuk user ID terpilih?"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "tandai ID user sebagai primer"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "tampilkan preferensi (ahli)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "tampilkan preferensi (verbose)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr "Perbarui preferensi untuk user ID terpilih?"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "tidak dapat memparsing URI keyserver\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr "Perbarui preferensi untuk user ID terpilih?"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "ubah passphrase"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "ubah ownertrust"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Benar-benar hapus seluruh ID user terpilih? "
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "batalkan sebuah ID user"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "batalkan kunci sekunder"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  #, fuzzy
  msgid "enable key"
  msgstr "aktifkan kunci"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "disable key"
  msgstr "tiadakan kunci"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "tampilkan photo ID"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "Kunci rahasia tersedia.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4320,279 -3423,220 +4338,279 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "Kunci dibatalkan"
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Tandai ID seluruh user? "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Tandai ID seluruh user? "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "kelas signature tidak dikenal"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Anda harus memilih minimum satu ID user.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Hapus seluruh ID user terpilih? "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Hapus ID user ini? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Hapus ID user ini? "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Anda harus memilih minimum satu kunci.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "tidak dapat membuka `%s': %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Anda harus memilih minimum satu kunci.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Anda ingin menghapus kunci terpilih ini? "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Anda ingin menghapus kunci ini? "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Benar-benar hapus seluruh ID user terpilih? "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Benar-benar hapus ID user ini? "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Anda ingin membatalkan kunci ini? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Anda ingin membatalkan kunci terpilih ini? "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Anda ingin membatalkan kunci ini? "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "set daftar preferensi"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Perbarui preferensi untuk user ID terpilih?"
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Update preferensi?"
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Simpan perubahan? "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Berhenti tanpa menyimpan? "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "gagal memperbarui: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Pembuatan kunci gagal: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "kesalahan: fingerprint tidak valid\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "nilai yang tidak valid\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Tidak ada ID user tersebut.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Digest: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Fitur: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  #, fuzzy
  msgid "Notations: "
  msgstr "Notasi: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, fuzzy, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (sensitive)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[revoked] "
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr " [berakhir: %s]"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr " [berakhir: %s]"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " trust: %c/%c"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " trust: %c/%c"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Kunci ini telah ditiadakan"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4600,19 -3644,14 +4618,20 @@@ msgstr "
  "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
  "kecuali anda memulai kembali program.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[revoked] "
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4620,17 -3659,14 +4639,17 @@@ 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:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
  msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4640,35 -3676,27 +4659,35 @@@ msgstr "
  "dapat menyebabkan beberapa versi\n"
  "          PGP menolak kunci ini.\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Anda tetap ingin menambahkannya? (y/n) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  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:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Hapus signature baik ini? (y/T/q)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Hapus signature tidak valid ini? (y/T/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4676,38 -3704,31 +4695,38 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Menghapus %d signature.\n"
  msgstr[1] "Menghapus %d signature.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Tidak ada yang dihapus.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  #, fuzzy
  msgid "invalid"
  msgstr "armor tidak valid"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "User ID \"%s\" dibatalkan."
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
  msgstr[0] "User ID \"%s\" dibatalkan."
  msgstr[1] "User ID \"%s\" dibatalkan."
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "User ID \"%s\" telah dibatalkan\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "User ID \"%s\" telah dibatalkan\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4717,44 -3738,36 +4736,44 @@@ msgstr "
  "designated dapat\n"
  "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  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:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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:4642
++#: g10/keyedit.c:4658
  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:4664
++#: g10/keyedit.c:4680
  #, 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:4682
++#: g10/keyedit.c:4698
  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:4688
++#: g10/keyedit.c:4704
  #, 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:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4762,239 -3775,188 +4781,239 @@@
  msgstr ""
  "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Merubah batas waktu untuk kunci sekunder.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Merubah batas waktu untuk kunci primer.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  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:4971
++#: g10/keyedit.c:4987
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Anda harus memilih minimum satu ID user.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, 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:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Notasi signature: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Ditimpa (y/T)? "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Tidak ada ID user dengan index %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Tidak ada ID user dengan index %d\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Tidak ada ID user dengan index %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Tidak ada ID user dengan index %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID user: "
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (tidak dapat diekspor)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Kunci ini akan kadaluarsa pada %s \n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Anda tetap ingin membatalkannya? (y/n) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   ditandai oleh %08lX pada %s%s\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, 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:6094
++#: g10/keyedit.c:6110
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (tidak dapat diekspor)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   dibatalkan oleh %08lX pada %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Anda akan membatalkan signature ini:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "tidak ada kunci rahasia\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "User ID \"%s\" telah dibatalkan\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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:6370
++#: g10/keyedit.c:6386
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "User ID \"%s\" telah dibatalkan\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "User ID \"%s\" telah dibatalkan\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "preferensi %c%lu ganda \n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "terlalu banyak preferensi `%c'\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "terlalu banyak preferensi `%c'\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "terlalu banyak preferensi `%c'\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "Karakter tidak valid dalam string preferensi\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "menulis signature direct\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "menulis self signature\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "menulis key binding signature\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "keysize tidak valid; menggunakan %u bit\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "keysize dibulatkan hingga %u bit\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  #, fuzzy
  msgid "Sign"
  msgstr "tandai"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  #, fuzzy
  msgid "Encrypt"
  msgstr "enkripsi data"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr ""
  
@@@ -5008,157 -3970,126 +5027,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "  (%d) ElGamal (hanya enkripsi)\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Silakan pilih kunci yang anda inginkan:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "  (%d) DSA dan ElGamal (baku)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "  (%d) DSA dan ElGamal (baku)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "  (%d) DSA (hanya menandai)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "  (%d) RSA (hanya menandai)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "  (%d) ElGamal (hanya enkripsi)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "  (%d) DSA dan ElGamal (baku)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) DSA (hanya menandai)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) RSA (hanya enkripsi)\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Notasi signature: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Tidak ada ID user dengan index %d\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "dibulatkan hingga %u bit\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Keysize yang anda inginkan? (1024) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Keysize yang anda inginkan? (1024) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Keysize yang diminta adalah %u bit\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Silakan pilih kunci yang anda inginkan:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5174,7 -4105,6 +5193,7 @@@ msgstr "
  "     <n>m = kunci berakhir dalam n bulan\n"
  "     <n>y = kunci berakhir dalam n tahun\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5190,40 -4120,32 +5209,40 @@@ msgstr "
  "     <n>m = signature berakhir dalam n bulan\n"
  "     <n>y = signature berakhir dalam n tahun\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "Kunci valid untuk? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Signature valid untuk? (0) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "nilai yang tidak valid\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s tidak pernah berakhir\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s tidak pernah berakhir\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s berakhir pada %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Signature kadaluarsa pada %s \n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5231,12 -4153,10 +5250,12 @@@ msgstr "
  "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
  "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  #, fuzzy
  msgid "Is this correct? (y/N) "
  msgstr "Benar (y/t)? "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5247,7 -4167,6 +5266,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  #, fuzzy
  msgid ""
  "\n"
@@@ -5263,50 -4182,39 +5282,50 @@@ msgstr "
  "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
  "  \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Nama sebenarnya: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Karakter tidak valid dalam nama\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "Nama tidak boleh dimulai dengan digit\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "Nama harus berukuran minimum 5 karakter\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "Alamat email: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "Bukan alamat email yang valid\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Komentar: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Karakter tidak valid dalam komentar\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Anda menggunakan set karakter `%s'.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5316,7 -4224,6 +5335,7 @@@ msgstr "
  "Anda memilih USER-ID ini:\n"
  "   \"%s\"\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
  
@@@ -5331,35 -4238,28 +5350,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnKkEeOoQq"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Silakan perbaiki kesalahan ini dulu\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5371,13 -4271,10 +5390,13 @@@ msgstr "
  "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
  "yang baik untuk memperoleh entropi.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Pembuatan kunci gagal: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5385,68 -4282,55 +5404,68 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "`%s' sudah dikompresi\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Tetap dibuat? "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Tetap dibuat? "
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "Pembuatan kunci dibatalkan.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "menulis kunci publik ke `%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "kesalahan menulis keyring publik `%s': %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5456,41 -4340,34 +5475,41 @@@ msgstr "
  "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
  "untuk tujuan ini.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr ""
  "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr ""
  "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Ingin diciptakan? "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "tidak pernah..."
  
@@@ -5541,30 -4409,24 +5560,30 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "Keyring"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Fingerprint kunci primer:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "     Fingerprint subkunci ="
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr "     Fingerprint kunci primer ="
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "     Fingerprint subkunci ="
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  #, fuzzy
  msgid "      Key fingerprint ="
  msgstr "     Fingerprint kunci ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr ""
  
@@@ -5600,113 -4457,90 +5619,113 @@@ msgstr[1] "1 signature yang buruk\n
  msgid "%s: keyring created\n"
  msgstr "%s: keyring tercipta\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  #, fuzzy
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "URL signature kebijakan yang diberikan tidak valid\n"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  #, fuzzy
  msgid "disabled"
  msgstr "disable"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr ""
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, fuzzy, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "opsi ekspor tidak valid\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr ""
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
  msgstr[0] "meminta kunci %08lX dari %s\n"
  msgstr[1] "meminta kunci %08lX dari %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, fuzzy, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, fuzzy, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "kunci '%s' tidak ditemukan: %s\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  #, fuzzy
  msgid "key not found on keyserver\n"
  msgstr "kunci '%s' tidak ditemukan: %s\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr ""
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, fuzzy, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "meminta kunci %08lX dari %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, fuzzy, c-format
  msgid "requesting key %s from %s\n"
  msgstr "meminta kunci %08lX dari %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  msgid "no keyserver known\n"
  msgstr "opsi ekspor tidak valid\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, fuzzy, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "melewati `%s': %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, fuzzy, c-format
  msgid "sending key %s to %s\n"
  msgstr ""
  "\"\n"
  "ditandai dengan kunci anda %08lX pada %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  msgid "requesting key from '%s'\n"
  msgstr "meminta kunci %08lX dari %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, fuzzy, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
@@@ -5806,132 -4620,105 +5825,132 @@@ msgstr "original file name='%.*s'\n
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Signature baik dari \""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "signature BURUK dari \""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Signature kadaluarsa dari \""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Signature baik dari \""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "verifikasi signature tidak diabaikan\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "tidak dapat menangani banyak signature ini\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Signature kadaluwarsa %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "              alias \""
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "              alias \""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Kunci tersedia di:"
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[uncertain]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "              alias \""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Signature kadaluwarsa %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Signature kadaluarsa pada %s \n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s signature, algoritma digest %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "biner"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "modeteks"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "tidak dikenal"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "algoritma pubkey tidak dikenal"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Tidak dapat memeriksa signature: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "bukan detached signature\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "kelas signature mandiri 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "signature model lama (PGP 2.X)\n"
  
@@@ -6031,26 -4799,21 +6050,26 @@@ msgstr "Tidak dikompresi
  msgid "uncompressed|none"
  msgstr "Tidak dikompresi"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "membaca pilihan dari `%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  msgid "unknown option '%s'\n"
  msgstr "penerima baku tidak dikenal `%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "kelas signature tidak dikenal"
@@@ -6348,7 -5056,21 +6367,24 @@@ msgstr "Kunci ini mungkin milik pemilik
  msgid "This key belongs to us\n"
  msgstr "Kunci ini milik kita\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "Tidak pasti bahwa kunci milik orang yang disebutkan\n"
+ "Jika anda sangat tahu apa yang sedang anda lakukan, anda boleh menjawab\n"
+ "pertanyaan berikut dengan ya\n"
+ "\n"
+ 
++#: g10/pkclist.c:489
  #, fuzzy
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
@@@ -6360,131 -5082,103 +6396,131 @@@ msgstr "
  "pertanyaan berikut dengan ya\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  #, fuzzy
  msgid "Use this key anyway? (y/N) "
  msgstr "Tetap gunakan kunci ini? "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
  "Peringatan: kunci ini mungkin dibatalkan:(kunci pembatalan tidak ada)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  #, fuzzy
  msgid "         This could mean that the signature is forged.\n"
  msgstr "        Hal ini dapat berarti bahwa signature adalah palsu.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Catatan: Kunci ini telah ditiadakan\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Catatan: Kunci ini telah berakhir!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr ""
  "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr "  Tidak ada indikasi signature milik pemilik.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "        Signature mungkin palsu.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
  "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "        Tidak pasti signature milik pemilik.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: dilewati: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: dilewati: kunci publik dimatikan\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: dilewati: kunci publik telah ada\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "tidak dapat terkoneksi ke `%s': %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "algoritma hash tidak valid `%s'\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "algoritma hash tidak valid `%s'\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr ""
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6492,37 -5186,29 +6528,37 @@@ msgstr "
  "\n"
  "Masukkan user ID.  Akhiri dengan baris kosong: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Tidak ada ID user tersebut.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "Kunci publik dimatikan.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "dilewati: kunci publik telah diset\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "penerima baku tidak dikenal `%s'\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "tidak ada alamat yang valid\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "kunci %08lX: tidak ada ID user\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "kunci %08lX: tidak ada ID user\n"
@@@ -6770,42 -5410,35 +6806,42 @@@ msgstr "
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "Peringatan: konflik digest signature dalam pesan\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, fuzzy, c-format
  msgid "please see %s for more information\n"
  msgstr " i = beri saya informasi lebih banyak lagi\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
  "PERINGATAN: subkey penanda tangan %08lX memiliki sertifikasi silang yang "
  "tidak valid\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
  msgstr[0] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
  msgstr[1] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
  msgstr[0] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
  msgstr[1] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6816,7 -5449,6 +6852,7 @@@ msgstr[0] "
  msgstr[1] ""
  "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
@@@ -6826,29 -5458,24 +6862,29 @@@ msgstr[0] "
  msgstr[1] ""
  "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "CATATAN: kunci telah dibatalkan"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, fuzzy, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
  "mengasumsikan signature buruk dari kunci %08lX karena ada bit kritik tidak "
  "dikenal\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
@@@ -6919,7 -5535,6 +6955,7 @@@ msgstr "
  "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
  "untuk signature!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@@ -6967,12 -5574,10 +7003,12 @@@ msgstr "kesalahan: gagal menemukan cata
  msgid "read error in '%s': %s\n"
  msgstr "kesalahan pembacaan: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: gagal sync: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "tidak dapat membuat %s: %s\n"
@@@ -7001,7 -5601,6 +7037,7 @@@ msgstr "transaksi trustdb terlalu besar
  msgid "%s: directory does not exist!\n"
  msgstr "%s: direktori tidak ada!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "tidak dapat menutup `%s': %s\n"
@@@ -7113,265 -5690,247 +7149,301 @@@ msgstr "tidak dapat menangani baris tek
  msgid "input line longer than %d characters\n"
  msgstr "baris input lebih dari %d karakter\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Algoritma yang didukung:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: kesalahan menulis dir record: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr ""
+ 
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "tampilkan kunci dan ID user"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Kebijakan: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "tampilkan kunci"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "|algo [file]|cetak digest pesan"
  msgstr[1] "|algo [file]|cetak digest pesan"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
+ #, c-format
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "kesalahan menulis keyring `%s': %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Menghapus %d signature.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|algo [file]|cetak digest pesan"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|algo [file]|cetak digest pesan"
+ msgstr[1] "|algo [file]|cetak digest pesan"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "dienkripsi dengan passphrase %lu\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|algo [file]|cetak digest pesan"
+ msgstr[1] "|algo [file]|cetak digest pesan"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7385,105 -5944,93 +7457,117 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "kesalahan menulis keyring publik `%s': %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
  msgstr "'%s' bukanlah keyID panjang yang valid\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, fuzzy, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, fuzzy, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "kunci %08lX muncul lebih dari satu kali dalam trustdb\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, fuzzy, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr "kunci %08lX: tidak ada kunci publik untuk trusted key- dilewati\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, fuzzy, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "kunci ditandai sebagai sangat dipercaya.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "tidak perlu memeriksa trustdb\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "pemeriksaan trustdb berikutnya pada %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "tidak perlu memeriksa trustdb\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "tidak perlu memeriksa trustdb\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "kunci publik %08lX tidak ditemukan: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "lakukanlah --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "memeriksa trustdb\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "%lu kunci telah diproses\n"
  msgstr[1] "%lu kunci telah diproses\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7491,22 -6038,18 +7575,22 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d kunci diproses (%d hitungan validitas dihapus)\n"
  msgstr[1] "%d kunci diproses (%d hitungan validitas dihapus)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@@ -7620,143 -6142,113 +7704,145 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "ubah passphrase"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
  msgstr "ubah passphrase"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "Silakan pilih alasan untuk pembatalan:\n"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "Silakan pilih alasan untuk pembatalan:\n"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "gagal membuat kembali cache keyring: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, fuzzy, c-format
- msgid "reading public key failed: %s\n"
- msgstr "gagal menghapus keyblok: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "remove keys from the public keyring"
+ msgid "response does not contain the EC public key\n"
+ msgstr "hapus kunci dari keyring publik"
+ 
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1551
+ #, fuzzy, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "gagal menghapus keyblok: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "Pengiriman keyserver gagal: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7766,26 -6258,21 +7852,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Silakan pilih alasan untuk pembatalan:\n"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7793,117 -6280,93 +7879,117 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "ubah passphrase"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "gagal membaca keyblock: %s\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: kesalahan membaca record bebas: %s\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  #, fuzzy
  msgid "key already exists\n"
  msgstr "`%s' sudah dikompresi\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  #, fuzzy
  msgid "generating new key\n"
  msgstr "buat sepasang kunci baru"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
  msgstr "buat sepasang kunci baru"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI tidak didukung"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Pembuatan kunci gagal: %s\n"
  msgstr[1] "Pembuatan kunci gagal: %s\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "%s signature, algoritma digest %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@@ -7924,7 -6384,6 +8010,7 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -7980,16 -6428,13 +8066,16 @@@ msgid "
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8009,11 -6451,9 +8095,11 @@@ msgstr "gpg-agent tidak tersedia untuk 
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  #, fuzzy
  msgid "shell"
  msgstr "bantuan"
@@@ -8046,209 -6480,162 +8132,209 @@@ msgstr "menulis kunci rahasia ke `%s'\n
  msgid "certificate policy not allowed"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
  msgstr "CATATAN: kunci telah dibatalkan"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
  msgstr "menulis kunci rahasia ke `%s'\n"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
  msgstr "Kunci ini telah berakhir!"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
  msgstr "Kunci ini telah berakhir!"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
  msgstr "Kunci ini telah berakhir!"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
  msgstr "Kunci ini telah berakhir!"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
  msgstr "       signature baru: %lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
  msgstr "Sertifikat pembatalan tercipta.\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
  msgstr "sertifikat yang buruk"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "tampilkan fingerprint"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
  msgstr "buat sertifikat revokasi"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr ""
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "Gagal memeriksa signature yang dibuat: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "verifikasi signature"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "preferensi %c%lu ganda \n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
  msgstr "Sertifikat pembatalan tercipta.\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
  msgstr "sertifikat yang buruk"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8580,7 -6901,6 +8666,7 @@@ msgstr "
  msgid "certificate '%s' not found: %s\n"
  msgstr "kunci '%s' tidak ditemukan: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
  msgstr "gagal membaca keyblock: %s\n"
@@@ -8605,134 -6921,104 +8691,134 @@@ msgstr "gagal menghapus keyblok: %s\n
  msgid "no valid recipients given\n"
  msgstr "(Tidak diberikan deskripsi)\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
  msgstr "tampilkan kunci rahasia"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
  msgstr "sertifikat yang buruk"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
  msgstr "sertifikat yang buruk"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
  msgstr "sertifikat yang buruk"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "ciptakan output ascii"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "jangan menggunakan terminal"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "mode batch: tanpa tanya"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "asumsikan ya untuk seluruh pertanyaan"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "asumsikan tidak untuk seluruh pertanyaan"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "tambah keyring ini ke daftar keyring"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAMA|gunakan algoritma cipher NAMA"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8743,47 -7029,38 +8829,47 @@@ msgstr "
  "tandai, cek, enkripsi atau dekripsi\n"
  "operasi baku tergantung pada data input\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "tidak dapat terkoneksi ke `%s': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "penerima baku tidak dikenal `%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(Tidak diberikan deskripsi)\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " s = lewati kunci ini\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "tidak dapat memparsing URI keyserver\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "menulis ke `%s'\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "tidak dapat menutup `%s': %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -8801,7 -7075,6 +8887,7 @@@ msgstr "buat sertifikat revokasi
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -8816,32 -7087,26 +8902,32 @@@ msgstr "kesalahan penciptaan passphrase
  msgid "error reading input: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
  msgstr "kesalahan penciptaan passphrase: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, fuzzy, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "rev? masalah memeriksa pembatalan: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
  msgstr "kesalahan membaca `%s': %s\n"
@@@ -9729,112 -7817,88 +9815,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Berhenti tanpa menyimpan? "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|muat modul ekstensi FILE"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "tidak dapat memparsing URI keyserver\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9847,91 -7911,72 +9937,91 @@@ msgstr "
  "@\n"
  "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "pemakaian: gpg [pilihan] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "%s tidak dibolehkan dengan %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "gagal enarmoring: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "gagal enarmoring: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "baris terlalu panjang\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "kesalahan: fingerprint tidak valid\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "kesalahan pembacaan: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "tidak diproses"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10111,13 -8120,6 +10201,7 @@@ msgstr "\"%s\" bukan sebuah file JPEG\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "kesalahan menulis keyring `%s': %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
  msgstr "kesalahan menulis keyring `%s': %s\n"
@@@ -10375,77 -8325,61 +10459,77 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "gagal menandai: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "gagal menandai: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "kesalahan mengirim ke `%s': %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "gagal menghapus keyblok: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "tidak dapat membuat %s: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: gagal membuat hashtable: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "gagal inisialisasi TrustDB: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "gagal membuat kembali cache keyring: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10493,7 -8418,6 +10577,7 @@@ msgstr "DSA butuh penggunaan algoritma 
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "q|k|keluar"
@@@ -10664,11 -8547,9 +10748,11 @@@ msgstr "|NAMA|enkripsi untuk NAMA
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "tidak dapat memparsing URI keyserver\n"
@@@ -10702,148 -8576,121 +10786,156 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "kesalahan jaringan"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "passphrase yang buruk"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "kunci publik tidak ditemukan"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
  msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
  msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "perbarui database trust"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "gunakan sebagai file output"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
  msgstr "kunci publik tidak ditemukan"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  #, fuzzy
  msgid "No argument allowed"
  msgstr "menulis kunci rahasia ke `%s'\n"
diff --cc po/it.po
index 0b16df4,ea6c820..bba9c33
--- a/po/it.po
+++ b/po/it.po
@@@ -6,16 -6,14 +6,16 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.1.92\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2008-05-26 12:02+0200\n"
  "Last-Translator: Marco d'Itri <md at linux.it>\n"
  "Language-Team: Italian <tp at lists.linux.it>\n"
  "Language: it\n"
  "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-1\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
@@@ -26,40 -24,31 +26,40 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Vuoi davvero cancellare le chiavi selezionate? "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -67,7 -56,6 +67,7 @@@ msgstr "passphrase non valida
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr ""
  
@@@ -77,103 -65,72 +77,103 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, 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"
+ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "passphrase errata"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
  msgstr "riga troppo lunga\n"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "passphrase troppo lunga\n"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "Carattere non valido nel nome\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
  msgstr "MPI danneggiato"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "passphrase errata"
  
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
  #, fuzzy, c-format
  msgid "ssh keys greater than %d bits are not supported\n"
- msgstr "l'algoritmo di protezione %d%s non � gestito\n"
+ msgstr "l'algoritmo di protezione %d%s non è gestito\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "impossibile creare `%s': %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -194,63 -148,43 +194,53 @@@ msgstr "
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
  
 +#: agent/command-ssh.c:2444
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
- msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
+ msgstr "non è stato trovato un portachiavi segreto scrivibile: %s\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "cancellazione del keyblock fallita: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "errore scrivendo il portachiavi `%s': %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
- msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "cambia la passphrase"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
- msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s: creazione della tabella hash fallita: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -382,8 -292,6 +372,8 @@@ msgstr "
  msgid "Please enter the new passphrase"
  msgstr "cambia la passphrase"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
@@@ -393,118 -301,92 +383,124 @@@ msgstr "
  "Opzioni:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "Questa chiave è stata sostituita"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "prolisso"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "meno prolisso"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
  msgstr "cerca delle chiavi su un keyserver"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
  msgstr "aggiorna il database della fiducia"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NOME|imposta NOME come set di caratteri del terminale"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
  msgstr "non gestito"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -513,167 -395,124 +509,167 @@@ msgstr "non gestito
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Per favore segnala i bug a <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "file con le opzioni `%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "lettura delle opzioni da `%s'\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
- msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+ msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "impossibile creare %s: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, fuzzy
  msgid "a gpg-agent is already running - not starting a new one\n"
- msgstr "gpg-agent non � disponibile in questa sessione\n"
+ msgstr "gpg-agent non è disponibile in questa sessione\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "aggiornamento fallito: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "impossibile creare la directory `%s': %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: directory creata\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "trustdb: read fallita (n=%d): %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: impossibile creare la directory: %s\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "aggiornamento della chiave segreta fallito: %s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: saltata: %s\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
- msgstr "gpg-agent non � disponibile in questa sessione\n"
+ msgstr "gpg-agent non è disponibile in questa sessione\n"
  
 +#: agent/preset-passphrase.c:99
  #, fuzzy
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
@@@ -684,8 -522,6 +680,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -693,9 -529,6 +689,9 @@@ msgstr "
  "@Comandi:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -716,17 -547,14 +712,17 @@@ msgid "
  "Secret key maintenance tool\n"
  msgstr ""
  
 +#: agent/protect-tool.c:693
  #, fuzzy
  msgid "Please enter the passphrase to unprotect the PKCS#12 object."
- msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
 +#: agent/protect-tool.c:698
  #, fuzzy
  msgid "Please enter the passphrase to protect the new PKCS#12 object."
- msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
 +#: agent/protect-tool.c:704
  msgid ""
  "Please enter the passphrase to protect the imported object within the GnuPG "
  "system."
@@@ -737,9 -564,8 +733,9 @@@ msgstr "
  msgid ""
  "Please enter the passphrase or the PIN\n"
  "needed to complete this operation."
- msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
  #, fuzzy
  msgid "cancelled\n"
  msgstr "Cancella"
@@@ -749,7 -574,6 +745,8 @@@
  msgid "error while asking for the passphrase: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
@@@ -803,13 -619,10 +800,13 @@@ msgid "
  "certificates?"
  msgstr ""
  
 +#: agent/trustlist.c:673 common/audit.c:467
  #, fuzzy
  msgid "Yes"
- msgstr "si|s�"
+ msgstr "si|sì"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -839,40 -649,33 +836,40 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
  msgstr "cambia la passphrase"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Vuoi davvero cancellare le chiavi selezionate? "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  msgid "Delete key"
  msgstr "abilita una chiave"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -887,12 -688,10 +884,12 @@@ msgstr "
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "controllo della firma creata fallito: %s\n"
@@@ -905,102 -702,87 +902,113 @@@ msgstr "parti della chiave segreta non 
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "public key algorithm %d (%s) is not supported\n"
- msgstr "l'algoritmo di protezione %d%s non � gestito\n"
+ msgstr "l'algoritmo di protezione %d%s non è gestito\n"
  
 +#: agent/cvt-openpgp.c:448
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection algorithm %d (%s) is not supported\n"
- msgstr "l'algoritmo di protezione %d%s non � gestito\n"
+ msgstr "l'algoritmo di protezione %d%s non è gestito\n"
  
 +#: agent/cvt-openpgp.c:455
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection hash algorithm %d (%s) is not supported\n"
- msgstr "l'algoritmo di protezione %d%s non � gestito\n"
+ msgstr "l'algoritmo di protezione %d%s non è gestito\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "aggiornamento fallito: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "aggiornamento fallito: %s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
  msgstr "impossibile connettersi a `%s': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  #, fuzzy
  msgid "problem setting the gpg-agent options\n"
  msgstr "problema con l'agent: ha restituito 0x%lx\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "impossibile disabilitare i core dump: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
- msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
+ msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "aggiornamento fallito: %s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "creazione dell'armatura fallita: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
- msgstr "si|s�"
+ msgstr "si|sì"
  
 +#: common/yesno.c:46 common/yesno.c:87
  msgid "yY"
  msgstr "sS"
  
@@@ -1051,7 -823,6 +1059,7 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "errore creando il portachiavi `%s': %s\n"
@@@ -1061,46 -831,37 +1069,46 @@@
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
  msgstr ""
  
 +#: common/miscellaneous.c:146
  #, fuzzy, c-format
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
- msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+ msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
  
 +#: common/miscellaneous.c:554
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  msgid "connection to agent is in restricted mode\n"
  msgstr "impossibile fare questo in modo batch\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1181,8 -926,6 +1189,8 @@@ msgstr "%s: portachiavi creato\n
  msgid "algorithm: %s"
  msgstr "armatura: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1226,12 -961,10 +1234,12 @@@ msgstr "algoritmo di hash non valido `%
  msgid "Data decryption succeeded"
  msgstr ""
  
 +#: common/audit.c:910
  #, fuzzy
  msgid "Encryption algorithm supported"
- msgstr "l'algoritmo di protezione %d%s non � gestito\n"
+ msgstr "l'algoritmo di protezione %d%s non è gestito\n"
  
 +#: common/audit.c:993
  #, fuzzy
  msgid "Data verification succeeded"
  msgstr "verifica della firma soppressa\n"
@@@ -1256,22 -985,18 +1264,22 @@@ msgstr "algoritmo di hash non valido `%
  msgid "Signature %d"
  msgstr "Firma scaduta il %s\n"
  
 +#: common/audit.c:1079
  #, fuzzy
  msgid "Certificate chain valid"
- msgstr "Questa chiave � scaduta!"
+ msgstr "Questa chiave è scaduta!"
  
 +#: common/audit.c:1090
  #, fuzzy
  msgid "Root certificate trustworthy"
  msgstr "certificato danneggiato"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
  msgstr "certificato danneggiato"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
  msgstr "Chiave disponibile presso: "
@@@ -1303,17 -1022,14 +1311,17 @@@ msgstr "
  msgid "Dirmngr usable"
  msgstr ""
  
 +#: common/audit.c:1307
  #, fuzzy, c-format
  msgid "No help available for '%s'."
- msgstr "Non � disponibile un aiuto per `%s'"
+ msgstr "Non è disponibile un aiuto per `%s'"
  
 +#: common/helpfile.c:90
  #, fuzzy
  msgid "ignoring garbage line"
  msgstr "errore nella riga della coda\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
  msgstr "sconosciuto"
@@@ -1396,7 -1097,6 +1404,7 @@@ msgid "command \"%.50s\" is ambiguous\n
  msgstr ""
  
  # ??? (Md)
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
  msgstr "non esaminato"
@@@ -1455,8 -1144,6 +1463,8 @@@ msgstr "chiave pubblica %08lX non trova
  msgid "waiting for lock %s...\n"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1531,25 -1202,21 +1539,25 @@@ msgstr "errore nella riga della coda\n
  msgid "no valid OpenPGP data found.\n"
  msgstr "Non sono stati trovati dati OpenPGP validi.\n"
  
 +#: g10/armor.c:1308
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
- msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
+ msgstr "armatura non valida: linea più lunga di %d caratteri\n"
  
 +#: g10/armor.c:1312
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
- "carattere quoted printable nell'armatura - probabilmente � stato usato\n"
+ "carattere quoted printable nell'armatura - probabilmente è stato usato\n"
  "un MTA buggato\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "non leggibile"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1557,25 -1224,20 +1565,25 @@@ msgstr "
  "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
  "spazi e terminare con un '='\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  #, fuzzy
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "il valore di una nota non deve usare caratteri di controllo\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  msgid "a notation name may not contain an '=' character\n"
  msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
@@@ -1585,67 -1247,50 +1593,66 @@@ msgstr "
  "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
  "spazi e terminare con un '='\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr ""
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Inserisci la passphrase: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "errore creando il portachiavi `%s': %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
  msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, fuzzy, c-format
  msgid "OpenPGP card not available: %s\n"
- msgstr "la chiave segreta non � disponibile"
+ msgstr "la chiave segreta non è disponibile"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  #, fuzzy
  msgid "can't do this in batch mode\n"
  msgstr "impossibile fare questo in modo batch\n"
  
 +#: g10/card-util.c:107
  #, fuzzy
  msgid "This command is only available for version 2 cards\n"
- msgstr "Questo comando non � permesso in modalit� %s.\n"
+ msgstr "Questo comando non è permesso in modalità %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "parti della chiave segreta non sono disponibili\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Cosa scegli? "
  
@@@ -1678,184 -1317,142 +1685,184 @@@ msgstr "non esaminato
  msgid "forced"
  msgstr ""
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr ""
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr ""
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr ""
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  #, fuzzy
  msgid "URL to retrieve public key: "
- msgstr "non c'� una chiave pubblica corrispondente: %s\n"
+ msgstr "non c'è una chiave pubblica corrispondente: %s\n"
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "errore scrivendo il portachiavi `%s': %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr ""
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr ""
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  #, fuzzy
  msgid "Language preferences: "
  msgstr "preferenze aggiornate"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  #, fuzzy
  msgid "Error: invalid length of preference string.\n"
  msgstr "carattere non valido nella stringa delle preferenze\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  #, fuzzy
  msgid "Error: invalid characters in preference string.\n"
  msgstr "carattere non valido nella stringa delle preferenze\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr ""
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  #, fuzzy
  msgid "Error: invalid response.\n"
  msgstr "errore: impronta digitale non valida\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  #, fuzzy
  msgid "CA fingerprint: "
  msgstr "mostra le impronte digitali"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  #, fuzzy
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "errore: impronta digitale non valida\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, fuzzy, c-format
  msgid "key operation not possible: %s\n"
  msgstr "Generazione della chiave fallita: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  #, fuzzy
  msgid "not an OpenPGP card"
  msgstr "Non sono stati trovati dati OpenPGP validi.\n"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Di che dimensioni vuoi la chiave? (1024) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "Di che dimensioni vuoi la chiave? (1024) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Di che dimensioni vuoi la chiave? (1024) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "arrotondate a %u bit\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
- msgstr "saltata: chiave pubblica gi� presente\n"
+ msgstr "saltata: chiave pubblica già presente\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1863,155 -1460,120 +1870,155 @@@
  "You should change them using the command --change-pin\n"
  msgstr ""
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  #, fuzzy
  msgid "Please select the type of key to generate:\n"
  msgstr "Per favore scegli che tipo di chiave vuoi:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  #, fuzzy
  msgid "   (1) Signature key\n"
  msgstr "Firma scaduta il %s\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  #, fuzzy
  msgid "   (2) Encryption key\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Scelta non valida.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  #, fuzzy
  msgid "Please select where to store the key:\n"
  msgstr "Per favore scegli il motivo della revoca:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "aggiornamento fallito: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
- msgstr "Questo comando non � permesso in modalit� %s.\n"
+ msgstr "Questo comando non è permesso in modalità %s.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
- msgstr "saltata: chiave pubblica gi� presente\n"
+ msgstr "saltata: chiave pubblica già presente\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  msgid "Continue? (y/N) "
  msgstr "Firmo davvero? "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
- msgstr "abbandona questo men�"
+ msgstr "abbandona questo menù"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  #, fuzzy
  msgid "show admin commands"
  msgstr "comandi in conflitto\n"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "mostra questo aiuto"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  #, fuzzy
  msgid "list all available data"
  msgstr "Chiave disponibile presso: "
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr ""
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr ""
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr ""
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  #, fuzzy
  msgid "change the login name"
  msgstr "cambia la data di scadenza"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  #, fuzzy
  msgid "change the language preferences"
  msgstr "cambia il valore di fiducia"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr ""
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  #, fuzzy
  msgid "change a CA fingerprint"
  msgstr "mostra le impronte digitali"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr ""
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  #, fuzzy
  msgid "generate new keys"
  msgstr "genera una nuova coppia di chiavi"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr ""
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr ""
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  #, fuzzy
  msgid "Admin-only command\n"
  msgstr "comandi in conflitto\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  #, fuzzy
  msgid "Admin commands are allowed\n"
  msgstr "comandi in conflitto\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  #, fuzzy
  msgid "Admin commands are not allowed\n"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Comando non valido  (prova \"help\")\n"
  
@@@ -2019,23 -1580,15 +2026,23 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output non funziona con questo comando\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "impossibile aprire `%s'\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "chiave `%s' non trovata: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "errore leggendo il keyblock: %s\n"
@@@ -2059,12 -1608,10 +2066,12 @@@ msgstr "impossibile fare questo in mod
  msgid "Delete this key from the keyring? (y/N) "
  msgstr "Vuoi cancellare questa chiave dal portachiavi? "
  
 +#: g10/delkey.c:158
  #, fuzzy
  msgid "This is a secret key! - really delete? (y/N) "
- msgstr "� una chiave segreta! - Vuoi cancellarla davvero? "
+ msgstr "È una chiave segreta! - Vuoi cancellarla davvero? "
  
 +#: g10/delkey.c:201
  #, fuzzy, c-format
  msgid "deleting secret %s failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
@@@ -2088,12 -1631,10 +2095,12 @@@ msgstr "cancellazione del keyblock fall
  msgid "ownertrust information cleared\n"
  msgstr "informazioni di fiducia del possessore cancellate\n"
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
- msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
+ msgstr "c'è una chiave segreta per la chiave pubblica \"%s\"!\n"
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
  
@@@ -2102,12 -1642,10 +2109,12 @@@
  msgid "error creating passphrase: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
 +#: g10/encrypt.c:239
  msgid "can't use a symmetric ESK packet due to the S2K mode\n"
  msgstr ""
- "impossibile usare un pacchetto ESK simmetrico a causa della modalit� S2K\n"
+ "impossibile usare un pacchetto ESK simmetrico a causa della modalità S2K\n"
  
 +#: g10/encrypt.c:253
  #, c-format
  msgid "using cipher %s\n"
  msgstr "uso il cifrario %s\n"
@@@ -2116,15 -1653,13 +2123,15 @@@
  #, fuzzy, c-format
  #| msgid "`%s' already compressed\n"
  msgid "'%s' already compressed\n"
- msgstr "`%s' � gi� compresso\n"
+ msgstr "`%s' è già compresso\n"
  
 +#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
- msgstr "ATTENZIONE: `%s' � un file vuoto\n"
+ msgstr "ATTENZIONE: `%s' è un file vuoto\n"
  
 +#: g10/encrypt.c:557
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "reading from '%s'\n"
@@@ -2159,12 -1690,10 +2166,12 @@@ msgstr "
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s cifrato per: \"%s\"\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
- msgstr "non � possibile usare %s in modalit� %s\n"
+ msgstr "non è possibile usare %s in modalità %s\n"
  
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
  #, c-format
  msgid "%s encrypted data\n"
  msgstr "dati cifrati con %s\n"
@@@ -2185,11 -1711,9 +2192,11 @@@ msgstr "
  msgid "problem handling encrypted packet\n"
  msgstr "problema nella gestione del pacchetto cifrato\n"
  
 +#: g10/exec.c:60
  msgid "no remote program execution supported\n"
- msgstr "l'esecuzione remota dei programmi non � gestita\n"
+ msgstr "l'esecuzione remota dei programmi non è gestita\n"
  
 +#: g10/exec.c:319
  msgid ""
  "external program calls are disabled due to unsafe options file permissions\n"
  msgstr ""
@@@ -2243,65 -1758,51 +2250,65 @@@ msgstr "ATTENZIONE: impossibile cancell
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  #, fuzzy
  msgid "export signatures that are marked as local-only"
  msgstr ""
  "\n"
- "La firma sar� marcata come irrevocabile.\n"
+ "La firma sarà marcata come irrevocabile.\n"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  #, fuzzy
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "non sono state trovate chiavi di revoca per `%s'\n"
  
- #: g10/export.c:108
++#: g10/export.c:112
  #, fuzzy
  msgid "remove unusable parts from key during export"
  msgstr "chiave segreta inutilizzabile"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: saltata: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "scrittura in `%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
- msgstr "ATTENZIONE: non � stato esportato nulla\n"
+ msgstr "ATTENZIONE: non è stato esportato nulla\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2312,8 -1812,6 +2319,8 @@@ msgstr "errore creando `%s': %s\n
  msgid "[User ID not found]"
  msgstr "[User ID non trovato]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
  msgstr "opzioni di importazione non valide\n"
@@@ -2334,266 -1829,207 +2341,266 @@@ msgstr "errore leggendo `%s': %s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "errore creando il portachiavi `%s': %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "errore creando `%s': %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "errore creando `%s': %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
  msgstr "mostra le impronte digitali"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "chiave segreta `%s' non trovata: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "|NOME|usa NOME come chiave segreta predefinita"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "|NOME|usa NOME come chiave segreta predefinita"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, fuzzy, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, fuzzy, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "fai una firma separata"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "fai una firma separata"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "cifra dati"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "cifra solo con un cifrario simmetrico"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "decifra dati (predefinito)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verifica una firma"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "elenca le chiavi"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "elenca le chiavi e le firme"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "controlla le firme delle chiavi"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "elenca le chiavi e le impronte digitali"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "elenca le chiavi segrete"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "genera una nuova coppia di chiavi"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "genera una nuova coppia di chiavi"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "genera una nuova coppia di chiavi"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "genera una nuova coppia di chiavi"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "genera un certificato di revoca"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "rimuove le chiavi dal portachiavi pubblico"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "rimuove le chiavi dal portachiavi privato"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "firma una chiave"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "firma una chiave localmente"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "firma una chiave"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "firma una chiave localmente"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "firma o modifica una chiave"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
  msgstr "cambia la passphrase"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "esporta delle chiavi"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "esporta le chiavi a un keyserver"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "importa le chiavi da un keyserver"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "cerca delle chiavi su un keyserver"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "aggiorna tutte le chiavi da un keyserver"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "importa/aggiungi delle chiavi"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "aggiorna il database della fiducia"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [files]|stampa tutti i message digests"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "crea un output ascii con armatura"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NOME|cifra per NOME"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "usa questo user-id per firmare o decifrare"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|imposta il livello di compressione (0 disab.)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "usa il modo testo canonico"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "non fa cambiamenti"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "chiede prima di sovrascrivere"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2601,7 -2037,6 +2608,7 @@@ msgstr "
  "@\n"
  "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2621,13 -2056,11 +2628,13 @@@ msgstr "
  " --list-keys [nomi]         mostra le chiavi\n"
  " --fingerprint [nomi]       mostra le impronte digitali\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2642,7 -2075,6 +2649,7 @@@ msgstr "
  "firma, controlla, cifra o decifra\n"
  "l'operazione predefinita dipende dai dati di input\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2650,629 -2082,498 +2657,634 @@@ msgstr "
  "\n"
  "Algoritmi gestiti:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "A chiave pubblica: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Cifrari: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Compressione: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "uso: gpg [opzioni] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "comandi in conflitto\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  msgid "no = sign found in group definition '%s'\n"
- msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
+ msgstr "non è stato trovato il segno = nella definizione del gruppo \"%s\"\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
- msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
+ msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
- msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
+ msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
- msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
+ msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, 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:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
- msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
+ msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
- msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
+ msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
- msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
+ msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, 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:1568
++#: g10/gpg.c:1576
  #, 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:1571
++#: g10/gpg.c:1579
  #, 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:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "elemento della configurazione sconosciuto \"%s\"\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
- msgstr "l'URL della politica di firma indicato non � valido\n"
+ msgstr "l'URL della politica di firma indicato non è valido\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  #, fuzzy
  msgid "show the keyring name in key listings"
  msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "disabilita una chiave"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "destinatario predefinito `%s' sconosciuto\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "opzioni di importazione non valide\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr ""
- "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
+ "NOTA: il vecchio file `%s' con le opzioni predefinite è stato ignorato\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
  msgstr "NOTA: %s normalmente non deve essere usato!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
- msgstr "%s non � un set di caratteri valido\n"
+ msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
- msgstr "L'indirizzo di email non � valido\n"
+ msgstr "L'indirizzo di email non è valido\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "algoritmo di hash non valido `%s'\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
- msgstr "%s non � un set di caratteri valido\n"
+ msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  #, fuzzy
  msgid "could not parse keyserver URL\n"
  msgstr "impossibile fare il parsing dell'URI del keyserver\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  #, fuzzy
  msgid "invalid keyserver options\n"
  msgstr "opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  #, fuzzy
  msgid "invalid list options\n"
  msgstr "opzioni di importazione non valide\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  #, fuzzy
  msgid "show all notations during signature verification"
- msgstr "%s non � un set di caratteri valido\n"
+ msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
- msgstr "l'URL della politica di firma indicato non � valido\n"
+ msgstr "l'URL della politica di firma indicato non è valido\n"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "show user ID validity during signature verification"
- msgstr "%s non � un set di caratteri valido\n"
+ msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
- msgstr "%s non � un set di caratteri valido\n"
+ msgstr "%s non è un set di caratteri valido\n"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  #, fuzzy
  msgid "invalid verify options\n"
  msgstr "opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "impossibile impostare exec-path a %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: opzioni di esportazione non valide\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
- msgstr "Non � permesso usare %s con %s!\n"
+ msgstr "Non è permesso usare %s con %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "Non ha senso usare %s con %s!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, 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:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
- msgstr "l'algoritmo di cifratura selezionato non � valido\n"
+ msgstr "l'algoritmo di cifratura selezionato non è valido\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
- msgstr "l'algoritmo di digest selezionato non � valido\n"
+ msgstr "l'algoritmo di digest selezionato non è valido\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
- msgstr "l'algoritmo di cifratura selezionato non � valido\n"
+ msgstr "l'algoritmo di cifratura selezionato non è valido\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
- msgstr "l'algoritmo di digest selezionato non � valido\n"
+ msgstr "l'algoritmo di digest selezionato non è valido\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed deve essere maggiore di 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed deve essere maggiore di 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  #, 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:3588
++#: g10/gpg.c:3686
  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:3590
++#: g10/gpg.c:3688
  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:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
- msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
+ msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  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:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "preferenze predefinite non valide\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "preferenze personali del cifrario non valide\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "preferenze personali del digest non valide\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "preferenze personali di compressione non valide\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s non funziona ancora con %s\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, 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"
+ msgstr "non è possibile usare l'algoritmo di cifratura \"%s\" in modalità %s\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, 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"
+ msgstr "non è possibile usare l'algoritmo di digest \"%s\" in modalità %s\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, 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"
+ "non è possibile usare l'algoritmo di compressione \"%s\" in modalità %s\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  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:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [nomefile]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [nomefile]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "decifratura fallita: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [nomefile]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  #, fuzzy
  msgid "--symmetric --encrypt [filename]"
  msgstr "--sign --encrypt [nomefile]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
- msgstr "non � possibile usare %s in modalit� %s\n"
+ msgstr "non è possibile usare %s in modalità %s\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [nomefile]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [nomefile]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  #, fuzzy
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--sign --encrypt [nomefile]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, fuzzy, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
- msgstr "non � possibile usare %s in modalit� %s\n"
+ msgstr "non è possibile usare %s in modalità %s\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [nomefile]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [nomefile]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [nomefile]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key user-id"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key user-id"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key user-id [comandi]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
  msgstr "--sign-key user-id"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "invio al keyserver fallito: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "ricezione dal keyserver fallita: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "esportazione della chiave fallita: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "esportazione della chiave fallita: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "ricerca nel keyserver fallita: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "aggiornamento del keyserver fallito: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "rimozione dell'armatura fallita: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "creazione dell'armatura fallita: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "algoritmo di hash non valido `%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[nomefile]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Vai avanti e scrivi il messaggio...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
- msgstr "l'URL della politica di certificazione indicato non � valido\n"
+ msgstr "l'URL della politica di certificazione indicato non è valido\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
- msgstr "l'URL della politica di firma indicato non � valido\n"
+ msgstr "l'URL della politica di firma indicato non è valido\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
- msgstr "l'URL della politica di firma indicato non � valido\n"
+ msgstr "l'URL della politica di firma indicato non è valido\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "prende le chiavi da questo portachiavi"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "segnala i conflitti di data solo con un avvertimento"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|scrivi le informazioni di stato sul FD"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -3281,338 -2582,270 +3293,338 @@@ msgstr "
  "Sintassi: gpg [opzioni] [file]\n"
  "Controlla le firme con le chiavi affidabili note\n"
  
 +#: g10/helptext.c:72
  msgid "No help available"
- msgstr "Non � disponibile un aiuto"
+ msgstr "Non è disponibile un aiuto"
  
 +#: g10/helptext.c:82
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "No help available for '%s'"
- msgstr "Non � disponibile un aiuto per `%s'"
+ msgstr "Non è disponibile un aiuto per `%s'"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
  msgstr "aggiorna il database della fiducia"
  
- #: g10/import.c:147
++#: g10/import.c:160
  #, fuzzy
  msgid "do not update the trustdb after import"
  msgstr "aggiorna il database della fiducia"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  msgid "show key during import"
  msgstr "mostra le impronte digitali"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  #, fuzzy
  msgid "remove unusable parts from key after import"
  msgstr "chiave segreta inutilizzabile"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "salto un blocco di tipo %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
  msgstr "Per ora sono state esaminate %lu chiavi\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Numero totale esaminato: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "  nuove chiavi saltate: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "  nuove chiavi saltate: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "         senza user ID: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "             importate: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "        non modificate: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "         nuovi user ID: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "       nuove subchiavi: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "           nuove firme: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "nuove revoche di chiavi: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "  chiavi segrete lette: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "chiavi segrete importate: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "chiavi segrete non cambiate: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "             importate: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "           nuove firme: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "  chiavi segrete lette: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "Firma %s, algoritmo di digest %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "chiave %08lX: nessun user ID\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "saltata `%s': %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "chiave %08lX: nessun user ID valido\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
- msgstr "questo pu� essere causato da una autofirma mancante\n"
+ msgstr "questo può essere causato da una autofirma mancante\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "chiave %08lX: nuova chiave - saltata\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
- msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
+ msgstr "non è stato trovato un portachiavi scrivibile: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "errore scrivendo il portachiavi `%s': %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "chiave %08lX: \"%s\" una nuova firma\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "chiave %08lX: \"%s\" non cambiata\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "chiave %08lX: chiave segreta importata\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
- msgstr "saltata: chiave pubblica gi� presente\n"
+ msgstr "saltata: chiave pubblica già presente\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
  msgstr "chiave segreta `%s' non trovata: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
@@@ -3627,181 -2860,147 +3639,181 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
  "certificato di revoca\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "chiave %08lX: nessun user ID per la firma\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "chiave %08lX: legame con la subchiave non valido:\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "chiave %08lX: revoca della subchiave non valida\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "chiave %08lX: saltato l'user ID '"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "chiave %08lX: saltata la subchiave\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
- "ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
+ "ATTENZIONE: la chiave %08lX può essere stata revocata: scarico la chiave\n"
  "di revoca %08lX.\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
- "ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
- "revoca %08lX non � presente.\n"
+ "ATTENZIONE: la chiave %08lX può essere stata revocata: la chiave di\n"
+ "revoca %08lX non è presente.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "errore creando il portachiavi `%s': %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
  msgstr "errore creando il portachiavi `%s': %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
  msgstr "portachiavi `%s' creato\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
  msgstr "portachiavi `%s' creato\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "errore creando `%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "rebuild della cache del portachiavi fallito: %s\n"
@@@ -3814,35 -3011,33 +3826,41 @@@ msgstr "[revoca]
  msgid "[self-signature]"
  msgstr "[autofirma]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "errore creando il portachiavi `%s': %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "Firma %s, algoritmo di digest %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Firma valida da \""
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "saltata `%s': %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "L'user ID \"%s\" � stato revocato."
- msgstr[1] "L'user ID \"%s\" � stato revocato."
+ msgstr[0] "L'user ID \"%s\" è stato revocato."
+ msgstr[1] "L'user ID \"%s\" è stato revocato."
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3850,7 -3045,6 +3868,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "una firma non controllata per mancanza della chiave\n"
  msgstr[1] "una firma non controllata per mancanza della chiave\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3858,21 -3052,18 +3876,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d firme non corrette\n"
  msgstr[1] "%d firme non corrette\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Firma valida da \""
  msgstr[1] "Firma valida da \""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3885,139 -3076,111 +3903,139 @@@ msgstr "
  "impronte digitali da diverse fonti...)?\n"
  "\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Mi fido marginalmente\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Mi fido completamente\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
- msgstr "L'user ID \"%s\" � stato revocato."
+ msgstr "L'user ID \"%s\" è stato revocato."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  Impossibile firmarla.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
- msgstr "L'user ID \"%s\" � scaduto."
+ msgstr "L'user ID \"%s\" è scaduto."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
- msgstr "L'user ID \"%s\" non � autofirmato."
+ msgstr "L'user ID \"%s\" non è autofirmato."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
- msgstr "L'user ID \"%s\" non � autofirmato."
+ msgstr "L'user ID \"%s\" non è autofirmato."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Firmo davvero? "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
  "is a PGP 2.x-style signature.\n"
  msgstr ""
  "L'autofirma su \"%s\"\n"
- "� una firma in stile PGP 2.x.\n"
+ "è una firma in stile PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "has expired.\n"
  msgstr ""
  "La tua firma attuale su \"%s\"\n"
- "� scaduta\n"
+ "è scaduta\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "is a local signature.\n"
  msgstr ""
  "La tua firma attuale su \"%s\"\n"
- "� una firma locale.\n"
+ "è una firma locale.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
- msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
+ msgstr "\"%s\" era già stato firmato localmente dalla chiave %08lX\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
- msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
+ msgstr "\"%s\" era già stato firmato dalla chiave %08lX\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Niente da firmare con la chiave %08lX\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
- msgstr "Questa chiave � scaduta!"
+ msgstr "Questa chiave è scaduta!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
- msgstr "Questa chiave scadr� il %s.\n"
+ msgstr "Questa chiave scadrà il %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4027,32 -3190,26 +4045,32 @@@ msgstr "
  "appartiene veramente alla persona indicata sopra?\n"
  "Se non sai cosa rispondere digita \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Preferisco non rispondere.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Non l'ho controllata per niente.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) L'ho controllata superficialmente.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) L'ho controllata molto attentamente.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4061,265 -3218,211 +4079,265 @@@ msgstr "
  "Sei davvero sicuro di volere firmare questa chiave\n"
  "con la tua chiave: \""
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
- "Questa sar� una autofirma.\n"
+ "Questa sarà una autofirma.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
- "ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
+ "ATTENZIONE: la firma non sarà marcata come non esportabile.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
- "ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
+ "ATTENZIONE: la firma sarà marcata come irrevocabile.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
- "La firma sar� marcata come non esportabile.\n"
+ "La firma sarà marcata come non esportabile.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
- "La firma sar� marcata come irrevocabile.\n"
+ "La firma sarà marcata come irrevocabile.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
  "Non ho controllato per niente questa chiave.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Ho controllato questa chiave superficialmente.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Ho controllato questa chiave molto attentamente.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Firmo davvero? "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "firma fallita: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "salva ed esci"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  #, fuzzy
  msgid "show key fingerprint"
  msgstr "mostra le impronte digitali"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Annotazione della firma: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "elenca le chiavi e gli user ID"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "scegli l'user ID N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  #, fuzzy
  msgid "select subkey N"
  msgstr "scegli l'user ID N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "check signatures"
  msgstr "revoca firme"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "firma la chiave localmente"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
  msgstr "Suggerimento: seleziona gli user ID da firmare\n"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "aggiungi un user ID"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "aggiungi un ID fotografico"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "cancella un user ID"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  #, fuzzy
  msgid "delete selected subkeys"
  msgstr "cancella una chiave secondaria"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "aggiungi una chiave di revoca"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
- msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
+ msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  #, fuzzy
  msgid "flag the selected user ID as primary"
  msgstr "imposta l'user ID come primario"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "elenca le preferenze (per esperti)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "elenca le preferenze (prolisso)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "impossibile fare il parsing dell'URI del keyserver\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "cambia la passphrase"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "cambia il valore di fiducia"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Revoco davvero tutti gli user ID selezionati? "
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "revoca un user ID"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  #, fuzzy
  msgid "revoke key or selected subkeys"
  msgstr "revoca una chiave secondaria"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  #, fuzzy
  msgid "enable key"
  msgstr "abilita una chiave"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "disable key"
  msgstr "disabilita una chiave"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  #, fuzzy
  msgid "show selected photo IDs"
  msgstr "mostra l'ID fotografico"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
- msgstr "� disponibile una chiave segreta.\n"
+ msgstr "È disponibile una chiave segreta.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Per fare questo serve la chiave segreta.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4327,300 -3430,236 +4345,301 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
- msgstr "La chiave � stata revocata."
+ msgstr "La chiave è stata revocata."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Firmo davvero tutti gli user ID? "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Firmo davvero tutti gli user ID? "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Suggerimento: seleziona gli user ID da firmare\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "classe della firma sconosciuta"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
- msgstr "Questo comando non � permesso in modalit� %s.\n"
+ msgstr "Questo comando non è permesso in modalità %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Devi selezionare almeno un user ID.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Non puoi cancellare l'ultimo user ID!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Tolgo davvero tutti gli user ID selezionati? "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Tolgo davvero questo user ID? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Tolgo davvero questo user ID? "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  #, fuzzy
  msgid "You must select exactly one key.\n"
  msgstr "Devi selezionare almeno una chiave.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "impossibile aprire `%s': %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "errore creando il portachiavi `%s': %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Devi selezionare almeno una chiave.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Vuoi davvero cancellare le chiavi selezionate? "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Vuoi davvero cancellare questa chiave? "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Revoco davvero tutti gli user ID selezionati? "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Revoco davvero questo user ID? "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Vuoi davvero revocare questa chiave? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Vuoi davvero revocare le chiavi selezionate? "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Vuoi davvero revocare questa chiave? "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  #, fuzzy
  msgid "Set preference list to:\n"
  msgstr "imposta la lista di preferenze"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
  msgstr "Aggiorno davvero le preferenze? "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  #, fuzzy
  msgid "Save changes? (y/N) "
  msgstr "Salvo i cambiamenti? "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Esco senza salvare? "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "aggiornamento fallito: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
- msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
+ msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Generazione della chiave fallita: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "errore: impronta digitale non valida\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "valore non valido\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "User ID inesistente.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Niente da firmare con la chiave %08lX\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Digest: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Caratteristiche: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  #, fuzzy
  msgid "Notations: "
  msgstr "Nota: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
- msgstr "Questa chiave pu� essere revocata dalla chiave %s "
+ msgstr "Questa chiave può essere revocata dalla chiave %s "
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, fuzzy, c-format
  msgid "This key may be revoked by %s key %s"
- msgstr "Questa chiave pu� essere revocata dalla chiave %s "
+ msgstr "Questa chiave può essere revocata dalla chiave %s "
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  #, fuzzy
  msgid "(sensitive)"
  msgstr " (sensibile)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
  msgstr "impossibile creare %s: %s\n"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "[revocata]"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr "[scadenza: %s]"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr "[scadenza: %s]"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "usage: %s"
  msgstr " fiducia: %c/%c"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, fuzzy, c-format
  msgid "trust: %s"
  msgstr " fiducia: %c/%c"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
- msgstr "Questa chiave � stata disabilitata"
+ msgstr "Questa chiave è stata disabilitata"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  msgstr ""
- "Nota che la validit� della chiave indicata non sar� necessariamente "
+ "Nota che la validità della chiave indicata non sarà necessariamente "
  "corretta\n"
- "finch� non eseguirai di nuovo il programma.\n"
+ "finchè non eseguirai di nuovo il programma.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "[revocata]"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4629,55 -3668,44 +4648,55 @@@ msgstr "
  "            potrebbe fare diventare un altro user ID il primario "
  "predefinito.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
- msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
+ msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  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 ""
- "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
- "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
+ "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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  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"
+ "Non è possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Cancellare questa firma corretta? (s/N/q)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Cancellare questa firma non valida? (s/N/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Cancellare davvero questa autofirma? (s/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4685,87 -3713,72 +4704,87 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Cancellata %d firma.\n"
  msgstr[1] "Cancellata %d firma.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
- msgstr "Non � stato cancellato nulla.\n"
+ msgstr "Non è stato cancellato nulla.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  #, fuzzy
  msgid "invalid"
  msgstr "armatura non valida"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
- msgstr "L'user ID \"%s\" � stato revocato."
+ msgstr "L'user ID \"%s\" è stato revocato."
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
- msgstr[0] "L'user ID \"%s\" � stato revocato."
- msgstr[1] "L'user ID \"%s\" � stato revocato."
+ msgstr[0] "L'user ID \"%s\" è stato revocato."
+ msgstr[1] "L'user ID \"%s\" è stato revocato."
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
- msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+ msgstr "l'user ID \"%s\" è già stato revocato\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
- msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+ msgstr "l'user ID \"%s\" è già stato revocato\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  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 ""
- "ATTENZIONE: Questa � una chiave in stile PGP 2.x. Aggiungere un revocatore\n"
- "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
+ "ATTENZIONE: Questa è una chiave in stile PGP 2.x. Aggiungere un revocatore\n"
+ "            designato può causarne il rifiuto da parte di alcune versioni\n"
  "            di PGP.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  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"
+ "Non è possibile aggiungere un revocatore designato a una chiave in stile\n"
  "PGP 2.x.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Inserisci l'user ID del revocatore designato: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr ""
- "impossibile nominare una chiave come revocatore designato di s� stessa\n"
+ "impossibile nominare una chiave come revocatore designato di sè stessa\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  #, fuzzy
  msgid "this key has already been designated as a revoker\n"
  msgstr ""
- "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
+ "ATTENZIONE: questa chiave è stata revocata dal suo revocatore designato!\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  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"
+ "ATTENZIONE: la nomina di una chiave a revocatrice designata non può essere\n"
  "annullata.\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  #, 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:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4773,243 -3786,192 +4792,243 @@@
  msgstr ""
  "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Cambio la data di scadenza per la chiave primaria.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  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"
+ msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, 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:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Devi selezionare esattamente un user ID.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, 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:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Sei sicuro di volerla usare? (s/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Sei sicuro di volerla usare? (s/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  #, fuzzy
  msgid "Enter the notation: "
  msgstr "Annotazione della firma: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Sovrascrivo (s/N)? "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Nessun user ID con l'indice %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Nessun user ID con l'indice %d\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Nessun user ID con l'indice %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
  msgstr "Nessun user ID con l'indice %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "user ID: \""
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (non esportabile)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
- msgstr "Questa chiave � scaduta il %s.\n"
+ msgstr "Questa chiave è scaduta il %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Creare un certificato di revoca per questa firma? (s/N) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   firmata da %08lX il %s%s\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, 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:6094
++#: g10/keyedit.c:6110
  #, fuzzy
  msgid " (non-revocable)"
  msgstr " (non esportabile)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   revocata da %08lX il %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Stai per revocare queste firme:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Creare davvero i certificati di revoca? (s/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "manca la chiave segreta\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
- msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+ msgstr "l'user ID \"%s\" è già stato revocato\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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:6370
++#: g10/keyedit.c:6386
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
- msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+ msgstr "l'user ID \"%s\" è già stato revocato\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
- msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+ msgstr "l'user ID \"%s\" è già stato revocato\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
- msgstr "la preferenza %c%lu � doppia\n"
+ msgstr "la preferenza %c%lu è doppia\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  #, fuzzy
  msgid "too many cipher preferences\n"
  msgstr "ci sono troppe preferenze `%c'\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  #, fuzzy
  msgid "too many digest preferences\n"
  msgstr "ci sono troppe preferenze `%c'\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  #, fuzzy
  msgid "too many compression preferences\n"
  msgstr "ci sono troppe preferenze `%c'\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "carattere non valido nella stringa delle preferenze\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "scrittura della firma diretta\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "scrittura della autofirma\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "scrittura della firma di collegamento alla chiave\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "dimensione della chiave non valida; uso %u bit\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "dimensioni della chiave arrotondate a %u bit\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  #, fuzzy
  msgid "Encrypt"
  msgstr "cifra dati"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr ""
  
@@@ -5023,157 -3985,126 +5042,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (cifra solo)\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Per favore scegli che tipo di chiave vuoi:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA e ElGamal (default)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA e ElGamal (default)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (firma solo)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (firma solo)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (cifra solo)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA e ElGamal (default)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (firma solo)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (cifra solo)\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Annotazione della firma: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Nessun user ID con l'indice %d\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "arrotondate a %u bit\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Di che dimensioni vuoi la chiave? (1024) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Di che dimensioni vuoi la chiave? (1024) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
- msgstr "La dimensione richiesta della chiave � %u bit\n"
+ msgstr "La dimensione richiesta della chiave è %u bit\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Per favore scegli che tipo di chiave vuoi:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5182,14 -4113,13 +5201,14 @@@
  "      <n>m = key expires in n months\n"
  "      <n>y = key expires in n years\n"
  msgstr ""
- "Per favore specifica per quanto tempo la chiave sar� valida.\n"
- "         0 = la chiave non scadr�\n"
- "      <n>  = la chiave scadr� dopo n giorni\n"
- "      <n>w = la chiave scadr� dopo n settimane\n"
- "      <n>m = la chiave scadr� dopo n mesi\n"
- "      <n>y = la chiave scadr� dopo n anni\n"
+ "Per favore specifica per quanto tempo la chiave sarà valida.\n"
+ "         0 = la chiave non scadrà\n"
+ "      <n>  = la chiave scadrà dopo n giorni\n"
+ "      <n>w = la chiave scadrà dopo n settimane\n"
+ "      <n>m = la chiave scadrà dopo n mesi\n"
+ "      <n>y = la chiave scadrà dopo n anni\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5198,60 -4128,50 +5217,60 @@@
  "      <n>m = signature expires in n months\n"
  "      <n>y = signature expires in n years\n"
  msgstr ""
- "Per favore specifica per quanto tempo la firma sar� valida.\n"
- "         0 = la chiave non scadr�\n"
- "      <n>  = la chiave scadr� dopo n giorni\n"
- "      <n>w = la chiave scadr� dopo n settimane\n"
- "      <n>m = la chiave scadr� dopo n mesi\n"
- "      <n>y = la chiave scadr� dopo n anni\n"
+ "Per favore specifica per quanto tempo la firma sarà valida.\n"
+ "         0 = la chiave non scadrà\n"
+ "      <n>  = la chiave scadrà dopo n giorni\n"
+ "      <n>w = la chiave scadrà dopo n settimane\n"
+ "      <n>m = la chiave scadrà dopo n mesi\n"
+ "      <n>y = la chiave scadrà dopo n anni\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "Chiave valida per? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Firma valida per? (0) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "valore non valido\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  #, fuzzy
  msgid "Key does not expire at all\n"
  msgstr "%s non ha scadenza\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  #, fuzzy
  msgid "Signature does not expire at all\n"
  msgstr "%s non ha scadenza\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
- msgstr "%s scadr� il %s\n"
+ msgstr "%s scadrà il %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
- msgstr "Questa firma scadr� il %s\n"
+ msgstr "Questa firma scadrà il %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
- "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
- "Comunque, sar� gestita correttamente fino al 2106.\n"
+ "Il tuo sistema non può mostrare date oltre il 2038.\n"
+ "Comunque, sarà gestita correttamente fino al 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  #, fuzzy
  msgid "Is this correct? (y/N) "
- msgstr "� giusto (s/n)? "
+ msgstr "È giusto (s/n)? "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5262,7 -4182,6 +5281,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  #, fuzzy
  msgid ""
  "\n"
@@@ -5279,50 -4198,39 +5298,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Nome e Cognome: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Carattere non valido nel nome\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
- msgstr "Il nome non pu� iniziare con una cifra\n"
+ msgstr "Il nome non può iniziare con una cifra\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "Indirizzo di Email: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
- msgstr "L'indirizzo di email non � valido\n"
+ msgstr "L'indirizzo di email non è valido\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Commento: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Carattere non valido nel commento\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Stai usando il set di caratteri `%s'.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5333,7 -4241,6 +5352,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
  
@@@ -5348,53 -4255,43 +5367,53 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Per favore correggi prima l'errore\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
  "disks) during the prime generation; this gives the random number\n"
  "generator a better chance to gain enough entropy.\n"
  msgstr ""
- "Dobbiamo generare un mucchio di byte casuali. � una buona idea eseguire\n"
+ "Dobbiamo generare un mucchio di byte casuali. È una buona idea eseguire\n"
  "qualche altra azione (scrivere sulla tastiera, muovere il mouse, usare i\n"
  "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
- "numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
+ "numeri casuali migliori possibilità di raccogliere abbastanza entropia.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Generazione della chiave fallita: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5402,66 -4299,53 +5421,66 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
- msgstr "`%s' � gi� compresso\n"
+ msgstr "`%s' è già compresso\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  msgid "Create anyway? (y/N) "
  msgstr "Uso lo stesso questa chiave? "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  msgid "creating anyway\n"
  msgstr "genera una nuova coppia di chiavi"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "Generazione della chiave annullata.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "impossibile creare `%s': %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "NOTA: chiave %08lX scaduta il %s\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "scrittura della chiave pubblica in `%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
- msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
+ msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "chiavi pubbliche e segrete create e firmate.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
@@@ -5471,43 -4355,36 +5490,43 @@@ msgstr "
  "il comando \"--edit-key\" per generare una chiave secondaria per questo "
  "scopo.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr ""
- "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
+ "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
  "con l'orologio)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr ""
- "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
+ "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
  "con l'orologio)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Parti della chiave segreta non sono disponibili.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Parti della chiave segreta non sono disponibili.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Crea davvero? "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "mai       "
  
@@@ -5558,30 -4426,24 +5577,30 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "Portachiavi"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Impronta digitale della chiave primaria:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "    Impronta digitale della subchiave:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr " Impronta digitale della chiave primaria:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "     Impronta digitale della subchiave:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  #, fuzzy
  msgid "      Key fingerprint ="
  msgstr "     Impronta digitale ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr ""
  
@@@ -5617,101 -4474,80 +5636,101 @@@ msgstr[1] "una firma non corretta\n
  msgid "%s: keyring created\n"
  msgstr "%s: portachiavi creato\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  #, fuzzy
  msgid "honor the preferred keyserver URL set on the key"
- msgstr "l'URL della politica di firma indicato non � valido\n"
+ msgstr "l'URL della politica di firma indicato non è valido\n"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  #, fuzzy
  msgid "disabled"
  msgstr "disable"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr ""
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, fuzzy, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "opzioni di esportazione non valide\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr ""
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
  msgstr[0] "richiedo la chiave %08lX a %s\n"
  msgstr[1] "richiedo la chiave %08lX a %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, fuzzy, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, fuzzy, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "chiave `%s' non trovata: %s\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  #, fuzzy
  msgid "key not found on keyserver\n"
  msgstr "chiave `%s' non trovata: %s\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr ""
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, fuzzy, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "richiedo la chiave %08lX a %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, fuzzy, c-format
  msgid "requesting key %s from %s\n"
  msgstr "richiedo la chiave %08lX a %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  msgid "no keyserver known\n"
  msgstr "opzioni di esportazione non valide\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, fuzzy, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "saltata `%s': %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, fuzzy, c-format
  msgid "sending key %s to %s\n"
  msgstr ""
@@@ -5719,12 -4555,10 +5738,12 @@@
  "firmata con la tua chiave %08lX il %s\n"
  "\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  msgid "requesting key from '%s'\n"
  msgstr "richiedo la chiave %08lX a %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, fuzzy, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
@@@ -5744,12 -4575,10 +5763,12 @@@ msgstr "chiave di sessione cifrata con 
  msgid "passphrase generated with unknown digest algorithm %d\n"
  msgstr "cifrato con l'algoritmo sconosciuto %d\n"
  
 +#: g10/mainproc.c:378
  #, fuzzy, c-format
  msgid "public key is %s\n"
- msgstr "la chiave pubblica � %08lX\n"
+ msgstr "la chiave pubblica è %08lX\n"
  
 +#: g10/mainproc.c:456
  msgid "public key encrypted data: good DEK\n"
  msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
  
@@@ -5792,19 -4613,15 +5811,19 @@@ msgstr "suppongo che i dati siano cifra
  msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
  msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  msgid "WARNING: message was not integrity protected\n"
- msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
+ msgstr "ATTENZIONE: l'integrità del messaggio non era protetta\n"
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
  msgstr "decifratura corretta\n"
  
 +#: g10/mainproc.c:637
  msgid "WARNING: encrypted message has been manipulated!\n"
- msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
+ msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
  
 +#: g10/mainproc.c:653
  #, c-format
  msgid "decryption failed: %s\n"
  msgstr "decifratura fallita: %s\n"
@@@ -5824,131 -4638,104 +5843,131 @@@ msgstr "nome del file originale='%.*s'\
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Firma valida da \""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "Firma NON corretta da \""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Firma scaduta da \""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Firma valida da \""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "verifica della firma soppressa\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
  msgstr "impossibile gestire queste firme multiple\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Firma scaduta il %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "                alias \""
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                alias \""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Chiave disponibile presso: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[incerta]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "                alias \""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Firma scaduta il %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
- msgstr "Questa firma scadr� il %s\n"
+ msgstr "Questa firma scadrà il %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "Firma %s, algoritmo di digest %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binario"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "modo testo"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "sconosciuto"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "algoritmo della chiave pubblica sconosciuto"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Impossibile controllare la firma: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
- msgstr "non � una firma separata\n"
+ msgstr "non è una firma separata\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
- msgstr "ATTENZIONE: trovate firme multiple. Sar� controllata solo la prima.\n"
+ msgstr "ATTENZIONE: trovate firme multiple. Sarà controllata solo la prima.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "firma solitaria di classe 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "firma vecchio stile (PGP 2.x)\n"
  
@@@ -6009,38 -4785,31 +6028,38 @@@ msgstr "errore di lettura: %s\n
  msgid "(further info: "
  msgstr ""
  
 +#: g10/misc.c:1056
  #, c-format
  msgid "%s:%d: deprecated option \"%s\"\n"
- msgstr "%s:%d \"%s\" � una opzione deprecata\n"
+ msgstr "%s:%d \"%s\" è una opzione deprecata\n"
  
 +#: g10/misc.c:1060
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated option\n"
- msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+ msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
  
 +#: g10/misc.c:1062
  #, c-format
  msgid "please use \"%s%s\" instead\n"
  msgstr "usa al suo posto \"%s%s\"\n"
  
 +#: g10/misc.c:1069
  #, fuzzy, c-format
  msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
- msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+ msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
  
 +#: g10/misc.c:1079
  #, fuzzy, c-format
  msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
- msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+ msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
  
 +#: g10/misc.c:1083
  #, fuzzy, c-format
  msgid ""
  "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
- msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+ msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
  
 +#: g10/misc.c:1147
  msgid "Uncompressed"
  msgstr "Non compresso"
  
@@@ -6050,26 -4818,21 +6069,26 @@@
  msgid "uncompressed|none"
  msgstr "Non compresso"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
- msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
+ msgstr "questo messaggio può non essere utilizzabile da %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "lettura delle opzioni da `%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  msgid "unknown option '%s'\n"
  msgstr "destinatario predefinito `%s' sconosciuto\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "classe della firma sconosciuta"
@@@ -6123,13 -4877,11 +6142,13 @@@ msgstr "
  msgid "can't handle public key algorithm %d\n"
  msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
  msgstr ""
- "ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
+ "ATTENZIONE: la chiave di sessione cifrata simmetricamente è potenzialmente\n"
  "non sicura\n"
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@@ -6152,27 -4900,22 +6171,27 @@@ msgstr "interrotto dall'utente\n
  msgid " (main key ID %s)"
  msgstr " (key ID principale %08lX)"
  
 +#: g10/passphrase.c:496
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
- msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
 +#: g10/passphrase.c:500
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
- msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
 +#: g10/passphrase.c:505
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
- msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
 +#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
- msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
  
 +#: g10/passphrase.c:513
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
  msgstr "Vuoi davvero cancellare le chiavi selezionate? "
@@@ -6228,16 -4964,13 +6247,16 @@@ msgstr "
  msgid "Are you sure you want to use it? (y/N) "
  msgstr "Sei sicuro di volerla usare? (s/N) "
  
 +#: g10/photoid.c:149
  #, fuzzy, c-format
  msgid "'%s' is not a JPEG file\n"
- msgstr "\"%s\": non � un file JPEG\n"
+ msgstr "\"%s\": non è un file JPEG\n"
  
 +#: g10/photoid.c:168
  msgid "Is this photo correct (y/N/q)? "
- msgstr "Questa foto � giusta? (s/N/q) "
+ msgstr "Questa foto è giusta? (s/N/q) "
  
 +#: g10/photoid.c:380
  msgid "unable to display photo ID!\n"
  msgstr "impossibile mostrare l'ID fotografico\n"
  
@@@ -6245,23 -4977,18 +6264,23 @@@
  msgid "No reason specified"
  msgstr "Nessuna ragione specificata"
  
 +#: g10/pkclist.c:74 g10/revoke.c:759
  msgid "Key is superseded"
- msgstr "Questa chiave � stata sostituita"
+ msgstr "Questa chiave è stata sostituita"
  
 +#: g10/pkclist.c:76 g10/revoke.c:758
  msgid "Key has been compromised"
- msgstr "Questa chiave � stata compromessa"
+ msgstr "Questa chiave è stata compromessa"
  
 +#: g10/pkclist.c:78 g10/revoke.c:760
  msgid "Key is no longer used"
- msgstr "La chiave non � pi� usata"
+ msgstr "La chiave non è più usata"
  
 +#: g10/pkclist.c:80 g10/revoke.c:761
  msgid "User ID is no longer valid"
- msgstr "L'user ID non � pi� valido"
+ msgstr "L'user ID non è più valido"
  
 +#: g10/pkclist.c:84
  msgid "reason for revocation: "
  msgstr "ragione della revoca: "
  
@@@ -6316,12 -5035,10 +6335,12 @@@ msgstr " %d = NON mi fido\n
  msgid "  %d = I trust ultimately\n"
  msgstr " %d = Mi fido definitivamente\n"
  
 +#: g10/pkclist.c:296
  #, fuzzy
  msgid "  m = back to the main menu\n"
- msgstr " m = torna al men� principale\n"
+ msgstr " m = torna al menù principale\n"
  
 +#: g10/pkclist.c:299
  #, fuzzy
  msgid "  s = skip this key\n"
  msgstr " s = salta questa chiave\n"
@@@ -6372,145 -5080,131 +6391,162 @@@ msgstr "Questa chiave probabilmente app
  msgid "This key belongs to us\n"
  msgstr "Questa chiave ci appartiene\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "NON è sicuro che la chiave appartenga alla persona indicata.\n"
+ "nell'user ID. Se sai *davvero* cosa stai facendo, puoi\n"
+ "rispondere sì alla prossima domanda.\n"
+ "\n"
+ 
++#: g10/pkclist.c:489
  #, fuzzy
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
  "you may answer the next question with yes.\n"
  msgstr ""
- "NON � sicuro che la chiave appartenga alla persona indicata.\n"
+ "NON è sicuro che la chiave appartenga alla persona indicata.\n"
  "nell'user ID. Se sai *davvero* cosa stai facendo, puoi\n"
- "rispondere s� alla prossima domanda.\n"
+ "rispondere sì alla prossima domanda.\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  #, fuzzy
  msgid "Use this key anyway? (y/N) "
  msgstr "Uso lo stesso questa chiave? "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
- "ATTENZIONE: questa chiave pu� essere stata revocata (la chiave di revoca\n"
- "non � presente).\n"
+ "ATTENZIONE: questa chiave può essere stata revocata (la chiave di revoca\n"
+ "non è presente).\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr ""
- "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
+ "ATTENZIONE: questa chiave è stata revocata dal suo revocatore designato!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
- msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
+ msgstr "ATTENZIONE: questa chiave è stata revocata dal suo proprietario!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  #, fuzzy
  msgid "         This could mean that the signature is forged.\n"
- msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
+ msgstr "         Questo può significare che la firma è stata falsificata.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
- msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
+ msgstr "ATTENZIONE: questa subchiave è stata revocata dal proprietario!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
- msgstr "Nota: questa chiave � stata disabilitata.\n"
+ msgstr "Nota: questa chiave è stata disabilitata.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
- msgstr "Nota: questa chiave � scaduta!\n"
+ msgstr "Nota: questa chiave è scaduta!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
- msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
+ msgstr "ATTENZIONE: questa chiave non è certificata con una firma fidata!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
  "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
- msgstr "          La firma � probabilmente un FALSO.\n"
+ msgstr "          La firma è probabilmente un FALSO.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
- "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
+ "ATTENZIONE: questa chiave non è certificata con firme abbastanza fidate!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
- msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
+ msgstr "         Non è sicuro che la firma appartenga al proprietario.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: saltata: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: saltata: chiave pubblica disabilitata\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
- msgstr "%s: saltata: chiave pubblica gi� presente\n"
+ msgstr "%s: saltata: chiave pubblica già presente\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "impossibile connettersi a `%s': %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "algoritmo di hash non valido `%s'\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "algoritmo di hash non valido `%s'\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr ""
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6518,37 -5212,29 +6554,37 @@@ msgstr "
  "\n"
  "Inserisci l'user ID. Termina con una riga vuota: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "User ID inesistente.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
- msgstr "saltata: chiave pubblica gi� impostata come destinatario predefinito\n"
+ msgstr "saltata: chiave pubblica già impostata come destinatario predefinito\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
- msgstr "La chiave pubblica � disabilitata.\n"
+ msgstr "La chiave pubblica è disabilitata.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
- msgstr "saltata: chiave pubblica gi� impostata\n"
+ msgstr "saltata: chiave pubblica già impostata\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "destinatario predefinito `%s' sconosciuto\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "nessun indirizzo valido\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "chiave %08lX: nessun user ID\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "chiave %08lX: nessun user ID\n"
@@@ -6594,22 -5271,18 +6630,22 @@@ msgstr "destinatario anonimo; provo la 
  msgid "okay, we are the anonymous recipient.\n"
  msgstr "bene, siamo il destinatario anonimo.\n"
  
 +#: g10/pubkey-enc.c:282
  msgid "old encoding of the DEK is not supported\n"
- msgstr "la vecchia codifica del DEK non � gestita\n"
+ msgstr "la vecchia codifica del DEK non è gestita\n"
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
- msgstr "l'algoritmo di cifratura %d%s � sconosciuto o disattivato\n"
+ msgstr "l'algoritmo di cifratura %d%s è sconosciuto o disattivato\n"
  
 +#: g10/pubkey-enc.c:352
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr ""
- "NOTA: l'algoritmo di cifratura %d non � stato trovato tra le preferenze\n"
+ "NOTA: l'algoritmo di cifratura %d non è stato trovato tra le preferenze\n"
  
 +#: g10/pubkey-enc.c:377
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@@ -6618,10 -5290,8 +6654,10 @@@
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
- msgstr "NOTA: la chiave � stata revocata"
+ msgstr "NOTA: la chiave è stata revocata"
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, c-format
  msgid "build_packet failed: %s\n"
  msgstr "build_packet fallito: %s\n"
@@@ -6635,17 -5303,14 +6671,17 @@@ msgstr "chiave %08lX: nessun user ID\n
  msgid "To be revoked by:\n"
  msgstr "Revocabile da:\n"
  
 +#: g10/revoke.c:316
  msgid "(This is a sensitive revocation key)\n"
- msgstr "(Questa � una chiave di revoca sensibile)\n"
+ msgstr "(Questa è una chiave di revoca sensibile)\n"
  
 +#: g10/revoke.c:322
  #, fuzzy
  #| msgid "Secret key is available.\n"
  msgid "Secret key is not available.\n"
- msgstr "� disponibile una chiave segreta.\n"
+ msgstr "È disponibile una chiave segreta.\n"
  
 +#: g10/revoke.c:327
  #, fuzzy
  msgid "Create a designated revocation certificate for this key? (y/N) "
  msgstr "Creare un certificato di revoca per questa chiave? "
@@@ -6768,16 -5414,13 +6804,16 @@@ msgstr "Inserisci una descrizione opzio
  msgid "Reason for revocation: %s\n"
  msgstr "Motivo della revoca: %s\n"
  
 +#: g10/revoke.c:852
  msgid "(No description given)\n"
- msgstr "(Non � stata data una descrizione)\n"
+ msgstr "(Non è stata data una descrizione)\n"
  
 +#: g10/revoke.c:857
  #, fuzzy
  msgid "Is this okay? (y/N) "
- msgstr "Va bene cos�? "
+ msgstr "Va bene così? "
  
 +#: g10/seskey.c:62 sm/encrypt.c:123
  msgid "weak key created - retrying\n"
  msgstr "creata una chiave debole - riprovo\n"
  
@@@ -6798,100 -5438,86 +6834,100 @@@ msgstr "
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "ATTENZIONE: conflitto del digest delle firme nel messaggio\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr ""
  "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
  "incrociata\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, fuzzy, c-format
  msgid "please see %s for more information\n"
  msgstr " i = mostrami ulteriori informazioni\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
  "ATTENZIONE: la sottochiave per firme %08lX ha una certificature incrociata\n"
  "non valida\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
- msgstr[0] "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
- msgstr[1] "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
+ msgstr[0] "la chiave pubblica %08lX è più recente della firma di %lu secondo\n"
+ msgstr[1] "la chiave pubblica %08lX è più recente della firma di %lu secondo\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
- msgstr[0] "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
- msgstr[1] "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
+ msgstr[0] "la chiave pubblica %08lX è più recente della firma di %lu secondo\n"
+ msgstr[1] "la chiave pubblica %08lX è più recente della firma di %lu secondo\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu seconds in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
+ "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
  "con l'orologio)\n"
  msgstr[1] ""
- "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
+ "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
  "con l'orologio)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu days in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
+ "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
  "con l'orologio)\n"
  msgstr[1] ""
- "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
+ "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
  "con l'orologio)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
- msgstr "NOTA: la chiave � stata revocata"
+ msgstr "NOTA: la chiave è stata revocata"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, fuzzy, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
  "si suppone una firma non valida della chiave %08lX a causa di un\n"
  "bit critico sconosciuto\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr ""
- "chiave %08lX: non c'� una subchiave per il pacchetto di revoca della "
+ "chiave %08lX: non c'è una subchiave per il pacchetto di revoca della "
  "subchiave\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr ""
- "chiave %08lX: non c'� una subchiave per la firma di collegamento della "
+ "chiave %08lX: non c'è una subchiave per la firma di collegamento della "
  "subchiave\n"
  
 +#: g10/sign.c:88
  #, c-format
  msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
  msgstr ""
@@@ -6933,34 -5554,28 +6969,34 @@@ msgstr "
  msgid "signing:"
  msgstr "firma:"
  
 +#: g10/sign.c:1286
  #, c-format
  msgid "%s encryption will be used\n"
- msgstr "sar� usato il cifrario %s\n"
+ msgstr "sarà usato il cifrario %s\n"
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
  msgstr ""
- "la chiave non � indicata come insicura - impossibile usarla con il RNG "
+ "la chiave non è indicata come insicura - impossibile usarla con il RNG "
  "finto!\n"
  
 +#: g10/skclist.c:187
  #, fuzzy, c-format
  msgid "skipped \"%s\": duplicated\n"
  msgstr "saltata `%s': doppia\n"
  
 +#: g10/skclist.c:206
  msgid "skipped: secret key already present\n"
- msgstr "saltata: chiave pubblica gi� presente\n"
+ msgstr "saltata: chiave pubblica già presente\n"
  
 +#: g10/skclist.c:225
  #, fuzzy
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr ""
- "saltata %s: questa � una chiave ElGamal generata da PGP che NON � sicura per "
+ "saltata %s: questa è una chiave ElGamal generata da PGP che NON è sicura per "
  "le firme!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@@ -7008,12 -5615,10 +7044,12 @@@ msgstr "errore cercando il record dell
  msgid "read error in '%s': %s\n"
  msgstr "errore di lettura: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: sync fallita: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "impossibile creare `%s': %s\n"
@@@ -7042,7 -5642,6 +7078,7 @@@ msgstr "transazione del trustdb troppo 
  msgid "%s: directory does not exist!\n"
  msgstr "%s: la directory non esiste!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
  msgstr "impossibile chiudere `%s': %s\n"
@@@ -7052,12 -5650,10 +7088,12 @@@
  msgid "%s: failed to create version record: %s"
  msgstr "%s: creazione del record della versione fallita: %s"
  
 +#: g10/tdbio.c:729
  #, c-format
  msgid "%s: invalid trustdb created\n"
- msgstr "%s: � stato creato un trustdb non valido\n"
+ msgstr "%s: è stato creato un trustdb non valido\n"
  
 +#: g10/tdbio.c:732
  #, c-format
  msgid "%s: trustdb created\n"
  msgstr "%s: creato il trustdb\n"
@@@ -7066,9 -5661,8 +7102,9 @@@
  #, fuzzy
  #| msgid "NOTE: trustdb not writable\n"
  msgid "Note: trustdb not writable\n"
- msgstr "NOTA: il trustdb non � scrivibile\n"
+ msgstr "NOTA: il trustdb non è scrivibile\n"
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
  msgstr "%s: trustdb non valido\n"
@@@ -7104,12 -5691,10 +7140,12 @@@ msgstr "trustdb: lseek fallita: %s\n
  msgid "trustdb: read failed (n=%d): %s\n"
  msgstr "trustdb: read fallita (n=%d): %s\n"
  
 +#: g10/tdbio.c:1497
  #, c-format
  msgid "%s: not a trustdb file\n"
- msgstr "%s: non � un file di trustdb\n"
+ msgstr "%s: non è un file di trustdb\n"
  
 +#: g10/tdbio.c:1522
  #, c-format
  msgid "%s: version record with recnum %lu\n"
  msgstr "%s: record di versione con recnum %lu\n"
@@@ -7144,275 -5723,255 +7180,311 @@@ msgstr "%s: accodatura a un record fall
  msgid "Error: The trustdb is corrupted.\n"
  msgstr "%s: creato il trustdb\n"
  
 +#: g10/textfilter.c:146
  #, c-format
  msgid "can't handle text lines longer than %d characters\n"
- msgstr "impossibile gestire linee di testo pi� lunghe di %d caratteri\n"
+ msgstr "impossibile gestire linee di testo più lunghe di %d caratteri\n"
  
 +#: g10/textfilter.c:241
  #, c-format
  msgid "input line longer than %d characters\n"
- msgstr "linea di input pi� lunga di %d caratteri\n"
+ msgstr "linea di input più lunga di %d caratteri\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Algoritmi gestiti:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: errore durante la scrittura del dir record: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr ""
+ 
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "elenca le chiavi e gli user ID"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Policy: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "elenca le chiavi"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "|algo [files]|stampa tutti i message digests"
  msgstr[1] "|algo [files]|stampa tutti i message digests"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1746
+ #, c-format
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "errore scrivendo il portachiavi `%s': %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Cancellate %d firme.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|algo [files]|stampa tutti i message digests"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|algo [files]|stampa tutti i message digests"
+ msgstr[1] "|algo [files]|stampa tutti i message digests"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "cifratto con %lu passphrase\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|algo [files]|stampa tutti i message digests"
+ msgstr[1] "|algo [files]|stampa tutti i message digests"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7426,129 -5985,113 +7498,141 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
- msgstr "`%s' non � un key ID lungo valido\n"
+ msgstr "`%s' non è un key ID lungo valido\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, fuzzy, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "chiave %08lX: accettata come chiave affidabile\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, fuzzy, c-format
  msgid "key %s occurs more than once in the trustdb\n"
- msgstr "chiave %08lX: appare nel trustdb pi� di una volta\n"
+ msgstr "chiave %08lX: appare nel trustdb più di una volta\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, fuzzy, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr ""
  "chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, fuzzy, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "chiavi marcate definitivamente affidabili.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "trust record %lu, tipo %d: read fallita: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
- msgstr "il trust record %lu non � del tipo richiesto %d\n"
+ msgstr "il trust record %lu non è del tipo richiesto %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
- msgstr "non � necessario un controllo del trustdb\n"
+ msgstr "non è necessario un controllo del trustdb\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
- msgstr "il prossimo controllo del trustdb sar� fatto il %s\n"
+ msgstr "il prossimo controllo del trustdb sarà fatto il %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
- msgstr "non � necessario un controllo del trustdb\n"
+ msgstr "non è necessario un controllo del trustdb\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
- msgstr "non � necessario un controllo del trustdb\n"
+ msgstr "non è necessario un controllo del trustdb\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
  msgstr "chiave pubblica %08lX non trovata: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "per favore usa --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "controllo il trustdb\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "Per ora sono state esaminate %lu chiavi\n"
  msgstr[1] "Per ora sono state esaminate %lu chiavi\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
- msgstr[0] "%d chiavi processate (%d conteggi di validit� azzerati)\n"
- msgstr[1] "%d chiavi processate (%d conteggi di validit� azzerati)\n"
+ msgstr[0] "%d chiavi processate (%d conteggi di validità azzerati)\n"
+ msgstr[1] "%d chiavi processate (%d conteggi di validità azzerati)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
- msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
+ msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@@ -7662,143 -6184,113 +7746,145 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "cambia la passphrase"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
  msgstr "cambia la passphrase"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "Per favore scegli il motivo della revoca:\n"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "Per favore scegli il motivo della revoca:\n"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "rebuild della cache del portachiavi fallito: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, fuzzy, c-format
- msgid "reading public key failed: %s\n"
- msgstr "cancellazione del keyblock fallita: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "remove keys from the public keyring"
+ msgid "response does not contain the EC public key\n"
+ msgstr "rimuove le chiavi dal portachiavi pubblico"
+ 
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1551
+ #, fuzzy, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "cancellazione del keyblock fallita: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "invio al keyserver fallito: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7808,26 -6300,21 +7894,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "Per favore scegli il motivo della revoca:\n"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7835,117 -6322,93 +7921,117 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "cambia la passphrase"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "errore leggendo il keyblock: %s\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: errore durante la lettura del record libero: %s\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  #, fuzzy
  msgid "key already exists\n"
- msgstr "`%s' � gi� compresso\n"
+ msgstr "`%s' è già compresso\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  #, fuzzy
  msgid "generating new key\n"
  msgstr "genera una nuova coppia di chiavi"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
  msgstr "genera una nuova coppia di chiavi"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI non gestito"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  #, fuzzy
  msgid "generating key failed\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "Generazione della chiave fallita: %s\n"
  msgstr[1] "Generazione della chiave fallita: %s\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "Firma %s, algoritmo di digest %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@@ -7966,7 -6426,6 +8052,7 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -8022,16 -6470,13 +8108,16 @@@ msgid "
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -8041,31 -6485,25 +8127,31 @@@
  msgid "invalid radix64 character %02x skipped\n"
  msgstr "Carattere radix64 non valido %02x saltato\n"
  
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
- msgstr "gpg-agent non � disponibile in questa sessione\n"
+ msgstr "gpg-agent non è disponibile in questa sessione\n"
  
 +#: sm/certchain.c:194
  #, c-format
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  #, fuzzy
  msgid "shell"
  msgstr "help"
  
 +#: sm/certchain.c:256 dirmngr/validate.c:107
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
- msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
+ msgstr "la versione %d del protocollo di gpg-agent non è gestita\n"
  
 +#: sm/certchain.c:295 dirmngr/validate.c:205
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8088,209 -6522,162 +8174,209 @@@ msgstr "scrittura della chiave segreta 
  msgid "certificate policy not allowed"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
- msgstr "NOTA: la chiave � stata revocata"
+ msgstr "NOTA: la chiave è stata revocata"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
  msgstr "controllo della firma creata fallito: %s\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
  msgstr "scrittura della chiave segreta in `%s'\n"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
- msgstr "Questa chiave � scaduta!"
+ msgstr "Questa chiave è scaduta!"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
- msgstr "Questa chiave � scaduta!"
+ msgstr "Questa chiave è scaduta!"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
- msgstr "Questa chiave � scaduta!"
+ msgstr "Questa chiave è scaduta!"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
- msgstr "Questa chiave � scaduta!"
+ msgstr "Questa chiave è scaduta!"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
  msgstr "           nuove firme: %lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
  msgstr "Certificato di revoca creato.\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
  msgstr "certificato danneggiato"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "mostra le impronte digitali"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
  msgstr "genera un certificato di revoca"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr ""
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "controllo della firma creata fallito: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "verifica una firma"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
- msgstr "la preferenza %c%lu � doppia\n"
+ msgstr "la preferenza %c%lu è doppia\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
  msgstr "Certificato di revoca creato.\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
  msgstr "certificato danneggiato"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8398,12 -6764,10 +8484,12 @@@ msgstr "algoritmo di hash non valido `%
  msgid "line %d: invalid subject name '%s' at pos %d\n"
  msgstr "algoritmo di hash non valido `%s'\n"
  
 +#: sm/certreqgen.c:525
  #, fuzzy, c-format
  msgid "line %d: not a valid email address\n"
- msgstr "L'indirizzo di email non � valido\n"
+ msgstr "L'indirizzo di email non è valido\n"
  
 +#: sm/certreqgen.c:544
  #, fuzzy, c-format
  msgid "line %d: invalid serial number\n"
  msgstr "algoritmo di hash non valido `%s'\n"
@@@ -8523,12 -6864,10 +8609,12 @@@ msgstr "   (%d) RSA (cifra solo)\n
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
 +#: sm/certreqgen-ui.c:311
  #, fuzzy
  msgid "No subject name given\n"
- msgstr "(Non � stata data una descrizione)\n"
+ msgstr "(Non è stata data una descrizione)\n"
  
 +#: sm/certreqgen-ui.c:315
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "algoritmo di hash non valido `%s'\n"
@@@ -8621,7 -6942,6 +8707,7 @@@ msgstr "
  msgid "certificate '%s' not found: %s\n"
  msgstr "chiave `%s' non trovata: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
  msgstr "errore leggendo il keyblock: %s\n"
@@@ -8631,149 -6950,116 +8717,149 @@@
  msgid "duplicated certificate '%s' deleted\n"
  msgstr "Certificato di revoca creato.\n"
  
 +#: sm/delete.c:145
  #, fuzzy, c-format
  msgid "certificate '%s' deleted\n"
- msgstr "la preferenza %c%lu � doppia\n"
+ msgstr "la preferenza %c%lu è doppia\n"
  
 +#: sm/delete.c:175
  #, fuzzy, c-format
  msgid "deleting certificate \"%s\" failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
 +#: sm/encrypt.c:328
  #, fuzzy
  msgid "no valid recipients given\n"
- msgstr "(Non � stata data una descrizione)\n"
+ msgstr "(Non è stata data una descrizione)\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
  msgstr "elenca le chiavi segrete"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
  msgstr "certificato danneggiato"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
  msgstr "certificato danneggiato"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
  msgstr "certificato danneggiato"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "crea un output ascii con armatura"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "non usa per niente il terminale"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "modo batch: non fa domande"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
- msgstr "risponde \"s�\" a quasi tutte le domande"
+ msgstr "risponde \"sì\" a quasi tutte le domande"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "risponde \"no\" a quasi tutte le domande"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "aggiungi questo portachiavi alla lista"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|NOME|usa NOME come chiave segreta predefinita"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|HOST|cerca le chiavi in questo keyserver"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOME|usa l'algoritmo di cifratura NOME"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOME|usa l'algoritmo di message digest NOME"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8784,47 -7070,38 +8870,47 @@@ msgstr "
  "firma, controlla, cifra o decifra\n"
  "l'operazione predefinita dipende dai dati di input\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "impossibile connettersi a `%s': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "destinatario predefinito `%s' sconosciuto\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
- msgstr "(Non � stata data una descrizione)\n"
+ msgstr "(Non è stata data una descrizione)\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " s = salta questa chiave\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "impossibile fare il parsing dell'URI del keyserver\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "scrittura in `%s'\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "impossibile chiudere `%s': %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -8842,7 -7116,6 +8928,7 @@@ msgstr "genera un certificato di revoca
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
@@@ -8857,32 -7128,26 +8943,32 @@@ msgstr "errore nella creazione della pa
  msgid "error reading input: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, fuzzy, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "rev? problema controllando la revoca: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
  msgstr "errore leggendo `%s': %s\n"
@@@ -8930,12 -7188,10 +9016,12 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
 +#: sm/sign.c:451
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
- msgstr "l'algoritmo di protezione %d%s non � gestito\n"
+ msgstr "l'algoritmo di protezione %d%s non è gestito\n"
  
 +#: sm/sign.c:465
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
@@@ -8979,9 -7227,8 +9065,9 @@@ msgstr "                alias \"
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
- "Questa sar� una autofirma.\n"
+ "Questa sarà una autofirma.\n"
  
 +#: dirmngr/certcache.c:106
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
  msgstr "controllo della firma creata fallito: %s\n"
@@@ -9012,22 -7254,18 +9098,22 @@@ msgstr "
  msgid "can't parse certificate '%s': %s\n"
  msgstr "impossibile creare `%s': %s\n"
  
 +#: dirmngr/certcache.c:395
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
- msgstr "la preferenza %c%lu � doppia\n"
+ msgstr "la preferenza %c%lu è doppia\n"
  
 +#: dirmngr/certcache.c:399
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "Certificato di revoca creato.\n"
  
 +#: dirmngr/certcache.c:401
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
- msgstr "la preferenza %c%lu � doppia\n"
+ msgstr "la preferenza %c%lu è doppia\n"
  
 +#: dirmngr/certcache.c:405
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "mostra le impronte digitali"
@@@ -9060,13 -7292,10 +9146,13 @@@ msgstr "errore nella creazione della pa
  msgid "certificate already cached\n"
  msgstr "Certificato di revoca creato.\n"
  
 +#: dirmngr/certcache.c:508
  #, fuzzy
  msgid "certificate cached\n"
- msgstr "la preferenza %c%lu � doppia\n"
+ msgstr "la preferenza %c%lu è doppia\n"
  
 +#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
  msgstr "errore nella creazione della passhprase: %s\n"
@@@ -9300,9 -7483,8 +9386,9 @@@ msgstr "%s: creazione della tabella has
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "no CRL available for issuer id %s\n"
- msgstr "Non � disponibile un aiuto per `%s'"
+ msgstr "Non è disponibile un aiuto per `%s'"
  
 +#: dirmngr/crlcache.c:1293
  #, c-format
  msgid "cached CRL for issuer id %s too old; update required\n"
  msgstr ""
@@@ -9729,17 -7825,14 +9815,17 @@@ msgstr "
  msgid "validation of certificate failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
  #, fuzzy
  msgid "certificate is valid\n"
- msgstr "la preferenza %c%lu � doppia\n"
+ msgstr "la preferenza %c%lu è doppia\n"
  
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
  #, fuzzy
  msgid "certificate has been revoked\n"
- msgstr "NOTA: la chiave � stata revocata"
+ msgstr "NOTA: la chiave è stata revocata"
  
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
  #, fuzzy, c-format
  msgid "certificate check failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
@@@ -9772,112 -7860,88 +9858,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Esco senza salvare? "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|carica il modulo di estensione FILE"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "impossibile fare il parsing dell'URI del keyserver\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9890,92 -7954,73 +9980,92 @@@ msgstr "
  "@\n"
  "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "uso: gpg [opzioni] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
- msgstr "Non � permesso usare %s con %s!\n"
+ msgstr "Non è permesso usare %s con %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "creazione dell'armatura fallita: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "creazione dell'armatura fallita: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "riga troppo lunga\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "errore: impronta digitale non valida\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "errore di lettura: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
  # ??? (Md)
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  msgid "shutdown forced\n"
  msgstr "non esaminato"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10113,12 -8130,10 +10203,12 @@@ msgstr "
  msgid "          attr '%s'\n"
  msgstr "                alias \""
  
 +#: dirmngr/dirmngr_ldap.c:616
  #, fuzzy, c-format
  msgid "no host name in '%s'\n"
- msgstr "(Non � stata data una descrizione)\n"
+ msgstr "(Non è stata data una descrizione)\n"
  
 +#: dirmngr/dirmngr_ldap.c:621
  #, c-format
  msgid "no attribute given for query '%s'\n"
  msgstr ""
@@@ -10145,23 -8156,14 +10235,17 @@@ msgstr "creazione dell'armatura fallita
  msgid "searching '%s' failed: %s\n"
  msgstr "rimozione dell'armatura fallita: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:718
  #, fuzzy, c-format
  msgid "'%s' is not an LDAP URL\n"
- msgstr "\"%s\": non � un file JPEG\n"
+ msgstr "\"%s\": non è un file JPEG\n"
  
 +#: dirmngr/dirmngr_ldap.c:724
  #, c-format
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "errore creando il portachiavi `%s': %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
  msgstr "errore scrivendo il portachiavi `%s': %s\n"
@@@ -10402,12 -8356,10 +10486,12 @@@ msgstr "
  msgid "good"
  msgstr ""
  
 +#: dirmngr/ocsp.c:708
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
- msgstr "NOTA: la chiave � stata revocata"
+ msgstr "NOTA: la chiave è stata revocata"
  
 +#: dirmngr/ocsp.c:743
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
@@@ -10419,77 -8369,61 +10503,77 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "firma fallita: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "firma fallita: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "cancellazione del keyblock fallita: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "impossibile creare `%s': %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s: creazione della tabella hash fallita: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "inizializzazione del trustdb fallita: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "rebuild della cache del portachiavi fallito: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10524,12 -8452,10 +10608,12 @@@ msgstr "verifica una firma
  msgid "checking trustworthiness of root certificate failed: %s\n"
  msgstr "controllo della firma creata fallito: %s\n"
  
 +#: dirmngr/validate.c:738
  #, fuzzy
  msgid "certificate chain is good\n"
- msgstr "la preferenza %c%lu � doppia\n"
+ msgstr "la preferenza %c%lu è doppia\n"
  
 +#: dirmngr/validate.c:968
  msgid "DSA requires the use of a 160 bit hash algorithm\n"
  msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
  
@@@ -10537,7 -8462,6 +10621,7 @@@
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "quit"
@@@ -10708,11 -8591,9 +10792,11 @@@ msgstr "|NOME|cifra per NOME
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "impossibile fare il parsing dell'URI del keyserver\n"
@@@ -10746,148 -8620,121 +10830,156 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "errore di rete"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "passphrase errata"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "chiave pubblica non trovata"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
  msgstr "elemento della configurazione sconosciuto \"%s\"\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
  msgstr "elemento della configurazione sconosciuto \"%s\"\n"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "aggiorna il database della fiducia"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "usa come file di output"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
  msgstr "chiave pubblica non trovata"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  #, fuzzy
  msgid "No argument allowed"
  msgstr "scrittura della chiave segreta in `%s'\n"
@@@ -10941,12 -8779,10 +11033,12 @@@ msgid "
  "Call a simple symmetric encryption tool\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:278
  #, fuzzy, c-format
  msgid "%s on %s aborted with status %i\n"
- msgstr "Non � permesso usare %s con %s!\n"
+ msgstr "Non è permesso usare %s con %s!\n"
  
 +#: tools/symcryptrun.c:285
  #, fuzzy, c-format
  msgid "%s on %s failed with status %i\n"
  msgstr "impossibile aprire il file: %s\n"
@@@ -10976,12 -8807,10 +11068,12 @@@ msgstr "errore leggendo `%s': %s\n
  msgid "error closing %s: %s\n"
  msgstr "errore leggendo `%s': %s\n"
  
 +#: tools/symcryptrun.c:490
  #, fuzzy
  msgid "no --program option provided\n"
- msgstr "l'esecuzione remota dei programmi non � gestita\n"
+ msgstr "l'esecuzione remota dei programmi non è gestita\n"
  
 +#: tools/symcryptrun.c:496
  msgid "only --decrypt and --encrypt are supported\n"
  msgstr ""
  
@@@ -11057,12 -8871,10 +11149,12 @@@ msgstr "
  msgid "no class provided\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:1018
  #, fuzzy, c-format
  msgid "class %s is not supported\n"
- msgstr "l'algoritmo di protezione %d%s non � gestito\n"
+ msgstr "l'algoritmo di protezione %d%s non è gestito\n"
  
 +#: tools/gpg-check-pattern.c:144
  #, fuzzy
  msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
  msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
diff --cc po/ja.po
index d29035b,e94e34f..444aa20
--- a/po/ja.po
+++ b/po/ja.po
@@@ -10,8 -10,7 +10,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 2.1.15\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
- "PO-Revision-Date: 2016-08-04 17:30+0900\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
+ "PO-Revision-Date: 2016-09-02 16:58+0200\n"
  "Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
  "Language-Team: none\n"
  "Language: ja\n"
@@@ -20,7 -19,6 +20,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=1; plural=0;\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "pinentryのロックの獲得に失敗しました: %s\n"
@@@ -31,45 -29,35 +31,45 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|キャンセル(_C)"
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|_Yes"
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|_No"
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|PIN:"
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|パスワードマネージャに保管(_S)"
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "本当に画面にパスフレーズを見えるようにしますか?"
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr "|pinentry-tt|パスフレーズを見えるようにする"
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  msgid "|pinentry-tt|Hide passphrase"
  msgstr "|pinentry-tt|パスフレーズを隠す"
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr "品質:"
  
@@@ -79,11 -67,9 +79,11 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr "pinentry.qualitybar.tooltip"
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -91,7 -77,6 +91,7 @@@ msgstr "
  "あなたのPINを入力してください(このセッションで秘密鍵のロックを解除するために"
  "使われます)"
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -99,53 -84,40 +99,53 @@@ msgstr "
  "あなたのパスフレーズを入力してください(このセッションで秘密鍵のロックを解除す"
  "るために使われます)"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "パスフレーズ:"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "一致しません - もう一度"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (現在 %d / 最大 %d)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr "繰り返し:"
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
  msgstr "PINが長すぎます"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
  msgstr "パスフレーズが長すぎます"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
  msgstr "PINに無効な文字があります"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr "PINが短すぎます"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "不正なPINです"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
  msgstr "パスフレーズが不正です"
  
@@@ -154,24 -125,10 +154,24 @@@
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "ssh鍵で%dビットより大きいものはサポートされません\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "'%s'が作成できません: %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "'%s'が開けません: %s\n"
@@@ -196,17 -149,6 +196,7 @@@ msgstr "カードにsshの認証鍵が�
  msgid "no suitable card key found: %s\n"
  msgstr "適当なカードの鍵が見つかりません: %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "鍵のシャドウ化に失敗しました: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "鍵の書き込みエラー: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -215,24 -157,19 +205,24 @@@ msgstr "
  "sshプロセスが以下の鍵の使用を要求しました:%%0A  %s%%0A  (%s)%%0Aこの使用を認"
  "めますか?"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr "許可する"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr "拒否する"
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "以下のssh鍵に対するパスフレーズを入力してください:%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "このパスフレーズをもう一度入力してください"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -241,16 -178,13 +231,16 @@@ msgstr "
  "パスフレーズを入力してください。gpg-agentの鍵の保管で受信した秘密鍵%%0A   %s"
  "%%0A   %s%%0Aを保護します。"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "ソケットからストリームを作成するのに失敗しました: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr "以下のシリアル番号のカードを挿入してください"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "今のカードを抜き、以下のシリアル番号のカードを挿入してください"
  
@@@ -373,8 -283,6 +363,8 @@@ msgstr "新しい鍵を保護するた�
  msgid "Please enter the new passphrase"
  msgstr "新しいパスフレーズを入力してください"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -382,128 -290,95 +372,134 @@@ msgstr "
  "@オプション:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "デーモン・モードで実行 (バックグラウンド)"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "サーバ・モードで実行 (フォアグラウンド)"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "run in server mode"
+ msgid "run in supervised mode"
+ msgstr "サーバ・モードで実行"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "冗長"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "いくらかおとなしく"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr "sh-形式のコマンド出力"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr "csh-形式のコマンド出力"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FILE|FILEからオプションを読み込みます"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "コンソールからデタッチしない"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr "キーボードとマウスを占有しない"
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
  msgstr "サーバのログ・ファイルを使う"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr "|PGM|PGMをPIN入力プログラムとして使う"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr "|PGM|PGMをSCdaemonプログラムとして使う"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
  msgstr "SCdaemonを使わない"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NAME|NAMEからのコマンドを受け付ける"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr "TTYの変更要求を無視する"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr "Xディスプレイの変更要求を無視する"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr "|N|N秒後に保持したPINを無効とする"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr "署名に対してPINの保持を使わない"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  msgid "disallow the use of an external password cache"
  msgstr "外部のパスワードキャッシュの使用を認めない"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "クライアントが鍵に\"trusted\"マークをつけることを認めない"
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
  msgstr "パスフレーズの事前設定を認める"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr "pinentryより優先してパスフレーズ入力を認めない"
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr "Emacsを通じてパスフレーズを催促することを認める"
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  msgid "enable ssh support"
  msgstr "sshサポートを有功にする"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
  msgstr "puttyサポートを有功にする"
  
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "バグは <@EMAIL@> までご報告ください。\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "使い方: @GPG_AGENT@ [オプション] (ヘルプは -h)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -511,135 -386,100 +507,135 @@@ msgstr "
  "形式: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
  "@GnuPG@の秘密鍵の管理\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "無効なdebug-level '%s'が与えられました\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "*注意*: デフォルトのオプション・ファイル '%s' がありません\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "オプション・ファイル '%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "'%s' からオプションを読み込みます\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "*注意*: '%s'はオプションとは考えられません\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "ソケットが作成できません: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "ソケット名'%s'は長すぎます\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "gpg-agentは既に実行されています - 新しいものをスタートさせません\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
  msgstr "ソケットのナンス取得エラー\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "'%s'でソケットのバインドのエラー: %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "'%s'の許可が設定できません: %s\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() に失敗しました: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "ソケット'%s'でlisten\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "ディレクトリ'%s'が作成できません: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "ディレクトリ'%s'が作成されました\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "'%s'でstat()が失敗しました: %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "'%s'をホーム・ディレクトリに使えません\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "fd %dでナンスの読み込みエラー: %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "ハンドラ0x%lx (fd %d に対する)が開始\n"
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "ハンドラ0x%lx (fd %d に対する)が終了\n"
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr "ssh ハンドラ0x%lx (fd %d に対する)が開始\n"
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "ssh ハンドラ0x%lx (fd %d に対する)が終了\n"
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_pselectに失敗しました: %s - 一秒待ちます\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s 停止しました\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "このセッションでgpg-agentは実行されていません\n"
  
@@@ -655,8 -493,6 +651,8 @@@ msgstr "
  "形式: gpg-preset-passphrase [オプション] KEYGRIP\n"
  "パスワードキャッシュの管理\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -664,9 -500,6 +660,9 @@@ msgstr "
  "@コマンド:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -722,7 -547,6 +718,8 @@@ msgstr "キャンセルされました\
  msgid "error while asking for the passphrase: %s\n"
  msgstr "パスフレーズを問い合わせする際、エラー: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "'%s'を開く際、エラー: %s\n"
@@@ -780,8 -595,6 +777,8 @@@ msgstr "究極的にこれを信用し%
  msgid "Yes"
  msgstr "はい"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "いいえ"
  
@@@ -813,12 -623,10 +810,12 @@@ msgstr "正しい
  msgid "Wrong"
  msgstr "誤り"
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr "注意: パスフレーズは変更されていません。%0A今、変更してください。"
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@@ -827,26 -635,21 +824,26 @@@ msgstr "
  "このパスフレーズは%.4s-%.2s-%.2sから変更されていません。%%0A今、変更してくだ"
  "さい。"
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
  msgstr "パスフレーズを変更する"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr "後で変更する"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "本当にこの鍵: keygrip%%0A  %s%%0A  %%C%%0Aを削除しますか?"
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  msgid "Delete key"
  msgstr "鍵を削除する"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -863,12 -664,10 +860,12 @@@ msgstr "DSAは8ビットの倍数のハ
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "%s 鍵は安全でない(%uビット)ハッシュを使用しています\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "%zuビットのハッシュは%uビットの%s鍵には無効です\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "作成された署名の検査に失敗しました: %s\n"
@@@ -892,82 -687,71 +889,94 @@@ msgstr "保護アルゴリズム%d (%s)
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "保護ハッシュ・アルゴリズム%d (%s)はサポートされていません\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "パイプの作成エラー: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "パイプのストリーム作成エラー: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "プロセスforkエラー: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
  #, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "プロセスの終了待ちが失敗: %s\n"
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "プロセス%dの終了待ちが失敗: %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "'%s'の実行エラー: おそらくインストールされていません\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "'%s'の実行エラー: exitステイタス %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, c-format
  msgid "error running '%s': terminated\n"
  msgstr "'%s'の実行エラー: 終了しました\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
  #, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "プロセス %d のexitコード取得エラー: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "プロセスの終了待ちが失敗: %s\n"
  
- #: common/exechelp-w32ce.c:767
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "プロセス%dの終了待ちが失敗: %s\n"
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "プロセス %d のexitコード取得エラー: %s\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, c-format
  msgid "can't connect to '%s': %s\n"
  msgstr "'%s'へ接続できません: %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "gpg-agentオプションの設定の問題\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "コア・ダンプを無効にできません: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "警告: '%s'の安全でない所有 \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "警告: '%s'の安全でない許可 \"%s\"\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ #| msgid "waiting for the agent to come up ... (%ds)\n"
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "agentの起動のため、%d秒待ちます\n"
+ 
++#: common/sysutils.c:685
+ #, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "'%s'から'%s'へ名前変更に失敗: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "yes"
  
@@@ -1021,7 -794,6 +1030,7 @@@ msgstr "%luバイトの確保におい�
  msgid "out of core while allocating %lu bytes"
  msgstr "%luバイトの確保においてメモリが足りません"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "十分なメモリの確保のエラー: %s\n"
@@@ -1043,35 -812,28 +1052,35 @@@ msgstr "
  msgid "unknown debug flag '%s' ignored\n"
  msgstr "未知のdebugフラグ'%s'は無視されました\n"
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr "gpg-agentが実行されていません - '%s'を開始します\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr "agentの起動のため、%d秒待ちます\n"
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr "エージェントへの接続が確立しました。\n"
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  msgid "connection to agent is in restricted mode\n"
  msgstr "エージェントへの接続は制限モードです。\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr "dirmngrが動いていません - 開始します'%s'\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr "dirmngrの起動のため、%d秒待ちます\n"
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr "dirmngrへの接続が確立しました\n"
  
@@@ -1142,8 -888,6 +1151,8 @@@ msgstr "セッション・キーが作�
  msgid "algorithm: %s"
  msgstr "アルゴリズム: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "サポートされていないアルゴリズム: %s"
@@@ -1218,11 -946,9 +1227,11 @@@ msgstr "証明書のチェインは有�
  msgid "Root certificate trustworthy"
  msgstr "信頼できるルート証明書"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "証明書に対するCRLがありません"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
  msgstr "利用できるCRLは古すぎます"
  
@@@ -1259,7 -977,6 +1268,7 @@@ msgstr "'%s'のヘルプはありませ
  msgid "ignoring garbage line"
  msgstr "ガベージ行を無視します"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[未設定]"
  
@@@ -1329,7 -1031,6 +1338,7 @@@ msgstr "オプション\"%.50s\"はあ�
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "コマンド\"%.50s\"はあいまいです\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
  msgstr "メモリがありません\n"
  
@@@ -1387,8 -1077,6 +1396,8 @@@ msgstr "lock '%s' は作成されませ
  msgid "waiting for lock %s...\n"
  msgstr "lock %s を待ちます...\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s が古すぎます (%s が必要、現在 %s)\n"
@@@ -1472,79 -1142,61 +1481,78 @@@ msgstr "
  "外装の中にquoted printable文字があります。おそらくバグのあるMTAが使われたので"
  "しょう\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, c-format
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "[ 人には読めません (%zuバイト: %s%s) ]"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr ""
  "注釈名には印字可能な文字か空白のみを使い、'='で終わらなければなりません\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "ユーザ注釈名は、'@'文字を含まなければなりません\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "ユーザ注釈名は、一つより大きい'@'文字を含んではなりません\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "注釈名の値に制御文字を使ってはいけません\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  msgid "a notation name may not contain an '=' character\n"
  msgstr "ユーザ注釈名は、'='の文字を含んではなりません\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr "注釈名には印字可能な文字か空白のみを使わなければなりません\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "*警告*: 無効な注釈データを発見\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr "プロキシ%sのクライアントへの問い合わせが失敗しました\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "パスフレーズを入力: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, c-format
  msgid "error getting version from '%s': %s\n"
  msgstr "%s'からバージョン取得エラー: %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr "サーバ'%s'はこちらより古いです(%s < %s)"
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, c-format
  msgid "WARNING: %s\n"
  msgstr "*警告*: %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "OpenPGPカードが利用できません: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "OpenPGPカードno. %sを検出\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "これはバッチ・モードではできません\n"
  
@@@ -1552,14 -1203,9 +1560,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "このコマンドが使えるのはバージョン2のカードだけです\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
  msgstr "リセット・コードが(もはや)利用可能ではありません\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "あなたの選択は? "
  
@@@ -1587,119 -1227,89 +1595,119 @@@ msgstr "強制なし
  msgid "forced"
  msgstr "強制"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr "エラー: 普通のASCIIだけが今、許可されています。\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "エラー: \"<\"文字は使えません。\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "エラー: 二重の空白は禁止です。\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "カード所有者の姓 (surname): "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "カード所有者の名 (given name): "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr "エラー: つないだ名前が長すぎます (上限%d文字)。\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "公開鍵を取得するURL: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "エラー: URLが長すぎます (上限%d文字)。\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "'%s'の読み込みエラー: %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "'%s'の書き込みエラー: %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "ログイン・データ (アカウント名): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr "エラー: ログイン・データが長すぎます (上限%d文字)。\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "プライベート DO データ: "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr "エラー: プライベート DOが長すぎます (上限%d文字)。\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "言語の優先指定: "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
  msgstr "エラー: 優先指定の文字列の長さが無効です。\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
  msgstr "エラー: 優先指定の文字列に無効な文字があります。\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "性別 ((M)男、(F)女、または空白): "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
  msgstr "エラー: 無効な応答。\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "CAのフィンガープリント: "
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "エラー: 無効な形式のフィンガープリント。\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "鍵は操作できません: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "OpenPGPカードでありません"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "現行鍵情報の取得エラー: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr "既存の鍵を置き換えしますか? (y/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
@@@ -1709,55 -1319,43 +1717,55 @@@ msgstr "
  "        鍵生成が成功しない場合、あなたのカードに関する技術文書を確認し、\n"
  "        利用できる鍵長について確認ください。\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "署名鍵の鍵長は? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "暗号化鍵の鍵長は? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "認証鍵の鍵長は? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "%uビットに切り上げます\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s 鍵長は %u-%u の範囲でなければなりません\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr "今、%uビットの鍵を生成するようにカードは再コンフィグされました\n"
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "鍵%dの長さを%u bit に変更する際にエラー: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr "暗号化鍵のカード外バックアップを作成しますか? (Y/n) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  msgid "Note: keys are already stored on the card!\n"
  msgstr "*注意*: 秘密鍵はもうカードに保管してあります!\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr "既存の鍵を置き換えますか? (y/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1768,138 -1366,103 +1776,138 @@@ msgstr "
  "   PIN = '%s'     管理者PIN = '%s'\n"
  "次のコマンドを使って変更すべきです --change-pin\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "生成する鍵の型を選択してください:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "   (1) 署名鍵\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) 暗号化鍵\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) 認証鍵\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "無効な選択です。\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "鍵を保管する場所を選択してください:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "KEYTOCARDが失敗しました: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  msgid "This command is not supported by this card\n"
  msgstr "このカードでは、このコマンドはサポートされていません。\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "*注意*: このコマンドはカードに保管してあるすべての鍵を破壊します!\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  msgid "Continue? (y/N) "
  msgstr "続けますか? (y/N) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr "工場出荷リセットを行いますか? (本当なら \"yes\" と入力) "
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "このメニューを終了"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
  msgstr "管理コマンドを表示"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "このヘルプを表示"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "全有効データを表示"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "カード所有者の名前の変更"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "鍵を取得するURLの変更"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "カードURLで指定された鍵の取得"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "ログイン名の変更"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "言語の優先指定の変更"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "カード所有者の性別の変更"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "CAフィンガープリントの変更"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr "署名強制PINフラグを反転"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "新しい鍵を生成"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "PINブロックの解除や変更のメニュー"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "PINを確認しすべてのデータを表示する"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr "PINをリセット・コードでブロックを解除する"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr "すべての鍵とデータを破壊します"
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr "gpg/card> "
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "管理者専用コマンド\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "管理者コマンドが許可されています\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "管理者コマンドは禁止されています\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "無効なコマンド (\"help\"を参照)\n"
  
@@@ -1907,22 -1469,14 +1915,22 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "このコマンドで--outputは機能しません\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "'%s'が開けません\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "鍵\"%s\"が見つかりません: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "鍵ブロックの読み込みエラー: %s\n"
@@@ -2033,7 -1565,6 +2041,7 @@@ msgstr "共通鍵暗号方式 %s (%d) �
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s暗号化 受信者:\"%s\"\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "%sを%sモードで使うことはできません\n"
@@@ -2111,56 -1627,42 +2119,56 @@@ msgstr "*警告*: 一時ファイルを
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "*警告*: 一時ディレクトリ'%s'を削除できません: %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
  msgstr "ローカルのみと指定された署名をエクスポートします"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr "ユーザIDの属性(通常フォトID)をエクスポートします"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "\"sensitive\"(機密)と指定された失効鍵をエクスポートします"
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "エクスポートの際、利用できない部分を除去する"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "エクスポートの際、できるだけ除去する"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  msgid " - skipped"
  msgstr " - スキップされました"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "'%s'への書き込み\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "鍵%s: 鍵はカード上にあります - スキップします\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "秘密鍵のエクスポートは認められません\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "鍵%s: PGP 2.x形式の鍵です - スキップします\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "*警告*: 何もエクスポートされていません\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "'%s'の作成エラー: %s\n"
@@@ -2169,8 -1670,6 +2177,8 @@@
  msgid "[User ID not found]"
  msgstr "[ユーザIDが見つかりません]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, c-format
  msgid "(check argument of option '%s')\n"
  msgstr "(オプション'%s'の引数を確認ください)\n"
@@@ -2190,244 -1686,185 +2198,244 @@@ msgstr "検索のエラー: %s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "警告: %sは鍵リングに%d回出現します\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "'%s'を %s から自動取得\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "'%s'を %s から取得する際のエラー: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "フィンガープリントがありません"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, c-format
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "警告: デフォルトの秘密鍵として '%s' を用いません: %s\n"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, c-format
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "デフォルトの署名用の秘密鍵として\"%s\"を用います\n"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr "'%s'に渡されたすべての値は無視されました\n"
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr "--allow-non-selfsigned-uidで有効にされた無効な鍵%sです\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "副鍵%s(主鍵%sではなく)を用います\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "署名を作成"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
  msgstr "クリア・テクスト署名を作成"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "分遣署名を作成"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "データを暗号化"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "暗号化には共通鍵暗号方式のみを使用"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "データを復号 (デフォルト)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "署名を検証"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "鍵の一覧"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "鍵と署名の一覧"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "鍵署名の検査と一覧"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "鍵とフィンガープリントの一覧"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "秘密鍵の一覧"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "新しい鍵ペアを生成"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  msgid "quickly generate a new key pair"
  msgstr "すばやく新しい鍵ペアを生成"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  msgid "quickly add a new user-id"
  msgstr "すばやく新しいユーザIDを追加"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  msgid "quickly revoke a user-id"
  msgstr "すばやくユーザIDを失効"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr "全機能の鍵ペアを生成"
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "失効証明書を生成"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "公開鍵リングから鍵を削除"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "秘密鍵リングから鍵を削除"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  msgid "quickly sign a key"
  msgstr "鍵にすばやく署名"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  msgid "quickly sign a key locally"
  msgstr "鍵へすばやくローカルに署名"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "鍵に署名"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "鍵へローカルに署名"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "鍵への署名や編集"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
  msgstr "パスフレーズの変更"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "鍵をエクスポートする"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "鍵サーバに鍵をエクスポートする"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "鍵サーバから鍵をインポートする"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "鍵サーバの鍵を検索する"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "鍵サーバから鍵を全部更新する"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "鍵のインポート/マージ"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "カード・ステイタスを表示"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "カードのデータを変更"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "カードのPINを変更"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "信用データベースを更新"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
  msgstr "メッセージ・ダイジェストを表示"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "サーバ・モードで実行"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr "|VALUE|TOFUポリシーを鍵に設定する"
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "ASCII形式の外装を作成"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|USER-ID|USER-ID用に暗号化"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|USER-ID|署名や復号にこのUSER-IDを使用"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|圧縮レベルをNに設定 (0は非圧縮)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "正準テキスト・モードを使用"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|出力をFILEに書き出す"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "無変更"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "上書き前に確認"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr "厳密なOpenPGPの振舞を採用"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2435,7 -1872,6 +2443,7 @@@ msgstr "
  "@\n"
  "(コマンドとオプション全部の一覧は、マニュアル・ページをご覧ください)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2455,11 -1891,9 +2463,11 @@@ msgstr "
  " --list-keys [名前]         鍵を表示\n"
  " --fingerprint [名前]       フィンガープリントを表示\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "使い方: @GPG@ [オプション] [ファイル] (ヘルプは -h)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2469,7 -1903,6 +2477,7 @@@ msgstr "
  "署名、検査、暗号化または復号\n"
  "デフォルトの操作は、入力データに依存\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2477,601 -1910,472 +2485,608 @@@ msgstr "
  "\n"
  "サポートしているアルゴリズム:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "公開鍵: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "暗号方式: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "ハッシュ: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "圧縮: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "使い方: %s [オプション] %s\n"
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "対立するコマンド\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "=記号が、グループ定義'%s'内に見つかりません\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "*警告*: homedir '%s'の安全でない所有\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない所有\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "*警告*: 拡張'%s'の安全でない所有\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "*警告*: homedir '%s'の安全でない許可\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない許可\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "*警告*: 拡張'%s'の安全でない許可\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ所有\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr ""
  "*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ所有\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ所有\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ許可\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
  msgstr ""
  "*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ許可\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ許可\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "不明のコンフィグレーション項目'%s'\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "鍵の一覧時にフォトIDを表示する"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  msgid "show key usage information during key listings"
  msgstr "鍵の一覧時に鍵の使い方の情報を表示する"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr "署名の一覧時にポリシーURLを表示する"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "署名の一覧時にすべての注釈を表示する"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr "署名の一覧時にIETF標準注釈を表示する"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr "署名の一覧時にユーザの注釈を表示する"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "署名の一覧時に優先鍵サーバURLを表示する"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr "鍵の一覧時にユーザIDの有効性を表示する"
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "鍵の一覧に鍵リングの名前を表示する"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "署名の一覧時に有効期限の日付を表示する"
  
- #: g10/gpg.c:2011
- msgid "available TOFU policies:\n"
- msgstr "利用可能なTOFUポリシー:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "valid values for option '%s':\n"
+ msgstr "オプション\"%.50s\"には無効な引数です\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "不明のTOFUポリシー'%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "invalid value for option '%s'\n"
+ msgstr "オプション\"%.50s\"には無効な引数です\n"
+ 
++#: g10/gpg.c:2203
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "*注意*: 普通%sは使いません!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "'%s'は、有効な署名表現ではありません\n"
  
- #: g10/gpg.c:2917
- #, fuzzy, c-format
- #| msgid "line %d: not a valid email address\n"
++#: g10/gpg.c:3012
+ #, c-format
  msgid "\"%s\" is not a proper mail address\n"
- msgstr "行 %d: 有効な電子メール・アドレスではありません\n"
+ msgstr "\"%s\"は正しいメール・アドレスではありません\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "無効な pinentry mode '%s'です\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "'%s'は、有効な文字集合ではありません\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "鍵サーバのURLを解析不能\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "無効な鍵サーバ・オプションです\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: 無効なインポート・オプションです\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "無効なインポート・オプションです\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "無効なフィルタ・オプションです: %s\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: 無効なエクスポート・オプションです\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "無効なエクスポート・オプションです\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: 無効な一覧オプションです\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "無効な一覧オプションです\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "署名の検証時にフォトIDを表示する"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr "署名の検証時にポリシーURLを表示する"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "署名の検証時にすべての注釈を表示する"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr "署名の検証時にIETF標準注釈を表示する"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr "署名の検証時にユーザの注釈を表示する"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "署名の検証時に優先鍵サーバURLを表示する"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
  msgstr "署名の検証時にユーザIDの有効性を表示する"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  msgid "show only the primary user ID in signature verification"
  msgstr "署名の検証時に主なユーザIDだけをを表示する"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "PKAデータで署名を検証する"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "有効なPKAデータで署名の信用度を上昇させる"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: 無効な検証オプションです\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "無効な検証オプションです\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "exec-pathを%sに設定不能\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: 無効な auto-key-locate リストです\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr "無効な auto-key-locate リストです\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "*警告*: %sは%sより優先\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%sは%sとともに使うことはできません!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%sは%sとともに使っても無意味です!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "%s のため、セキュアでないメモリで実行しません\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "選択された暗号アルゴリズムは、無効です\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "選択された圧縮アルゴリズムは、無効です\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-neededは正の値が必要です\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-neededは1より大きな値が必要です\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  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:3590
++#: g10/gpg.c:3688
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "無効なデフォルトの優先指定\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "無効な個人用暗号方式の優先指定\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "無効な個人用ダイジェストの優先指定\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "無効な個人用圧縮の優先指定\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%sは%sではまだ機能しません\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "信用データベースの初期化に失敗しました: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [ファイル名]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [ファイル名]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [ファイル名]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [ファイル名]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [ファイル名]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [ファイル名]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [ファイル名]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [ファイル名]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [ファイル名]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [ファイル名]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key ユーザid"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key ユーザid"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key ユーザid [コマンド]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
  msgstr "--passwd <ユーザid>"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "鍵サーバへの送信に失敗しました: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "鍵サーバからの受信に失敗しました: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "鍵のエクスポートに失敗しました: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "ssh鍵としてのエクスポートに失敗しました: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "鍵サーバの検索に失敗しました: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "鍵サーバの更新に失敗しました: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "外装除去に失敗しました: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "外装に失敗しました: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "鍵指定'%s'の構文解析エラー: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr "'%s'は有効な鍵ID, フィンガープリント、keygripではないようです。\n"
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[ファイル名]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "開始します。メッセージを打ってください ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "あたえられた証明書ポリシーURLは無効です\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "あたえられた署名ポリシーURLは無効です\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "指定された優先鍵サーバURLは無効です\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FILE|鍵リングFILEの鍵を扱います"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "日時の矛盾を警告だけにします"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|このFDにステイタス情報を書き出す"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr "|ALGO|ALGOで作成された署名を拒絶する"
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "使い方: gpgv [オプション] [ファイル] (ヘルプは -h)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3088,133 -2390,105 +3103,133 @@@ msgstr "ヘルプはありません
  msgid "No help available for '%s'"
  msgstr "'%s'のヘルプはありません"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr "ローカルだけとマークされた署名をインポートします"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr "インポートの際、にpksキーサーバからのダメージを修正します"
  
- #: g10/import.c:144
++#: g10/import.c:157
  msgid "do not clear the ownertrust values during import"
  msgstr "インポートの際、所有者信用の値をクリアしない"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "インポート後、信用データベースを更新しない"
  
- #: g10/import.c:150
++#: g10/import.c:163
  msgid "show key during import"
  msgstr "インポートの際、鍵を表示"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr "既存の鍵に対する更新のみ認めます"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
  msgstr "インポート後、利用できない部分を鍵から除去します"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "インポート後、できるだけ除去します"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr "インポート・フィルタを実行し鍵をすぐにエクスポートします"
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "型%dのブロックをスキップします\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "これまで%lu個の鍵を処理\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "          処理数の合計: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "   スキップしたPGP-2鍵: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "  スキップした新しい鍵: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          ユーザIDなし: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "            インポート: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "              変更なし: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "        新しいユーザID: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "            新しい副鍵: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "            新しい署名: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "        新しい鍵の失効: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "      秘密鍵の読み込み: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "    秘密鍵のインポート: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "        無変更の秘密鍵: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "          未インポート: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "        掃除された署名: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "    掃除されたユーザID: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3223,187 -2497,149 +3238,187 @@@ msgstr "
  "*警告*: 鍵%sには、これらのユーザIDに対して使用不可のアルゴリズムの優先指定が"
  "あります\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": 暗号アルゴリズムの優先指定 %s\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": ダイジェスト・アルゴリズムの優先指定 %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": 圧縮アルゴリズムの優先指定 %s\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "あなたの優先指定を更新し、この鍵を再配布することが強く推奨されます\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr "それによって、潜在的なアルゴリズム不一致の問題を避けられます\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr "以下で、優先指定を更新できます: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "鍵%s: ユーザIDがありません\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, c-format
  msgid "key %s: %s\n"
  msgstr "鍵  %s: %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr "インポートの検査で拒否されました"
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "鍵%s: PKSの副鍵変造を修復\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "鍵%s: 受理した未自己署名のユーザID\"%s\"\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "鍵%s: 有効なユーザIDがありません\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "これはおそらく自己署名のないせいでしょう\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "鍵%s: 公開鍵が見つかりません: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "鍵%s: 新しい鍵です - スキップします\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "書き込み可能な鍵リングが見つかりません: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "鍵リング'%s'の書き込みエラー: %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "鍵%s: 公開鍵\"%s\"をインポートしました\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "鍵%s: こちらの複製と合いません\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "鍵%s: 元の鍵ブロックに位置づけできません: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "鍵%s: 元の鍵ブロックを読み込めません: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "鍵%s: \"%s\" 新しいユーザIDを1個\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "鍵%s: \"%s\" 新しいユーザIDを%d個\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "鍵%s: \"%s\" 新しい署名を1個\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "鍵%s: \"%s\" 新しい署名を%d個\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "鍵%s: \"%s\" 新しい副鍵を1個\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "鍵%s: \"%s\" 新しい副鍵を%d個\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "鍵%s:\"%s\"変更なし\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "鍵%s: 秘密鍵をインポートしました\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "鍵 %s: 秘密鍵はもうあります\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "鍵 %s: エージェントへの送信エラー: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "秘密鍵 %s: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "秘密鍵のインポートは禁止です\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "鍵%s: 無効な暗号方式%dの秘密鍵です - スキップします\n"
@@@ -3418,172 -2654,138 +3433,172 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr "'%s'の移行には、スマードカードそれぞれで、以下を実行してください: %s\n"
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "鍵%s: 公開鍵がありません - 失効証明書を適用できません\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "鍵%s: 無効な失効証明書: %s - 拒否\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "鍵%s:\"%s\"失効証明書をインポートしました\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "鍵%s: 署名に対応するユーザIDがありません\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "鍵%s: ユーザID\"%s\"のサポートしていない公開鍵アルゴリズムです\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "鍵%s: ユーザID\"%s\"の自己署名が、無効です\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "鍵%s: サポートしていない公開鍵アルゴリズムです\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "鍵%s: 無効な直接鍵署名\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "鍵%s: 鍵に対応する副鍵がありません\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "鍵%s: 無効な副鍵の対応です\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "鍵%s: 多重副鍵の対応を削除します\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "鍵%s: 鍵失効に対する副鍵がありません\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "鍵%s: 無効な副鍵失効です\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "鍵%s: 無効な副鍵の多重失効を削除します\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "鍵%s: スキップしたユーザID\"%s\"\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "鍵%s: スキップした副鍵\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "鍵%s: エクスポート不可な署名 (クラス0x%02X) - スキップします\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "鍵%s: 失効証明書が誤って設定されています - スキップします\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "鍵%s: 無効な失効証明書: %s - スキップします\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "鍵%s: 副鍵署名の場所が、誤っています - スキップします\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "鍵%s: 予期せぬ署名クラス (0x%02X) - スキップします\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "鍵%s: 重複したユーザIDの検出 - マージ\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sを取ってきます\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sが存在しません。\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "鍵%s:\"%s\"失効証明書の追加\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "鍵%s: 直接鍵署名を追加\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "keybox'%s'の作成エラー: %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, c-format
  msgid "error creating keyring '%s': %s\n"
  msgstr "鍵リング'%s'の作成エラー: %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, c-format
  msgid "keybox '%s' created\n"
  msgstr "keybox'%s'が作成されました\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, c-format
  msgid "keyring '%s' created\n"
  msgstr "鍵リング'%s'ができました\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "keyblock リソース'%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, c-format
  msgid "error opening key DB: %s\n"
  msgstr "鍵DBを開く際のエラー: %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "鍵リング・キャッシュの再構築に失敗しました: %s\n"
@@@ -3596,52 -2796,47 +3611,58 @@@ msgstr "[失効]
  msgid "[self-signature]"
  msgstr "[自己署名]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "メモリの確保のエラー: %s\n"
+ 
++#: g10/keyedit.c:629
  #, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "サポートしていない公開鍵アルゴリズム(%d)の署名は確認できません: %s.\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr ""
  "サポートしていないメッセージ・ダイジェスト(%d)の署名は確認できません: %s.\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  msgid " (reordered signatures follow)"
  msgstr "(順番を変えた署名が続きます)"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, c-format
  msgid "key %s:\n"
  msgstr "鍵  %s:\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "%d個の重複した署名が除去されました\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, c-format
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
  msgstr[0] "鍵がないため%d個の署名は検査しません\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, c-format
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
  msgstr[0] "%d個の不正な署名\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "%d個の正しい署名\n"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3650,7 -2845,6 +3671,7 @@@ msgstr "
  "警告: エラーがあり、自己署名だけ確認しました。'%s'を実行してすべての署名を確"
  "認ください。\n"
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3661,17 -2855,14 +3682,17 @@@ msgstr "
  "(パスポートを見せてもらったり、他から得たフィンガープリントを検査したり、など"
  "など)\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = まぁまぁ信用する\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = 充分に信用する\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3680,50 -2871,38 +3701,50 @@@ msgstr "
  "信用署名の深さを入力してください。\n"
  "深さが1より大きいと、署名しようとしている鍵で信用署名を作れます。\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr "署名を制限するドメインを入力するか、空行を入力してください。\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr "ユーザID\"%s\"をスキップします、テキストのIDではありません。\n"
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "ユーザID\"%s\"は、失効されています。"
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "それでもこの鍵に署名したいですか? (y/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  署名不能。\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "ユーザID \"%s\"は、期限切れです。"
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "ユーザID \"%s\"は、自己署名されていません。"
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "ユーザID \"%s\"は署名可能です。 "
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
  msgstr "署名しますか? (y/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3732,11 -2911,9 +3753,11 @@@ msgstr "
  "\"%s\"にたいする自己署名は、\n"
  "PGP 2.x形式の署名です。\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "OpenPGPの自己署名に格上げしたいですか? (y/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3745,11 -2922,9 +3766,11 @@@ msgstr "
  "\"%s\"に対するあなたの今の署名\n"
  "は期限切れです。\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "新しい署名を発行し、期限切れ署名と置き換えたいですか? (y/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3758,43 -2933,34 +3779,43 @@@ msgstr "
  "\"%s\"にたいするあなたの今の署名\n"
  "はローカルな署名です。\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "エクスポート可能な署名に格上げしたいですか? (y/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\"は鍵%sでもうローカルに署名してあります\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\"は鍵%sでもう署名してあります\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "それでも再署名したいですか? (y/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "鍵%sで署名すべきものはありません\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "この鍵は期限切れです!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "この鍵は%sで期限が切れます。\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "同時に署名も期限切れとしたいですか? (Y/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3803,31 -2969,25 +3824,31 @@@ msgstr "
  "署名しようとしている鍵が実際に上記の名前の人のものかどうか、どの程度\n"
  "注意して検証しましたか? 答がわからなければ、\"0\"を入力してください。\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) 答えません。%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) 全然、検査していません。%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) 一応、検査しました。%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) かなり注意して検査しました。%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  msgid "Your selection? (enter '?' for more information): "
  msgstr "選択は? (詳細は '?'): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3836,220 -2996,166 +3857,220 @@@ msgstr "
  "本当にこの鍵にあなたの鍵\"%s\"で署名してよいですか\n"
  "(%s)\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
  msgstr "自己署名になるでしょう。\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "*警告*: 署名は、エクスポート不可に設定されません。\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "*警告*: 署名は、失効不可に設定されません。\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "署名は、エクスポート不可に設定されます。\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "署名は、失効不可に設定されます。\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "この鍵は全然、検査していません。\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "この鍵は一応、検査しました。\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "この鍵は、かなり注意して検査しました。\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
  msgstr "本当に署名しますか? (y/N) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "署名に失敗しました: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "鍵にはスタブあるいはカード上の項目しかありません - パスフレーズは変更されませ"
  "ん。\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "鍵 %s: パスフレーズの変更エラー: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "保存して終了"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "鍵のフィンガープリントを表示"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  msgid "show the keygrip"
  msgstr "keygripを表示"
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "鍵とユーザIDの一覧"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "ユーザID Nの選択"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "副鍵Nの選択"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "署名の確認"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "選択したユーザIDに署名する [* 以下の関連コマンドを参照 ]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "選択したユーザIDにローカルに署名"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "選択したユーザIDに信用署名を署名する"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "選択したユーザIDに失効不可の署名をする"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "ユーザIDの追加"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "フォトIDの追加"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "選択したユーザIDの削除"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "副鍵を追加"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "スマートカードへ鍵の追加"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "鍵をスマートカードへ移動"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "バックアップ鍵をスマートカードへ移動"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "選択した副鍵の削除"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "失効鍵の追加"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "選択したユーザIDから署名を削除する"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "鍵または選択した副鍵の有効期限を変更する"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "選択したユーザIDを主にする"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "優先指定の一覧 (エキスパート)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "優先指定の一覧 (冗長)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "選択したユーザIDに優先指定リストを設定"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "選択したユーザIDに優先鍵サーバのURLを設定"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
  msgstr "選択したユーザIDに注釈を設定する"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "パスフレーズの変更"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "所有者信用の変更"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "選択したユーザIDの署名を失効"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "選択したユーザIDの失効"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "鍵の失効または選択した副鍵の失効"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "鍵を有効にする"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "鍵を無効にする"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "選択したフォトIDを表示"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr "使えないユーザIDをコンパクトにし、使えない署名を鍵から除去"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr "使えないユーザIDをコンパクトにし、すべての署名を鍵から除去"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "秘密鍵が利用できます。\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "この実行には秘密鍵がいります。\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4060,255 -3166,196 +4081,255 @@@ msgstr "
  "  't' で始まると信用署名 (tsign)、'nr' で始まると失効不可署名\n"
  "  (nrsign)、もしくはこれらの組み合わせ (ltsign, tnrsign, など)となります。\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "鍵は、失効されています。"
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
  msgstr "本当に全ユーザIDに署名しますか? (y/N) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "本当に全てのテキストユーザIDに署名しますか? (y/N) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "ヒント: まず署名するユーザIDを選択します\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "不明の署名タイプ'%s'\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "%sモードでこのコマンドは禁止です。\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "ユーザIDを少なくともひとつ選択してください。\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr "('%s'コマンドを使用してください。)\n"
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "最後のユーザIDは削除できません!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "選択した全ユーザIDを本当に削除しますか? (y/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
  msgstr "このユーザIDを本当に削除しますか? (y/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
  msgstr "この主鍵を本当に移動しますか? (y/N) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "鍵をきっかり1つ選択してください。\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "コマンドはファイル名の引数を期待します\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "'%s'が開けません: %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "バックアップ鍵を'%s'から読み込みする際のエラー: %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "鍵を少なくとも1本選択してください。\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "選択した鍵を本当に削除しますか? (y/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "この鍵を本当に削除しますか? (y/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "選択した全ユーザIDを本当に失効しますか? (y/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
  msgstr "このユーザIDを本当に失効しますか? (y/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "この鍵全体を本当に失効しますか? (y/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "選択した副鍵を本当に失効しますか? (y/N) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "この副鍵を本当に失効しますか? (y/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "ユーザが指定した信用データベースを利用中、所有者信用は設定できません。\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "優先指定の一覧を設定:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "選択したユーザIDの優先指定を本当に更新しますか? (y/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
  msgstr "優先指定を本当に更新しますか? (y/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
  msgstr "変更を保存しますか? (y/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
  msgstr "保存せずに終了しますか? (y/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "更新に失敗しました: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "鍵は無変更なので更新は不要です。\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, c-format
  msgid "User ID revocation failed: %s\n"
  msgstr "ユーザIDの失効に失敗しました: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "\"%s\"はフィンガープリントではありません\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "\"%s\" はプライマリ・フィンガープリントではありません\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, c-format
  msgid "Invalid user ID '%s': %s\n"
  msgstr "無効なユーザID '%s': %s\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "No matching user IDs."
  msgstr "マッチするユーザIDはありません。"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "Nothing to sign.\n"
  msgstr "署名するものがありません。\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "ダイジェスト: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "機能: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "鍵サーバ 修正しない"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "優先鍵サーバ: "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "注釈: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr "PGP 2.x形式ユーザIDの優先指定が、ありません。\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "%sで%s鍵%sによって以下の鍵は、失効されました\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "この鍵は、%s鍵%sによって失効可能です"
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(機密指定)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "作成: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "失効: %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "期限切れ: %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "有効期限: %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "利用法: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "カード番号: "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "信用: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "有効性: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "この鍵は使用禁止に設定されています"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4316,17 -3363,12 +4337,18 @@@ msgstr "
  "プログラムを再起動するまで、表示された鍵の有効性は正しくないかもしれない、\n"
  "ということを念頭においてください。\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "失効"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "期限切れ"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4334,15 -3376,12 +4356,15 @@@ msgstr "
  "*警告*: 主たるユーザIDがありません。このコマンドは、別な\n"
  "              ユーザIDが主になると仮定する場合があります。\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "*警告*: あなたの暗号副鍵はもうすぐ期限切れとなります。\n"
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  msgid "You may want to change its expiration date too.\n"
  msgstr "その有効期限も変更したいでしょう\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4352,70 -3391,55 +4374,70 @@@ msgstr "
  "は、\n"
  "        この鍵を拒否するかもしれません。\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "それでも追加したいですか? (y/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "PGP2形式の鍵にはフォトIDを追加できません。\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr "そういったユーザIDはすでにこの鍵に存在しています!\n"
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "この正しい署名を削除しますか? (y/N/q)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "この無効な署名を削除しますか? (y/N/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "この不明の署名を削除しますか? (y/N/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "この自己署名を本当に削除しますか? (y/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, c-format
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
  msgstr[0] "%d個の署名を削除しました。\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "何も削除していません。\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "無効"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "ユーザID \"%s\" は、コンパクトになりました: %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
  msgstr[0] "ユーザID \"%s\": %d の署名が除去されました\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "ユーザID \"%s\": 既に最小化されています\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "ユーザID \"%s\": 既にクリーンとなっています\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4425,264 -3449,205 +4447,264 @@@ msgstr "
  "では、\n"
  "        この鍵を拒否するかもしれません。\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "PGP 2.x形式の鍵には指名失効者を追加できません。\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "指名失効者のユーザIDを入力してください: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr "PGP 2.x形式の鍵は、指名失効者に任命できません\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "指名失効者には、その鍵自体を任命できません\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
  msgstr "この鍵は失効者としてもう指名されています\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr "*警告*: ある鍵を指名失効者に設定すると、元に戻せません!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr "本当にこの鍵を指名失効者に任命しますか? (y/N) "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
  msgstr "本当に複数の副鍵の失効期限を変更しますか? (y/N) "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "副鍵の有効期限を変更します。\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "主鍵の有効期限を変更します。\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "v3鍵の有効期限は変更できません\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "署名する副鍵%sはすでに相互証明されています\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr "副鍵 %s は署名をしないので、相互証明の必要はありません\n"
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "ユーザIDをきっかりひとつ選択してください。\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "ユーザID\"%s\"のv3自己署名をスキップします\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "優先鍵サーバURLを入力してください: "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "本当に置き換えたいですか? (y/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "本当に削除したいですか? (y/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "注釈を入力: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
  msgstr "進みますか? (y/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "%d番のユーザIDはありません\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "ハッシュ%sのユーザIDはありません\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "鍵ID'%s'の副鍵はありません\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "%d番の副鍵はありません\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ユーザID:\"%s\"\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "%sで%s%s%sに署名されています\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (エクスポート不可)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "この署名は%sで期限切れです。\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "それでも本当に失効したいですか? (y/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "この署名に対する失効証明書を作成しますか? (y/N) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr "あなたによって署名されていません。\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "これらのユーザIDに鍵%sで署名しました:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (失効不可)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "あなたの鍵%sで%sに失効されています\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "これらの署名を失効しようとしています:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "失効証明書を本当に作成しますか? (y/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "秘密鍵がありません\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr "ユーザIDでないものを失効しようとしました: %s\n"
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "ユーザID\"%s\"は、もう失効されています\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr "*警告*: ユーザID署名が、%d秒未来です\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "鍵 %s は、もう失効されています。\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "副鍵 %s は、もう失効されています。\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "%s (大きさ%ld) の鍵%s (uid %d) のフォトIDとして表示\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "優先指定'%s'の重複\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "暗号方式の優先指定が多すぎます\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "ダイジェストの優先指定が多すぎます\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
  msgstr "圧縮の優先指定が多すぎます\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "優先指定の文字列に無効な項目'%s'があります\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "直接署名を書き込みます\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "自己署名を書き込みます\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "鍵対応への署名を書き込みます\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "無効な鍵長。%uビットにします\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "鍵長を%uビットに丸めます\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "*警告*: いくつかのOpenPGPプログラムはこのダイジェスト長のDSA鍵を扱うことがで"
  "きません\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "Sign"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "Certify"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "Encrypt"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "Authenticate"
  
@@@ -4696,150 -3661,119 +4718,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "鍵%sに認められた操作: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "現在の認められた操作: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) 署名機能を反転する\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) 暗号機能を反転する\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) 認証機能を反転する\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) 完了\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "ご希望の鍵の種類を選択してください:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA と RSA (デフォルト)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA と Elgamal\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (署名のみ)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (署名のみ)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (暗号化のみ)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (暗号化のみ)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (機能をあなた自身で設定)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (機能をあなた自身で設定)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC と ECC\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (署名のみ)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (機能をあなた自身で設定)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (暗号化のみ)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) 既存の鍵\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "keygripを入力: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "有効なkeygrip (40桁の16進数字)ではありません\n"
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "このkeygripの鍵はありません\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "%uビットに切り上げます\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s 鍵は %u から %u ビットの長さで可能です。\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "副鍵の鍵長は? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "鍵長は? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "要求された鍵長は%uビット\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  msgid "Please select which elliptic curve you want:\n"
  msgstr "ご希望の楕円曲線を選択してください:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4855,7 -3789,6 +4877,7 @@@ msgstr "
  "      <n>m = 鍵は n か月間で期限切れ\n"
  "      <n>y = 鍵は n 年間で期限切れ\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4871,38 -3804,30 +4893,38 @@@ msgstr "
  "      <n>m = 署名は n か月間で期限切れ\n"
  "      <n>y = 署名は n 年間で期限切れ\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "鍵の有効期間は? (0)"
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "署名の有効期間は? (%s)"
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "無効な値\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "%sは無期限です\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "%署名は無期限です\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "鍵は%sで期限切れとなります\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "署名は%sで期限切れとなります\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -4910,11 -3835,9 +4932,11 @@@ msgstr "
  "このシステムでは、2038年以降の日付を表示することはできませんが、\n"
  "2106年まで正しく処理されます。\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "これで正しいですか? (y/N) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4928,7 -3851,6 +4950,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -4944,49 -3866,38 +4966,49 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "本名: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "名前に無効な文字があります\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "キャラクタ'%s'と'%s'は名前に使えません\n"
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "名前を数字で始めてはいけません\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "名前は5文字以上でなければなりません\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "電子メール・アドレス: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "有効な電子メール・アドレスではありません\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "コメント: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "コメントに無効な文字があります\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "あなたは文字集合'%s'を使っています。\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -4997,7 -3908,6 +5019,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "電子メールのアドレスを本名やコメントに入れないように\n"
  
@@@ -5012,31 -3922,24 +5034,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "名前(N)、コメント(C)、電子メール(E)の変更、または終了(Q)? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "名前(N)、コメント(C)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "名前(N)、電子メール(E)の変更、または終了(Q)? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "名前(N)、電子メール(E)の変更、またはOK(O)か終了(Q)? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "まずエラーを修正してください\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5047,13 -3950,10 +5069,13 @@@ msgstr "
  "す、ディスクにアクセスするなどの他の操作を素数生成の間に行うことで、乱数生\n"
  "成器に十分なエントロピーを供給する機会を与えることができます。\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "鍵の生成に失敗しました: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5064,62 -3964,49 +5086,62 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr "続けますか? (Y/n) "
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "\"%s\" の鍵はもうあります\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  msgid "Create anyway? (y/N) "
  msgstr "それでも鍵を作成しますか? (y/N) "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  msgid "creating anyway\n"
  msgstr "いずれにしろ鍵を作成\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr "注意: 全機能の鍵生成には \"%s %s\" を使います。\n"
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "鍵の生成が取り消されました。\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "バックアップ・ファイル'%s'が作成できません: %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "*注意*: カード鍵のバックアップが'%s'へ保存されます\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "'%s'へ公開鍵を書き込みます\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "書き込み可能な公開鍵リングが見つかりません: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "公開鍵リング'%s'の書き込みエラー: %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "公開鍵と秘密鍵を作成し、署名しました。\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5127,35 -4014,28 +5149,35 @@@ msgstr "
  "この鍵は暗号化には使用できないことに注意してください。暗号化を行うには、\n"
  "\"--edit-key\"コマンドを使って副鍵を生成してください。\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "*注意*: v3鍵に対する副鍵の作成は、OpenPGPに適合しません\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "主鍵の秘密部分が利用できません。\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "主鍵の秘密部分はカード上に保存されています。\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
  msgstr "本当に作成しますか? (y/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "無期限    "
  
@@@ -5201,29 -4072,23 +5223,29 @@@ msgstr[0] "*警告*: %lu個の鍵がそ
  msgid "Keyring"
  msgstr "鍵リング"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr " 主鍵フィンガープリント:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr " 副鍵フィンガープリント:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr "  主鍵フィンガープリント:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "  副鍵フィンガープリント:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "   フィンガープリント ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr "   カードシリアル番号 ="
  
@@@ -5255,106 -4115,83 +5277,106 @@@ msgstr[0] " (%lu個の不正な署名)\
  msgid "%s: keyring created\n"
  msgstr "%s: 鍵リングができました\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr "dirmngrのプロキシ・オプション設定を押し切る"
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr "失効した鍵を検索結果に含める"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr "key IDによる検索に副鍵も含める"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr "dirmngrのタイムアウト・オプション設定を押し切る"
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr "署名の検証時に自動的に鍵を取得する"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "鍵に設定される優先鍵サーバURLを与える"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr "鍵に設定されたPKAレコードを鍵の取得時に与える"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "使用禁止"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr "番号(s)、N)次、またはQ)中止を入力してください >"
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "無効な鍵サーバ・プロトコルです (us %d!=handler %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "\"%s\"鍵IDではありません: スキップします\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
  msgstr[0] "%d本の鍵を%sから更新\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "*警告*: 鍵%sを%s経由で更新できません: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "鍵\"%s\"が鍵サーバに見つかりません\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "鍵が鍵サーバに見つかりません\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr "既知の鍵サーバがありません (オプション--keyserverを使いましょう)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "鍵%sを%sからサーバ%sに要求\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "鍵%sを%sに要求\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  msgid "no keyserver known\n"
  msgstr "鍵サーバがわかりません\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "\"%s\"をスキップしました: %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "鍵%sを%sへ送信\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, c-format
  msgid "requesting key from '%s'\n"
  msgstr "鍵を'%s'から要求\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "*警告*: URI %s からデータを取れません: %s\n"
@@@ -5452,128 -4269,100 +5474,127 @@@ msgstr "元のファイル名='%.*s'\n
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr "*警告*: 複数のプレインテクストが見られます\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "スタンドアロン失効 - \"gpg --import\"を使って適用してください\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "署名が見つかりません\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "\"%s\"からの*不正な*署名"
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "\"%s\"からの期限切れの署名"
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "\"%s\"からの正しい署名"
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "署名の検証を省略\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "このあいまいな署名データは取り扱えません\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "%sに施された署名\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               %s鍵%sを使用\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "%sに%s鍵ID %sで施された署名\n"
  
- #: g10/mainproc.c:1755
- #, fuzzy, c-format
- #| msgid "                aka \"%s\""
++#: g10/mainproc.c:1772
+ #, c-format
  msgid "               issuer \"%s\"\n"
- msgstr "                別名\"%s\""
+ msgstr "               発行者\"%s\"\n"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "以下に鍵があります: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[不確定]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                別名\"%s\""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "期限切れの署名 %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "この署名は%sで期限切れとなります\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s署名、ダイジェスト・アルゴリズム %s%s%s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "バイナリ"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "テキストモード"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "不明の"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  msgid ", key algorithm "
  msgstr "、鍵アルゴリズム "
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  "*警告*: 分遣署名ではありません。ファイル「%s」は検証され*ませんでした*!\n"
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "署名を検査できません: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "分遣署名でありません\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "*警告*: 多重署名の検出。最初のものだけ検査します。\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "クラス0x%02xのスタンドアロン署名\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "古い形式 (PGP 2.x) の署名\n"
  
@@@ -5674,26 -4444,21 +5695,26 @@@ msgstr "無圧縮
  msgid "uncompressed|none"
  msgstr "無圧縮|なし"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "このメッセージは、%sでは使用できません\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "あいまいなオプション'%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, c-format
  msgid "unknown option '%s'\n"
  msgstr "不明のオプション'%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr "ECDSAの公開鍵は8ビットの倍数のSECエンコーディングを期待します\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "不明の弱いダイジェスト'%s'\n"
@@@ -5973,7 -4683,25 +5994,28 @@@ msgstr "この鍵はたぶん本人の�
  msgid "This key belongs to us\n"
  msgstr "この鍵は自分のものです\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ #| msgid "root certificate has now been marked as trusted\n"
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "ルート証明書は信用すると今、マークされました\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "この鍵は、このユーザIDをなのる本人のものかどうか確信でき\n"
+ "ません。今から行うことを*本当に*理解していない場合には、\n"
+ "次の質問にはnoと答えてください。\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -5983,126 -4711,98 +6025,126 @@@ msgstr "
  "ません。今から行うことを*本当に*理解していない場合には、\n"
  "次の質問にはnoと答えてください。\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "それでもこの鍵を使いますか? (y/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "*警告*: 信用できない鍵を使っています!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr "*警告*: この鍵は失効されたようです (失効鍵は不在)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "*警告*: この鍵は指名失効者によって失効されています!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "*警告*: この鍵は所有者によって失効されています!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
  msgstr "        署名が偽物なこともある、ということです。\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "*警告*: この副鍵は所有者によって失効されています!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "注意: この鍵は使用禁止に設定されています。\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr "注意: 確認された署名者のアドレスは'%s'です\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr "注意: 署名者のアドレス'%s'がDNSのエントリと一致しません\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr "PKA情報が有効のため、信用レベルがFULLに調整されました\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr "PKA情報が無効のため、信用レベルがNEVERに調整されました\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "注意: この鍵は期限切れです!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr "*警告*: この鍵は信用できる署名で証明されていません!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr "      この署名が所有者のものかどうかの検証手段がありません。\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "*警告*: この鍵は信用できません!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "        この署名はおそらく 偽物 です。\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr "*警告*: この鍵は十分に信用できる署名で証明されていません!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "        この署名が所有者のものかどうか確信できません。\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: スキップ: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: スキップ: 公開鍵は使用禁止です\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: スキップ: 公開鍵はもうあります\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, c-format
  msgid "can't encrypt to '%s'\n"
  msgstr "'%s'に暗号化できません\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr ""
  "オプション'%s'が与えられましたが、有効なデフォルト鍵が与えられていません\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "オプション'%s'が与えられましたが、オプション'%s'は与えられていません\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "ユーザIDを指定していません (\"-r\"を使いましょう) 。\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "今の受取人:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6110,37 -4810,29 +6152,37 @@@ msgstr "
  "\n"
  "ユーザIDを入力。空行で終了: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "そのユーザIDはありません。\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr "スキップ: 公開鍵はデフォルトの受取人としてもう設定済みです\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "公開鍵は使用禁止です。\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "スキップ: 公開鍵はもう設定済みです\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "デフォルトの受取人\"%s\"が不明です\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "有効な宛先がありません\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "注意: 鍵%sには %s の機能がありません\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "注意: 鍵%sには%sに対する優先指定がありません\n"
@@@ -6388,38 -5034,31 +6430,38 @@@ msgid "%s key %s requires a %zu bit or 
  msgstr ""
  "%s鍵%sは%zuビットあるいはより大きいハッシュを必要とします(今のハッシュは%s)\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "*警告*: 署名のダイジェストが、メッセージと衝突します\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "*警告*: 署名副鍵%sは、相互証明されてません\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
  msgstr "詳細は%sをご覧ください\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr "*警告*: 無効な相互証明が、署名副鍵%sにあります\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
  msgstr[0] "公開鍵%sは、署名よりも%lu秒、新しいものです\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
  msgstr[0] "公開鍵%sは、署名よりも%lu日、新しいものです\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6427,34 -5066,28 +6469,34 @@@ msgid_plural "
  "key %s was created %lu seconds in the future (time warp or clock problem)\n"
  msgstr[0] "鍵%sは%lu秒、未来にできました (時間歪曲か時計の障害でしょう)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu days in the future (time warp or clock problem)\n"
  msgstr[0] "鍵%sは%lu日、未来にできました (時間歪曲か時計の障害でしょう)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "*注意*: 署名鍵%sは%sに期限切れとなります\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "*注意*: 鍵 %s は失効済みです\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr "不明のクリティカル・ビットにより、鍵%sの署名を不正とみなします\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr "鍵%s: 副鍵失効署名にたいする副鍵がありません\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "鍵%s: 副鍵対応への署名にたいする副鍵がありません\n"
@@@ -6518,7 -5140,6 +6560,7 @@@ msgstr "スキップ: 秘密鍵はも�
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr "これはPGPの生成したElgamal鍵で、署名用には安全ではありません!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "信用レコード%lu, 型%d: 書き込みに失敗しました: %s\n"
@@@ -6563,12 -5176,10 +6605,12 @@@ msgstr "'%s'で信用レコードの検
  msgid "read error in '%s': %s\n"
  msgstr "'%s'で読み込みエラー: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "信用データベース: 同期に失敗しました: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "'%s'のロックを作成できません\n"
@@@ -6597,7 -5203,6 +6639,7 @@@ msgstr "信用データベースのト�
  msgid "%s: directory does not exist!\n"
  msgstr "%s: ディレクトリがありません!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "'%s'にアクセスできません: %s\n"
@@@ -6706,254 -5289,283 +6748,337 @@@ msgstr "%d文字以上の長さのテ�
  msgid "input line longer than %d characters\n"
  msgstr "入力行の長さが%d文字を超えています\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "TOFUデータベースのトランザクション開始エラー: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr "TOFUデータベースのトランザクションコミットのエラー: %s\n"
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr "TOFUデータベースのトランザクションのロールバックのエラー: %s\n"
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr "サポートされていないTOFUデータベースバージョン: %s\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "TOFUデータベースの読み込みエラー: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, c-format
  msgid "error determining TOFU database's version: %s\n"
  msgstr "TOFUデータベースのバージョン判定エラー: %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, c-format
  msgid "error initializing TOFU database: %s\n"
  msgstr "TOFUデータベースの初期化エラー: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "TOFUデータベースのオープンでエラー '%s': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "TOFUデータベースの更新エラー: %s\n"
  
- #: g10/tofu.c:1118
- #, c-format
- msgid "The binding %s is NOT known."
- msgstr "%sのバインディングは不明です。"
- 
- #: g10/tofu.c:1128
- #, c-format
++#: g10/tofu.c:1239
+ #, fuzzy, c-format
+ #| msgid "The email address \"%s\" is associated with %d key:\n"
+ #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ "This is the first time the email address \"%s\" is being used with key %s."
+ msgstr "電子メールアドレス\"%s\"は%d個の鍵に結びつけられます:\n"
+ 
++#: g10/tofu.c:1247
+ #, fuzzy, c-format
+ #| msgid "The email address \"%s\" is associated with %d key:\n"
+ #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr "電子メールアドレス\"%s\"は%d個の鍵に結びつけられます:\n"
+ 
++#: g10/tofu.c:1251
+ #, fuzzy
+ #| msgid ""
+ #| "The key with fingerprint %s raised a conflict with the binding %s.  Since "
+ #| "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  "鍵のフィンガープリント%sがバインディング%sと衝突しました。このバインディング"
  "ポリシーは'auto'だったので、'ask'に変更されました。"
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
- "バインディング%s%sが適切(鍵は述べられた所有者に属する)か、偽られたものか(ダ"
- "メ)かを指示してください。"
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "ほかのユーザIDの収集エラー: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr "この鍵に結びつけられた知られているユーザID:\n"
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "鍵とユーザIDの一覧"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, c-format
  msgid "policy: %s"
  msgstr "ポリシー: %s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "署名の統計の収集エラー: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] "電子メールアドレス\"%s\"は%d個の鍵に結びつけられます:\n"
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr "この電子メールアドレス\"%s\"の鍵の統計:\n"
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  msgid "this key"
  msgstr "この鍵"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] "%ld個のメッセージが未来に署名されました。"
++#: g10/tofu.c:1715
+ #, fuzzy, c-format
+ #| msgid "Verified %ld messages signed by \"%s\"."
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "%ld個のメッセージを検証しました(\"%s\"で署名されたもの)。"
  
- #: g10/tofu.c:1351
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "%ld個のメッセージに署名しました"
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
  
- #: g10/tofu.c:1357
- #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
++#: g10/tofu.c:1734
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] "過去%ld日に。"
  
- #: g10/tofu.c:1361
- #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
- msgstr[0] "過去%ld週間に。"
- 
- #: g10/tofu.c:1365
- #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
++#: g10/tofu.c:1740
+ #, fuzzy, c-format
+ #| msgid " over the past %ld month."
+ #| msgid_plural " over the past %ld months."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] "過去%ld月に。"
  
++#: g10/tofu.c:1746
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
+ msgstr[0] "過去%ld日に。"
+ 
++#: g10/tofu.c:1752
+ #, fuzzy
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid " in the past."
+ msgstr "過去%ld日に。"
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr "TOFUはバインディングの衝突を検出しました"
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr "gGaAuUrRbB"
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  "(G)ood-良, (A)ccept once-一度だけ良, (U)nknown-不明, (R)eject once-一度だけ"
  "否, (B)ad-ダメ? "
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ #| msgid "error writing key: %s\n"
+ msgid "resetting keydb: %s\n"
+ msgstr "鍵の書き込みエラー: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "TOFUデータベースの信用レベルの設定エラー: %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "TOFUポリシーの作成エラー: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] "%d~年"
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] "%d~月"
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] "%d~月"
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] "%d~時間"
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] "%d~分"
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] "%d~秒"
  
- #: g10/tofu.c:1947
- #, c-format
- msgid "Have never verified a message signed by key %s!\n"
- msgstr "鍵%sで署名されたメッセージを検証したことは一度もありません!\n"
- 
- #: g10/tofu.c:1976
++#: g10/tofu.c:2802
  #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
+ msgid "%s: "
  msgstr ""
- "\"%s\"の署名の統計を収集することに失敗しました\n"
- "(鍵 %s)\n"
  
- #: g10/tofu.c:1996
- #, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "%ld個のメッセージを検証しました(\"%s\"で署名されたもの)。"
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "%d個の署名を削除しました。\n"
  
- #: g10/tofu.c:2007
- #, c-format
- msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
++#: g10/tofu.c:2816
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Verified %ld message signed by \"%s\"\n"
+ #| "in the past %s."
+ #| msgid_plural ""
+ #| "Verified %ld messages signed by \"%s\"\n"
+ #| "in the past %s."
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
  msgstr[0] "メッセージを%ld回検証しました(\"%s\"で署名されたもの。かつて %s)。"
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
- msgstr "もっとも最近のメッセージは%s前に検証されました。"
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "%lu 個のパスフレーズで暗号化\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Verified %ld message signed by \"%s\"\n"
+ #| "in the past %s."
+ #| msgid_plural ""
+ #| "Verified %ld messages signed by \"%s\"\n"
+ #| "in the past %s."
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "メッセージを%ld回検証しました(\"%s\"で署名されたもの。かつて %s)。"
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2880
+ #, fuzzy
+ #| msgid "Warning: we've have yet to see a message signed by this key!\n"
+ msgid ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr "警告: この鍵で署名されたメッセージを検証したことはありません!\n"
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2883
+ #, fuzzy
+ #| msgid "Warning: we've only seen a single message signed by this key!\n"
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  "警告: この鍵で署名されたメッセージを検証したことは一度しかありません!\n"
  
- #: g10/tofu.c:2077
- #, c-format
++#: g10/tofu.c:2887
+ #, fuzzy
+ #| msgid "Warning: we've have yet to see a message signed by this key!\n"
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
+ msgstr "警告: この鍵で署名されたメッセージを検証したことはありません!\n"
+ 
++#: g10/tofu.c:2890
+ #, fuzzy
+ #| msgid "Warning: we've only seen a single message signed by this key!\n"
+ msgid "Warning: you have only encrypted one message to this key!\n"
+ msgstr ""
+ "警告: この鍵で署名されたメッセージを検証したことは一度しかありません!\n"
+ 
++#: g10/tofu.c:2919
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Warning: if you think you've seen more than %ld message signed by this "
+ #| "key, then this key might be a forgery!  Carefully examine the email "
+ #| "address for small variations.  If the key is suspect, then use\n"
+ #| "  %s\n"
+ #| "to mark it as being bad.\n"
+ #| msgid_plural ""
+ #| "Warning: if you think you've seen more than %ld messages signed by this "
+ #| "key, then this key might be a forgery!  Carefully examine the email "
+ #| "address for small variations.  If the key is suspect, then use\n"
+ #| "  %s\n"
+ #| "to mark it as being bad.\n"
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -6971,124 -5583,108 +7096,136 @@@ msgstr[0] "
  "  %s\n"
  "でダメとマークしてください。\n"
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "TOFUデータベースのオープンでエラー: %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring '%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "公開鍵リング'%s'の書き込みエラー: %s\n"
+ 
++#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
  msgstr "'%s'は、有効な大型鍵IDでありません\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "鍵%s: 信用する鍵として受理しました\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "鍵%sが信用データベースに複数あります\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr "鍵%s: 信用される鍵の公開鍵がありません - スキップします\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "鍵%sを究極的に信用するよう記録しました\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "信用レコード%lu, リクエスト型%d: 読み込みに失敗しました: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "信用レコード%luが要求された型%dではありません\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr "trustdbを下記のコマンドで再生成することを試すことができます:\n"
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr "もし、それがうまくいかなかったら、マニュアルをご覧ください\n"
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr "不明の信用モデル (%d) は使えません - %s信用モデルを仮定\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "%s信用モデルを使用\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "信用データベースの検査は、不要です\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "次回の信用データベース検査は、%sです\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "信用モデル'%s'で信用データベースの検査は、不要です\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "信用モデル'%s'で信用データベースの更新は、不要です\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "公開鍵%sが見つかりません: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "--check-trustdbを実行してください\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "信用データベースの検査\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "%d個の鍵を処理"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
  msgstr[0] " (うち%d本の有効性数をクリア)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "究極的に信用する鍵が見つかりません\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "究極的に信用する鍵%sの公開鍵が見つかりません\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr "深さ: %d  有効性: %3d  署名: %3d  信用: %d-, %dq, %dn, %dm, %df, %du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7199,142 -5774,112 +7336,144 @@@ msgstr "
  "形式:  kbxutil [オプション] [ファイル]\n"
  "Keyboxデータを一覧、エクスポート、インポート\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSAのモジュラスがないか、%dビットのものではありません\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "RSA公開指数がないか %d ビットより大きすぎます\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PINコールバックがエラーを返しました: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr "NullPINが変更されていません\n"
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "|N|新しいPINを標準の鍵のために入力してください。"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
  msgstr "||PINを標準の鍵のために入力してください。"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|NP|標準の鍵の新しいPIN Unblocking Code (PUK)を入力してください。"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|P|標準の鍵のPIN Unblocking Code (PUK)を入力してください。"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr "|N|新しいPINを認定署名を生成する鍵のために入力してください。"
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr "||新しいPINを認定署名を生成する鍵のために入力してください。"
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  "|NP|認定署名の鍵のために新しいPINブロック解除コード(PUK)を入力してください。"
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  "|P|認定署名の鍵のために新しいPINブロック解除コード(PUK)を入力してください。"
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "新しいPINの取得エラー: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "指紋の保管に失敗しました: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "生成日の保管に失敗しました: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "公開鍵の読み込みに失敗しました: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "応答に公開鍵データが含まれていません\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr "応答にRSAのモジュラスが含まれていません\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr "応答にRSA公開指数が含まれていません\n"
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "response does not contain the EC public point\n"
+ msgid "response does not contain the EC public key\n"
  msgstr "応答に楕円曲線の公開点が含まれていません\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "応答に公開鍵データが含まれていません\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "公開鍵の読み込みに失敗しました: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "デフォルトPINを%sとして使います\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "デフォルトのPIN %s を使うのに失敗しました: %s - これ以上デフォルトとしての使"
  "用を無効とします\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||PINを入力してください%%0A[署名数: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
  msgstr "||PINを入力してください"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "CHV%dのPINが短すぎます。最短で%dです\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "CHV%dの認証に失敗しました: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "カードからCHVステイタスの取得でエラー\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr "カードが永久にロックされてます!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7343,24 -5888,19 +7482,24 @@@ msgstr[0] "カードの永久ロック�
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|管理者PINを入力してください%%0A[残り回数: %d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|管理者PINを入力してください"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr "管理コマンドへのアクセスが設定されていません\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
  msgstr "||カードのリセット・コードを入力してください"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "リセット・コードが短すぎます。最短の長さは%dです。\n"
@@@ -7368,106 -5908,82 +7507,106 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr "|RN|新しいリセット・コード"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|新しい管理者PIN"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|新しいPIN"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||管理者PINと新しい管理者PINを入力してください"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  msgid "||Please enter the PIN and New PIN"
  msgstr "||PINと新しいPINを入力してください"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
  msgstr "アプリケーション・データの読み込みエラー\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "フィンガープリントのデータ・オブジェクトの読み込みエラー\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "鍵はもうあります\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr "既存の鍵は置き換えられます\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "新しい鍵を生成\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
  msgstr "新しい鍵を書き込み\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "作成時刻スタンプがありません\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA素数 %s がありません、または%dビットのものではありません\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "鍵の保管に失敗しました: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  msgid "unsupported curve\n"
  msgstr "サポートされていない曲線\n"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "鍵生成の間、お待ちください ...\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
  msgstr "鍵の生成に失敗しました\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "鍵の生成が完了しました (%d秒)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "OpenPGPカードに無効な構造 (データ・オブジェクト 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr "カードのフィンガープリントが要求されたものと一致しません\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "カードはダイジェスト・アルゴリズム %s をサポートしていません\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "これまでに作成された署名: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "管理者PINの確認はこのコマンドでは今のところ禁止されています\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "%sにアクセスできません - 無効なOpenPGPカード?\n"
@@@ -7487,7 -6000,6 +7626,7 @@@ msgstr "|N|初期の新しいPIN
  msgid "run in multi server mode (foreground)"
  msgstr "マルチ・サーバ・モード(フォアグラウンド)で実行"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LEVEL|デバッグ・レベルをLEVELとします"
  
@@@ -7539,18 -6040,15 +7678,18 @@@ msgstr "
  "形式: scdaemon [オプション] [コマンド [引数]]\n"
  "@GNUPG@のSmartcardデーモン\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  "'--daemon'オプションを使って、プログラムをバックグラウンドで実行してくださ"
  "い\n"
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "fd %dのハンドラが開始されました\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "fd %dのハンドラが終了しました\n"
@@@ -7569,11 -6064,9 +7708,11 @@@ msgstr "このセッションでdirmngr
  msgid "validation model requested by certificate: %s"
  msgstr "証明書から以下の検証モデルが要求されました: %s"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr "chain"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr "shell"
  
@@@ -7603,197 -6090,150 +7742,197 @@@ msgstr "注意: クリティカルで�
  msgid "certificate policy not allowed"
  msgstr "証明書ポリシーは認められません"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr "発行者の外部ロケーションを調べています\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr "マッチする発行者の数: %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr "Dirmngrキャッシュから発行者を調べています\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "マッチする証明書の数: %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "dirmngrのキャッシュだけの鍵探索に失敗しました: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "keyDBハンドルの確保に失敗しました\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
  msgstr "証明書は失効済みです"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "証明書のステイタスは不明です"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr "\"dirmngr\" が正しくインストールされていることを確認してください\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
  msgstr "CRLの検査に失敗しました: %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "無効の妥当性の証明書: %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr "証明書はまだ有効ではありません"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
  msgstr "ルート証明書がまだ有効ではありません"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr "中間証明書はまだ有効ではありません"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
  msgstr "証明書が有効期限を過ぎています"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
  msgstr "ルート証明書が有効期限を過ぎています"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
  msgstr "中間証明書が有効期限を過ぎています"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr "必要な証明書の属性がありません: %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
  msgstr "妥当性が無効な証明書"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr "証明書のライフタイムの間に署名が作られていません"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr "発行者のライフタイムの間に証明書が作られていません"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr "発行者のライフタイムの間に中間証明書が作られていません"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  (  署名、作成"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "   (証明書、作成"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
  msgstr "  (     証明書、有効"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr "  (     発行者、有効"
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "フィンガープリント=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr "ルート証明書は信用すると今、マークされました\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  "インタラクティブに信用するとマークすることがgpg-agentで有効となっていません\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  "インタラクティブに信用するとマークすることはこのセッションでは無効となってい"
  "ます\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr "*警告*: 署名の作成時間が不明です - 現在時刻を仮定します"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "証明書の発行者がありません"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr "自己署名証明書に*不正な*署名があります"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr "ルート証明書が信用できるとマークされていません"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "信用リストの検査に失敗しました: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr "証明書のチェインが長すぎます\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "発行者証明書が見つかりません"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
  msgstr "証明書に*不正な*署名があります"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr "別の一致する可能性があるCA証明書が見つかりました - 再度試します"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "証明書のチェインがCAにより認められたもの(%d)より長くなっています"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "証明書は正しいです\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
  msgstr "中間証明書は正しいです\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
  msgstr "ルート証明書は正しいです\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr "チェイン・モデルに切り替えました"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr "使用した検証モデル: %s"
@@@ -8114,7 -6488,6 +8253,7 @@@ msgstr "(暗号化されたメッセー
  msgid "certificate '%s' not found: %s\n"
  msgstr "証明書'%s'が見つかりません: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
  msgstr "keyboxのロックのエラー: %s\n"
@@@ -8138,123 -6507,93 +8277,123 @@@ msgstr "証明書'%s'の削除に失敗
  msgid "no valid recipients given\n"
  msgstr "有効な受け取り手が指定されていません\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
  msgstr "外部鍵を一覧する"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
  msgstr "証明書のチェインを表示する"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
  msgstr "証明書をインポートする"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
  msgstr "証明書をエクスポートする"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "スマートカードを登録する"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "dirmngrにコマンドを渡す"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr "gpg-protect-toolを起動する"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
  msgstr "base-64形式の出力を作成"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr "PEMフォーマットの入力を仮定する"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr "base-64フォーマットの入力を仮定する"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr "バイナリ・フォーマットの入力を仮定する"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr "決してCRLを調べない"
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr "OCSPを用いて有効性を確認する"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr "|N|インクルードする証明書の数"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr "|FILE|ポリシー情報をFILEから取得する"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr "証明書ポリシーをチェックしない"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr "紛失している発行者証明書を取得する"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "端末をまったく使わない"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FILE|サーバ・モードのログをFILEに書き出す"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FILE|監査ログをFILEに書き出す"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "バッチ・モード: なにもユーザに問い合わせない"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "ほとんどの設問にyesを仮定する"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "ほとんどの設問にnoを仮定する"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FILE|鍵リングを鍵リングのリストに追加"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|USER-ID|USER-IDをデフォルトの秘密鍵として使う"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|このキーサーバを鍵の検索に使う"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAME|暗号アルゴリズムにNAMEを使用"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAME|ダイジェスト・アルゴリズムにNAMEを使用"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "使い方: @GPGSM@ [オプション] [ファイル] (ヘルプは -h)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8264,46 -6603,37 +8403,46 @@@ msgstr "
  "S/MIMEプロトコルを用いて、署名、検査、暗号化や復号を行います\n"
  "デフォルトの操作は、入力データに依存します\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "*注意*:'%s'に対して暗号化できません: %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "不明の検証モデル '%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: ホスト名が指定されていません\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: ユーザなしに与えられたパスワード\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: この行はスキップ\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
  msgstr "鍵サーバのURLを解析不能\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "共通証明書のインポート・エラー: %s\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "'%s'を用いて署名できません: %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr "無効なコマンド (暗黙のコマンドはありません)\n"
  
@@@ -8320,7 -6647,6 +8459,7 @@@ msgstr "証明書の保存に失敗し�
  msgid "basic certificate checks failed - not imported\n"
  msgstr "基本証明書チェックが失敗しました - インポートされませんでした\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "保存されたフラグの取得エラー: %s\n"
@@@ -8335,31 -6659,25 +8474,31 @@@ msgstr "証明書のインポート・�
  msgid "error reading input: %s\n"
  msgstr "入力読み込みエラー: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
  msgstr "フィンガープリントの取得に失敗しました\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr "既存の証明書の検索の問題: %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "書き込み可能keyDBの判定エラー: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
  msgstr "証明書保存エラー: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "証明書の再検索の問題: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
  msgstr "フラグの保存エラー: %s\n"
@@@ -9228,108 -7369,84 +9367,112 @@@ msgstr "絶対ファイル名がきま�
  msgid "looking up '%s'\n"
  msgstr "'%s'を検索します\n"
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr "CRLキャッシュの内容をリストします"
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|FILEからCRLをキャッシュにロードする"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|URLからCRLを取得します"
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr "dirmngrをシャットダウンする"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr "キャッシュをフラッシュします"
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FILE|FILEにサーバ・モードのログを書き出す"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  msgid "run without asking a user"
  msgstr "ユーザに問い合わせせずに実行"
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr "期日の過ぎたCRLのロードを強制する"
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr "OCSP要求の送信を認める"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr "HTTPの使用を禁止する"
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr "LDAPの使用を禁止する"
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr "HTTP CRL配布ポイントを無視する"
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr "LDAP CRL配布ポイントを無視する"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "OCSPサービスURLに入っている証明書を無視する"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|すべてのHTTPリクエストをURLにリダイレクトする"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HOST|LDAPの問い合わせにHOSTを使う"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "--ldap-proxy にフォールバック・ホストを使わない"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|FILEからLDAPサーバリストを読み込みます"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr "CRL配布ポイントに発見された新しいサーバを serverlist に追加する"
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|LDAPのタイムアウトをN秒とする"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|OCSP応答としてURLを使用"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|FPRで署名されたOCSPレスポンス"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|一つのクエリでNを越えるのアイテムを返さない"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|FILE|FILEにあるCA証明書をTLSでのHKPに使う"
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr "ネットワーク・トラフィックをすべてTor経由にする"
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9338,11 -7455,9 +9481,11 @@@ msgstr "
  "@\n"
  "(コマンドとオプション全部の一覧は、\"info\" マニュアルをご覧ください)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "使い方: @DIRMNGR@ [オプション] (ヘルプは -h)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9350,77 -7465,60 +9493,77 @@@ msgstr "
  "形式: @DIRMNGR@ [オプション] [コマンド [引数]]\n"
  "@GnuPG@の鍵サーバ、CRLとOCSPアクセス\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "有効なdebugレベルは: %s\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, c-format
  msgid "usage: %s [options] "
  msgstr "使い方: %s [オプション] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  msgid "colons are not allowed in the socket name\n"
  msgstr "コロンはソケット名に許されません\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "'%s'からCRLの取得の失敗: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "'%s'からCRLの処理に失敗: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: 行が長すぎます - スキップされました\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: 無効なフィンガープリントが検出されました\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: 読み込みエラー: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: 行末のゴミを無視\n"
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr "SIGHUPを受け取り - 設定を読み直し、キャッシュをフラッシュ\n"
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "SIGUSR2を受け取り - 動作は定義されない\n"
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "SIGTERMを受け取り - シャットダウン...\n"
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "SIGTERMを受け取り - %d本のアクティブな接続がまだあります\n"
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  msgid "shutdown forced\n"
  msgstr "強制的にシャットダウンする\n"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "SIGINTを受け取り - すぐにシャットダウン\n"
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "シグナル%dを受け取り - アクションは定義されない\n"
@@@ -9590,13 -7652,6 +9733,7 @@@ msgstr "'%s'は、LDAP URLではあり�
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr "'%s' は無効なLDAP URLです\n"
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, c-format
- msgid "error allocating memory: %s\n"
- msgstr "メモリの確保のエラー: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, c-format
  msgid "error printing log line: %s\n"
  msgstr "log出力エラー: %s\n"
@@@ -9845,76 -7848,60 +9982,76 @@@ msgstr "OSCPレスポンダは現在で
  msgid "OCSP responder returned an too old status\n"
  msgstr "OSCPレスポンダは古すぎるステイタスを返しました\n"
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "assuan_inquire(%s)が失敗しました: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr "ldapserverがありません"
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr "serialnoがcert IDにありません"
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "assuan_inquireに失敗しました: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "fetch_cert_by_url が失敗しました: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "データ送信エラー: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "start_cert_fetch が失敗しました: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "fetch_next_cert が失敗しました: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d を越えました\n"
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "制御構造を確保できません: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "assuanコンテクストの確保に失敗しました: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "サーバの初期化に失敗しました: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "Assuanで登録コマンドに失敗しました: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "Assuan accept の問題: %s\n"
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "Assuanの処理が失敗しました: %s\n"
@@@ -9956,7 -7934,6 +10093,7 @@@ msgstr "DSAは160ビットののハッ�
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "証明書はCRL署名のために使われるべきではありませんでした\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "おとなしく"
  
@@@ -10123,11 -8059,9 +10260,11 @@@ msgstr "|NAME|ユーザID NAMEにも暗
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|電子メールエイリアスを設定する"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr "キーサーバのコンフィグレーション"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|鍵サーバとしてURLを使用"
  
@@@ -10159,128 -8086,110 +10296,142 @@@ msgstr "出力フォーマットを制�
  msgid "Options controlling the interactivity and enforcement"
  msgstr "インタラクティビティと強制を制御するオプション"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr "Torの使用を制御するオプション"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr "HTTPサーバのコンフィグレーション"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr "システムのHTTPプロキシ設定を用います"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr "使用するLDAPサーバのコンフィグレーション"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr "LDAPサーバ・リスト"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr "OCSPのコンフィグレーション"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ #, fuzzy
+ #| msgid "GPG for OpenPGP"
+ msgid "OpenPGP"
  msgstr "OpenPGPのためのGPG"
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
- msgstr "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
+ msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ #, fuzzy
+ #| msgid "Smartcard Daemon"
+ msgid "Smartcards"
  msgstr "スマートカード・デーモン"
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ #, fuzzy
+ #| msgid "GPG for S/MIME"
+ msgid "S/MIME"
  msgstr "S/MIME のためのGPG"
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr "キー取得プログラム"
++#: tools/gpgconf-comp.c:1070
+ msgid "Network"
+ msgstr ""
  
- #: tools/gpgconf-comp.c:1068
- msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1071
+ #, fuzzy
+ #| msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "PINとパスフレーズの入力"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  msgid "Component not suitable for launching"
  msgstr "コンポーネントが起動するために適切ではありません"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "コンポーネント%sの外部の検証が失敗しました"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr "グループ仕様は無視されていることに注意してください\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr "すべてのコンポーネントをリストする"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr "すべてのプログラムをチェックする"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|COMPONENT|オプションをリストする"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|COMPONENT|オプションを変更する"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|COMPONENT|オプションをチェックする"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr "グローバル・デフォルト値を適用する"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "@GPGCONF@のためにコンフィグレーション・ディレクトリを取得する"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
  msgstr "グローバルのコンフィグレーション・ファイルをリストする"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
  msgstr "グローバルのコンフィグレーション・ファイルをチェックする"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "信用データベースを更新"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr "すべて、あるいは指定されたコンポーネントをリロードする"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr "指定されたコンポーネントを起動する"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr "指定されたコンポーネントをkillする"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "出力ファイルとして使用"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr "可能な場合、実行時に変更を有効とする"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "使い方: @GPGCONF@ [オプション] (ヘルプは -h)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10288,15 -8197,12 +10439,15 @@@ msgstr "
  "形式: @GPGCONF@ [オプション]\n"
  "@GNUPG@システムのツールに対しコンフィグレーション・オプションを管理する\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "一つコンポーネント引数が必要です"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "コンポーネントが見つかりません"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr "引数は許可されていません"
  
diff --cc po/nb.po
index af4f461,c6bfb7f..7fe3da5
--- a/po/nb.po
+++ b/po/nb.po
@@@ -11,7 -11,6 +11,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: GNU gnupg 2.1.14\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2016-07-15 10:27+0100\n"
  "Last-Translator: Åka Sikrom <a4 æt hush dåt com>\n"
  "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@@ -23,7 -22,6 +23,7 @@@
  "X-Generator: Poedit 1.5.4\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "klarte ikke å skaffe pin-inntastingslås: %s\n"
@@@ -34,45 -32,35 +34,45 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|_Avbryt"
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|_Ja"
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|_Nei"
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|PIN:"
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|_Lagre i passordbehandler"
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Er du sikker på at du vil gjøre passordfrasen synlig på skjermen?"
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr "|pinentry-tt|Gjør passordfrase synlig"
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  msgid "|pinentry-tt|Hide passphrase"
  msgstr "|pinentry-tt|Skjul passordfrase"
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr "Kvalitet:"
  
@@@ -82,20 -70,17 +82,20 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Kvaliteten på teksten overfor. Spør administrator for mer informasjon om "
  "hvordan kvaliteten vurderes."
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  "Skriv inn PIN-kode slik at hemmelig nøkkel kan låses opp for denne økta"
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -103,53 -88,40 +103,53 @@@ msgstr "
  "Skriv inn passordfrasen din, slik at hemmelig nøkkel kan låses opp for "
  "gjeldende økt"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Passordfrase:"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "feil. Prøv igjen"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (forsøk %d av %d)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr "Gjenta:"
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
  msgstr "For lang PIN"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
  msgstr "For lang passordfrase"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
  msgstr "Ugyldig tegn i PIN"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr "Koden er for kort"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "Ugyldig PIN"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
  msgstr "Ugyldig passordfrase"
  
@@@ -158,24 -129,10 +158,24 @@@
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "ssh-nøkler som er lenger enn %d bit støttes ikke\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "klarte ikke å lage «%s»: %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "klarte ikke å åpne «%s»: %s\n"
@@@ -200,17 -153,6 +200,7 @@@ msgstr "ingen ssh-autentiseringnøkkel 
  msgid "no suitable card key found: %s\n"
  msgstr "fant ingen passende kortnøkkel: %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "skyggelegging av nøkkel mislyktes: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "feil under skriving av nøkkel: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -219,24 -161,19 +209,24 @@@ msgstr "
  "En ssh-prosess ber om tillatelse til å brukt nøkkel%%0A  %s%%0A  (%s)%%0AVil "
  "du tillate dette?"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr "Tillat"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr "Avvis"
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Skriv inn passordfrase for ssh-nøkkel%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Skriv inn denne passordfrasen på nytt"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -245,16 -182,13 +235,16 @@@ msgstr "
  "Skriv inn passordfrase som skal brukes til å beskytte mottatt hemmelig nøkkel"
  "%%0A   %s%%0A   %s%%0Ai nøkkellageret for gpg-agent"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "klarte ikke å lage strøm av sokkel: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr "Sett inn kort med serienummer"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "Fjern gjeldende kort og sett inn kort med serienummer"
  
@@@ -377,8 -287,6 +367,8 @@@ msgstr "Skriv inn passordfrase for å%0
  msgid "Please enter the new passphrase"
  msgstr "Skriv inn ny passordfrase"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -386,128 -294,95 +376,134 @@@ msgstr "
  "@Valg:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "kjør som bakgrunnsprosess («daemon»)"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "kjør i tjenermodus (forgrunn)"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "run in server mode"
+ msgid "run in supervised mode"
+ msgstr "kjør i tjenermodus"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "detaljert utskrift"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "være noenlunde stille"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr "sh-utdata for kommandoer"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr "csh-utdata for kommandoer"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FIL|les valg fra valgt FIL"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "ikke løsne fra konsoll"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr "ikke bruk tastatur og mus"
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
  msgstr "bruk loggfil for tjeneren"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr "|PGM|bruk PGN som SCdaemon-program"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
  msgstr "ikke bruk SCdaemon"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NAME|godta enkelte kommandoer via «NAME»"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr "ignorer forespørsler om å bytte TTY"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr "ignorer forespørsler om å bytte X-skjerm"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr "|N|fjern hurtiglagrede PIN-koder etter N sekunder"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr "ikke bruk PIN-hurtiglager under signering"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  msgid "disallow the use of an external password cache"
  msgstr "ikke tillat bruk av eksternt passord-hurtiglager"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "ikke la klienter tillitsmarkere nøkler"
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
  msgstr "tillat valg av passordfrase på forhånd"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr "ikke la kaller overstyre PIN-inntasting"
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr "la brukeren skrive inn passordfrase via Emacs"
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  msgid "enable ssh support"
  msgstr "slå på ssh-støtte"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
  msgstr "slå på støtte for putty"
  
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Rapporter programfeil til <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Bruk: @GPG_AGENT@ [valg] («-h» for hjelp)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -515,135 -390,100 +511,135 @@@ msgstr "
  "Syntaks: @GPG_AGENT@ [valg] [kommando [arg]]\n"
  "Håndtering av hemmelige nøkler for @GNUPG@\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "valgfil «%s»: %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "leser valg fra «%s»\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "Merk: «%s» regnes ikke som et valg\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "klarte ikke å lage sokkel: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "sokkelnavnet «%s» er for langt\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "en gpg-agent kjører allerede. Lar være å starte en ny\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
  msgstr "feil under henting av sokkel-anledning\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "feil under knytning av sokkel til «%s»: %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() mislyktes: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "lytter på sokkel «%s»\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "klarte ikke å lage mappa «%s»: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "mappa «%s» er opprettet\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "stat() mislyktes for «%s»: %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "«%s» kan ikke brukes som hjemmemappe\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "feil under lesing av anledning på fd %d: %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "startet behandler 0x%lx for fd %d\n"
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "avsluttet behandler 0x%lx for fd %d\n"
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr "startet ssh-behandler 0x%lx for fd %d\n"
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "avsluttet ssh-behandler 0x%lx for fd %d\n"
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_pselect mislyktes: %s - venter 1s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s stoppet\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "ingen gpg-agent kjører i gjeldende økt\n"
  
@@@ -659,8 -497,6 +655,8 @@@ msgstr "
  "Syntaks: gpg-preset-passphrase [valg] KEYGRIP\n"
  "Vedlikehold av hurtiglager for passord\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -668,9 -504,6 +664,9 @@@ msgstr "
  "@Kommandoer:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -724,7 -549,6 +720,8 @@@ msgstr "avbrutt\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "feil under spørring etter passordfrase: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "feil under åpning av «%s»: %s\n"
@@@ -784,8 -599,6 +781,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Ja"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "Nei"
  
@@@ -815,13 -625,11 +812,13 @@@ msgstr "Riktig
  msgid "Wrong"
  msgstr "Feil"
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  "Merk: denne passordfrasen har aldri blitt endret.%0AEndre den umiddelbart."
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@@ -830,15 -638,12 +827,15 @@@ msgstr "
  "Denne passordfrasen har ikke blitt endret%%0Asiden %.4s-%.2s-%.2s. Endre den "
  "umiddelbart."
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
  msgstr "Endre passordfrase"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr "Jeg endrer senere"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@@ -846,11 -651,9 +843,11 @@@
  msgstr ""
  "Er du sikker på at du vil slette nøkkel med nøkkelgrep%%0A  %s%%0A  %%C%%0A?"
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  msgid "Delete key"
  msgstr "Slett nøkkel"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -868,12 -669,10 +865,12 @@@ msgstr "DSA krever at kontrollsummen e
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "%s nøkkel bruker utrygg kontrollsum (%u bit)\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "kontrollsum på %zu bit er ugyldig for %u-bits %s-nøkler\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "kontroll av opprettet signatur mislyktes: %s\n"
@@@ -897,83 -692,73 +894,96 @@@ msgstr "beskyttelsesalgoritme %d (%s) s
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "kontrollsum-algoritme for beskyttelse %d (%s) støttes ikke\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "feil under opprettelse av datarør: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "feil under opprettelse av strøm for datarør: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "feil under kopiering av prosess: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
  #, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "venting på avslutning av prosesser mislyktes: %s\n"
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "prosess %d avsluttet ikke i tide: %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr ""
  "feil under kjøring av «%s». Programmet er sannsynligvis ikke installert\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "feil under kjøring av «%s». Avslutningskode %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, c-format
  msgid "error running '%s': terminated\n"
  msgstr "feil under kjøring av «%s». Avsluttet\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
  #, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "feil under henting av prosess-avslutningskode %d: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "venting på avslutning av prosesser mislyktes: %s\n"
  
- #: common/exechelp-w32ce.c:767
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "prosess %d avsluttet ikke i tide: %s\n"
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "feil under henting av prosess-avslutningskode %d: %s\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, c-format
  msgid "can't connect to '%s': %s\n"
  msgstr "klarte ikke å koble til «%s»: %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "klarte ikke å sette opp valg for gpg-agent\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "klarte ikke å slå av kjernedump: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Advarsel: utrygt eierskap til %s «%s»\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Advarsel: utrygge tillatelser til %s «%s»\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ #| msgid "waiting for the agent to come up ... (%ds)\n"
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "venter på at agent skal dukke opp … (%ds)\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ #| msgid "error renaming '%s' to '%s': %s\n"
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "ja"
  
@@@ -1027,7 -801,6 +1037,7 @@@ msgstr "kjernen i sikkert minne ble ful
  msgid "out of core while allocating %lu bytes"
  msgstr "kjernen ble full under tildeling av %lu byte"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "feil under tildeling av minne: %s\n"
@@@ -1047,35 -817,28 +1057,35 @@@ msgstr "ADVARSEL: valget «%s%s» er ut
  msgid "unknown debug flag '%s' ignored\n"
  msgstr "unknown debug flag '%s' ignored\n"
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr "ingen kjørende gpg-agent. Starter «%s»\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr "venter på at agent skal dukke opp … (%ds)\n"
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr "koblet til agent\n"
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  msgid "connection to agent is in restricted mode\n"
  msgstr "kobler til agent i begrenset modus\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr "ingen kjørende Dirmngr. Starter «%s»\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr "venter på at dirmngr skal dukke opp … (%ds)\n"
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr "koblet til dirmngr\n"
  
@@@ -1146,8 -893,6 +1156,8 @@@ msgstr "Øktnøkkel opprettet
  msgid "algorithm: %s"
  msgstr "algoritme: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "ustøttet algoritme: %s"
@@@ -1222,11 -951,9 +1232,11 @@@ msgstr "Sertifikatkjede gyldig
  msgid "Root certificate trustworthy"
  msgstr "Rotsertifikat regnes som troverdig"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "fant ingen sertifikat-CRL"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
  msgstr "tilgjengelig CRL er for gammel"
  
@@@ -1263,7 -982,6 +1273,7 @@@ msgstr "Ingen hjelp tilgjengelig for «
  msgid "ignoring garbage line"
  msgstr "ignorerer ubrukelig linje"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[ingen]"
  
@@@ -1333,7 -1036,6 +1343,7 @@@ msgstr "valget «%.50s» er flertydig\n
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "kommandoen «%.50s» er flertydig\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
  msgstr "kjernen er full\n"
  
@@@ -1391,8 -1082,6 +1401,8 @@@ msgstr "lås «%s» ikke opprettet: %s\
  msgid "waiting for lock %s...\n"
  msgstr "venter på lås %s …\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s er for gammel (krever %s, har %s)\n"
@@@ -1476,12 -1147,10 +1486,12 @@@ msgstr "
  "anført utskrivbart tegn i armor. Noen har antakeligvis brukt en feiloppsatt "
  "e-posttjener\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, c-format
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "[ ikke menneskevennlig (%zu byte: %s%s) ]"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1489,67 -1158,51 +1499,66 @@@ msgstr "
  "notatnavn kan bare inneholde utskrivbare tegn og mellomrom, og må slutte med "
  "«=»\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "bruker-notatnavn må inneholde tegnet «@»\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "notatnavn kan ikke inneholde flere enn ett «@»-tegn\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "notatverdier kan ikke inneholde kontrolltegn\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  msgid "a notation name may not contain an '=' character\n"
  msgstr "notatnavn kan ikke inneholde tegnet «=»\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr "notatnavn skal bare inneholde utskrivbare tegn og evt. mellomrom\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "ADVARSEL: fant ugyldig notatdata\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr "klarte ikke å videresende %s forespørsel til klient\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Skriv inn passordfrase: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, c-format
  msgid "error getting version from '%s': %s\n"
  msgstr "feil under henting av versjon fra «%s»: %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr "tjener «%s» er eldre enn oss (%s < %s)"
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, c-format
  msgid "WARNING: %s\n"
  msgstr "ADVARSEL: %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "Oppdaget OpenPGP-kortnummer %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "du kan ikke gjøres dette i buntmodus\n"
  
@@@ -1557,14 -1209,9 +1566,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Denne kommandoen er bare tilgjengelig for kort av versjon 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
  msgstr "Tilbakestillingskode er ikke tilgjengelig\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Ditt valg? "
  
@@@ -1592,119 -1233,89 +1601,119 @@@ msgstr "ikke tvunget
  msgid "forced"
  msgstr "tvunget"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr "Feil: Bare ren ASCII er foreløpig tillatt.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "Feil: tegnet «<» kan ikke brukes.\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "Kortholders etternavn: "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "Kortholders fornavn: "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr "Feil: Det kombinerte navnet er for langt (grensa går ved %d tegn).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "Adresse for henting av offentlig nøkkel: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Feil: Adressen er for lang (grensa er %d tegn).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "feil under lesing av «%s»: %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "feil under skriving av «%s»: %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "Logindata (kontonavn): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr "Feil: Logindata er for langt (grensa går ved %d tegn).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "Privat DO-data: "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr "Feil: Privat DO for lang (grensa går ved %d tegn).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "Språkoppsett: "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
  msgstr "Feil: oppsettsstreng har ugyldig lengde.\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
  msgstr "Feil: oppsettsstreng inneholder ugyldige tegn.\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "Kjønn ((M)askulint, (F)eminint eller mellomrom): "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
  msgstr "Feil: ugyldig svar.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "CA-fingeravtrykk: "
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "Feil: feilformatert fingeravtrykk.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "klarte ikke å utføre nøkkelhandling: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "ikke et OpenPGP-kort"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "feil under henting av nøkkelinfo: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr "Erstatte eksisterende nøkkel? (j/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
@@@ -1714,55 -1325,43 +1723,55 @@@ msgstr "
  "      Se dokumentasjon for kortet du bruker og finn ut hvilke størrelser \n"
  "      det tillater hvis nøkkelgenerering mislykkes.\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Hvor stor skal signaturnøkkelen være? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "Hvor stor skal krypteringsnøkkelen være? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Hvor stor skal autentiseringsnøkkelen være? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "rundet opp til %u bit\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s nøkkelstørrelser må ligge i rekkevidden %u-%u\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr "Kortet blir nå satt opp på nytt for å lage nøkkel på %u bit\n"
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "feil under endring av størrelse på nøkkel %d til %u bit: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr "Lage sikkerhetskopi av krypteringsnøkler utenfor kortet? (J/n) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  msgid "Note: keys are already stored on the card!\n"
  msgstr "MERK: det ligger allerede nøkler på kortet.\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr "Erstatte eksisterende nøkler? (j/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1773,138 -1372,103 +1782,138 @@@ msgstr "
  "   PIN = «%s»     Admin-PIN = «%s»\n"
  "Du bør endre disse med kommandoen «--change-pin»\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "Velg hvilken type nøkkel du vil lage:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "   (1) Signaturnøkkel\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) Krypteringsnøkkel\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Autentiseringsnøkkel\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Ugyldig valg.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "velg hvor nøkkelen skal lagres:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "KEYTOCARD mislyktes: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  msgid "This command is not supported by this card\n"
  msgstr "Denne kommandoen støttes ikke av dette kortet\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "Merk: denne kommandoen ødelegger alle nøkler på kortet.\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  msgid "Continue? (y/N) "
  msgstr "Vil du fortsette? (j/N) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr "Er du sikker på at du vil gjenopprette fabrikkoppsett? (skriv «ja») "
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "gå ut av denne menyen"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
  msgstr "vis admin-kommandoer"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "vis denne hjelpeteksten"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "vis alle tilgjengelige data"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "endre kortholders navn"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "endre adresse for å hente nøkkel"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "hent nøkkel som ligger i kortets adresse"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "endre brukernavn"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "endre språkoppsett"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "endre kortholders kjønn"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "endre CA-fingeravtrykk"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr "slå av på tvungen bruk av signatur-PIN"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "lag nye nøkler"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "meny for å endre eller fjerne blokkering av PIN"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "bekrefte PIN og vise alle data"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr "fjern PIN-blokkering med en tilbakestillingskode"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr "ødelegg alle nøkler og data"
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr "gpg/kort> "
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "Admin-reservert kommando\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "Admin-kommandoer er tillatt\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "Admin-kommandoer er ikke tillatt\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Ugyldig kommando  (prøv «help»)\n"
  
@@@ -1912,22 -1475,14 +1921,22 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "«--output» virker ikke med denne kommandoen\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "klarte ikke å åpne «%s»\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "fant ikke nøkkelen «%s»: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "feil under lesing av nøkkelblokk: %s\n"
@@@ -2041,7 -1574,6 +2050,7 @@@ msgstr "tvungen bruk av krypt.metode %
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s kryptert for: «%s»\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "du kan ikke bruke «%s» i «%s»-modus\n"
@@@ -2121,56 -1638,42 +2130,56 @@@ msgstr "ADVARSEL: klarte ikke å fjern
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "ADVARSEL: klarte ikke å fjerne midlertidig mappe «%s»: %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
  msgstr "eksportere signaturer som er markert som bare-lokale"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr "eksporter bruker-id-er (generelt foto-id-er)"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "eksporter opphevelsesnøkler markert som «sensitive»"
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "fjern ubrukelige deler fra nøkkelen under eksportering"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "fjern så mye som mulig fra nøkkelen under eksportering"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  msgid " - skipped"
  msgstr ". Hoppet over"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "skriver til «%s»\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "nøkkel %s: nøkkelmateriell på kort - hoppet over\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "eksportering av hemmelige nøkler er ikke tillatt\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "nøkkel %s: PGP 2.x-aktig nøkkel - hoppet over\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "ADVARSEL: ingenting eksportert\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "feil under oppretting av «%s»: %s\n"
@@@ -2179,8 -1681,6 +2188,8 @@@
  msgid "[User ID not found]"
  msgstr "[Fant ikke bruker-ID]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, c-format
  msgid "(check argument of option '%s')\n"
  msgstr "(kontroller argument for valget «%s»)\n"
@@@ -2200,244 -1697,185 +2209,244 @@@ msgstr "feil under oppslag av %s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "Advarsel: %s står oppført på nøkkelknippet %d ganger\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "hentet «%s» via %s automatisk\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "feil under henting av «%s» via %s: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "Ingen fingeravtrykk"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "fant ikke hemmelig nøkkel «%s»: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, c-format
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "Advarsel: bruker ikke «%s» som forvalgt nøkkel: %s\n"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, c-format
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "bruker «%s» som forvalgt hemmelig signeringsnøkkel\n"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr "alle verdier som sendes til «%s» blir ignorert\n"
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr "Ugyldig nøkkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "bruker undernøkkel %s i stedet for primærnøkkel %s\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "lag signatur"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
  msgstr "lag klartekst-signatur"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "lag adskilt signatur"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "krypter data"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "krypter data (symmetrisk)"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "dekrypter data (forvalgt)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "bekreft signatur"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "vis nøkler"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "vis nøkler og signaturer"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "vis og kontroller nøkkelsignaturer"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "vis nøkler og fingeravtrykk"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "vis hemmelige nøkler"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "lag nytt nøkkelpar"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  msgid "quickly generate a new key pair"
  msgstr "lag nytt nøkkelpar raskt"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  msgid "quickly add a new user-id"
  msgstr "legg til en ny bruker-ID raskt"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  msgid "quickly revoke a user-id"
  msgstr "opphev bruker-ID raskt"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr "fullverdig generering av nøkkelpar"
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "lag opphevelsessertifikat"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "fjern nøkler fra offentlig nøkkelknippe"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "fjern nøkler fra hemmelig nøkkelknippe"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  msgid "quickly sign a key"
  msgstr "hurtigsigner nøkkel"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  msgid "quickly sign a key locally"
  msgstr "hurtigsigner nøkkel lokalt"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "signer nøkkel"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "signer nøkkel lokalt"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "signer eller rediger nøkkel"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
  msgstr "endre passordfrase"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "eksporter nøkler"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "eksporter nøkler til nøkkeltjener"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "importer nøkler fra nøkkeltjener"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "søk etter nøkler på nøkkeltjener"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "oppdater alle nøkler fra nøkkeltjener"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "importer/slå sammen nøkler"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "vis kortstatus"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "endre data på kort"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "endre PIN på kort"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "oppdater tillitsdatabase"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
  msgstr "skriv ut kontrollsum av melding"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "kjør i tjenermodus"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr "|VERDI|endre TOFU-regler for nøkkel"
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "lag ASCII-beskyttet utdata"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|BRUKER-ID|bruk valgt BRUKER-ID til å signere eller dekryptere"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "bruk kanonisk tekstmodus"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|skriv utdata til valgt FIL"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "ikke utfør valgte endringer"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "spør før overskriving"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr "bruk streng OpenPGP-oppførsel"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2445,7 -1883,6 +2454,7 @@@ msgstr "
  "@\n"
  "(Se bruksanvisning for en fullstendig liste over alle kommandoer og valg)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2465,11 -1902,9 +2474,11 @@@ msgstr "
  " --list-keys [navn]         vis nøkler\n"
  " --fingerprint [navn]       vis fingeravtrykk\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Bruk: @GPG@ [valg] [filer] (-h for hjelp)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2479,7 -1914,6 +2488,7 @@@ msgstr "
  "Signer, kontroller, krypter eller dekrypter.\n"
  "Forvalgt handling avhenger av inndata.\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2487,602 -1921,474 +2496,610 @@@ msgstr "
  "\n"
  "Støttede algoritmer:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "Off. nøkkel: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Kryptering: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Komprimering: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "bruk: %s [valg] %s\n"
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "motstridende kommandoer\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "fant ingen «=»-tegn i gruppedefinisjon «%s»\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "ADVARSEL: utrygt eierskap til hjemmemappe «%s»\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "ADVARSEL: utrygt eierskap til oppsettsfil «%s»\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "ADVARSEL: utrygt eierskap til utvidelse «%s»\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "ADVARSEL: utrygge tillatelser til hjemmemappe «%s»\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "ADVARSEL: utrygge tillatelser til oppsettsfil «%s»\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "ADVARSEL: utrygge tillatelser til utvidelse «%s»\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "ADVARSEL: utrgt eierskap til foreldermapper av hjemmemappe «%s»\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr "ADVARSEL: utrgt eierskap til foreldermapper av oppsettsfil «%s»\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "ADVARSEL: utrgt eierskap til foreldermapper av utvidelse «%s»\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av hjemmemappe «%s»\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
  msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av oppsettsfil «%s»\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av utvidelse «%s»\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "oppsettselementet «%s» er ukjent\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "vis foto-id-er i nøkkelvisning"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  msgid "show key usage information during key listings"
  msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr "vis regeladresser i signaturvisning"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "vis alle notater i signaturvisning"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr "vis IETF-standardnotater under signaturvisning"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr "vis brukervalgte notater under signaturvisning"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr "vis opphevede og utgåtte bruker-id-er i nøkkelvisning"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "vis nøkkelknippe-navn i nøkkelvisning"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "vis utløpsdatoer i nøkkelvisning"
  
- #: g10/gpg.c:2011
- msgid "available TOFU policies:\n"
- msgstr "tilgjengelige TOFU-regler:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "valid values for option '%s':\n"
+ msgstr "ugyldig argument for valget «%.50s»\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "«%s» er et ukjent TOFU-regelverk\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr "(bruk «help» for å vise valg)\n"
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "invalid value for option '%s'\n"
+ msgstr "ugyldig argument for valget «%.50s»\n"
+ 
++#: g10/gpg.c:2203
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "Merk: gammel standardvalgfil «%s» ble ignorert\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "«%s» er en ugyldig signatur-utløpstid\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "linje %d: ugyldig e-postadresse\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "«%s» er ikke et gyldig tegnsett\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "ugyldige nøkkeltjener-valg\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: ugyldige importeringsvalg\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "ugyldige importeringsvalg\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "filtervalget %s er ugyldig\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: ugyldige eksporteringsvalg\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "ugyldige eksporteringsvalg\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: ugyldige listevalg\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "ugyldige listevalg\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "vis bruker-ID under signaturbekreftelse"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr "vis adresser til retningslinjer under signaturbekreftelse"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "vis alle merknader under signaturbekreftelse"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr "vis IETF-standardnotater under signaturbekreftelse"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr "vis selvvalgte merknader under signaturbekreftelse"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
  msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  msgid "show only the primary user ID in signature verification"
  msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "kontroller signaturer som har PKA-data"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "øk tillitsnivå for signaturer med gyldige PKA-data"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: ugyldige kontrollvalg\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "ugyldige kontrollvalg\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "klarte ikke å endre «exec»-sti til %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr "ugyldig «auto-key-locate»-liste\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "ADVARSEL: %s overstyrere %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "du kan ikke bruke %s med %s.\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s gir ikke mening med %s.\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr "ADVARSEL: kjører med falsk systemtid: "
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "lar være å kjøre med usikret minne på grunn av %s\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "valgt krypteringsalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "valg kontrollsum-algoritme er ugyldig\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "valgt komprimeringsalgoritme er ugyldig\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "«completes-needed» må være større enn 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "«marginals-needed» må være større enn 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "«max-cert-depth» må være mellom 1 og 255\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  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:3590
++#: g10/gpg.c:3688
  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:3593
++#: g10/gpg.c:3691
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "Merk: enkel S2K-modus (0) er sterkt frarådet\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  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:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "ugyldig standardoppsett\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s virker ikke enda med %s\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "du kan ikke bruke krypteringsalgoritme «%s» i %s-modus\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "du kan ikke bruke summeringsalgoritme «%s» i %s-modus\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "du kan ikke bruke komprimeringsalgoritme «%s» i «%s»-modus\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr "ADVARSEL: mottakere (-r) valgt uten offentlig nøkkelkryptering\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [filnavn]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [filnavn]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [filnavn]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [filnavn]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "du kan ikke bruke «--symmetric --encrypt» og «--s2k-mode 0» samtidig\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "du kan ikke velge «--symmtric» og «--encrypt» i «%s»-modus\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [filnavn]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [filnavn]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [filnavn]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  "du kan ikke bruke «--symmetric --sign --encrypt» og «--s2k-mode 0» samtidig\n"
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "du kan ikke velge «--symmtric», «--sign» og «--encrypt» i «%s»-modus\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [filnavn]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [filnavn]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [filnavn]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key bruker-ID"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key bruker-ID"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key bruker-ID [kommandoer]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
  msgstr "--passwd <bruker-id>"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "sending til nøkkeltjener mislyktes: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "nøkkeleksport mislyktes: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "søk på nøkkeltjener mislyktes: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "dearmoring failed: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "enarmoring failed: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "«%s» er en ugyldig summeringsalgoritme\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "feil under tolking av nøkkelspesifikasjon «%s»: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  "«%s» ser hverken ut til å være en gyldig nøkkel-ID, fingeravtrykk eller "
  "nøkkelgrep\n"
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[filnavn]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Skriv inn melding …\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "valgt adresse for signaturregler er ugyldig\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FIL|hent nøkler fra valgt nøkkelknippe-FIL"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "la konflikter mellom tidsstempler bare være en advarsel"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|skrive statusinfo til denne FD"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr "|ALGO|avvis signaturer som er laget med valgt ALGOritme"
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Bruk: gpgv [valg] [filer] (-h for hjelp)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3099,133 -2403,105 +3116,133 @@@ msgstr "Ingen hjelp tilgjengelig
  msgid "No help available for '%s'"
  msgstr "Ingen hjelp tilgjengelig for «%s»"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr "importer signaturer som er merket som kun lokale"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr "reparer skader fra pks-nøkkeltjener under importering"
  
- #: g10/import.c:144
++#: g10/import.c:157
  msgid "do not clear the ownertrust values during import"
  msgstr "ikke tøm «ownertrust»-verdier under importering"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "ikke oppdater tillitsdatabase etter importering"
  
- #: g10/import.c:150
++#: g10/import.c:163
  msgid "show key during import"
  msgstr "vis nøkkel under importering"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr "bare godta oppdateringer av nøkler som finnes allerede"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
  msgstr "fjern ubrukelige deler av nøkkel etter importering"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "fjern så mye som mulig fra nøkkel etter importering"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr "kjør importeringsfiltre og eksporter nøkkel umiddelbart"
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "hopper over blokk av typen %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu nøkler behandlet hittil\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Totalt antall behandlet: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "    hopper over PGP 2-nøkler: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "      nye nøkler som ble hoppet over: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          uten bruker-id-er: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "              importert: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "             uendret: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "          nye bruker-id-er: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "           nye undernøkler: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        nye signaturer: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "   nye nøkkelopphevinger: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "      leste hemmelige nøkler: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  importerte hemmelige nøkler: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " uforandrede hemmelige nøkler: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "          ikke importert: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "    oppryddete signaturer: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "      tømte bruker-id-er: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3234,190 -2510,152 +3251,190 @@@ msgstr "
  "ADVARSEL: nøkkelen %s inneholder innstillinger for\n"
  "utilgjengelige algoritmer på følgende bruker-id-er:\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         «%s»: innstilling for krypteringsalgoritme %s\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         «%s»: oppsett for kontrollsum-algoritme %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         «%s»: oppsett av komprimeringsalgoritme %s\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "du anbefales på det sterkeste å endre oppsett og\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "dele ut denne nøkkelen på nytt for å unngå potensielle problemer med "
  "algoritme-samsvar\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "oppdater oppsettet med følgende kommando: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "nøkkel %s: ingen bruker-ID\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, c-format
  msgid "key %s: %s\n"
  msgstr "nøkkel %s: %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr "avvist av importeringskontrollør"
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "nøkkel %s: PKS-undernøkkel reparert\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "nøkkel %s: akseptert ikke-selvsignert bruker-ID «%s»\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "nøkkel %s: ingen gyldig bruker-id-er\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "dette kan skyldes manglende selvsignatur\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "nøkkel %s: fant ikke offentlig nøkkel: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "nøkkel %s: ny nøkkel. Hoppet over\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "fant ikke skrivbart nøkkelknippe: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "feil under skriving av nøkkelknippe «%s»: %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "nøkkel %s: offentlig nøkkel «%s» importert\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "nøkkel %s: stemmer ikke med vår kopi\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "nøkkel %s: finner ikke original nøkkelblokk: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "nøkkel %s: klarte ikke å lese opprinnelig nøkkelblokk: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "nøkkel %s: «%s» 1 ny bruker-ID\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "nøkkel %s: «%s» 1 ny signatur\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "nøkkel %s: «%s» 1 ny undernøkkel\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "nøkkel %s: «%s» %d nye undernøkler\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "nøkkel %s: «%s» ikke endret\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "nøkkel %s: hemmelig nøkkel importert\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "nøkkel %s: hemmelig nøkkel finnes allerede\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "nøkkel %s: feil under sending til agent: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "hemmelig nøkkel %s: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "importering av hemmelig nøkkel er ikke tillatt\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr ""
@@@ -3433,176 -2671,142 +3450,176 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr "Kjør følgende kommando for å flytte «%s»: %s\n"
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "nøkkel %s: offentlig nøkkel mangler. Klarte ikke å bruke "
  "opphevelsessertifikat\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "nøkkel %s: «%s» opphevingssertifikat importert\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "nøkkel %s: ingen bruker-ID for signatur\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "nøkkel %s: offentlig nøkkelalgoritme for bruker-ID («%s») støttes ikke\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "nøkkel %s: ugyldig selvsignatur for bruker-ID «%s»\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "nøkkel %s: ustøttet offentlig nøkkelalgoritme\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "nøkkel %s: ugyldig direkte nøkkelsignatur\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "nøkkel %s: ingen undernøkkel for nøkkelbinding\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "nøkkel %s: ugyldig undernøkkelbinding\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "nøkkel %s: fjernet flere undernøkkelbindinger\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "nøkkel %s: ingen undernøkkel for nøkkeloppheving\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "nøkkel %s: ugyldig undernøkkeloppheving\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "nøkkel %s: fjernet flere undernøkkelopphevinger\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "nøkkel %s: hoppet over bruker-ID «%s»\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "nøkkel %s: hoppet over undernøkkel\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "nøkkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "nøkkel %s: opphevingssertifikat på feil plass - hoppet over\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "nøkkel %s: undernøkkelsignatur på feil plass - hoppet over\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "nøkkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "nøkkel %s: oppdaget duplisert bruker-ID. Slått sammen\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "ADVARSEL: nøkkel %s kan være opphevet: henter opphevingsnøkkel %s\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "ADVARSEL: nøkkel %s kan være opphevet: opphevingsnøkkel %s ikke tilstede.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "nøkkel %s: «%s» opphevingssertifikat lagt til\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "nøkkel %s: direkte nøkkelsignatur lagt til\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "feil under opprettelse av nøkkelskrin «%s»: %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, c-format
  msgid "error creating keyring '%s': %s\n"
  msgstr "feil under opprettelse av nøkkelknippe «%s»: %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, c-format
  msgid "keybox '%s' created\n"
  msgstr "nøkkelskrin «%s» er opprettet\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, c-format
  msgid "keyring '%s' created\n"
  msgstr "nøkkelknippe «%s» er opprettet\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "nøkkelblokkressurs «%s»: %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, c-format
  msgid "error opening key DB: %s\n"
  msgstr "feil under åpning av nøkkeldatabase: %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "klarte ikke å bygge hurtiglager for nøkkelknippe på nytt: %s\n"
@@@ -3615,14 -2817,16 +3632,20 @@@ msgstr "[oppheving]
  msgid "[self-signature]"
  msgstr "[selvsignatur]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "feil under minnetildeling: %s\n"
+ 
++#: g10/keyedit.c:629
  #, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr ""
  "klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
  "offentlig nøkkel (%d): %s.\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
@@@ -3630,44 -2834,37 +3653,44 @@@ msgstr "
  "klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
  "meldingssum (%d): %s.\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  msgid " (reordered signatures follow)"
  msgstr " (omsorterte signaturer følger)"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, c-format
  msgid "key %s:\n"
  msgstr "nøkkel %s:\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "%d duplikatsignatur fjernet\n"
  msgstr[1] "%d duplikatsignaturer fjernet\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, c-format
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
  msgstr[0] "%d signatur ble ikke kontrollert på grunn av manglende nøkkel\n"
  msgstr[1] "%d signaturer ble ikke kontrollert på grunn av manglende nøkkel\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, c-format
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
  msgstr[0] "%d ubrukelig signatur\n"
  msgstr[1] "%d ubrukelige signaturer\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "%d signatur omsortert\n"
  msgstr[1] "%d signaturer omsortert\n"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3676,7 -2873,6 +3699,7 @@@ msgstr "
  "Advarsel: fant feil og kontrollerte bare selvsignaturer. Kjør «%s» for å "
  "kontrollere alle signaturer.\n"
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3687,17 -2883,14 +3710,17 @@@ msgstr "
  "andre brukeres nøkler (ved å se på pass, sjekke fingeravtrykk fra\n"
  "forskjellige kilder, osv.)\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = Jeg stoler marginalt\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = Jeg stoler fullt\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3707,52 -2900,40 +3730,52 @@@ msgstr "
  "En dybde på over 1 tillater at nøkkelen du signerer\n"
  "lager tillitssignaturer på dine vegne.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Skriv inn et domene som denne signaturen skal begrenses til, eller trykk "
  "enter hvis ingen.\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr "Hopper over bruker-ID «%s», som ikke er en tekst-iD.\n"
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Bruker-ID «%s» er opphevet."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Er du sikker på at du vil signerere den? (j/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  Klarte ikke å signere.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Bruker-ID «%s» er utgått."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Bruker-ID «%s» er ikke selvsignert."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Bruker-ID «%s» er signerbar.  "
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
  msgstr "Signere den? (j/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3761,11 -2942,9 +3784,11 @@@ msgstr "
  "Selvsignaturen på «%s»\n"
  "er en PGP 2.x-aktig signatur.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Vil du forfremme den til en OpenPGP-selvsignatur? (j/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3774,11 -2953,9 +3797,11 @@@ msgstr "
  "Gjeldende signatur på «%s»\n"
  "er utgått.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Vil du utstede en ny signatur for å erstatte den som er utgått? (j/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3787,43 -2964,34 +3810,43 @@@ msgstr "
  "Din nåværede signatur på «%s»\n"
  "er en lokal signatur.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Vil du forfremme den til en fullt eksporterbar signatur? (j/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "«%s» var allerede lokalt signert med nøkkelen %s\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "«%s» var allerede signert med nøkkelen %s\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Vil du signere den på nytt likevel? (j/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Ingenting å signere med nøkkelen %s\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "Denne nøkkelen er utgått."
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Denne nøkkelen utgår %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Vil du at signaturen skal utgå på samme tidspunkt? (J/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3833,31 -3001,25 +3856,31 @@@ msgstr "
  "tilhører den overnevnte personen? Skriv «0» hvis du ikke vet\n"
  "svaret.\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Jeg vil ikke svare.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Jeg har ikke sjekket i det hele tatt.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Jeg har gjort en vanlig sjekk.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Jeg har sjekket veldig nøye.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Hva velger du? (skriv «?» for mer informasjon): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3866,224 -3028,170 +3889,224 @@@ msgstr "
  "Er du sikker på at du vil signerere denne nøkkelen med\n"
  "nøkkelen «%s» (%s)\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
  msgstr "Dette skal være en selvsignatur.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "ADVARSEL: signaturen blir ikke markert som ikke-eksporterbar.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "ADVARSEL: signaturen blir ikke markert som ikke-opphevbar.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Signaturen blir markert som ikke-eksporterbar.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Signaturen blir markert som ikke-opphevbar.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "Jeg har ikke sjekket denne nøkkelen i det hele tatt.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "Jeg har sjekket denne nøkkelen på vanlig måte.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "Jeg har sjekket denne nøkkelen veldig nøye.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
  msgstr "Er du sikker på at du vil signere? (j/N) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "signering mislyktes: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "Nøkkelen har bare stubbe- eller kortnøkkel-elementer. Ingen passordfrase å "
  "endre.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "nøkkel %s: feil under endring av passordfrase: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "lagre og avslutte"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "vise nøkkelens fingeravtrykk"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  msgid "show the keygrip"
  msgstr "vis nøkkelgrep"
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "vis nøkler og bruker-id-er"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "velger bruker-ID N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "velger bruker-ID N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "sjekke signaturer"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "signer valgte bruker-id-er [* se nedenfor for relevante kommandoer]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "signerer valgte bruker-id-er lokalt"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "signer valgte bruker-id-er med tillitssignatur"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  "signer valgte bruker-id-er med en signatur som ikke kan trekkes tilbake"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "legg til bruker-ID"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "legg til foto-ID"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "slett valgte bruker-id-er"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "legg til undernøkkel"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "legg til nøkkel på et smartkort"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "flytt nøkkel til et smartkort"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "flytt en sikkerhetskopi-nøkkel til et smartkort"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "slett valgte undernøkler"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "legg til opphevingsnøkkel"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "slett signaturer fra valgte bruker-id-er"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "endre utløpsdato for nøkkelen eller valgte undernøkler"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "marker valgt bruker-ID som primær"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "vis innstillinger (avansert)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "vis innstillinger (detaljert)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "velg oppsettsliste for valgte bruker-id-er"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "endre adresse til foretrukket nøkkeltjener for valgte bruker-id-er"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
  msgstr "endre notat for valgte bruker-id-er"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "endre passordfrase"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "endre eiertillit"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "opphev signaturer på valgte bruker-id-er"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "opphev valgte bruker-id-er"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "opphev nøkkel eller valgte undernøkler"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "ta nøkkel i bruk"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "ta nøkkel ut av bruk"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "vis valgte foto-id-er"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "pakkk sammen ubrukelige bruker-id-er og fjern ubrukelige signaturer fra "
  "nøkkel"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "pakkk sammen ubrukelige bruker-id-er og fjern alle signaturer fra nøkkel"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "Hemmelig nøkkel er tilgjengelig.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Du trenger tilhørende hemmelig nøkkel for å gjøre dette.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4097,256 -3205,197 +4120,256 @@@ msgstr "
  "  (nrsign), eller hvilken som helst kombinasjon av disse (ltsign, tnrsign, "
  "osv.).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "Nøkkelen er opphevet."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Er du sikekr på at du vil signerere alle bruker-id-er? (j/N) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Er du sikker på at du vil signerere alle bruker-id-er? (j/N) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Tips: Velg bruker-id-en(e) du vil signere\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "«%s» er en ukjent signaturtype\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Du må velge minst én bruker-ID.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr "(Bruk kommandoen «%s».)\n"
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Du kan ikke slette siste bruker-ID.\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Er du sikker på at du vil fjerne alle valgte bruker-id-er? (j/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
  msgstr "Er du sikker på at du vil fjerne valgt bruker-ID? (j/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
  msgstr "Er du sikker på at du vil flytte primærnøkkelen? (j/N) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "Du må velge minst én nøkkel.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "Kommandoen forventer et filnavn-argument\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "Klarte ikke å åpne «%s»: %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Feil under lesing av sikkerhetskopi-nøkkel fra «%s»: %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Du må velge minst én nøkkel.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Er du sikker på at du vil slette valgt nøkkel? (j/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Er du sikker på at du vil slette denne nøkkelen? (j/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Er du sikker på at du vil oppheve alle valgte bruker-id-er? (j/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Er du sikker på at du vil oppheve denne bruker-id-en? (j/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Er du sikker på at du vil oppheve hele nøkkelen? (j/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Er du sikker på at du vil oppheve valgte undernøkler? (j/N) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Er du sikker på at du vil oppheve denne undernøkkelen? (j/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Du kan ikke justere eiertillit når du bruker selvvalgt tillitsdatabase\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "Bytt oppsettsliste til:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Er du sikker på at du vil oppdatere oppsett for valgte bruker-id-er? (j/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
  msgstr "Er du sikker på at du vil oppdatere oppsett? (j/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
  msgstr "Vil du lagre endringer? (j/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
  msgstr "Vil du avslutte uten å lagre? (j/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "oppdatering mislyktes: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  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:3025
++#: g10/keyedit.c:3038
  #, c-format
  msgid "User ID revocation failed: %s\n"
  msgstr "oppheving av bruker-ID mislyktes: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "«%s» er ikke et fingeravtrykk\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "«%s» er ikke primært fingeravtrykk\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, c-format
  msgid "Invalid user ID '%s': %s\n"
  msgstr "Bruker-ID «%s» er ugyldig: %s\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "No matching user IDs."
  msgstr "Ingen treff på bruker-id-er."
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "Nothing to sign.\n"
  msgstr "Ingenting å signere.\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Kontrollsum: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Funksjoner: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "Nøkkeltjener no-modify"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Foretrukket nøkkeltjener: "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "Notasjoner: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr "PGP 2.x-brukere har ingen oppsettsmuligheter.\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Følgende nøkkel ble opphevet %s av %s med nøkkelen %s\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, 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:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(sensitiv)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "opprettet: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "opphevet: %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "utgikk: %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "utgår: %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "bruk: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "kortnr.: "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "tillit: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "gyldighet: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Denne nøkkelen er ikke i bruk"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4354,17 -3403,12 +4377,18 @@@ msgstr "
  "Merk: du bør starte programmet på nytt for å sikre at nøkkel-gyldigheten\n"
  "som vises her er riktig.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "opphevet"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "utgått"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4372,15 -3416,12 +4396,15 @@@ msgstr "
  "ADVARSEL: ingen bruker-ID er merket som primær. Denne kommandoen kan\n"
  "              føre til at en annen bruker-ID blir brukt som primærbruker.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "ADVARSEL: Undernøkkel for kryptering utløper snart.\n"
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  msgid "You may want to change its expiration date too.\n"
  msgstr "Du bør vurdere å endre utløpsdato samtidig.\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4390,72 -3431,57 +4414,72 @@@ msgstr "
  "føre til at\n"
  "         enkelte PGP-versjoner avviser nøkkelen.\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  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:4298
++#: g10/keyedit.c:4311
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "Du kan ikke knytte foto-ID til PGP2-nøkler.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Slette denne gode signaturen? (j/N/a)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Vil du slette denne ugyldige signaturen? (j/N/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Vil du slette denne ukjente signaturen? (j/N/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Er du sikker på at du vil slette denne selvsignaturen? (j/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, c-format
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
  msgstr[0] "Slettet %d signatur.\n"
  msgstr[1] "Slettet %d signaturer.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Ingen ble slettet.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "ugyldig"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Bruker-ID «%s» pakket sammen: %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
  msgstr[0] "Bruker-ID «%s»: %d signatur fjernet\n"
  msgstr[1] "Bruker-ID «%s»: %d signaturer fjernet\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Bruker-ID «%s»: allerede minimert\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Bruker-ID «%s»: allerede renset\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4465,267 -3491,208 +4489,267 @@@ msgstr "
  "         kan dette føre til at enkelte PGP-versjoner ikke vil kunne bruke "
  "nøkkelen.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "Du kan ikke knytte opphevere til PGP 2.x-nøkler.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Skriv inn oppheverens bruker-ID: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr "du kan ikke bruke PGP 2.x-nøkler som opphevere\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "du kan ikke bruke en nøkkel som opphevelsesnøkkel for seg selv\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
  msgstr "denne nøkkelen er allerede i bruk som opphevelsesnøkkel\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr ""
  "ADVARSEL: du kan ikke angre tildeling av opphevelsesrolle til en nøkkel.\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr "Er du sikker på at du vil gjøre denne nøkkelen til en opphever? (j/N) "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
  msgstr ""
  "Er du sikker på at du vil endre utløpstid for flere undernøkler? (j/N) "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Endrer utløpstid for undernøkkel.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Endrer utløpstid for primærnøkkel.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "Du kan ikke endre utløpsdato for v3-nøkler\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "signerings-undernøkkel %s er allerede kryssertifisert\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  "undernøkkel %s signerer ikke, og behøver derfor ikke å bli kryssertifisert\n"
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Velg én bruker-ID.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "hopper over v3-selvsignatur for bruker-ID «%s»\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "Skriv inn adresse til foretrukket nøkkeltjener: "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  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:5384
++#: g10/keyedit.c:5400
  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:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "Skriv inn notat: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
  msgstr "Vil du fortsette? (j/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Ingen bruker-ID med indeks %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Ingen bruker-ID med kontrollsum %s\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Ingen undernøkkel med ID «%s».\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Ingen undernøkkel med indeks %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "bruker-ID: «%s»\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "signert med nøkkelen %s %s%s%s\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (ikke-eksporterbar)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Denne signaturen utgikk %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Er du sikker på at du vil oppheve den? (j/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Vil du lage et opphevelsessertifikat for denne signaturen? (j/N) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr "Ikke signert av deg.\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Du har signert disse bruker-id-ene med nøkkelen %s:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (kan ikke oppheves)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "opphevet med nøkkelen %s %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Du er i ferd med å oppheve følgende signaturer:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Er du sikker på at du vil lage opphevelsessertifikatene? (j/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "ingen hemmelig nøkkel\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr "prøvde å oppheve ID som ikke tilhørte en bruker: %s\n"
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "bruker-ID «%s» er allerede opphevet\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr "ADVARSEL: en bruker-id-signatur er datert %d sekunder i fremtiden\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Nøkkelen %s er allerede opphevet.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Undernøkkel %s er allerede opphevet.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Viser %s foto-ID av størrelsen %ld for nøkkel %s (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "innstilling «%s» er duplisert\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "for mange krypteringsinnstillinger\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "for mange kontrollsum-innstillinger\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
  msgstr "for mange komprimeringsinnstillinger\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "«%s» er et ugyldig oppsettsvalg\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "skriver direkte signatur\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "skriver selvsignatur\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "skriver nøkkelbindende signatur\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "ugyldig nøkkelstørrelse. Bruker %u bit\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "nøkkelstørrelse rundet opp til %u bit\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "ADVARSEL: noen OpenPGP-programmer klarer ikke å behandle DSA-nøkler med "
  "denne kontrollsum-størrelsen\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "Signere"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "Bekrefte"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "Kryptere data"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "Autentisere"
  
@@@ -4743,150 -3710,119 +4767,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "SsKkAaQq"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Mulige handlinger med en %s-nøkkel: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "Tillatte handlinger: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Slå av/på signeringsfunksjon\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Slå av/på krypteringsfunksjon\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Slå av/på autentiseringsfunksjon\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Ferdig\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Velg hvilken type nøkkel du vil ha:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA og RSA (standard)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA og Elgamal\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (bare signering)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (bare signering)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (bare kryptering)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (bare kryptering)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (sette dine egne muligheter)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (sette dine egne muligheter)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC og ECC\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (kun signering)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (velg funksjoner selv)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (kun kryptering)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) Nøkkel\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Skriv inn nøkkelgrep: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Ugyldig nøkkelgrep (forventer 40 heks-sifre)\n"
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Ingen nøkkel med dette nøkkelgrepet\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "rundet av til %u bit\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s-nøkler må være mellom %u og %u bit lange.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Hvor stor vil du at undernøkkelen skal være? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Hvor stor skal nøkkelen være? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Forespurt nøkkelstørrelse er %u bit\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Velg elliptisk kurve:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4902,7 -3838,6 +4926,7 @@@ msgstr "
  "      <n>m = nøkkelen utgår om n months\n"
  "      <n>y = nøkkelen utgår om n years\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4918,38 -3853,30 +4942,38 @@@ msgstr "
  "      <n>m = signaturen utgår om n months\n"
  "      <n>y = signaturen utgår om n years\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "Nøkkelen er gyldig for? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Signaturen er gyldig for? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "ugyldig verdi\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "Nøkkel utgår ikke i det hele tatt\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "Signaturen utgår ikke i det hele tatt\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Nøkkel utgår %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Signaturen utgår %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -4957,11 -3884,9 +4981,11 @@@ msgstr "
  "Systemet ditt klarer ikke å håndtere datoer etter 2038.\n"
  "Likevel håndteres det korrekt frem til 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "Er dette korrekt (j/N)? "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4975,7 -3900,6 +4999,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -4991,49 -3915,38 +5015,49 @@@ msgstr "
  "    «Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>»\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Fullt navn: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Ugyldig tegn i navn\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "Tegnene «%s» og «%s» kan ikke brukes i navn\n"
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "Navn kan ikke begynne med siffer\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "Navnet må bestå av minst 5 tegn\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "E-postadresse: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "Ugyldig e-postadresse\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Kommentar: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Ugyldig tegn i kommentar\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Du bruker tegnsettet «%s».\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5044,7 -3957,6 +5068,7 @@@ msgstr "
  "    «%s»\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Ikk bruk e-postadresse som navn eller kommentar\n"
  
@@@ -5059,31 -3971,24 +5083,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnKeEeRrAa"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Endre (N)avn, (E)postadresse eller (A)vslutt? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Endre (N)avn, (E)postadresse eller (R)iktig/(A)vslutt? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Rett opp feilen først\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5095,13 -4000,10 +5119,13 @@@ msgstr "
  "diskene jobbe) mens dette pågår. Da får\n"
  "tallgeneratoren bedre muligheter til å samle inn vilkårlighetsdata.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Nøkkelgenerering mislyktes: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5112,63 -4014,50 +5136,63 @@@ msgstr "
  "    «%s»\n"
  "\n"
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr "Vil du fortsette? (J/n) "
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Det finnes allerede en nøkkel for «%s»\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  msgid "Create anyway? (y/N) "
  msgstr "Vil du lage nøkkel likevel? (j/N) "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  msgid "creating anyway\n"
  msgstr "lager likevel\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  "Merk: Bruk «%s %s» for å se et fullverdig dialogvindu for nøkkelgenerering.\n"
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "Nøkkelgenerering ble avbrutt.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "klarte ikke å lage sikkerhetskopifila «%s»: %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "Merk: sikkerhetskopi av kortnøkkel lagret på «%s»\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "skriver offentlig nøkkel til «%s»\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "fant ikke skrivbart offentlig nøkkelknippe: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5177,7 -4066,6 +5201,7 @@@ msgstr "
  "vurdere å bruke kommandoen «--edit-key» for å lage en\n"
  "undernøkkel til dette formålet.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5185,7 -4073,6 +5209,7 @@@ msgstr "
  "nøkkel har blitt opprettet %lu sekund i fremtiden (time warp- eller "
  "klokkeproblem)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5193,24 -4080,19 +5217,24 @@@ msgstr "
  "nøkkel har blitt opprettet %lu sekunder i fremtiden (time warp- eller "
  "klokkeproblem)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr ""
  "Merk: det strider med OpenPGP-standarden å lage undernøkler for v3-nøkler\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Hemmelige deler av primærnøkkelen er ikke tilgjengelig.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Hemmelige deler av primærnøkkelen er lagret på kort.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
  msgstr "Er du sikker på at du vil fortsette? (j/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "aldri     "
  
@@@ -5259,29 -4132,23 +5283,29 @@@ msgstr[1] "Advarsel: hoppet over %lu n�
  msgid "Keyring"
  msgstr "Nøkkelknippe"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Fingeravtrykk for primærnøkkel:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "     Fingeravtrykk for undernøkkel:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr " Fingeravtrykk for primærnøkkel:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "      Fingeravstrykk for undernøkkel:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "      Nøkkelfingeravtrykk ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr "      Serienummer for kort ="
  
@@@ -5316,107 -4178,84 +5340,107 @@@ msgstr[1] " (%lu signaturer)\n
  msgid "%s: keyring created\n"
  msgstr "%s: laget nøkkelknippe\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr "overstyr mellomtjener-oppsett for dirmngr"
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr "ta med opphevede nøkler som søketreff"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr "ta med undernøkler ved søk på nøkkel-ID"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr "overstyr tidsavbrudd-oppsett for dirmngr"
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr "hent nøkler automatisk ved bekreftelse av signaturer"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "bruk nøklers foretrukne nøkkeltjener-adresse"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr "bruk nøklers PKA-oppføring når du henter dem"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "ikke i bruk"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr "Skriv inn tall, N)este, eller Q)uit (Avslutt) > "
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "ugyldig nøkkeltjener-protokoll (us %d!=håndteringsprogram %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "«%s» er ikke en nøkkel-ID, og blir hoppet over\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
  msgstr[0] "oppdaterer %d nøkkel fra %s\n"
  msgstr[1] "oppdaterer %d nøkler fra %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "ADVARSEL: klarte ikke å oppdatere nøkkel %s via %s: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "fant ikke nøkkelen «%s» på nøkkeltjener\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "fant ikke nøkkelen på nøkkeltjener\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr "ingen kjent nøkkeltjener (bruk valget «--keyserver»)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "ber om nøkkelen %s fra %s tjener %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "ber om nøkkelen %s fra %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  msgid "no keyserver known\n"
  msgstr "ingen kjent nøkkeltjener\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "hoppet over «%s»: %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "sender nøkkelen %s til %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, c-format
  msgid "requesting key from '%s'\n"
  msgstr "ber om nøkkel fra «%s»\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "ADVARSEL: klarte ikke å fange URI %s: %s\n"
@@@ -5516,127 -4335,100 +5540,127 @@@ msgstr "opprinnelig filnavn=«%.*s»\n
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr "ADVARSEL: fant flere elementer i ren tekst\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "selvstendig opphevelse - bruk «gpg --import» for å ta i bruk\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "fant ikke signatur\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "DÅRLIG signatur fra «%s»"
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Utgått signatur fra «%s»"
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "God signatur fra «%s»"
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "signaturbekreftelse ble hindret\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "disse flertydige signaturdataene kan ikke behandles\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Signatur opprettet %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               bruker %s nøkkel %s\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Signatur laget %s ved hjelp av %s-nøkkel ID %s\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                aka «%s»"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Nøkkel tilgjengelig ved: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[usikker]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                aka «%s»"
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Signatur utgått %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Signatur utgår %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s-signatur, kontrollsum-algoritme %s%s%s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binær"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "tekstmodus"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "ukjent"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  msgid ", key algorithm "
  msgstr ", nøkkelalgoritme"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr "ADVARSEL: ikke en separat signatur. Fila «%s» er IKKE bekreftet.\n"
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Klarte ikke å kontrollere signatur: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "ikke en separat signatur\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "ADVARSEL: fant flere signaturer. Kontrollerer bare den første.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "separat signatur av klasse 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "gammeldags (PGP 2.x) signatur\n"
  
@@@ -5733,27 -4506,22 +5757,27 @@@ msgstr "Ukomprimert
  msgid "uncompressed|none"
  msgstr "ukomprimert|ingen"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "denne meldinga kan kanskje ikke brukes av %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "«%s» er et flertydig valg\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, c-format
  msgid "unknown option '%s'\n"
  msgstr "«%s» er et ukjent valg\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  "Offentlig ECDSA-nøkler forventes i SEC-koding som kan ganges med 8 bit\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "«%s» er en ukjent svak summeringsmetode\n"
@@@ -6039,7 -4752,25 +6063,28 @@@ msgstr "Denne nøkkelen tilhører sanns
  msgid "This key belongs to us\n"
  msgstr "denne nøkkelen tilhører oss\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ #| msgid "root certificate has now been marked as trusted\n"
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "rotsertifikat er nå merket som troverdig\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "Det er IKKE sikkert at nøkkelen tilhører personen som er navngitt i\n"
+ "bruker-id-en.  Hvis du *virkelig* vet hva du gjør, kan du svare ja\n"
+ "på neste spørsmål.\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6049,129 -4780,101 +6094,129 @@@ msgstr "
  "bruker-id-en.  Hvis du *virkelig* vet hva du gjør, kan du svare ja\n"
  "på neste spørsmål.\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "Vil du bruke denne nøkkelen likevel? (j/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "ADVARSEL: du bruker en upålitelig nøkkel.\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
  "ADVARSEL: nøkkel %s kan være opphevet: opphevingsnøkkel %s ikke tilstede.\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "ADVARSEL: denne nøkkelen er opphevet.\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "ADVARSEL: denne nøkkelen er opphevet av eieren.\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
  msgstr "         Dette kan bety at signaturen er falsk.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "ADVARSEL: denne undernøkkelen er opphevet av eieren.\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Merk: Denne nøkkelen er ikke i bruk.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr "Merk: Bekreftet signeringsadresse er «%s»\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr "Merk: Signeringsadresse «%s» samsvarer ikke med DNS-oppslag\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr "tillitsnivå oppjustert til «FULL» pga. gyldig PKA-info\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr "tillitsnivå nedjustert til «NEVER» (aldri) pga. ugyldig PKA-info\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Merk: denne nøkkelen er utgått.\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr ""
  "ADVARSEL: denne nøkkelen er ikke sertifisert med en tillitsverdig signatur.\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr "         Det er ingen indikasjon på at signaturen tilhører eieren.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "ADVARSEL: vi stoler IKKE på denne nøkkelen.\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "         Signaturen er sannsynligvis et FALSKNERI.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
  "ADVARSEL: denne nøkkelen er ikke sertifisert med tilstrekkelig "
  "tillitsverdige signaturer.\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "         Det er ikke sikkert at signaturen tilhører brukeren.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: hoppet over: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: hoppet over. Offentlig nøkkel er ikke i bruk\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: hoppet over: offentlig nøkkel er allerede tilstede\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, c-format
  msgid "can't encrypt to '%s'\n"
  msgstr "klarte ikke å kryptere til «%s»\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "valgt «%s», men mangler gyldig forvalgt nøkkel\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "valgt «%s», men mangler valget «%s»\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "Du skrev ikke inn en bruker-ID. (bruk evt. «-r»)\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "Gjeldende mottakere:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6179,37 -4882,29 +6224,37 @@@ msgstr "
  "\n"
  "Skriv inn bruker-ID og avslutt med tom linje: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Bruker-id-en finnes ikke.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr "hoppet over: offentlig nøkkel allerede valgt som standardmottaker\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "Offentlig nøkkel er ikke i bruk.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "hoppet over: offentlig nøkkel er allerede valgt\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "«%s» er en ukjent standardmottaker\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "ingen gyldige mottakere\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Merk: nøkkel %s har ingen %s-funksjon\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Merk: nøkkel %s har ingen innstilling for %s\n"
@@@ -6461,42 -5110,35 +6506,42 @@@ msgid "%s key %s requires a %zu bit or 
  msgstr ""
  "%s-nøkkel %s krever kontrollsum på %zu eller flere bit (gjeldende sum: %s)\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "ADVARSEL: konflikt med signatur-kontrollsum i melding\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "ADVARSEL: undernøkkel %s for signering er ikke kryssertifisert\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
  msgstr "se %s for mer informasjon\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
  "ADVARSEL: undernøkkel %s for signering er kryssertifisert på ugyldig "
  "grunnlag\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
  msgstr[0] "offentlig nøkkel %s er %lu sekund nyere enn signaturen\n"
  msgstr[1] "offentlig nøkkel %s er %lu sekunder nyere enn signaturen\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
  msgstr[0] "offentlig nøkkel %s er %lu dag nyere enn signaturen\n"
  msgstr[1] "offentlig nøkkel %s er %lu dager nyere enn signaturen\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6509,7 -5151,6 +6554,7 @@@ msgstr[1] "
  "nøkkel %s ble opprettet %lu sekunder i fremtiden (tidsforskyvnings- eller "
  "klokkeproblem)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
@@@ -6521,27 -5162,22 +6566,27 @@@ msgstr[1] "
  "nøkkel %s ble opprettet %lu dager i fremtiden (tidsforskyvnings- eller "
  "klokkeproblem)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "Merk: signaturnøkkel %s utgått %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "Merk: signaturnøkkel %s er opphevet\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr "antatt ugyldig signatur fra nøkkel %s pga. ukjent «kritisk»-bit\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr "nøkkel %s: ingen undernøkkel for undernøkkelopphevingssignatur\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "nøkkel %s: ingen undernøkkel for undernøkkelbindingssignatur\n"
@@@ -6604,7 -5229,6 +6649,7 @@@ msgid "this is a PGP generated Elgamal 
  msgstr ""
  "dette er en PGP-generelt Elgamal-nøkkel, og egner seg ikke til signering."
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "tillitsoppføring %lu, type %d: skriving mislyktes: %s\n"
@@@ -6649,12 -5265,10 +6694,12 @@@ msgstr "feil under søk etter tillitspo
  msgid "read error in '%s': %s\n"
  msgstr "lesefeil i «%s»: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: synk mislyktes: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "klarte ikke å lage lås for «%s»\n"
@@@ -6683,7 -5292,6 +6728,7 @@@ msgstr "trustdb-transaksjon er for stor
  msgid "%s: directory does not exist!\n"
  msgstr "%s: mappa finnes ikke.\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "fikk ikke tilgang til «%s»: %s\n"
@@@ -6792,244 -5378,236 +6837,283 @@@ msgstr "tekstlinjer som er lengre enn %
  msgid "input line longer than %d characters\n"
  msgstr "inndata-linje er lengre enn %d tegn\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "feil under transaksjonsstart i TOFU-database: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr "feil under ferdigstillelse av transaksjon i TOFU-database: %s\n"
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr "feil under reversering av transaksjon i TOFU-database: %s\n"
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr "TOFU-databaseversjon støttes ikke: %s\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "feil under lesing av TOFU-database: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, c-format
  msgid "error determining TOFU database's version: %s\n"
  msgstr "klarte ikke å kontrollere versjon av TOFU-database: %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, c-format
  msgid "error initializing TOFU database: %s\n"
  msgstr "feil under oppstart av TOFU-database: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "feil under åpning av TOFU-database «%s»: %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "feil under oppdatering av TOFU-database: %s\n"
  
- #: g10/tofu.c:1118
- #, c-format
- msgid "The binding %s is NOT known."
- msgstr "Tilknytning %s er ukjent."
- 
- #: g10/tofu.c:1128
- #, c-format
++#: g10/tofu.c:1239
+ #, fuzzy, c-format
+ #| msgid "The email address \"%s\" is associated with %d key:\n"
+ #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ "This is the first time the email address \"%s\" is being used with key %s."
+ msgstr "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
+ 
++#: g10/tofu.c:1247
+ #, fuzzy, c-format
+ #| msgid "The email address \"%s\" is associated with %d key:\n"
+ #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
+ 
++#: g10/tofu.c:1251
+ #, fuzzy
+ #| msgid ""
+ #| "The key with fingerprint %s raised a conflict with the binding %s.  Since "
+ #| "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  "Nøkkel med fingeravtrykk %s forårsaket konflikt med tilknytning %s. Siden "
  "regelen var «auto» er den nå endret til «ask» (spør)."
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
- "Oppgi hvorvidt du tror tilknytninga %s%ser sannferdig (dvs.: at nøkkelen "
- "tilhører personen som hevder å eie den) eller falsk."
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "feil under henting av andre bruker-id-er: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr "Kjente bruker-id-er tilknyttet denne nøkkelen:\n"
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "vis nøkler og bruker-id-er"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, c-format
  msgid "policy: %s"
  msgstr "regelverk: %s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "feil under henting av signaturstatistikk: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
  msgstr[1] "E-postadressen «%s» er tilknyttet %d nøkler:\n"
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr "Statistikk for nøkler med e-postadresse «%s»:\n"
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  msgid "this key"
  msgstr "denne nøkkelen"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] "%ld melding signert i fremtid."
- msgstr[1] "%ld meldinger signert i fremtid."
++#: g10/tofu.c:1715
+ #, fuzzy, c-format
+ #| msgid "Verified %ld messages signed by \"%s\"."
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "Bekreftet %ld meldinger signert av «%s»."
+ msgstr[1] "Bekreftet %ld meldinger signert av «%s»."
  
- #: g10/tofu.c:1351
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "%ld melding signert"
- msgstr[1] "%ld meldinger signert"
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
+ msgstr[1] ""
  
- #: g10/tofu.c:1357
- #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
++#: g10/tofu.c:1734
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] " i løpet av gårsdagen (%ld)."
  msgstr[1] " i løpet av de %ld siste dagene."
  
- #: g10/tofu.c:1361
- #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
- msgstr[0] " i løpet av den siste uka (%ld)."
- msgstr[1] " i løpet av de siste %ld ukene."
- 
- #: g10/tofu.c:1365
- #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
++#: g10/tofu.c:1740
+ #, fuzzy, c-format
+ #| msgid " over the past %ld month."
+ #| msgid_plural " over the past %ld months."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] " i løpet av den siste måneden (%ld)."
  msgstr[1] " i løpet av de siste %ld månedene."
  
++#: g10/tofu.c:1746
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
+ msgstr[0] " i løpet av gårsdagen (%ld)."
+ msgstr[1] " i løpet av de %ld siste dagene."
+ 
++#: g10/tofu.c:1752
+ #, fuzzy
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid " in the past."
+ msgstr " i løpet av gårsdagen (%ld)."
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr "TOFU oppdaget en tilknytningskonflikt"
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr "gGaAuUnNdD"
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr "(G)od, (A)ksepter én gang, (U)kjent, (N)ekt én gang, (D)årlig? "
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ #| msgid "error writing key: %s\n"
+ msgid "resetting keydb: %s\n"
+ msgstr "feil under skriving av nøkkel: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "feil under endring av tillitsnivå for TOFU-tilknytning til %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "feil under endring av TOFU-regler: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] "%d~år"
  msgstr[1] "%d~år"
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] "%d~måned"
  msgstr[1] "%d~måneder"
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] "%d~dag"
  msgstr[1] "%d~dager"
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] "%d~time"
  msgstr[1] "%d~timer"
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] "%d~minutt"
  msgstr[1] "%d~minutter"
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] "%d~sekund"
  msgstr[1] "%d~sekunder"
  
- #: g10/tofu.c:1947
- #, c-format
- msgid "Have never verified a message signed by key %s!\n"
- msgstr "Har aldri bekreftet en melding som er signert av nøkkel %s.\n"
- 
- #: g10/tofu.c:1976
++#: g10/tofu.c:2802
  #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
+ msgid "%s: "
  msgstr ""
- "Klarte ikke å samle inn signaturstatistikk for «%s»\n"
- "(nøkkel %s)\n"
  
- #: g10/tofu.c:1996
- #, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "Bekreftet %ld meldinger signert av «%s»."
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Slettet %d signaturer.\n"
  
- #: g10/tofu.c:2007
- #, c-format
- msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
++#: g10/tofu.c:2816
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Verified %ld message signed by \"%s\"\n"
+ #| "in the past %s."
+ #| msgid_plural ""
+ #| "Verified %ld messages signed by \"%s\"\n"
+ #| "in the past %s."
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
  msgstr[0] ""
  "Bekreftet %ld melding signert av «%s»\n"
  "siste %s."
@@@ -7037,26 -5615,70 +7121,77 @@@ msgstr[1] "
  "Bekreftet %ld meldinger signert av «%s»\n"
  "siste %s."
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
- msgstr "Nyeste melding ble bekreftet for %s siden."
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "kryptert med %lu passordfraser\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Verified %ld message signed by \"%s\"\n"
+ #| "in the past %s."
+ #| msgid_plural ""
+ #| "Verified %ld messages signed by \"%s\"\n"
+ #| "in the past %s."
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] ""
+ "Bekreftet %ld melding signert av «%s»\n"
+ "siste %s."
+ msgstr[1] ""
+ "Bekreftet %ld meldinger signert av «%s»\n"
+ "siste %s."
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2880
+ #, fuzzy
+ #| msgid "Warning: we've have yet to see a message signed by this key!\n"
+ msgid ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  "Advarsel: vi har enda ikke sett en melding som er signert av denne "
  "nøkkelen.\n"
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2883
+ #, fuzzy
+ #| msgid "Warning: we've only seen a single message signed by this key!\n"
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  "Advarsel: vi har bare sett én melding som er signert av denne nøkkelen.\n"
  
- #: g10/tofu.c:2077
- #, c-format
++#: g10/tofu.c:2887
+ #, fuzzy
+ #| msgid "Warning: we've have yet to see a message signed by this key!\n"
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
+ msgstr ""
+ "Advarsel: vi har enda ikke sett en melding som er signert av denne "
+ "nøkkelen.\n"
+ 
++#: g10/tofu.c:2890
+ #, fuzzy
+ #| msgid "Warning: we've only seen a single message signed by this key!\n"
+ msgid "Warning: you have only encrypted one message to this key!\n"
+ msgstr ""
+ "Advarsel: vi har bare sett én melding som er signert av denne nøkkelen.\n"
+ 
++#: g10/tofu.c:2919
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Warning: if you think you've seen more than %ld message signed by this "
+ #| "key, then this key might be a forgery!  Carefully examine the email "
+ #| "address for small variations.  If the key is suspect, then use\n"
+ #| "  %s\n"
+ #| "to mark it as being bad.\n"
+ #| msgid_plural ""
+ #| "Warning: if you think you've seen more than %ld messages signed by this "
+ #| "key, then this key might be a forgery!  Carefully examine the email "
+ #| "address for small variations.  If the key is suspect, then use\n"
+ #| "  %s\n"
+ #| "to mark it as being bad.\n"
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7080,129 -5702,113 +7215,141 @@@ msgstr[1] "
  "Bruk %s \n"
  "for å markere nøkkelen som ugyldig hvis den virker mistenkelig.\n"
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "feil under åpning av TOFU-database: %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring '%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
+ 
++#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
  msgstr "«%s» er en ugyldig lang nøkkel-ID\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "nøkkel %s: godtatt som betrodd nøkkel\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "nøkkel %s forekommer flere enn én gang i trustdb\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr "nøkkel %s: ingen offentlig nøkkel for betrodd nøkkel - hoppet over\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "nøkkel %s markert som endelig betrodd.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "tillitsoppføring %lu, foresp.type %d: lesing mislyktes: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "tillitsoppføring %lu er ikke av forespurt type (%d)\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  "Du kan prøve å gjenskape trustdb ved å skrive inn følgende kommandoer:\n"
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr "Se bruksanvisning hvis dette ikke hjelper\n"
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "Klarte ikke å bruke ukjent tillitsmodell (%d). Prøver tillitsmodell %s\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "bruker tillitsmodell %s\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "kontroll av trustdb er ikke nødvendig\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "neste kontroll av trustdb planlagt %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "trustdb behøver ikke kontroll ved bruk av tillitsmodell «%s»\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "trustdb behøver ikke oppdatering ved bruk av tillitsmodell «%s»\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "fant ikke offentlig nøkkel %s: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "kjør «--check-trustdb»\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "kontrollerer trustdb\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "%d nøkkel behandlet"
  msgstr[1] "%d nøkler behandlet"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
  msgstr[0] "(%d gyldighetsantall klarert)\n"
  msgstr[1] "(%d gyldighetsantall klarert)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "fant ingen nøkler med absolutt («ultimat») pålitelighet\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "fant ikke offentlig nøkkel for absolutt pålitelig nøkkel %s\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  "dybde: %d  gyldig: %3d  signert: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7312,141 -5897,111 +7459,143 @@@ msgstr "
  "Syntaks: kbxutil [valg] [filer]\n"
  "Vis, eksporter eller importer Keybox-data\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSA-modulus mangler eller er av annen størrelse enn %d bit\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "offentlig RSA-eksponent mangler eller er større enn %d bit\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN-callback returnerte en feil: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr "NullPIN er ikke blitt endret enda\n"
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "|N|Skriv inn ny PIN-kode for standardnøkler."
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
  msgstr "||Skriv inn PIN-kode for standardnøkler."
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|NP|Skriv inn ny PIN-opplåsingskode (PUK) for standardnøkler."
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|P|Skriv inn PIN-opplåsingskode (PUK) for standardnøkler."
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr "|N|Skriv inn ny PIN for å la nøkkelen lage kvalifiserte signaturer."
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr "||Skriv inn PIN for å la nøkkelen lage kvalifiserte signaturer."
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  "|NP|Skriv inn ny PUK-kode for å la nøkkelen lage kvalifiserte signaturer."
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr "|P|Skriv inn PUK-kode for å la nøkkelen lage kvalifiserte signaturer."
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "feil under henting av ny PIN: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "klarte ikke å lagre fingeravtrykk: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "klarte ikke å lagre opprettelsesdato: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "svar inneholder ikke offentlig nøkkeldata\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr "svar inneholder ikke RSA-modulus\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr "svar inneholder ikke offentlig RSA-eksponent\n"
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "response does not contain the EC public point\n"
+ msgid "response does not contain the EC public key\n"
  msgstr "svar inneholder ikke offentlig EC-punkt\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "svar inneholder ikke offentlig nøkkeldata\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "bruker forvalgt PIN som %s\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "klarte ikke å bruke forvalgt PIN som %s: %s. Lar være å bruke forvalgt PIN "
  "senere\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Skriv inn PIN%%0A[signaturer utført: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
  msgstr "||Skriv inn PIN-kode"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "bekreftelse av CHV%d mislyktes: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "feil under henting av CHV-status fra kort\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr "kortet er låst for godt.\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7456,24 -6011,19 +7605,24 @@@ msgstr[1] "%d Admin-PIN-forsøk gjenst�
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Skriv inn admin-PIN%%0A[gjenstående forsøk: %d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Skriv inn admin-PIN"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Skriv inn tilbakestillingskode for kortet"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Tilbakestillingskoden er for kort. Minimumslengde er %d\n"
@@@ -7481,107 -6031,83 +7630,107 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr "|RN|Ny tilbakestillingskode"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Ny Admin PIN"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|Ny PIN"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Skriv inn admin-PIN og ny admin-PIN"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Skriv inn PIN-kode og ny PIN-kode"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
  msgstr "feil under lesing av programdata\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "feil under lesing av fingeravtrykk DO\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "nøkkelen finnes allerede\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr "gjeldende nøkkel blir erstattet\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "lager ny nøkkel\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
  msgstr "skriver ny nøkkel\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "tidsstempel for opprettelse mangler\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA-primtall %s mangler eller er av annen størrelse enn %d bit\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "klarte ikke å lagre nøkkel: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  msgid "unsupported curve\n"
  msgstr "ustøttet kurve\n"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "vent mens nøkkel blir generert …\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
  msgstr "nøkkelgenerering mislyktes\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "nøkkelgenerering fullført (%d sekund)\n"
  msgstr[1] "nøkkelgenerering fullført (%d sekunder)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr "fingeravtrykk på kort samsvarer ikke med forespurt avtrykk\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "kortet støtter ikke kontrollsum-algoritme %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "signaturer opprettet så langt: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "bekrefting av Admin PIN er foreløpig nektet gjennom denne kommandoen\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "fikk ikke tilgang til %s. Bruker du et ugyldig OpenPGP-kort?\n"
@@@ -7601,7 -6124,6 +7750,7 @@@ msgstr "|N|Ny PIN
  msgid "run in multi server mode (foreground)"
  msgstr "kjør i multi-tjenermodus (forgrunn)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
  
@@@ -7653,16 -6164,13 +7802,16 @@@ msgstr "
  "Syntaks: scdaemon [valg] [kommando [arg]]\n"
  "Smartcard-bakgrunnsprogram for @GNUPG@\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr "bruk valget «--daemon» for å kjøre programmet i bakgrunnen\n"
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "startet håndteringsprogram for fd %d\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "avsluttet håndteringsprogram for fd %d\n"
@@@ -7681,11 -6186,9 +7830,11 @@@ msgstr "ingen dirmngr kjører i gjelden
  msgid "validation model requested by certificate: %s"
  msgstr "kontrollmodell forespurt av sertifikat: %s"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr "kjede"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr "skall"
  
@@@ -7715,195 -6212,148 +7864,195 @@@ msgstr "Merk: ukritisk sertifikat-regel
  msgid "certificate policy not allowed"
  msgstr "sertifikatregelverk tillates ikke"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr "slår opp utsteder på ekstern plassering\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr "antall ustedere funnet: %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr "slår opp utsteder fra Dirmngr-hurtiglager\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "antall treff på sertifikater: %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "nøkkeloppslag i dirmngr-hurtiglager mislyktes: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "klarte ikke å tildele nøkkeldatabase-verdi\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
  msgstr "sertifikatet er opphevet"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "sertifikatet har ukjent status"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr "kontroller at «dirmngr» er installert skikkelig\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
  msgstr "kontroll av CRL mislyktes: %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "sertifikat med ugyldig gyldighetsverdi: %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr "sertifikatet er ikke gyldig enda"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
  msgstr "rotsertifikat er ikke gyldig enda"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr "mellomsertifikat er ikke gyldig enda"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
  msgstr "sertifikatet er utgått"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
  msgstr "rotsertifikat er utgått"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
  msgstr "mellomsertifikat er utgått"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr "påkrevde sertifikategenskaper mangler: %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
  msgstr "sertifikat med ugyldig gyldighetsverdi"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr "signatur ikke laget innenfor sertifikatets levetid"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr "sertifikat ikke laget innenfor utsteders levetid"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr "mellomsertifikat ikke laget innenfor utsteders levetid"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  (  signatur opprettet "
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "  (sertifikat opprettet "
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
  msgstr "  (sertifikat gyldig fra "
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr "  (     utsteder gyldig fra "
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "fingeravtrykk=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr "rotsertifikat er nå merket som troverdig\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr "interaktiv tillitsmerking er ikke slått på i gpg-agent\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr "interaktiv tillitsmarkering er slått av for gjeldende økt\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  "ADVARSEL: opprettelsestid for signatur er ukjent. Antar gjeldende tidspunkt"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "fant ingen utsteder i sertifikat"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr "selvsignert sertifikat har ugyldig signatur"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr "rotsertifikat er ikke merket som troverdig"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "kontroll av tillitsliste mislyktes: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr "sertifikatkjede er for langt\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "fant ikke utstedersertifikat"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
  msgstr "sertifikatet har ugyldig signatur"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr "fant et annet CA-sertifikat som kan fungere. Prøver igjen"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "sertifikatkjede er lengre enn CA tillater (%d)"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "sertifikatet er gyldig\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
  msgstr "mellomsertifikat er ok\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
  msgstr "rotsertifikat er gyldig\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr "bytter til kjedemodell"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr "gyldighetsmodell: %s"
@@@ -8227,7 -6611,6 +8376,7 @@@ msgstr "(dette ser ikke ut som en krypt
  msgid "certificate '%s' not found: %s\n"
  msgstr "fant ikke sertifikatet «%s»: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
  msgstr "feil under låsing av nøkkelskrin: %s\n"
@@@ -8251,123 -6630,93 +8400,123 @@@ msgstr "sletting av sertifikat «%s» m
  msgid "no valid recipients given\n"
  msgstr "ingen gyldige mottakere valgt\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
  msgstr "vis eksterne nøkler"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
  msgstr "vis sertifikatkjede "
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
  msgstr "importer sertifikater"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
  msgstr "eksporter sertifikater"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "registrer smartkort"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "send en kommando til dirmngr"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr "kall gpg-protect-tool"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
  msgstr "lag base64-kodet utdata"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr "forvent inndata i «PEM»-format"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr "forvent inndata i «base-64»-format"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr "forvent inndata i binærformat"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr "aldri spør CRL"
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr "kontroller gyldighet med OCSP"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr "|N|antall sertifikater som skal være med"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr "|FIL|hent regler fra valgt FIL"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr "ikke kontroller sertifikatregler"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr "hent manglende utstedersertifikat"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "ikke bruk terminal i det hele tatt"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FIL|lagre en tjenermodus-logg i valgt FIL"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FIL|lagre en revisjonslogg i valgt FIL"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "buntmodus: aldri spør"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "svar automatisk ja på de fleste spørsmål"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "svar automatisk nei på de fleste spørsmål"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FIL|legg til nøkkelknippe i liste over nøkkelknipper"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|BRUKER-ID|bruk valgt BRUKER-ID som forvalgt hemmelig nøkkel"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|bruk valgt nøkkeltjener til å slå opp nøkler"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAVN|bruk valgt krypteringsalgoritme-NAVN"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAVN|bruk valgt summeringsalgoritme-NAVN for melding"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Bruk: @GPGSM@ [valg] [filer] (-h for hjelp)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8377,46 -6726,37 +8526,46 @@@ msgstr "
  "Signer, kontroller, krypter eller dekrypter.\n"
  "Forvalgt handling avhenger av inndata.\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "Merk: det er ikke mulig å kryptere til «%s»: %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "«%s» er en ukjent kontrollmodell\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: vertsnavn mangler\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: passord skrevet inn uten brukernavn\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: hopper over denne linja\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
  msgstr "klarte ikke å tolke nøkkeltjener\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "importerer sertifikat «%s»\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "klarte ikke å signere med «%s»: %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr "ugyldig kommando (implisitt kommando finnes ikke)\n"
  
@@@ -8433,7 -6770,6 +8582,7 @@@ msgstr "feil under lagring av sertifika
  msgid "basic certificate checks failed - not imported\n"
  msgstr "enkel sertifikatkontroll mislyktes. Ikke importert\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "feil under henting av lagrede valg: %s\n"
@@@ -8448,31 -6782,25 +8597,31 @@@ msgstr "feil under importering av serti
  msgid "error reading input: %s\n"
  msgstr "feil under lesing av inndata: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
  msgstr "klarte ikke å hente fingeravtrykk\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr "klarte ikke å søke etter sertifikat: %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "feil under søk etter skrivbar nøkkeldatabase: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
  msgstr "feil under lagring av sertifikat: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "det oppstod en feil under nytt søk etter sertifikat: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
  msgstr "feil under lagring av valg: %s\n"
@@@ -9342,109 -7493,85 +9491,113 @@@ msgstr "forventet fullstendig filsti\n
  msgid "looking up '%s'\n"
  msgstr "slår opp «%s»\n"
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr "vis innhold i CRL-hurtiglager"
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FIL|last inn CRL fra valgt FIL i hurtiglager"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr "|ADR|hent CRL fra valgt nettADResse"
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr "slå av dirmngr"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr "tøm hurtiglager"
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  msgid "run without asking a user"
  msgstr "kjør uten å spørre bruker"
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr "tving innlasting av utdatert CRL"
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr "tillat sending av OCSP-forespørsler"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr "hindre bruk av HTTP"
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr "hindre bruk av LDAP"
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr "ignorer HTTP CRL-distribusjonspunkter"
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr "ignorer LDAP CRL-distribusjonspunkter"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|ADR|videresend alle HTTP-forespørsler til valgt nettADResse"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|VERT|bruk valgt VERT til LDAP-oppslag"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "ikke bruk tilbakefallsverter ved bruk av valget «--ldap-proxy»"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FIL|les LDAP-tjenerliste fra valgt FIL"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  "legg til tjenere i tjenerliste som blir oppdaget via CRL-distribusjonspunkter"
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|endre LDAP-tidsavbrudd til N antall sekunder"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  msgid "|URL|use OCSP responder at URL"
  msgstr "|ADR|bruk OCSP-svartjeneste ved valgt nettADResse"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|OCSP-svartjeneste signert av FPR"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|ikke vis flere enn N antall elementer per spørring"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|FIL|bruk CA-sertifikater i valgt FIL til HKP via TLS"
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr "kjør all nettverkstrafikk gjennom Tor"
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9453,11 -7580,9 +9606,11 @@@ msgstr "
  "@\n"
  "Se «info»-bruksanvisning for fullstendig liste over alle kommandoer og valg\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Bruk: @DIRMNGR@ [valg] (-h for hjelp)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9465,77 -7590,60 +9618,77 @@@ msgstr "
  "Syntaks: @DIRMNGR@ [valg] [kommando [arg]]\n"
  "Tilgang til nøkkeltjener, CRL og OCSP for @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, c-format
  msgid "usage: %s [options] "
  msgstr "bruk: %s [valg] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  msgid "colons are not allowed in the socket name\n"
  msgstr "kolon tillates ikke i sokkelnavn\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "henting av CRL fra «%s» mislyktes: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: for lang linje. Hoppet over\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: lesefeil: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: ignorerer ugyldige data ved linjeslutt\n"
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr "SIGHUP mottatt. Leser inn oppsett på nytt og tømmer hurtiglagre\n"
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "SIGTERM mottatt. Slår av …\n"
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  msgid "shutdown forced\n"
  msgstr "slår av under tvang\n"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "SIGINT mottatt. Slår av umiddelbart\n"
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "signal %d mottatt. Ingen handling definert\n"
@@@ -9705,13 -7777,6 +9858,7 @@@ msgstr "«%s» er ikke en LDAP-adresse\
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr "«%s» er en ugyldig LDAP-adresse\n"
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, c-format
- msgid "error allocating memory: %s\n"
- msgstr "feil under minnetildeling: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, c-format
  msgid "error printing log line: %s\n"
  msgstr "feil under utskrift av logglinje: %s\n"
@@@ -9960,76 -7973,60 +10107,76 @@@ msgstr "OCSP-svartjeneste sendte statu
  msgid "OCSP responder returned an too old status\n"
  msgstr "OCSP-svartjeneste sendte for gammel status\n"
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "«assuan_inquire»(%s) mislyktes: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr "ldapserver mangler"
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr "serienummer mangler i sertifikat-ID"
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "«assuan_inquire» mislyktes: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "«fetch_cert_by_url» mislyktes: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "feil under sending av data: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "«start_cert_fetch» mislyktes: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "«fetch_next_cert» mislyktes: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d overskredet\n"
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "klarte ikke å starte opp tjener: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "Assuan-godkjenningsproblem: %s\n"
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "Assuan-behandling mislyktes: %s\n"
@@@ -10071,7 -8059,6 +10218,7 @@@ msgstr "DSA krever kontrollsum på 160 
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "sertifikat skulle ikke vært brukt til CRL-signering\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "stille"
  
@@@ -10240,11 -8186,9 +10387,11 @@@ msgstr "|NAVN|krypter også til valgt b
  msgid "|SPEC|set up email aliases"
  msgstr "|SPES|sett opp e-post-alias"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr "Oppsett for nøkkeltjenere"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
  msgstr "|ADR|bruk nøkkeltjener på valgt nettADResse"
  
@@@ -10276,128 -8213,112 +10423,144 @@@ msgstr "Valg som styrer utdata-format
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Valg som styrer grensesnitt og håndheving av regler"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr "Valg som styrer bruk av Tor"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr "Oppsett for HTTP-tjenere"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr "bruk systemets innstilling for HTTP-mellomtjener"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr "Oppsett for bruk av LDAP-tjenere"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr "LDAP-tjenerliste"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr "Oppsett for OCSP"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ #, fuzzy
+ #| msgid "GPG for OpenPGP"
+ msgid "OpenPGP"
  msgstr "GPG for OpenPGP"
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
- msgstr "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
+ msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ #, fuzzy
+ #| msgid "Smartcard Daemon"
+ msgid "Smartcards"
  msgstr "Smartcard-bakgrunnsprosess"
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ #, fuzzy
+ #| msgid "GPG for S/MIME"
+ msgid "S/MIME"
  msgstr "GPG for S/MIME"
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr "Nøkkelhenter"
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "nettverksfeil"
  
- #: tools/gpgconf-comp.c:1068
- msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1071
+ #, fuzzy
+ #| msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "Skriving av PIN og passordfrase"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  msgid "Component not suitable for launching"
  msgstr "Komponent egner seg ikke for oppstart"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Ekstern bekreftelse av komponent %s mislyktes"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr "vis alle komponenter"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr "kontroller alle programmer"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|KOMPONENT|vis valg"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|KOMPONENT|endre valg"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|KOMPONENT|kontroller valg"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr "bruk globale standardverdier"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "hent oppsettsmapper for @GPGCONF@"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
  msgstr "vis global oppsettsfil"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
  msgstr "kontroller global oppsettsfil"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "oppdater tillitsdatabase"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr "last inn én eller alle komponenter på nytt"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr "last inn valgt komponent"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr "drep valgt komponent"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "bruk som utdatafil"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr "ta i bruk endringer under kjøring, hvis mulig"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Bruk: @GPGCONF@ [valg] (-h for hjelp)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10405,15 -8326,12 +10568,15 @@@ msgstr "
  "Syntaks: @GPGCONF@ [valg]\n"
  "Behandle oppsettsvalg for verktøy i @GNUPG at -systemet\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "Komponent-argument mangler"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "Fant ikke komponent"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr "Ingen argumenter tillatt"
  
diff --cc po/pl.po
index bc55d69,6b77df7..8f8ae12
--- a/po/pl.po
+++ b/po/pl.po
@@@ -8,7 -8,6 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg-2.0.20\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2013-05-12 17:25+0200\n"
  "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
  "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@@ -19,10 -18,9 +19,10 @@@
  "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:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
- msgstr "nie uda�o si� uzyska� blokady pinentry: %s\n"
+ msgstr "nie udało się uzyskać blokady pinentry: %s\n"
  
  #. TRANSLATORS: These are labels for buttons etc used in
  #. Pinentries.  An underscore indicates that the next letter
@@@ -30,47 -28,38 +30,47 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|_Anuluj"
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|PIN:"
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  #, fuzzy
  #| msgid "|pinentry-label|_Cancel"
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|_Anuluj"
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to make your passphrase visible on the screen?"
- msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
+ msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "Enter new passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -78,9 -67,8 +78,9 @@@ msgstr "Wprowadź nowe hasło
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
- msgstr "Jako��:"
+ msgstr "Jakość:"
  
  #. TRANSLATORS: This string is a tooltip, shown by pinentry when
  #. hovering over the quality bar.  Please use an appropriate
@@@ -88,183 -76,128 +88,173 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
- "Jako�� wpisanego wy�ej tekstu.\n"
- "Kryteria jako�ci mo�na uzyska� od administratora."
+ "Jakość wpisanego wyżej tekstu.\n"
+ "Kryteria jakości można uzyskać od administratora."
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  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"
+ msgstr "Proszę wprowadzić swój PIN, żeby odblokować klucz tajny dla tej sesji"
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  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"
+ "Proszę wprowadzić swoje hasło, żeby odblokować klucz tajny dla tej sesji"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
- msgstr "Has�o:"
+ msgstr "Hasło:"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
- msgstr "nie pasuj� - prosz� spr�bowa� jeszcze raz"
+ msgstr "nie pasują - proszę spróbować jeszcze raz"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
- msgstr "SETERROR %s (pr�ba %d z %d)"
+ msgstr "SETERROR %s (próba %d z %d)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
- msgstr "PIN zbyt d�ugi"
+ msgstr "PIN zbyt długi"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
- msgstr "Has�o zbyt d�ugie"
+ msgstr "Hasło zbyt długie"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
- msgstr "Niew�a�ciwy znak w PIN-ie"
+ msgstr "Niewłaściwy znak w PIN-ie"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
- msgstr "PIN zbyt kr�tki"
+ msgstr "PIN zbyt krótki"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "Niepoprawny PIN"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
- msgstr "Niepoprawne has�o"
+ msgstr "Niepoprawne hasło"
  
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
  #, c-format
  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"
+ msgstr "klucze ssh większe niż %d bitów nie są obsługiwane\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
- msgstr "nie mo�na utworzy� ,,%s'': %s\n"
+ msgstr "nie można utworzyć ,,%s'': %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
- msgstr "nie mo�na otworzy� ,,%s'': %s\n"
+ msgstr "nie można otworzyć ,,%s'': %s\n"
  
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
  #, c-format
  msgid "error getting serial number of card: %s\n"
- msgstr "b��d pobierania numeru seryjnego karty: %s\n"
+ msgstr "błąd pobierania numeru seryjnego karty: %s\n"
  
 +#: agent/command-ssh.c:2419
  #, c-format
  msgid "detected card with S/N: %s\n"
- msgstr "wykryto kart� o numerze seryjnym: %s\n"
+ msgstr "wykryto kartę o numerze seryjnym: %s\n"
  
 +#: agent/command-ssh.c:2424
  #, fuzzy, c-format
  #| msgid "error getting default authentication keyID of card: %s\n"
  msgid "no authentication key for ssh on card: %s\n"
- msgstr "b��d pobierania domy�lnego keyID uwierzytelnienia karty: %s\n"
+ msgstr "błąd pobierania domyślnego keyID uwierzytelnienia karty: %s\n"
  
 +#: agent/command-ssh.c:2444
  #, c-format
  msgid "no suitable card key found: %s\n"
- msgstr "nie znaleziono pasuj�cego klucza karty: %s\n"
+ msgstr "nie znaleziono pasującego klucza karty: %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "zaciemnienie klucza nie powiod�o si�: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "b��d zapisu klucza: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
- "Proces ssh zarz�da� u�ycia klucza%%0a  %s%%0A  (%s)%%0ACzy zezwoli� na to?"
+ "Proces ssh zarządał użycia klucza%%0a  %s%%0A  (%s)%%0ACzy zezwolić na to?"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr "Zgoda"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr "Odmowa"
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
- msgstr "Prosz� wprowadzi� has�o dla klucza ssh%%0A  %F%%0A  (%c)"
+ msgstr "Proszę wprowadzić hasło dla klucza ssh%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
- msgstr "Prosz� ponownie wprowadzi� to has�o"
+ msgstr "Proszę ponownie wprowadzić to hasło"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr ""
- "Prosz� wprowadzi� has�o do zabezpieczenia odebranego klucza tajnego%%0A   %s"
+ "Proszę wprowadzić hasło do zabezpieczenia odebranego klucza tajnego%%0A   %s"
  "%%0A   %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
- msgstr "nie uda�o si� utworzy� strumienia z gniazda: %s\n"
+ msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
- msgstr "Prosz� w�o�y� kart� z numerem seryjnym"
+ msgstr "Proszę włożyć kartę z numerem seryjnym"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
- msgstr "Prosz� wyj�� obecn� kart� i w�o�y� kart� z numerem seryjnym"
+ msgstr "Proszę wyjąć obecną kartę i włożyć kartę z numerem seryjnym"
  
 +#: agent/divert-scd.c:204
  msgid "Admin PIN"
  msgstr "PIN administracyjny"
  
@@@ -274,59 -206,46 +264,59 @@@
  msgid "PUK"
  msgstr "PUK"
  
 +#: agent/divert-scd.c:216
  msgid "Reset Code"
- msgstr "Kod resetuj�cy"
+ msgstr "Kod resetujący"
  
 +#: agent/divert-scd.c:242
  #, c-format
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
- msgstr "%s%%0A%%0ADo wpisywania nale�y u�y� klawiatury czytnika."
+ msgstr "%s%%0A%%0ADo wpisywania należy użyć klawiatury czytnika."
  
 +#: agent/divert-scd.c:291
  msgid "Repeat this Reset Code"
- msgstr "Powt�rz ten kod resetuj�cy"
+ msgstr "Powtórz ten kod resetujący"
  
 +#: agent/divert-scd.c:293
  msgid "Repeat this PUK"
- msgstr "Powt�rz ten PUK"
+ msgstr "Powtórz ten PUK"
  
 +#: agent/divert-scd.c:294
  msgid "Repeat this PIN"
- msgstr "Powt�rz ten PIN"
+ msgstr "Powtórz ten PIN"
  
 +#: agent/divert-scd.c:299
  msgid "Reset Code not correctly repeated; try again"
- msgstr "Kod resetuj�cy nie powt�rzony poprawnie; spr�buj jeszcze raz"
+ msgstr "Kod resetujący nie powtórzony poprawnie; spróbuj jeszcze raz"
  
 +#: agent/divert-scd.c:301
  msgid "PUK not correctly repeated; try again"
- msgstr "PUK nie powt�rzony poprawnie; spr�buj jeszcze raz"
+ msgstr "PUK nie powtórzony poprawnie; spróbuj jeszcze raz"
  
 +#: agent/divert-scd.c:302
  msgid "PIN not correctly repeated; try again"
- msgstr "PIN nie powt�rzony poprawnie; spr�buj jeszcze raz"
+ msgstr "PIN nie powtórzony poprawnie; spróbuj jeszcze raz"
  
 +#: agent/divert-scd.c:314
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
- msgstr "Prosz� wprowadzi� PIN%s%s%s aby odblokowa� kart�"
+ msgstr "Proszę wprowadzić PIN%s%s%s aby odblokować kartę"
  
 +#: agent/genkey.c:110 sm/certreqgen-ui.c:394
  #, c-format
  msgid "error creating temporary file: %s\n"
- msgstr "b��d tworzenia pliku tymczasowego: %s\n"
+ msgstr "błąd tworzenia pliku tymczasowego: %s\n"
  
 +#: agent/genkey.c:117
  #, c-format
  msgid "error writing to temporary file: %s\n"
- msgstr "b��d zapisu do pliku tymczasowego: %s\n"
+ msgstr "błąd zapisu do pliku tymczasowego: %s\n"
  
 +#: agent/genkey.c:158 agent/genkey.c:164
  msgid "Enter new passphrase"
- msgstr "Wprowad� nowe has�o"
+ msgstr "Wprowadź nowe hasło"
  
 +#: agent/genkey.c:172
  msgid "Take this one anyway"
  msgstr "Przyjmij je mimo to"
  
@@@ -334,18 -252,16 +324,18 @@@
  #, c-format
  msgid ""
  "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
- msgstr "Nie wprowadzono has�a!%0APuste has�o nie jest dozwolone."
+ msgstr "Nie wprowadzono hasła!%0APuste hasło nie jest dozwolone."
  
 +#: agent/genkey.c:204
  #, c-format
  msgid ""
  "You have not entered a passphrase - this is in general a bad idea!%0APlease "
  "confirm that you do not want to have any protection on your key."
  msgstr ""
- "Nie wprowadzono has�a - to jest og�lnie z�y pomys�!%0AProsz� potwierdzi�, �e "
- "naprawd� ma nie by� �adnej ochrony tego klucza."
+ "Nie wprowadzono hasła - to jest ogólnie zły pomysł!%0AProszę potwierdzić, że "
+ "naprawdę ma nie być żadnej ochrony tego klucza."
  
 +#: agent/genkey.c:216
  msgid "Yes, protection is not needed"
  msgstr "Tak, ochrona nie jest potrzebna"
  
@@@ -354,11 -269,10 +344,11 @@@
  #| msgid "Name must be at least 5 characters long\n"
  msgid "A passphrase should be at least %u character long."
  msgid_plural "A passphrase should be at least %u characters long."
- msgstr[0] "Imi� i nazwisko musz� mie� co najmniej 5 znak�w d�ugo�ci.\n"
- msgstr[1] "Imi� i nazwisko musz� mie� co najmniej 5 znak�w d�ugo�ci.\n"
- msgstr[2] "Imi� i nazwisko musz� mie� co najmniej 5 znak�w d�ugo�ci.\n"
+ msgstr[0] "Imię i nazwisko muszą mieć co najmniej 5 znaków długości.\n"
+ msgstr[1] "Imię i nazwisko muszą mieć co najmniej 5 znaków długości.\n"
+ msgstr[2] "Imię i nazwisko muszą mieć co najmniej 5 znaków długości.\n"
  
 +#: agent/genkey.c:252
  #, fuzzy, c-format
  #| msgid ""
  #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@@ -370,26 -284,24 +360,26 @@@ msgid "A passphrase should contain at l
  msgid_plural ""
  "A passphrase should contain at least %u digits or%%0Aspecial characters."
  msgstr[0] ""
- "Uwaga: Wprowadzono has�o, kt�re nie jest bezpieczne.%%0AHas�o powinno mie� "
- "przynajmniej %u cyfr� lub%%0Aznak specjalny."
+ "Uwaga: Wprowadzono hasło, które nie jest bezpieczne.%%0AHasło powinno mieć "
+ "przynajmniej %u cyfrę lub%%0Aznak specjalny."
  msgstr[1] ""
- "Uwaga: Wprowadzono has�o, kt�re nie jest bezpieczne.%%0AHas�o powinno mie� "
+ "Uwaga: Wprowadzono hasło, które nie jest bezpieczne.%%0AHasło powinno mieć "
  "przynajmniej %u cyfry lub%%0Aznaki specjalne."
  msgstr[2] ""
- "Uwaga: Wprowadzono has�o, kt�re nie jest bezpieczne.%%0AHas�o powinno mie� "
- "przynajmniej %u cyfr lub%%0Aznak�w specjalnych."
+ "Uwaga: Wprowadzono hasło, które nie jest bezpieczne.%%0AHasło powinno mieć "
+ "przynajmniej %u cyfr lub%%0Aznaków specjalnych."
  
 +#: agent/genkey.c:278
  #, fuzzy, c-format
  #| msgid ""
  #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
  #| "be a known term or match%%0Acertain pattern."
  msgid "A passphrase may not be a known term or match%%0Acertain pattern."
  msgstr ""
- "Uwaga: Wprowadzono has�o, kt�re nie jest bezpieczne.%%0AHas�o nie mo�e by� "
- "znanym s�owem ani pasowa�%%0Ado okre�lonego wzorca."
+ "Uwaga: Wprowadzono hasło, które nie jest bezpieczne.%%0AHasło nie może być "
+ "znanym słowem ani pasować%%0Ado określonego wzorca."
  
 +#: agent/genkey.c:293
  #, fuzzy
  #| msgid ""
  #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@@ -399,20 -311,16 +389,20 @@@
  #| "be at least %u characters long."
  msgid "Warning: You have entered an insecure passphrase."
  msgstr ""
- "Uwaga: Wprowadzono has�o, kt�re nie jest bezpieczne.%%0AHas�o powinno mie� "
- "przynajmniej %u znak d�ugo�ci."
+ "Uwaga: Wprowadzono hasło, które nie jest bezpieczne.%%0AHasło powinno mieć "
+ "przynajmniej %u znak długości."
  
 +#: agent/genkey.c:480
  #, c-format
  msgid "Please enter the passphrase to%0Aprotect your new key"
- msgstr "Prosz� wprowadzi� has�o do%0Azabezpieczenia swojego nowego klucza"
+ msgstr "Proszę wprowadzić hasło do%0Azabezpieczenia swojego nowego klucza"
  
 +#: agent/genkey.c:606
  msgid "Please enter the new passphrase"
- msgstr "Prosz� wprowadzi� nowe has�o"
+ msgstr "Proszę wprowadzić nowe hasło"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -420,136 -328,103 +410,142 @@@ msgstr "
  "@Opcje:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "uruchomienie w trybie demona (w tle)"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "run in server mode"
+ msgid "run in supervised mode"
+ msgstr "uruchomienie w trybie serwera"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "z dodatkowymi informacjami"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
- msgstr "mniej komunikat�w"
+ msgstr "mniej komunikatów"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
- msgstr "wyj�cie polece� w stylu sh"
+ msgstr "wyjście poleceń w stylu sh"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
- msgstr "wyj�cie polece� w stylu csh"
+ msgstr "wyjście poleceń w stylu csh"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|PLIK|odczyt opcji z PLIKU"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "nie odczepianie od konsoli"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr "nie przechwytywanie klawiatury i myszy"
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
- msgstr "u�ycie pliku loga dla serwera"
+ msgstr "użycie pliku loga dla serwera"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
- msgstr "|PGM|u�ycie PGM jako programu do wprowadzania PIN-u"
+ msgstr "|PGM|użycie PGM jako programu do wprowadzania PIN-u"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
- msgstr "|PGM|u�ycie PGM jako programu SCdaemon"
+ msgstr "|PGM|użycie PGM jako programu SCdaemon"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
- msgstr "nie u�ywanie SCdaemona"
+ msgstr "nie używanie SCdaemona"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|connect to Assuan socket NAME"
  msgid "|NAME|accept some commands via NAME"
- msgstr "|NAZWA|po��czenie z gniazdem Assuan o tej nazwie"
+ msgstr "|NAZWA|połączenie z gniazdem Assuan o tej nazwie"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
- msgstr "ignorowanie ��da� zmiany TTY"
+ msgstr "ignorowanie żądań zmiany TTY"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
- msgstr "ignorowanie ��da� zmiany ekranu X"
+ msgstr "ignorowanie żądań zmiany ekranu X"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
- msgstr "|N|przedawnienie pami�tanych PIN-�w po N sekundach"
+ msgstr "|N|przedawnienie pamiętanych PIN-ów po N sekundach"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
- msgstr "nie u�ywanie pami�ci PIN-�w przy podpisywaniu"
+ msgstr "nie używanie pamięci PIN-ów przy podpisywaniu"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  #| msgid "do not allow the reuse of old passphrases"
  msgid "disallow the use of an external password cache"
- msgstr "nie zezwalanie na ponowne u�ycie starych hase�"
+ msgstr "nie zezwalanie na ponowne użycie starych haseł"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  #, fuzzy
  #| msgid "allow clients to mark keys as \"trusted\""
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
- msgstr "zezwolenie na predefiniowane has�o"
+ msgstr "zezwolenie na predefiniowane hasło"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  msgid "enable ssh support"
  msgstr ""
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
  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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
- msgstr "B��dy prosimy zg�asza� na adres <@EMAIL@>.\n"
+ msgstr "Błędy prosimy zgłaszać na adres <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
- msgstr "Wywo�anie: gpgconf [opcje] (-h podaje pomoc)"
+ msgstr "Wywołanie: gpgconf [opcje] (-h podaje pomoc)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -558,170 -433,131 +554,170 @@@ msgid "
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
- "Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
- "Zarz�dzanie kluczem tajnym dla GnuPG\n"
+ "Składnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
+ "Zarządzanie kluczem tajnym dla GnuPG\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "invalid debug-level '%s' given\n"
- msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
+ msgstr "podano błędny poziom diagnostyki ,,%s''\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
- msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
+ msgstr "UWAGA: brak domyślnego pliku opcji ,,%s''\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "plik opcji ,,%s'': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "odczyt opcji z ,,%s''\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
- msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
+ msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
- msgstr "nie mo�na utworzy� gniazda: %s\n"
+ msgstr "nie można utworzyć gniazda: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, fuzzy, c-format
  #| msgid "socket name `%s' is too long\n"
  msgid "socket name '%s' is too long\n"
- msgstr "nazwa gniazda `%s' zbyt d�uga\n"
+ msgstr "nazwa gniazda `%s' zbyt długa\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  msgid "a gpg-agent is already running - not starting a new one\n"
- msgstr "gpg-agent ju� dzia�a - nie uruchamianie nowego\n"
+ msgstr "gpg-agent już działa - nie uruchamianie nowego\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
- msgstr "b��d podczas pobierania nonce z gniazda\n"
+ msgstr "błąd podczas pobierania nonce z gniazda\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error binding socket to '%s': %s\n"
- msgstr "b��d podczas przypisywania gniazda do ,,%s'': %s\n"
+ msgstr "błąd podczas przypisywania gniazda do ,,%s'': %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgid "can't set permissions of '%s': %s\n"
- msgstr "Ostrze�enie: niebezpieczne prawa dost�pu do %s ,,%s''\n"
+ msgstr "Ostrzeżenie: niebezpieczne prawa dostępu do %s ,,%s''\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
- msgstr "listen() nie powiod�o si�: %s\n"
+ msgstr "listen() nie powiodło się: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
- msgstr "nas�uchiwanie na gnie�dzie ,,%s''\n"
+ msgstr "nasłuchiwanie na gnieździe ,,%s''\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
- msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
+ msgstr "nie można utworzyć katalogu ,,%s'': %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "katalog ,,%s'' utworzony\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  #| msgid "stat() failed for `%s': %s\n"
  msgid "stat() failed for '%s': %s\n"
- msgstr "stat() nie powiod�o si� dla ,,%s'': %s\n"
+ msgstr "stat() nie powiodło się dla ,,%s'': %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  #| msgid "can't use `%s' as home directory\n"
  msgid "can't use '%s' as home directory\n"
- msgstr "nie mo�na u�y� ,,%s'' jako katalogu domowego\n"
+ msgstr "nie można użyć ,,%s'' jako katalogu domowego\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
- msgstr "b��d odczytu nonce z fd %d: %s\n"
+ msgstr "błąd odczytu nonce z fd %d: %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
- msgstr "obs�uga 0x%lx dla fd %d uruchomiona\n"
+ msgstr "obsługa 0x%lx dla fd %d uruchomiona\n"
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
- msgstr "obs�uga 0x%lx dla fd %d zako�czona\n"
+ msgstr "obsługa 0x%lx dla fd %d zakończona\n"
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
- msgstr "obs�uga ssh 0x%lx dla fd %d uruchomiona\n"
+ msgstr "obsługa ssh 0x%lx dla fd %d uruchomiona\n"
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
- msgstr "obs�uga ssh 0x%lx dla fd %d zako�czona\n"
+ msgstr "obsługa ssh 0x%lx dla fd %d zakończona\n"
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  #| msgid "pth_select failed: %s - waiting 1s\n"
  msgid "npth_pselect failed: %s - waiting 1s\n"
- msgstr "pth_select nie powiod�o si�: %s - czekanie 1s\n"
+ msgstr "pth_select nie powiodło się: %s - czekanie 1s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s zatrzymany\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
- msgstr "brak dzia�aj�cego gpg-agenta w tej sesji\n"
+ msgstr "brak działającego gpg-agenta w tej sesji\n"
  
 +#: agent/preset-passphrase.c:99
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
  msgstr ""
- "Wywo�anie: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA (-h podaje pomoc)\n"
+ "Wywołanie: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA (-h podaje pomoc)\n"
  
 +#: agent/preset-passphrase.c:102
  msgid ""
  "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
  "Password cache maintenance\n"
  msgstr ""
- "Sk�adnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
- "Utrzymuwanie pami�ci hase�\n"
+ "Składnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
+ "Utrzymuwanie pamięci haseł\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -729,9 -565,6 +725,9 @@@ msgstr "
  "@Polecenia:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -741,57 -574,47 +737,58 @@@ msgstr "
  "Opcje:\n"
  " "
  
 +#: agent/protect-tool.c:154
  msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
- msgstr "Wywo�anie: gpg-protect-tool [opcje] (-h podaje pomoc)\n"
+ msgstr "Wywołanie: gpg-protect-tool [opcje] (-h podaje pomoc)\n"
  
 +#: agent/protect-tool.c:156
  msgid ""
  "Syntax: gpg-protect-tool [options] [args]\n"
  "Secret key maintenance tool\n"
  msgstr ""
- "Sk�adnia: gpg-protect-tool [opcje] [argumenty]\n"
- "Narz�dzie do utrzymywania kluczy tajnych\n"
+ "Składnia: gpg-protect-tool [opcje] [argumenty]\n"
+ "Narzędzie do utrzymywania kluczy tajnych\n"
  
 +#: agent/protect-tool.c:693
  msgid "Please enter the passphrase to unprotect the PKCS#12 object."
- msgstr "Prosz� wprowadzi� has�o do odbezpieczenia obiektu PKCS#12."
+ msgstr "Proszę wprowadzić hasło do odbezpieczenia obiektu PKCS#12."
  
 +#: agent/protect-tool.c:698
  msgid "Please enter the passphrase to protect the new PKCS#12 object."
- msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
+ msgstr "Proszę wprowadzić hasło do zabezpieczenia obiektu PKCS#12."
  
 +#: agent/protect-tool.c:704
  msgid ""
  "Please enter the passphrase to protect the imported object within the GnuPG "
  "system."
  msgstr ""
- "Prosz� wprowadzi� has�o do zabezpieczenia wa�nego obiektu w systemie GnuPG."
+ "Proszę wprowadzić hasło do zabezpieczenia ważnego obiektu w systemie GnuPG."
  
 +#: agent/protect-tool.c:709
  msgid ""
  "Please enter the passphrase or the PIN\n"
  "needed to complete this operation."
  msgstr ""
- "Prosz� wprowadzi� has�o lub PIN\n"
- "Potrzebny do zako�czenia tej operacji."
+ "Proszę wprowadzić hasło lub PIN\n"
+ "Potrzebny do zakończenia tej operacji."
  
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
  msgid "cancelled\n"
  msgstr "anulowano\n"
  
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
  #, c-format
  msgid "error while asking for the passphrase: %s\n"
- msgstr "b��d podczas pytania o has�o: %s\n"
+ msgstr "błąd podczas pytania o hasło: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
- msgstr "b��d podczas otwierania ,,%s'': %s\n"
+ msgstr "błąd podczas otwierania ,,%s'': %s\n"
  
 +#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
  #, fuzzy, c-format
  #| msgid "file `%s', line %d: %s\n"
  msgid "file '%s', line %d: %s\n"
@@@ -807,29 -628,25 +804,29 @@@ msgstr "instrukcja \"%s\" zignorowana 
  #, fuzzy, c-format
  #| msgid "system trustlist `%s' not available\n"
  msgid "system trustlist '%s' not available\n"
- msgstr "systemowa lista zaufania ,,%s'' niedost�pna\n"
+ msgstr "systemowa lista zaufania ,,%s'' niedostępna\n"
  
 +#: agent/trustlist.c:250
  #, fuzzy, c-format
  #| msgid "bad fingerprint in `%s', line %d\n"
  msgid "bad fingerprint in '%s', line %d\n"
- msgstr "b��dny odcisk w ,,%s'', w linii %d\n"
+ msgstr "błędny odcisk w ,,%s'', w linii %d\n"
  
 +#: agent/trustlist.c:275 agent/trustlist.c:282
  #, fuzzy, c-format
  #| msgid "invalid keyflag in `%s', line %d\n"
  msgid "invalid keyflag in '%s', line %d\n"
- msgstr "nieprawid�owa flaga klucza w ,,%s'', w linii %d\n"
+ msgstr "nieprawidłowa flaga klucza w ,,%s'', w linii %d\n"
  
 +#: agent/trustlist.c:316 common/helpfile.c:136
  #, fuzzy, c-format
  #| msgid "error reading `%s', line %d: %s\n"
  msgid "error reading '%s', line %d: %s\n"
- msgstr "b��d odczytu ,,%s'', w linii %d: %s\n"
+ msgstr "błąd odczytu ,,%s'', w linii %d: %s\n"
  
 +#: agent/trustlist.c:434 agent/trustlist.c:503
  msgid "error reading list of trusted root certificates\n"
- msgstr "b��d odczytu listy zaufanych certyfikat�w g��wnych\n"
+ msgstr "błąd odczytu listy zaufanych certyfikatów głównych\n"
  
  #. TRANSLATORS: This prompt is shown by the Pinentry
  #. and has one special property: A "%%0A" is used by
@@@ -845,15 -661,12 +842,15 @@@ msgid "
  "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
  "certificates?"
  msgstr ""
- "Czy absolutnie ufasz, �e%%0A  ,,%s''%%0Apoprawnie po�wiadcza certyfikaty "
- "u�ytkownik�w?"
+ "Czy absolutnie ufasz, że%%0A  ,,%s''%%0Apoprawnie poświadcza certyfikaty "
+ "użytkowników?"
  
 +#: agent/trustlist.c:673 common/audit.c:467
  msgid "Yes"
  msgstr "Tak"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "Nie"
  
@@@ -881,175 -692,149 +878,188 @@@ msgstr "
  msgid "Correct"
  msgstr "Akceptuj"
  
 +#: agent/trustlist.c:721
  msgid "Wrong"
- msgstr "Odrzu�"
+ msgstr "Odrzuć"
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
- msgstr "Uwaga: To has�o nie by�o nigdy zmieniane.%0AProsz� zmieni� je teraz."
+ msgstr "Uwaga: To hasło nie było nigdy zmieniane.%0AProszę zmienić je teraz."
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
- "To has�o nie zosta�o zmienione%%0Aod %.4s-%.2s-%.2s. Prosz� zmieni� je teraz."
+ "To hasło nie zostało zmienione%%0Aod %.4s-%.2s-%.2s. Proszę zmienić je teraz."
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
- msgstr "Zmiana has�a"
+ msgstr "Zmiana hasła"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
- msgstr "Zmieni� je p�niej"
+ msgstr "Zmienię je później"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
- msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
+ msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
- msgstr "w��czenie klucza do u�ycia"
+ msgstr "włączenie klucza do użycia"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
  msgstr ""
  
 +#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
  msgid "DSA requires the hash length to be a multiple of 8 bits\n"
- msgstr "DSA wymaga d�ugo�ci skr�tu b�d�cego wielokrotno�ci� 8 bit�w\n"
+ msgstr "DSA wymaga długości skrótu będącego wielokrotnością 8 bitów\n"
  
 +#: agent/pksign.c:187 sm/certcheck.c:97
  #, c-format
  msgid "%s key uses an unsafe (%u bit) hash\n"
- msgstr "Klucz %s u�ywa niebezpiecznego (%u-bitowego) skr�tu\n"
+ msgstr "Klucz %s używa niebezpiecznego (%u-bitowego) skrótu\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, fuzzy, c-format
  #| msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
- msgstr "skr�t %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
+ msgstr "skrót %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
- msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
+ msgstr "sprawdzenie złożonego podpisu nie powiodło się: %s\n"
  
 +#: agent/cvt-openpgp.c:338
  msgid "secret key parts are not available\n"
- msgstr "tajne cz�ci klucza s� niedost�pne\n"
+ msgstr "tajne części klucza są niedostępne\n"
  
 +#: agent/cvt-openpgp.c:344
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "public key algorithm %d (%s) is not supported\n"
- msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
+ msgstr "algorytm ochrony %d%s nie jest obsługiwany\n"
  
 +#: agent/cvt-openpgp.c:448
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection algorithm %d (%s) is not supported\n"
- msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
+ msgstr "algorytm ochrony %d%s nie jest obsługiwany\n"
  
 +#: agent/cvt-openpgp.c:455
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection hash algorithm %d (%s) is not supported\n"
- msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
+ msgstr "algorytm ochrony %d%s nie jest obsługiwany\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
- msgstr "b��d tworzenia potoku: %s\n"
+ msgstr "błąd tworzenia potoku: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error creating a stream for a pipe: %s\n"
- msgstr "b��d tworzenia potoku: %s\n"
+ msgstr "błąd tworzenia potoku: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
- msgstr "b��d podczas tworzenia procesu: %s\n"
+ msgstr "błąd podczas tworzenia procesu: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- #| msgid "waiting for process %d to terminate failed: %s\n"
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "oczekiwanie na zako�czenie procesu %d nie powiod�o si�: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "oczekiwanie na zakończenie procesu %d nie powiodło się: %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  #| msgid "error running `%s': probably not installed\n"
  msgid "error running '%s': probably not installed\n"
- msgstr "b��d uruchamiania ,,%s'': prawdopodobnie nie zainstalowany\n"
+ msgstr "błąd uruchamiania ,,%s'': prawdopodobnie nie zainstalowany\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error running '%s': exit status %d\n"
- msgstr "b��d uruchamiania ,,%s'': kod wyj�cia %d\n"
+ msgstr "błąd uruchamiania ,,%s'': kod wyjścia %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  #| msgid "error running `%s': terminated\n"
  msgid "error running '%s': terminated\n"
- msgstr "b��d uruchamiania ,,%s'': zako�czono\n"
+ msgstr "błąd uruchamiania ,,%s'': zakończono\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
- #, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "b��d odczytu kodu zako�czenia procesu %d: %s\n"
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "oczekiwanie na zakończenie procesu %d nie powiodło się: %s\n"
  
- #: common/exechelp-w32ce.c:767
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "oczekiwanie na zako�czenie procesu %d nie powiod�o si�: %s\n"
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "błąd odczytu kodu zakończenia procesu %d: %s\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
- msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
+ msgstr "nie można się połączyć z ,,%s'': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "problem z ustawieniem opcji gpg-agenta\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
- msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
+ msgstr "nie można wyłączyć zrzutów pamięci: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
- msgstr "Ostrze�enie: niebezpieczne prawa w�asno�ci do %s ,,%s''\n"
+ msgstr "Ostrzeżenie: niebezpieczne prawa własności do %s ,,%s''\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
- msgstr "Ostrze�enie: niebezpieczne prawa dost�pu do %s ,,%s''\n"
+ msgstr "Ostrzeżenie: niebezpieczne prawa dostępu do %s ,,%s''\n"
+ 
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ #| msgid "waiting %d seconds for the agent to come up\n"
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "oczekiwanie (%d s) na uruchomienie agenta\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ #| msgid "renaming `%s' to `%s' failed: %s\n"
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "tak"
  
@@@ -1067,11 -849,9 +1077,11 @@@ msgid "nN
  msgstr "nN"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:86
  msgid "quit"
- msgstr "wyj�cie"
+ msgstr "wyjście"
  
 +#: common/yesno.c:89
  msgid "qQ"
  msgstr "wW"
  
@@@ -1093,72 -869,59 +1103,72 @@@ msgstr "oO
  msgid "cC"
  msgstr "aA"
  
 +#: common/miscellaneous.c:86
  #, c-format
  msgid "out of core in secure memory while allocating %lu bytes"
- msgstr "brak miejsca w bezpiecznej pami�ci podczas przydzielania %lu bajt�w"
+ msgstr "brak miejsca w bezpiecznej pamięci podczas przydzielania %lu bajtów"
  
 +#: common/miscellaneous.c:89
  #, c-format
  msgid "out of core while allocating %lu bytes"
- msgstr "brak miejsca podczas przydzielania %lu bajt�w"
+ msgstr "brak miejsca podczas przydzielania %lu bajtów"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
- msgstr "b��d przydzielania wystarczaj�cej ilo�ci pami�ci: %s\n"
+ msgstr "błąd przydzielania wystarczającej ilości pamięci: %s\n"
  
 +#: common/miscellaneous.c:143
  #, c-format
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
- msgstr "%s:%u: przestarza�a opcja ,,%s'' - nie ma efektu\n"
+ msgstr "%s:%u: przestarzała opcja ,,%s'' - nie ma efektu\n"
  
 +#: common/miscellaneous.c:146
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
- msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj� - nie ma efektu\n"
+ msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją - nie ma efektu\n"
  
 +#: common/miscellaneous.c:554
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, fuzzy, c-format
  #| msgid "no running gpg-agent - starting one\n"
  msgid "no running gpg-agent - starting '%s'\n"
- msgstr "gpg-agent nie dzia�a - uruchamianie\n"
+ msgstr "gpg-agent nie działa - uruchamianie\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, fuzzy, c-format
  #| msgid "waiting %d seconds for the agent to come up\n"
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr "oczekiwanie (%d s) na uruchomienie agenta\n"
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  #| msgid "can't connect to the dirmngr - trying fall back\n"
  msgid "connection to agent is in restricted mode\n"
- msgstr "nie mo�na po��czy� si� z dirmngr - pr�ba fallbacku\n"
+ msgstr "nie można połączyć się z dirmngr - próba fallbacku\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, fuzzy, c-format
  #| msgid "no running dirmngr - starting `%s'\n"
  msgid "no running Dirmngr - starting '%s'\n"
- msgstr "dirmngr nie dzia�a - uruchamianie ,,%s''\n"
+ msgstr "dirmngr nie działa - uruchamianie ,,%s''\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, fuzzy, c-format
  #| msgid "waiting %d seconds for the agent to come up\n"
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr "oczekiwanie (%d s) na uruchomienie agenta\n"
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  #, fuzzy
  #| msgid "can't connect to the dirmngr - trying fall back\n"
  msgid "connection to the dirmngr established\n"
@@@ -1170,59 -932,45 +1180,59 @@@ msgstr "nie można połączyć się z d
  msgid "|audit-log-result|Good"
  msgstr "|audit-log-result|Dobry"
  
 +#: common/audit.c:477
  msgid "|audit-log-result|Bad"
- msgstr "|audit-log-result|Z�y"
+ msgstr "|audit-log-result|Zły"
  
 +#: common/audit.c:479
  msgid "|audit-log-result|Not supported"
- msgstr "|audit-log-result|Nieobs�ugiwany"
+ msgstr "|audit-log-result|Nieobsługiwany"
  
 +#: common/audit.c:481
  msgid "|audit-log-result|No certificate"
  msgstr "|audit-log-result|Brak certyfikatu"
  
 +#: common/audit.c:483
  msgid "|audit-log-result|Not enabled"
- msgstr "|audit-log-result|Nie w��czony"
+ msgstr "|audit-log-result|Nie włączony"
  
 +#: common/audit.c:485
  msgid "|audit-log-result|Error"
- msgstr "|audit-log-result|B��d"
+ msgstr "|audit-log-result|Błąd"
  
 +#: common/audit.c:487
  msgid "|audit-log-result|Not used"
- msgstr "|audit-log-result|Nie u�ywany"
+ msgstr "|audit-log-result|Nie używany"
  
 +#: common/audit.c:489
  msgid "|audit-log-result|Okay"
  msgstr "|audit-log-result|OK"
  
 +#: common/audit.c:491
  msgid "|audit-log-result|Skipped"
- msgstr "|audit-log-result|Pomini�to"
+ msgstr "|audit-log-result|Pominięto"
  
 +#: common/audit.c:493
  msgid "|audit-log-result|Some"
- msgstr "|audit-log-result|Cz�ciowo"
+ msgstr "|audit-log-result|Częściowo"
  
 +#: common/audit.c:726
  msgid "Certificate chain available"
- msgstr "�a�cuch certyfikat�w dost�pny"
+ msgstr "Łańcuch certyfikatów dostępny"
  
 +#: common/audit.c:733
  msgid "root certificate missing"
- msgstr "brak certyfikatu g��wnego"
+ msgstr "brak certyfikatu głównego"
  
 +#: common/audit.c:759
  msgid "Data encryption succeeded"
- msgstr "Szyfrowanie danych zako�czone"
+ msgstr "Szyfrowanie danych zakończone"
  
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
  msgid "Data available"
- msgstr "Dane dost�pne"
+ msgstr "Dane dostępne"
  
 +#: common/audit.c:767
  msgid "Session key created"
  msgstr "Klucz sesji utworzony"
  
@@@ -1231,103 -978,79 +1241,103 @@@
  msgid "algorithm: %s"
  msgstr "algorytm: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
- msgstr "nieobs�ugiwany algorytm: %s"
+ msgstr "nieobsługiwany algorytm: %s"
  
 +#: common/audit.c:778 common/audit.c:925
  msgid "seems to be not encrypted"
- msgstr "nie wygl�da na zaszyfrowan� wiadomo��"
+ msgstr "nie wygląda na zaszyfrowaną wiadomość"
  
 +#: common/audit.c:784 common/audit.c:933
  msgid "Number of recipients"
- msgstr "Liczba odbiorc�w"
+ msgstr "Liczba odbiorców"
  
 +#: common/audit.c:792 common/audit.c:956
  #, c-format
  msgid "Recipient %d"
  msgstr "Odbiorca %d"
  
 +#: common/audit.c:825
  msgid "Data signing succeeded"
- msgstr "Podpisywanie danych zako�czone"
+ msgstr "Podpisywanie danych zakończone"
  
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
  #, c-format
  msgid "data hash algorithm: %s"
- msgstr "algorytm skr�tu danych: %s"
+ msgstr "algorytm skrótu danych: %s"
  
 +#: common/audit.c:862
  #, c-format
  msgid "Signer %d"
- msgstr "Podpisuj�cy %d"
+ msgstr "Podpisujący %d"
  
 +#: common/audit.c:866 common/audit.c:1065
  #, c-format
  msgid "attr hash algorithm: %s"
- msgstr "algorytm skr�tu atrybut�w: %s"
+ msgstr "algorytm skrótu atrybutów: %s"
  
 +#: common/audit.c:901
  msgid "Data decryption succeeded"
- msgstr "Odszyfrowywanie danych zako�czone"
+ msgstr "Odszyfrowywanie danych zakończone"
  
 +#: common/audit.c:910
  msgid "Encryption algorithm supported"
- msgstr "Algorytm szyfrowania obs�ugiwany"
+ msgstr "Algorytm szyfrowania obsługiwany"
  
 +#: common/audit.c:993
  msgid "Data verification succeeded"
- msgstr "Weryfikacja danych zako�czona"
+ msgstr "Weryfikacja danych zakończona"
  
 +#: common/audit.c:1002
  msgid "Signature available"
- msgstr "Podpis dost�pny"
+ msgstr "Podpis dostępny"
  
 +#: common/audit.c:1024
  msgid "Parsing data succeeded"
- msgstr "Analiza danych zako�czona"
+ msgstr "Analiza danych zakończona"
  
 +#: common/audit.c:1036
  #, c-format
  msgid "bad data hash algorithm: %s"
- msgstr "niew�a�ciwy algorytm skr�tu danych: %s"
+ msgstr "niewłaściwy algorytm skrótu danych: %s"
  
 +#: common/audit.c:1051
  #, c-format
  msgid "Signature %d"
  msgstr "Podpis %d"
  
 +#: common/audit.c:1079
  msgid "Certificate chain valid"
- msgstr "�a�cuch certyfikat�w poprawny"
+ msgstr "Łańcuch certyfikatów poprawny"
  
 +#: common/audit.c:1090
  msgid "Root certificate trustworthy"
- msgstr "Certyfikat g��wny jest zaufany"
+ msgstr "Certyfikat główny jest zaufany"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "nie znaleziono CRL dla certyfikatu"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
- msgstr "dost�pny CRL jest zbyt stary"
+ msgstr "dostępny CRL jest zbyt stary"
  
 +#: common/audit.c:1119
  msgid "CRL/OCSP check of certificates"
- msgstr "weryfikacja CRL/OCSP certyfikat�w"
+ msgstr "weryfikacja CRL/OCSP certyfikatów"
  
 +#: common/audit.c:1139
  msgid "Included certificates"
- msgstr "Do��czone certyfikaty"
+ msgstr "Dołączone certyfikaty"
  
 +#: common/audit.c:1194
  msgid "No audit log entries."
- msgstr "Brak wpis�w w logu."
+ msgstr "Brak wpisów w logu."
  
 +#: common/audit.c:1243
  msgid "Unknown operation"
  msgstr "Nieznana operacja"
  
@@@ -1345,11 -1065,9 +1355,11 @@@ msgstr "Dirmngr sprawny
  msgid "No help available for '%s'."
  msgstr "Brak pomocy dla ,,%s''."
  
 +#: common/helpfile.c:90
  msgid "ignoring garbage line"
- msgstr "zignorowano b��dn� lini�"
+ msgstr "zignorowano błędną linię"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[brak]"
  
@@@ -1357,15 -1074,12 +1367,15 @@@
  msgid "argument not expected"
  msgstr "nieoczekiwany argument"
  
 +#: common/argparse.c:367
  msgid "read error"
- msgstr "b��d odczytu"
+ msgstr "błąd odczytu"
  
 +#: common/argparse.c:369
  msgid "keyword too long"
- msgstr "s�owo kluczowe zbyt d�ugie"
+ msgstr "słowo kluczowe zbyt długie"
  
 +#: common/argparse.c:371
  msgid "missing argument"
  msgstr "brak argumentu"
  
@@@ -1373,25 -1086,20 +1383,25 @@@
  #, fuzzy
  #| msgid "invalid value\n"
  msgid "invalid argument"
- msgstr "niepoprawna warto��\n"
+ msgstr "niepoprawna wartość\n"
  
 +#: common/argparse.c:375
  msgid "invalid command"
- msgstr "b��dne polecenie"
+ msgstr "błędne polecenie"
  
 +#: common/argparse.c:377
  msgid "invalid alias definition"
- msgstr "b��dna definicja aliasu"
+ msgstr "błędna definicja aliasu"
  
 +#: common/argparse.c:379
  msgid "out of core"
- msgstr "brak pami�ci"
+ msgstr "brak pamięci"
  
 +#: common/argparse.c:381
  msgid "invalid option"
- msgstr "b��dna opcja"
+ msgstr "błędna opcja"
  
 +#: common/argparse.c:389
  #, c-format
  msgid "missing argument for option \"%.50s\"\n"
  msgstr "brak argumentu dla opcji ,,%.50s''\n"
@@@ -1402,17 -1109,14 +1412,17 @@@
  msgid "invalid argument for option \"%.50s\"\n"
  msgstr "brak argumentu dla opcji ,,%.50s''\n"
  
 +#: common/argparse.c:393
  #, c-format
  msgid "option \"%.50s\" does not expect an argument\n"
- msgstr "opcja ,,%.50s'' nie mo�e mie� argument�w\n"
+ msgstr "opcja ,,%.50s'' nie może mieć argumentów\n"
  
 +#: common/argparse.c:395
  #, c-format
  msgid "invalid command \"%.50s\"\n"
- msgstr "b��dne polecenie ,,%.50s''\n"
+ msgstr "błędne polecenie ,,%.50s''\n"
  
 +#: common/argparse.c:397
  #, c-format
  msgid "option \"%.50s\" is ambiguous\n"
  msgstr "opcja ,,%.50s'' jest niejednoznaczna\n"
@@@ -1422,55 -1125,45 +1432,55 @@@
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "polecenie ,,%.50s'' jest niejednoznaczne\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
- msgstr "brak pami�ci\n"
+ msgstr "brak pamięci\n"
  
 +#: common/argparse.c:403
  #, c-format
  msgid "invalid option \"%.50s\"\n"
- msgstr "b��dna opcja ,,%.50s''\n"
+ msgstr "błędna opcja ,,%.50s''\n"
  
 +#: common/utf8conv.c:123
  #, fuzzy, c-format
  #| msgid "conversion from `%s' to `%s' not available\n"
  msgid "conversion from '%s' to '%s' not available\n"
- msgstr "konwersja z ,,%s'' do ,,%s'' niedost�pna\n"
+ msgstr "konwersja z ,,%s'' do ,,%s'' niedostępna\n"
  
 +#: common/utf8conv.c:131
  #, c-format
  msgid "iconv_open failed: %s\n"
- msgstr "iconv_open nie powiod�o si�: %s\n"
+ msgstr "iconv_open nie powiodło się: %s\n"
  
 +#: common/utf8conv.c:385 common/utf8conv.c:651
  #, fuzzy, c-format
  #| msgid "conversion from `%s' to `%s' failed: %s\n"
  msgid "conversion from '%s' to '%s' failed: %s\n"
- msgstr "konwersja z ,,%s'' do ,,%s'' nie powiod�a si�: %s\n"
+ msgstr "konwersja z ,,%s'' do ,,%s'' nie powiodła się: %s\n"
  
 +#: common/dotlock.c:707
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "failed to create temporary file '%s': %s\n"
- msgstr "nie uda�o si� utworzy� pliku tymczasowego ,,%s'': %s\n"
+ msgstr "nie udało się utworzyć pliku tymczasowego ,,%s'': %s\n"
  
 +#: common/dotlock.c:771
  #, fuzzy, c-format
  #| msgid "error writing to `%s': %s\n"
  msgid "error writing to '%s': %s\n"
- msgstr "b��d zapisu do ,,%s'': %s\n"
+ msgstr "błąd zapisu do ,,%s'': %s\n"
  
 +#: common/dotlock.c:1116
  #, c-format
  msgid "removing stale lockfile (created by %d)\n"
  msgstr "usuwanie nieaktualnego pliku blokady (utworzonego przez %d)\n"
  
 +#: common/dotlock.c:1152
  #, c-format
  msgid "waiting for lock (held by %d%s) %s...\n"
- msgstr "oczekiwanie na blokad� (trzyman� przez %d%s) %s...\n"
+ msgstr "oczekiwanie na blokadę (trzymaną przez %d%s) %s...\n"
  
 +#: common/dotlock.c:1153
  msgid "(deadlock?) "
  msgstr "(zakleszczenie?) "
  
@@@ -1478,15 -1170,12 +1488,15 @@@
  #, fuzzy, c-format
  #| msgid "lock `%s' not made: %s\n"
  msgid "lock '%s' not made: %s\n"
- msgstr "blokada ,,%s'' nie za�o�ona: %s\n"
+ msgstr "blokada ,,%s'' nie założona: %s\n"
  
 +#: common/dotlock.c:1219
  #, c-format
  msgid "waiting for lock %s...\n"
- msgstr "oczekiwanie na blokad� %s...\n"
+ msgstr "oczekiwanie na blokadę %s...\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
@@@ -1496,27 -1184,21 +1506,27 @@@
  msgid "armor: %s\n"
  msgstr "opakowanie: %s\n"
  
 +#: g10/armor.c:463
  msgid "invalid armor header: "
- msgstr "niepoprawny nag��wek opakowania: "
+ msgstr "niepoprawny nagłówek opakowania: "
  
 +#: g10/armor.c:474
  msgid "armor header: "
- msgstr "nag��wek opakowania: "
+ msgstr "nagłówek opakowania: "
  
 +#: g10/armor.c:487
  msgid "invalid clearsig header\n"
- msgstr "niew�a�ciwy nag��wek dokumentu z podpisem na ko�cu\n"
+ msgstr "niewłaściwy nagłówek dokumentu z podpisem na końcu\n"
  
 +#: g10/armor.c:500
  msgid "unknown armor header: "
- msgstr "nieznany nag��wek opakowania: "
+ msgstr "nieznany nagłówek opakowania: "
  
 +#: g10/armor.c:553
  msgid "nested clear text signatures\n"
- msgstr "zagnie�d�one podpisy na ko�cu dokumentu\n"
+ msgstr "zagnieżdżone podpisy na końcu dokumentu\n"
  
 +#: g10/armor.c:688
  msgid "unexpected armor: "
  msgstr "nieoczekiwane opakowanie: "
  
@@@ -1524,12 -1205,10 +1534,12 @@@
  msgid "invalid dash escaped line: "
  msgstr "niepoprawne oznaczenie linii minusami: "
  
 +#: g10/armor.c:873 g10/armor.c:1490
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
- msgstr "niew�a�ciwy znak formatu radix64 ,,%02X'' zosta� pomini�ty\n"
+ msgstr "niewłaściwy znak formatu radix64 ,,%02X'' został pominięty\n"
  
 +#: g10/armor.c:916
  msgid "premature eof (no CRC)\n"
  msgstr "przedwczesny koniec pliku (brak CRC)\n"
  
@@@ -1537,153 -1215,119 +1547,152 @@@
  msgid "premature eof (in CRC)\n"
  msgstr "przedwczesny koniec pliku (w CRC)\n"
  
 +#: g10/armor.c:958
  msgid "malformed CRC\n"
- msgstr "b��d formatu CRC\n"
+ msgstr "błąd formatu CRC\n"
  
 +#: g10/armor.c:962 g10/armor.c:1527
  #, c-format
  msgid "CRC error; %06lX - %06lX\n"
- msgstr "B��d sumy CRC; %06lX - %06lX\n"
+ msgstr "Błąd sumy CRC; %06lX - %06lX\n"
  
 +#: g10/armor.c:982
  msgid "premature eof (in trailer)\n"
- msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
+ msgstr "przedwczesny koniec pliku (w linii kończącej)\n"
  
 +#: g10/armor.c:986
  msgid "error in trailer line\n"
- msgstr "b��d w linii ko�cz�cej\n"
+ msgstr "błąd w linii kończącej\n"
  
 +#: g10/armor.c:1303
  msgid "no valid OpenPGP data found.\n"
  msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
  
 +#: g10/armor.c:1308
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
- msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
+ msgstr "błąd opakowania: linia dłuższa niż %d znaków\n"
  
 +#: g10/armor.c:1312
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
  "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
- "przek�amanie wprowadzone przez serwer pocztowy\n"
+ "przekłamanie wprowadzone przez serwer pocztowy\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
- msgstr "nieczytelne dla cz�owieka"
+ msgstr "nieczytelne dla człowieka"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr ""
- "nazwa adnotacji musi zawiera� tylko znaki drukowalne lub spacje i ko�czy� "
- "si� znakiem ,,=''\n"
+ "nazwa adnotacji musi zawierać tylko znaki drukowalne lub spacje i kończyć "
+ "się znakiem ,,=''\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
- msgstr "nazwa adnotacji u�ytkownika musi zawiera� znak ,,@''\n"
+ msgstr "nazwa adnotacji użytkownika musi zawierać znak ,,@''\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
- msgstr "nazwa adnotacjinie mo�e zawiera� wi�cej ni� jednego znaku ,,@''\n"
+ msgstr "nazwa adnotacjinie może zawierać więcej niż jednego znaku ,,@''\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
- msgstr "warto�� adnotacji nie mo�e zawiera� �adnych znak�w steruj�cych\n"
+ msgstr "wartość adnotacji nie może zawierać żadnych znaków sterujących\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  #| msgid "a notation name must not contain more than one '@' character\n"
  msgid "a notation name may not contain an '=' character\n"
- msgstr "nazwa adnotacjinie mo�e zawiera� wi�cej ni� jednego znaku ,,@''\n"
+ msgstr "nazwa adnotacjinie może zawierać więcej niż jednego znaku ,,@''\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
  #| "with an '='\n"
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr ""
- "nazwa adnotacji musi zawiera� tylko znaki drukowalne lub spacje i ko�czy� "
- "si� znakiem ,,=''\n"
+ "nazwa adnotacji musi zawierać tylko znaki drukowalne lub spacje i kończyć "
+ "się znakiem ,,=''\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
- msgstr "OSTRZE�ENIE: napotkano b��dne dane adnotacji\n"
+ msgstr "OSTRZEŻENIE: napotkano błędne dane adnotacji\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
- msgstr "nie uda�o si� przekaza� zapytania %s do klienta\n"
+ msgstr "nie udało się przekazać zapytania %s do klienta\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  #, fuzzy
  #| msgid "Enter passphrase\n"
  msgid "Enter passphrase: "
- msgstr "Has�o\n"
+ msgstr "Hasło\n"
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
- msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
+ msgstr "błąd tworzenia zbioru kluczy `%s': %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
- msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
+ msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
- msgstr "Karta OpenPGP niedost�pna: %s\n"
+ msgstr "Karta OpenPGP niedostępna: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
- msgstr "Wykryto kart� OpenPGP nr %s\n"
+ msgstr "Wykryto kartę OpenPGP nr %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
- msgstr "nie dzia�a w trybie wsadowym\n"
+ msgstr "nie działa w trybie wsadowym\n"
  
 +#: g10/card-util.c:107
  msgid "This command is only available for version 2 cards\n"
- msgstr "To polecenie jest dost�pne tylko dla kart w wersji 2\n"
+ msgstr "To polecenie jest dostępne tylko dla kart w wersji 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
- msgstr "Kod resetuj�cy nie jest (ju� lub w og�le) dost�pny\n"
+ msgstr "Kod resetujący nie jest (już lub w ogóle) dostępny\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
- msgstr "Tw�j wyb�r? "
+ msgstr "Twój wybór? "
  
 +#: g10/card-util.c:279 g10/card-util.c:330
  msgid "[not set]"
  msgstr "[nie ustawiono]"
  
 +#: g10/card-util.c:533
  msgid "male"
- msgstr "m�czyzna"
+ msgstr "mężczyzna"
  
 +#: g10/card-util.c:534
  msgid "female"
  msgstr "kobieta"
  
@@@ -1699,121 -1340,91 +1708,121 @@@ msgstr "nie wymuszono
  msgid "forced"
  msgstr "wymuszono"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
- msgstr "B��d: aktualnie dopuszczalne jest tylko czyste ASCII.\n"
+ msgstr "Błąd: aktualnie dopuszczalne jest tylko czyste ASCII.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
- msgstr "B��d: znak ,,<'' nie mo�e by� u�yty.\n"
+ msgstr "Błąd: znak ,,<'' nie może być użyty.\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
- msgstr "B��d: podw�jne spacje nie s� dopuszczalne.\n"
+ msgstr "Błąd: podwójne spacje nie są dopuszczalne.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "Nazwisko posiadacza karty: "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
- msgstr "Imi� posiadacza karty: "
+ msgstr "Imię posiadacza karty: "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
- msgstr "B��d: pe�ne personalia zbyt d�ugie (limit to %d znak�w).\n"
+ msgstr "Błąd: pełne personalia zbyt długie (limit to %d znaków).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "URL do odczytania klucza publicznego: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
- msgstr "B��d: URL zbyt d�ugi (limit to %d znak�w).\n"
+ msgstr "Błąd: URL zbyt długi (limit to %d znaków).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
- msgstr "b��d odczytu ,,%s'': %s\n"
+ msgstr "błąd odczytu ,,%s'': %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  #| msgid "error writing `%s': %s\n"
  msgid "error writing '%s': %s\n"
- msgstr "b��d zapisu ,,%s'': %s\n"
+ msgstr "błąd zapisu ,,%s'': %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "Dane logowania (nazwa konta): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
- msgstr "B��d: dane logowania zbyt d�ugie (limit to %d znak�w).\n"
+ msgstr "Błąd: dane logowania zbyt długie (limit to %d znaków).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "Prywatne dane DO: "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
- msgstr "B��d: prywatne DO zbyt d�ugie (limit to %d znak�w).\n"
+ msgstr "Błąd: prywatne DO zbyt długie (limit to %d znaków).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
- msgstr "Preferowane j�zyki: "
+ msgstr "Preferowane języki: "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
- msgstr "B��d: niew�a�ciwa d�ugo�� tekstu preferencji.\n"
+ msgstr "Błąd: niewłaściwa długość tekstu preferencji.\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
- msgstr "B��d: niew�a�ciwe znaki w tek�cie preferencji.\n"
+ msgstr "Błąd: niewłaściwe znaki w tekście preferencji.\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
- msgstr "P�e� (M - m�czyzna, F - kobieta lub spacja): "
+ msgstr "Płeć (M - mężczyzna, F - kobieta lub spacja): "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
- msgstr "B��d: niew�a�ciwa odpowied�.\n"
+ msgstr "Błąd: niewłaściwa odpowiedź.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "Odcisk CA:"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
- msgstr "B��d: niew�a�ciwie sformatowany odcisk.\n"
+ msgstr "Błąd: niewłaściwie sformatowany odcisk.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "operacja na kluczu niewykonalna: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "to nie jest karta OpenPGP"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
- msgstr "b��d podczas odczytu aktualnych informacji o kluczu: %s\n"
+ msgstr "błąd podczas odczytu aktualnych informacji o kluczu: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
- msgstr "Zast�pi� istniej�cy klucz? (t/N) "
+ msgstr "Zastąpić istniejący klucz? (t/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  #, fuzzy
  #| msgid ""
  #| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1824,61 -1435,49 +1833,61 @@@ msgid "
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
- "UWAGA: Nie ma gwarancji, �e karta obs�uguje ��dany rozmiar.\n"
- "       Je�li tworzenie klucza nie powiedzie si�, prosz� sprawdzi�\n"
- "       dokumentacj� karty, aby pozna� dozwolone rozmiary.\n"
+ "UWAGA: Nie ma gwarancji, że karta obsługuje żądany rozmiar.\n"
+ "       Jeśli tworzenie klucza nie powiedzie się, proszę sprawdzić\n"
+ "       dokumentację karty, aby poznać dozwolone rozmiary.\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
- msgstr "Jakiej d�ugo�ci klucz do podpisywania wygenerowa�? (%u) "
+ msgstr "Jakiej długości klucz do podpisywania wygenerować? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
- msgstr "Jakiej d�ugo�ci klucz do szyfrowania wygenerowa�? (%u) "
+ msgstr "Jakiej długości klucz do szyfrowania wygenerować? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
- msgstr "Jakiej d�ugo�ci klucz do uwierzytelniania wygenerowa�? (%u) "
+ msgstr "Jakiej długości klucz do uwierzytelniania wygenerować? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
- msgstr "zaokr�glono do %u bit�w\n"
+ msgstr "zaokrąglono do %u bitów\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
- msgstr "Rozmiary kluczy %s musz� by� z przedzia�u %u-%u\n"
+ msgstr "Rozmiary kluczy %s muszą być z przedziału %u-%u\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr "Karta zostanie przekonfigurowana do tworzenia klucza %u-bitowego\n"
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
- msgstr "b��d podczas zmiany rozmiaru klucza %d na %u bit�w: %s\n"
+ msgstr "błąd podczas zmiany rozmiaru klucza %d na %u bitów: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
- msgstr "Stworzy� poza kart� kopi� zapasow� klucza szyfruj�cego? (T/n) "
+ msgstr "Stworzyć poza kartą kopię zapasową klucza szyfrującego? (T/n) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  #| msgid "NOTE: keys are already stored on the card!\n"
  msgid "Note: keys are already stored on the card!\n"
- msgstr "UWAGA: klucze s� ju� zapisane na karcie!\n"
+ msgstr "UWAGA: klucze są już zapisane na karcie!\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
- msgstr "Zast�pi� istniej�ce klucze? (t/N) "
+ msgstr "Zastąpić istniejące klucze? (t/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, fuzzy, c-format
  #| msgid ""
  #| "Please note that the factory settings of the PINs are\n"
@@@ -1889,206 -1488,155 +1898,206 @@@ msgid "
  "   PIN = '%s'     Admin PIN = '%s'\n"
  "You should change them using the command --change-pin\n"
  msgstr ""
- "Fabryczne ustawienia PIN-�w to\n"
+ "Fabryczne ustawienia PIN-ów to\n"
  "   PIN = ,,%s''   PIN administracyjny = ,,%s''\n"
- "Nale�y je zmieni� przy u�yciu polecenia --change-pin\n"
+ "Należy je zmienić przy użyciu polecenia --change-pin\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
- msgstr "Prosz� wybra� rodzaj klucza do wygenerowania:\n"
+ msgstr "Proszę wybrać rodzaj klucza do wygenerowania:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
- msgstr "   (1) Klucz do podpis�w\n"
+ msgstr "   (1) Klucz do podpisów\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) Klucz do szyfrowania\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Klucz do uwierzytelniania\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
- msgstr "Niew�a�ciwy wyb�r.\n"
+ msgstr "Niewłaściwy wybór.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
- msgstr "Prosz� wybra� gdzie zapisa� klucz:\n"
+ msgstr "Proszę wybrać gdzie zapisać klucz:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "KEYTOCARD failed: %s\n"
- msgstr "odczyt nie powi�d� si�: %s\n"
+ msgstr "odczyt nie powiódł się: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
- msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
+ msgstr "To polecenie nie jest dostępne w trybie %s.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  #| msgid "NOTE: keys are already stored on the card!\n"
  msgid "Note: This command destroys all keys stored on the card!\n"
- msgstr "UWAGA: klucze s� ju� zapisane na karcie!\n"
+ msgstr "UWAGA: klucze są już zapisane na karcie!\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  #| msgid "Sign it? (y/N) "
  msgid "Continue? (y/N) "
- msgstr "Podpisa� go? (t/N) "
+ msgstr "Podpisać go? (t/N) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
- msgstr "wyj�cie z tego menu"
+ msgstr "wyjście z tego menu"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
- msgstr "pokazanie polece� administratora"
+ msgstr "pokazanie poleceń administratora"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "ten tekst pomocy"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
- msgstr "wypisanie wszystkich dost�pnych danych"
+ msgstr "wypisanie wszystkich dostępnych danych"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "zmiana nazwy posiadacza karty"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "zmiana URL-a do odczytu klucza"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
- msgstr "pobranie klucza okre�lonego w URL-u karty"
+ msgstr "pobranie klucza określonego w URL-u karty"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "zmiana nazwy logowania"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
- msgstr "zmiana preferowanych j�zyk�w"
+ msgstr "zmiana preferowanych języków"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
- msgstr "zmiana p�ci posiadacza karty"
+ msgstr "zmiana płci posiadacza karty"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "zmiana odcisku CA"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr "zmiana flagi wymuszenia PIN-u do podpisu"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "wygenerowanie nowych kluczy"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "menu do zmiany lub odblokowania PIN-u"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "sprawdzenie PIN-u i wypisanie wszystkich danych"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
- msgstr "odblokowanie PIN-u przy u�yciu kodu resetuj�cego"
+ msgstr "odblokowanie PIN-u przy użyciu kodu resetującego"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr "gpg/karta> "
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "Polecenie tylko dla administratora\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
- msgstr "Polecenia dla administratora s� dozwolone\n"
+ msgstr "Polecenia dla administratora są dozwolone\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
- msgstr "Polecenia dla administratora nie s� dozwolone\n"
+ msgstr "Polecenia dla administratora nie są dozwolone\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
- msgstr "Niepoprawne polecenie  (spr�buj ,,help'')\n"
+ msgstr "Niepoprawne polecenie  (spróbuj ,,help'')\n"
  
 +#: g10/decrypt.c:191 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
- msgstr "opcja --output nie dzia�a z tym poleceniem\n"
+ msgstr "opcja --output nie działa z tym poleceniem\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
- msgstr "nie mo�na otworzy� ,,%s''\n"
+ msgstr "nie można otworzyć ,,%s''\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
- msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
+ msgstr "klucz ,,%s'' nie został odnaleziony: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
- msgstr "b��d odczytu bloku kluczy: %s\n"
+ msgstr "błąd odczytu bloku kluczy: %s\n"
  
 +#: g10/delkey.c:118 g10/getkey.c:579
  #, fuzzy, c-format
  #| msgid "key \"%s\" not found: %s\n"
  msgid "key \"%s\" not found\n"
- msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
+ msgstr "klucz ,,%s'' nie został odnaleziony: %s\n"
  
 +#: g10/delkey.c:129 g10/delkey.c:136
  msgid "(unless you specify the key by fingerprint)\n"
- msgstr "(chyba, �e klucz zostaje wybrany przez podanie odcisku)\n"
+ msgstr "(chyba, że klucz zostaje wybrany przez podanie odcisku)\n"
  
 +#: g10/delkey.c:135
  msgid "can't do this in batch mode without \"--yes\"\n"
- msgstr "bez opcji ,,--yes'' nie dzia�a w trybie wsadowym\n"
+ msgstr "bez opcji ,,--yes'' nie działa w trybie wsadowym\n"
  
 +#: g10/delkey.c:148
  msgid "Delete this key from the keyring? (y/N) "
- msgstr "Usun�� ten klucz ze zbioru? (t/N) "
+ msgstr "Usunąć ten klucz ze zbioru? (t/N) "
  
 +#: g10/delkey.c:158
  msgid "This is a secret key! - really delete? (y/N) "
- msgstr "To jest klucz tajny! - czy na pewno go usun��? (t/N) "
+ msgstr "To jest klucz tajny! - czy na pewno go usunąć? (t/N) "
  
 +#: g10/delkey.c:201
  #, fuzzy, c-format
  #| msgid "deleting certificate \"%s\" failed: %s\n"
  msgid "deleting secret %s failed: %s\n"
- msgstr "usuni�cie certyfikatu ,,%s'' nie powiod�o si�: %s\n"
+ msgstr "usunięcie certyfikatu ,,%s'' nie powiodło się: %s\n"
  
 +#: g10/delkey.c:203
  msgid "key"
  msgstr ""
  
@@@ -2098,35 -1645,28 +2107,35 @@@
  msgid "subkey"
  msgstr "Asymetryczne: "
  
 +#: g10/delkey.c:226
  #, c-format
  msgid "deleting keyblock failed: %s\n"
- msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
+ msgstr "usunięcie bloku klucza nie powiodło się: %s\n"
  
 +#: g10/delkey.c:239
  msgid "ownertrust information cleared\n"
- msgstr "informacja o zaufaniu dla w�a�ciciela klucza zosta�a wymazana\n"
+ msgstr "informacja o zaufaniu dla właściciela klucza została wymazana\n"
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
  msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
- msgstr "aby go usun�� nale�y najpierw u�y� opcji \"--delete-secret-key\".\n"
+ msgstr "aby go usunąć należy najpierw użyć opcji \"--delete-secret-key\".\n"
  
 +#: g10/encrypt.c:232 g10/sign.c:1292
  #, c-format
  msgid "error creating passphrase: %s\n"
- msgstr "b��d podczas tworzenia has�a: %s\n"
+ msgstr "błąd podczas tworzenia hasła: %s\n"
  
 +#: g10/encrypt.c:239
  msgid "can't use a symmetric ESK packet due to the S2K mode\n"
  msgstr ""
- "ustawiony tryb S2K nie pozwala u�y� pakietu ESK dla szyfru symetrycznego\n"
+ "ustawiony tryb S2K nie pozwala użyć pakietu ESK dla szyfru symetrycznego\n"
  
 +#: g10/encrypt.c:253
  #, c-format
  msgid "using cipher %s\n"
  msgstr "szyfrem %s\n"
@@@ -2135,15 -1674,13 +2144,15 @@@
  #, fuzzy, c-format
  #| msgid "`%s' already compressed\n"
  msgid "'%s' already compressed\n"
- msgstr ",,%s'' ju� jest skompresowany\n"
+ msgstr ",,%s'' już jest skompresowany\n"
  
 +#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
- msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
+ msgstr "OSTRZEŻENIE: plik ,,%s'' jest pusty\n"
  
 +#: g10/encrypt.c:557
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "reading from '%s'\n"
@@@ -2154,39 -1690,33 +2163,39 @@@ msgstr "odczyt z ,,%s''\n
  msgid ""
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
- "OSTRZE�ENIE: wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami "
+ "OSTRZEŻENIE: wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami "
  "adresata\n"
  
 +#: g10/encrypt.c:707 g10/sign.c:984
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
  "preferences\n"
  msgstr ""
- "OSTRZE�ENIE: wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami "
+ "OSTRZEŻENIE: wymuszone użycie kompresji %s (%d) kłóci się z ustawieniami "
  "adresata\n"
  
 +#: g10/encrypt.c:817
  #, c-format
  msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
- msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
+ msgstr "wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami adresata\n"
  
 +#: g10/encrypt.c:903
  #, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
- msgstr "%s nie jest dost�pne w trybie %s\n"
+ msgstr "%s nie jest dostępne w trybie %s\n"
  
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
  #, c-format
  msgid "%s encrypted data\n"
- msgstr "dane zaszyfrowano za pomoc� %s\n"
+ msgstr "dane zaszyfrowano za pomocą %s\n"
  
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
  #, c-format
  msgid "encrypted with unknown algorithm %d\n"
  msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
@@@ -2195,134 -1724,105 +2204,134 @@@
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
- "OSTRZE�ENIE: wiadomo�� by�a szyfrowana kluczem s�abym szyfru symetrycznego.\n"
+ "OSTRZEŻENIE: wiadomość była szyfrowana kluczem słabym szyfru symetrycznego.\n"
  
 +#: g10/decrypt-data.c:176
  msgid "problem handling encrypted packet\n"
- msgstr "problem podczas obr�bki pakietu szyfrowego\n"
+ msgstr "problem podczas obróbki pakietu szyfrowego\n"
  
 +#: g10/exec.c:60
  msgid "no remote program execution supported\n"
- msgstr "odwo�ania do zewn�trznych program�w s� wy��czone\n"
+ msgstr "odwołania do zewnętrznych programów są wyłączone\n"
  
 +#: g10/exec.c:319
  msgid ""
  "external program calls are disabled due to unsafe options file permissions\n"
  msgstr ""
- "nieszczelne uprawnienia ustawie� - wo�anie zewn�trznych program�w wy��czone\n"
+ "nieszczelne uprawnienia ustawień - wołanie zewnętrznych programów wyłączone\n"
  
 +#: g10/exec.c:349
  msgid "this platform requires temporary files when calling external programs\n"
  msgstr ""
- "platforma wymaga u�ycia plik�w tymczasowych do wo�ania zewn�trznych "
- "program�w\n"
+ "platforma wymaga użycia plików tymczasowych do wołania zewnętrznych "
+ "programów\n"
  
 +#: g10/exec.c:427
  #, fuzzy, c-format
  #| msgid "unable to execute program `%s': %s\n"
  msgid "unable to execute program '%s': %s\n"
- msgstr "nie mo�na uruchomi� programu ,,%s'': %s\n"
+ msgstr "nie można uruchomić programu ,,%s'': %s\n"
  
 +#: g10/exec.c:430
  #, fuzzy, c-format
  #| msgid "unable to execute shell `%s': %s\n"
  msgid "unable to execute shell '%s': %s\n"
- msgstr "nie mo�na uruchomi� pow�oki ,,%s'': %s\n"
+ msgstr "nie można uruchomić powłoki ,,%s'': %s\n"
  
 +#: g10/exec.c:521
  #, c-format
  msgid "system error while calling external program: %s\n"
- msgstr "b��d systemu podczas wo�ania programu zewn�trznego: %s\n"
+ msgstr "błąd systemu podczas wołania programu zewnętrznego: %s\n"
  
 +#: g10/exec.c:532 g10/exec.c:599
  msgid "unnatural exit of external program\n"
- msgstr "nienaturalne zako�czenie pracy zewn�trznego programu\n"
+ msgstr "nienaturalne zakończenie pracy zewnętrznego programu\n"
  
 +#: g10/exec.c:547
  msgid "unable to execute external program\n"
- msgstr "nie mo�na uruchomi� zewn�trznego programu\n"
+ msgstr "nie można uruchomić zewnętrznego programu\n"
  
 +#: g10/exec.c:564
  #, c-format
  msgid "unable to read external program response: %s\n"
- msgstr "nie mo�na odczyta� odpowiedzi programu zewn�trznego: %s\n"
+ msgstr "nie można odczytać odpowiedzi programu zewnętrznego: %s\n"
  
 +#: g10/exec.c:610 g10/exec.c:617
  #, fuzzy, c-format
  #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
  msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
- msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
+ msgstr "OSTRZEŻENIE: nie można skasować pliku tymczasowego (%s) ,,%s'': %s.\n"
  
 +#: g10/exec.c:622
  #, fuzzy, c-format
  #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
- msgstr "OSTRZE�ENIE: nie mo�na skasowa� tymczasowego katalogu ,,%s'': %s.\n"
+ msgstr "OSTRZEŻENIE: nie można skasować tymczasowego katalogu ,,%s'': %s.\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
- msgstr "eksport podpis�w oznaczonych jako tylko lokalne"
+ msgstr "eksport podpisów oznaczonych jako tylko lokalne"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
- msgstr "eksport atrybut�w ID u�ytkownika (og�lnie ID zdj��)"
+ msgstr "eksport atrybutów ID użytkownika (ogólnie ID zdjęć)"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
- msgstr "eksport kluczy uniewa�niaj�cych oznaczonych jako ,,poufne''"
+ msgstr "eksport kluczy unieważniających oznaczonych jako ,,poufne''"
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
- msgstr "usuni�cie bezu�ytecznych cz�ci z klucza przy eksporcie"
+ msgstr "usunięcie bezużytecznych części z klucza przy eksporcie"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
- msgstr "usuni�cie jak najwi�kszej cz�ci klucza przy eksporcie"
+ msgstr "usunięcie jak największej części klucza przy eksporcie"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
- msgstr "%s: pomini�ty: %s\n"
+ msgstr "%s: pominięty: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "zapis do ,,%s''\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
- msgstr "klucz %s: zawarto�� klucza na karcie - pomini�to\n"
+ msgstr "klucz %s: zawartość klucza na karcie - pominięto\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "eksport kluczy tajnych nie jest dozwolony\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
- msgstr "klucz %s: klucz PGP 2.x - pomini�ty\n"
+ msgstr "klucz %s: klucz PGP 2.x - pominięty\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
- msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
+ msgstr "OSTRZEŻENIE: nic nie zostało wyeksportowane!\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
- msgstr "b��d tworzenia ,,%s'': %s\n"
+ msgstr "błąd tworzenia ,,%s'': %s\n"
  
 +#: g10/getkey.c:257
  msgid "[User ID not found]"
- msgstr "[brak identyfikatora u�ytkownika]"
+ msgstr "[brak identyfikatora użytkownika]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "(check argument of option '%s')\n"
@@@ -2337,277 -1835,216 +2346,277 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error closing %s: %s\n"
  msgid "error looking up: %s\n"
- msgstr "b��d zamykania %s: %s\n"
+ msgstr "błąd zamykania %s: %s\n"
  
 +#: g10/getkey.c:636
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "Warning: %s appears in the keyring %d times\n"
- msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
+ msgstr "błąd tworzenia zbioru kluczy `%s': %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  #| msgid "automatically retrieved `%s' via %s\n"
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "automatycznie pobrano `%s' poprzez %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  #| msgid "error retrieving `%s' via %s: %s\n"
  msgid "error retrieving '%s' via %s: %s\n"
- msgstr "b��d odtwarzania ,,%s'' poprzez %s: %s\n"
+ msgstr "błąd odtwarzania ,,%s'' poprzez %s: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "Brak odcisku"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
- msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
+ msgstr "klucz prywatny ,,%s'' nie został odnaleziony: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
- msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego klucza tajnego"
+ msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
- msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego klucza tajnego"
+ msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
- "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %s.\n"
+ "Opcja --allow-non-selfsigned-uid wymusiła uznanie za poprawny klucza %s.\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
- msgstr "u�ywany jest podklucz %s zamiast klucza g��wnego %s\n"
+ msgstr "używany jest podklucz %s zamiast klucza głównego %s\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
- msgstr "z�o�enie podpisu"
+ msgstr "złożenie podpisu"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
- msgstr "z�o�enie podpisu pod dokumentem"
+ msgstr "złożenie podpisu pod dokumentem"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
- msgstr "z�o�enie podpisu oddzielonego od dokumentu"
+ msgstr "złożenie podpisu oddzielonego od dokumentu"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "szyfrowanie danych"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "szyfrowanie tylko szyfrem symetrycznym"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
- msgstr "odszyfrowywanie danych (domy�lne)"
+ msgstr "odszyfrowywanie danych (domyślne)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "sprawdzenie podpisu"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "lista kluczy"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
- msgstr "lista kluczy i podpis�w"
+ msgstr "lista kluczy i podpisów"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
- msgstr "wypisanie i sprawdzenie podpis�w kluczy"
+ msgstr "wypisanie i sprawdzenie podpisów kluczy"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
- msgstr "lista kluczy i ich odcisk�w"
+ msgstr "lista kluczy i ich odcisków"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "lista kluczy prywatnych"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "generacja nowej pary kluczy"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "generacja nowej pary kluczy"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "generacja nowej pary kluczy"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "generacja nowej pary kluczy"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
- msgstr "tworzenie certyfikatu uniewa�nienia klucza"
+ msgstr "tworzenie certyfikatu unieważnienia klucza"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
- msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
+ msgstr "usunięcie klucza ze zbioru kluczy publicznych"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
- msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
+ msgstr "usunięcie klucza ze zbioru kluczy prywatnych"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
- msgstr "z�o�enie podpisu na kluczu"
+ msgstr "złożenie podpisu na kluczu"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
- msgstr "z�o�enie prywatnego podpisu na kluczu"
+ msgstr "złożenie prywatnego podpisu na kluczu"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
- msgstr "z�o�enie podpisu na kluczu"
+ msgstr "złożenie podpisu na kluczu"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
- msgstr "z�o�enie prywatnego podpisu na kluczu"
+ msgstr "złożenie prywatnego podpisu na kluczu"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "podpisanie lub modyfikacja klucza"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
- msgstr "zmiana has�a"
+ msgstr "zmiana hasła"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "eksport kluczy do pliku"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "eksport kluczy do serwera kluczy"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "import kluczy z serwera kluczy"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "szukanie kluczy na serwerze"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
- msgstr "od�wie�enie wszystkich kluczy z serwera"
+ msgstr "odświeżenie wszystkich kluczy z serwera"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
- msgstr "import/do��czenie kluczy"
+ msgstr "import/dołączenie kluczy"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
- msgstr "wy�wietlenie stanu karty"
+ msgstr "wyświetlenie stanu karty"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "zmiana danych na karcie"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "zmiana PIN-u karty"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "uaktualnienie bazy zaufania"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
- msgstr "wypisanie skr�t�w wiadomo�ci"
+ msgstr "wypisanie skrótów wiadomości"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "uruchomienie w trybie serwera"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "opakowanie ASCII pliku wynikowego"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
- msgstr "|U�YTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
+ msgstr "|UŻYTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr ""
- "|U�YTKOWNIK|u�ycie tego identyfikatora u�ytkownika do podpisania lub "
+ "|UŻYTKOWNIK|użycie tego identyfikatora użytkownika do podpisania lub "
  "odszyfrowania"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "kanoniczny format tekstowy"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
- msgstr "|PLIK|zapis wyj�cia do PLIKU"
+ msgstr "|PLIK|zapis wyjścia do PLIKU"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "pozostawienie bez zmian"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
- msgstr "pytanie przed nadpisaniem plik�w"
+ msgstr "pytanie przed nadpisaniem plików"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
- msgstr "�cis�e zachowanie OpenPGP"
+ msgstr "ścisłe zachowanie OpenPGP"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
  msgstr ""
  "@\n"
- "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
+ "(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2627,15 -2064,13 +2636,15 @@@ msgstr "
  " --detach-sign [plik]       podpisanie z umieszczeniem podpisu w osobnym "
  "pliku\n"
  " --list-keys [nazwy]        pokazanie klucze\n"
- " --fingerprint [nazwy]      pokazanie odcisk�w kluczy\n"
+ " --fingerprint [nazwy]      pokazanie odcisków kluczy\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
- msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
+ msgstr "Wywołanie: gpg [opcje] [pliki] (-h podaje pomoc)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2646,124 -2081,105 +2655,124 @@@ msgid "
  "Sign, check, encrypt or decrypt\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "Sk�adnia: gpg [opcje] [pliki]\n"
- "Podpisywanie, sprawdzanie podpis�w, szyfrowanie, rozszyfrowywanie\n"
- "Domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
+ "Składnia: gpg [opcje] [pliki]\n"
+ "Podpisywanie, sprawdzanie podpisów, szyfrowanie, rozszyfrowywanie\n"
+ "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
  msgstr ""
  "\n"
- "Obs�ugiwane algorytmy:\n"
+ "Obsługiwane algorytmy:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "Asymetryczne: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Symetryczne: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
- msgstr "Skr�t�w: "
+ msgstr "Skrótów: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Kompresji: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] %s\n"
- msgstr "wywo�anie: gpgsm [opcje]"
+ msgstr "wywołanie: gpgsm [opcje]"
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "sprzeczne polecenia\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  #| msgid "no = sign found in group definition `%s'\n"
  msgid "no = sign found in group definition '%s'\n"
  msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr ""
- "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu domowego ,,%s''\n"
+ "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu domowego ,,%s''\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr ""
- "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do pliku konfiguracyjnego ,,%s''\n"
+ "OSTRZEŻENIE: niebezpieczne prawa własności do pliku konfiguracyjnego ,,%s''\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on extension `%s'\n"
  msgid "WARNING: unsafe ownership on extension '%s'\n"
- msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do rozszerzenia ,,%s''\n"
+ msgstr "OSTRZEŻENIE: niebezpieczne prawa własności do rozszerzenia ,,%s''\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
- msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu domowego ,,%s''\n"
+ msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu domowego ,,%s''\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr ""
- "OSTRZE�ENIE: niebezpieczne prawa dost�pu do pliku konfiguracyjnego ,,%s''\n"
+ "OSTRZEŻENIE: niebezpieczne prawa dostępu do pliku konfiguracyjnego ,,%s''\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on extension `%s'\n"
  msgid "WARNING: unsafe permissions on extension '%s'\n"
- msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do rozszerzenia ,,%s''\n"
+ msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do rozszerzenia ,,%s''\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr ""
- "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego katalog "
+ "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego katalog "
  "domowy ,,%s''\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr ""
- "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego plik "
+ "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego plik "
  "konfiguracyjny ,,%s''\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr ""
- "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego "
+ "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego "
  "rozszerzenie ,,%s''\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr ""
- "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego katalog "
+ "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego katalog "
  "domowy ,,%s''\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2771,893 -2187,713 +2780,899 @@@
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
  msgstr ""
- "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego plik "
+ "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego plik "
  "konfiguracyjny ,,%s''\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr ""
- "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego "
+ "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego "
  "rozszerzenie ,,%s''\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
  msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
- msgstr "wy�wietlenie ID zdj�� przy wypisywaniu kluczy"
+ msgstr "wyświetlenie ID zdjęć przy wypisywaniu kluczy"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  #| msgid "show user ID validity during key listings"
  msgid "show key usage information during key listings"
- msgstr "pokazywanie poprawno�ci ID u�ytkownika przy wypisywaniu kluczy"
+ msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
- msgstr "pokazywanie URL-i polityk przy wypisywaniu podpis�w"
+ msgstr "pokazywanie URL-i polityk przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
- msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpis�w"
+ msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
- msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpis�w"
+ msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
- msgstr "pokazywanie adnotacji u�ytkownika przy wypisywaniu podpis�w"
+ msgstr "pokazywanie adnotacji użytkownika przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr ""
- "pokazywanie URL-i preferowanych serwer�w kluczy przy wypisywaniu podpis�w"
+ "pokazywanie URL-i preferowanych serwerów kluczy przy wypisywaniu podpisów"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
- msgstr "pokazywanie poprawno�ci ID u�ytkownika przy wypisywaniu kluczy"
+ msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
- "pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika na listach kluczy"
+ "pokazywanie unieważnionych i wygasłych ID użytkownika na listach kluczy"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
- msgstr "pokazywanie uniewa�nionych i wygas�ych podkluczy na listach kluczy"
+ msgstr "pokazywanie unieważnionych i wygasłych podkluczy na listach kluczy"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
- msgstr "pokazywanie dat wyga�ni�cia przy wypisywaniu podpis�w"
+ msgstr "pokazywanie dat wygaśnięcia przy wypisywaniu podpisów"
  
- #: g10/gpg.c:2011
- #, fuzzy
- #| msgid "Available keys:\n"
- msgid "available TOFU policies:\n"
- msgstr "Dost�pne klucze:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "valid values for option '%s':\n"
+ msgstr "brak argumentu dla opcji ,,%.50s''\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "nieznana opcja ,,%s''\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "invalid value for option '%s'\n"
+ msgstr "brak argumentu dla opcji ,,%.50s''\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
- msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
+ msgstr "UWAGA: stary domyślny plik opcji ,,%s'' został zignorowany\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
- msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
+ msgstr "UWAGA: %s nie jest do normalnego użytku!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid signature expiration\n"
  msgid "'%s' is not a valid signature expiration\n"
- msgstr ",,%s'' nie jest poprawnym czasem wyga�ni�cia podpisu\n"
+ msgstr ",,%s'' nie jest poprawnym czasem wygaśnięcia podpisu\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "linia %d: niepoprawny adres e-mail\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "invalid pinentry mode '%s'\n"
- msgstr "niew�a�ciwy kod kraju w ,,%s'', w linii %d\n"
+ msgstr "niewłaściwy kod kraju w ,,%s'', w linii %d\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid character set\n"
  msgid "'%s' is not a valid character set\n"
- msgstr ",,%s'' nie jest poprawn� nazw� zestawu znak�w\n"
+ msgstr ",,%s'' nie jest poprawną nazwą zestawu znaków\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
- msgstr "niezrozumia�y URL serwera kluczy\n"
+ msgstr "niezrozumiały URL serwera kluczy\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "niepoprawne opcje serwera kluczy\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "niepoprawne opcje wczytania kluczy\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "niepoprawne opcje wypisywania\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "niepoprawne opcje eksportu kluczy\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: niepoprawne opcje wypisywania\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "niepoprawne opcje wypisywania\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
- msgstr "wy�wietlanie ID zdj�� przy sprawdzaniu podpis�w"
+ msgstr "wyświetlanie ID zdjęć przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
- msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpis�w"
+ msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
- msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpis�w"
+ msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
- msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpis�w"
+ msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
- msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpis�w"
+ msgstr "pokazywanie adnotacji użytkownika przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
  msgstr ""
- "pokazywanie URL-i preferowanych serwer�w kluczy przy sprawdzaniu podpis�w"
+ "pokazywanie URL-i preferowanych serwerów kluczy przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
- msgstr "pokazywanie poprawno�ci ID u�ytkownika przy sprawdzaniu podpis�w"
+ msgstr "pokazywanie poprawności ID użytkownika przy sprawdzaniu podpisów"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
- "pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika przy sprawdzaniu "
- "podpis�w"
+ "pokazywanie unieważnionych i wygasłych ID użytkownika przy sprawdzaniu "
+ "podpisów"
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  msgid "show only the primary user ID in signature verification"
- msgstr "pokazywanie tylko g��wnego ID u�ytkownika przy sprawdzaniu podpisu"
+ msgstr "pokazywanie tylko głównego ID użytkownika przy sprawdzaniu podpisu"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
- msgstr "sprawdzanie podpis�w z danymi PKA"
+ msgstr "sprawdzanie podpisów z danymi PKA"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
- msgstr "zwi�kszenie zaufania podpis�w z poprawnymi danymi PKA"
+ msgstr "zwiększenie zaufania podpisów z poprawnymi danymi PKA"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "niepoprawne opcje sprawdzania\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
- msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
+ msgstr "nie można ustawić ścieżki programów wykonywalnych na %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr "Niepoprawna lista auto-key-locate\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
- msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
+ msgstr "OSTRZEŻENIE: program może stworzyć plik zrzutu pamięci!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
- msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
+ msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
- msgstr "Nie wolno u�ywa� %s z %s!\n"
+ msgstr "Nie wolno używać %s z %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
- msgstr "%s nie ma sensu w po��czeniu z %s!\n"
+ msgstr "%s nie ma sensu w połączeniu z %s!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
- msgstr "OSTRZE�ENIE: dzia�anie z fa�szywym czasem systemowym: "
+ msgstr "OSTRZEŻENIE: działanie z fałszywym czasem systemowym: "
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, 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"
+ msgstr "nie zadziała z niebezpieczną pamięcią z powodu %s\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
- msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
+ msgstr "wybrany algorytm szyfrujący jest niepoprawny\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
- msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
+ msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "wybrany algorytm kompresji jest niepoprawny\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
- msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
+ msgstr "wybrany algorytm skrótów poświadczeń jest niepoprawny\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
- msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
+ msgstr "wartość completes-needed musi być większa od 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
- msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
+ msgstr "wartość marginals-needed musi być większa od 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  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"
+ msgstr "wartość max-cert-depth musi mieścić się w zakresie od 1 do 255\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  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"
+ "niewłaściwy domyślny poziom sprawdzania; musi mieć wartość 0, 1, 2 lub 3\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  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"
+ "niewłaściwy minimalny poziom sprawdzania; musi mieć wartość 0, 1, 2 lub 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
- msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
+ msgstr "niepoprawny tryb S2K; musi mieć wartość 0, 1 lub 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
- msgstr "niew�a�ciwe domy�lne ustawienia\n"
+ msgstr "niewłaściwe domyślne ustawienia\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
- msgstr "niew�a�ciwe ustawienia szyfr�w\n"
+ msgstr "niewłaściwe ustawienia szyfrów\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
- msgstr "niew�a�ciwe ustawienia skr�t�w\n"
+ msgstr "niewłaściwe ustawienia skrótów\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
- msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
+ msgstr "niewłaściwe ustawienia algorytmów kompresji\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
- msgstr "%s jeszcze nie dzia�a z %s!\n"
+ msgstr "%s jeszcze nie działa z %s!\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
- msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
+ msgstr "szyfr ,,%s'' nie jest dostępny w trybie %s\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  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"
+ msgstr "skrót ,,%s'' nie jest dostępny w trybie %s\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
- msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
+ msgstr "kompresja ,,%s'' nie jest dostępna w trybie %s\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
- msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
+ msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  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"
+ msgstr "OSTRZEŻENIE: podano adresatów (-r) w działaniu które ich nie dotyczy\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [plik]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [plik]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  #| msgid "symmetric encryption of `%s' failed: %s\n"
  msgid "symmetric encryption of '%s' failed: %s\n"
- msgstr "szyfrowanie symetryczne ,,%s'' nie powiod�o si�: %s\n"
+ msgstr "szyfrowanie symetryczne ,,%s'' nie powiodło się: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [plik]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [plik]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  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"
+ msgstr "nie można użyć --symmetric --encrypt wraz z --s2k-mode 0\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, 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"
+ msgstr "nie można użyć --symmetric --encrypt w trybie %s\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [plik]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [plik]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [plik]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  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"
+ msgstr "nie można użyć --symmetric --sign --encrypt wraz z --s2k-mode 0\n"
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, 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"
+ msgstr "nie można użyć --symmetric --sign --encrypt w trybie %s\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [plik]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [plik]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [plik]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
- msgstr "--sign-key nazwa u�ytkownika"
+ msgstr "--sign-key nazwa użytkownika"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
- msgstr "--lsign-key nazwa u�ytkownika"
+ msgstr "--lsign-key nazwa użytkownika"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
- msgstr "--edit-key nazwa u�ytkownika [polecenia]"
+ msgstr "--edit-key nazwa użytkownika [polecenia]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
- msgstr "--passwd <id-u�ytkownika>"
+ msgstr "--passwd <id-użytkownika>"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
- msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
+ msgstr "wysyłka do serwera kluczy nie powiodła się: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
- msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
+ msgstr "odbiór z serwera kluczy nie powiódł się: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
- msgstr "eksport kluczy nie powi�d� si�: %s\n"
+ msgstr "eksport kluczy nie powiódł się: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
- msgstr "eksport kluczy nie powi�d� si�: %s\n"
+ msgstr "eksport kluczy nie powiódł się: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
- msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
+ msgstr "szukanie w serwerze kluczy nie powiodło się: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
- msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
+ msgstr "odświeżenie kluczy z serwera nie powiodło się: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
- msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
+ msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
- msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
+ msgstr "opakowywanie ASCII nie powiodło się: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
- msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
+ msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error parsing key specification '%s': %s\n"
- msgstr "b��d zapisywania certyfikatu: %s\n"
+ msgstr "błąd zapisywania certyfikatu: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[nazwa pliku]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
- msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
+ msgstr "Wpisz tutaj swoją wiadomość ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
- msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
+ msgstr "podany URL regulaminu poświadczania jest niepoprawny\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
- msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
+ msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|PLIK|pobieranie kluczy ze zbioru PLIK"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
- msgstr "nie traktowa� konfliktu datownik�w jako b��du"
+ msgstr "nie traktować konfliktu datowników jako błędu"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|pisanie opisu stanu do deskryptora FD"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
- msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
+ msgstr "Wywołanie: gpgv [opcje] [pliki] (-h podaje pomoc)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
  msgstr ""
- "Sk�adnia: gpgv [opcje] [pliki]\n"
- "Sprawdzanie podpis�w ze znanych zaufanych kluczy\n"
+ "Składnia: gpgv [opcje] [pliki]\n"
+ "Sprawdzanie podpisów ze znanych zaufanych kluczy\n"
  
 +#: g10/helptext.c:72
  msgid "No help available"
- msgstr "Pomoc niedost�pna"
+ msgstr "Pomoc niedostępna"
  
 +#: g10/helptext.c:82
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "No help available for '%s'"
  msgstr "Brak pomocy o ,,%s''"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
- msgstr "import podpis�w oznaczonych jako tylko lokalne"
+ msgstr "import podpisów oznaczonych jako tylko lokalne"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
- msgstr "naprawienie uszkodze� z serwera pks przy imporcie"
+ msgstr "naprawienie uszkodzeń z serwera pks przy imporcie"
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "nie uaktualnianie bazy zaufania po imporcie"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "nie uaktualnianie bazy zaufania po imporcie"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "okazanie odcisku klucza"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
- msgstr "przyjmowanie tylko uaktualnie� istniej�cych kluczy"
+ msgstr "przyjmowanie tylko uaktualnień istniejących kluczy"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
- msgstr "usuwanie bezu�ytecznych cz�ci kluczy po imporcie"
+ msgstr "usuwanie bezużytecznych części kluczy po imporcie"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
- msgstr "usuwanie jak najwi�kszej cz�ci kluczy po imporcie"
+ msgstr "usuwanie jak największej części kluczy po imporcie"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
- msgstr "blok typu %d zostaje pomini�ty\n"
+ msgstr "blok typu %d zostaje pominięty\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu kluczy przetworzonych do tej chwili\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
- msgstr "Og�em przetworzonych kluczy: %lu\n"
+ msgstr "Ogółem przetworzonych kluczy: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
- msgstr "   pomini�tych nowych kluczy: %lu\n"
+ msgstr "   pominiętych nowych kluczy: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
- msgstr "   pomini�tych nowych kluczy: %lu\n"
+ msgstr "   pominiętych nowych kluczy: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          bez identyfikatora: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
- msgstr "         do��czono do zbioru: %lu"
+ msgstr "         dołączono do zbioru: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                   bez zmian: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
- msgstr "      nowych identyfikator�w: %lu\n"
+ msgstr "      nowych identyfikatorów: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "            nowych podkluczy: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
- msgstr "             nowych podpis�w: %lu\n"
+ msgstr "             nowych podpisów: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
- msgstr "   nowych uniewa�nie� kluczy: %lu\n"
+ msgstr "   nowych unieważnień kluczy: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "   tajnych kluczy wczytanych: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "     tajnych kluczy dodanych: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "    tajnych kluczy bez zmian: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
- msgstr "      nie w��czono do zbioru: %lu\n"
+ msgstr "      nie włączono do zbioru: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
- msgstr "     podpis�w wyczyszczonych: %lu\n"
+ msgstr "     podpisów wyczyszczonych: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
- msgstr "ID u�ytkownika wyczyszczonych: %lu\n"
+ msgstr "ID użytkownika wyczyszczonych: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
- "OSTRZE�ENIE: klucz %s zawiera preferencje dla niedost�pnych\n"
- "algorytm�w dla tych ID u�ytkownika:\n"
+ "OSTRZEŻENIE: klucz %s zawiera preferencje dla niedostępnych\n"
+ "algorytmów dla tych ID użytkownika:\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         ,,%s'': preferowany szyfr %s\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
- msgstr "         ,,%s'': preferowany algorytm skr�tu %s\n"
+ msgstr "         ,,%s'': preferowany algorytm skrótu %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         ,,%s'': preferowany algorytm kompresji %s\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
- msgstr "zdecydowanie sugerowane jest uaktualnienie ustawie� i ponowne\n"
+ msgstr "zdecydowanie sugerowane jest uaktualnienie ustawień i ponowne\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
- msgstr "rozes�anie tego klucza w celu unikni�cia niezgodno�ci algorytm�w\n"
+ msgstr "rozesłanie tego klucza w celu uniknięcia niezgodności algorytmów\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
- "mo�na uaktualni� swoje ustawienia poprzez: gpg --edit-key %s updpref save\n"
+ "można uaktualnić swoje ustawienia poprzez: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
- msgstr "klucz %s: brak identyfikatora u�ytkownika\n"
+ msgstr "klucz %s: brak identyfikatora użytkownika\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
- msgstr "pomini�ty ,,%s'': %s\n"
+ msgstr "pominięty ,,%s'': %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
- msgstr "klucz %s: podklucz uszkodzony przez serwer zosta� naprawiony\n"
+ msgstr "klucz %s: podklucz uszkodzony przez serwer został naprawiony\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
- msgstr "klucz %s: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
+ msgstr "klucz %s: przyjęto identyfikator nie podpisany nim samym ,,%s''\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
- msgstr "klucz %s: brak poprawnych identyfikator�w u�ytkownika\n"
+ msgstr "klucz %s: brak poprawnych identyfikatorów użytkownika\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
- msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
+ msgstr "to może być spowodowane brakiem podpisu klucza nim samym\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "klucz %s: brak klucza publicznego: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
- msgstr "klucz %s: nowy klucz - pomini�ty\n"
+ msgstr "klucz %s: nowy klucz - pominięty\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "brak zapisywalnego zbioru kluczy: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
- msgstr "b��d zapisu zbioru kluczy ,,%s'': %s\n"
+ msgstr "błąd zapisu zbioru kluczy ,,%s'': %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "klucz %s: klucz publiczny ,,%s'' wczytano do zbioru\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
- msgstr "klucz %s: nie zgadza si� z lokaln� kopi�\n"
+ msgstr "klucz %s: nie zgadza się z lokalną kopią\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
- msgstr "klucz %s: nie mo�na odczyta� oryginalnego bloku klucza: %s\n"
+ msgstr "klucz %s: nie można odczytać oryginalnego bloku klucza: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
- msgstr "klucz %s: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
+ msgstr "klucz %s: ,,%s'' 1 nowy identyfikator użytkownika\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
- msgstr "klucz %s: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
+ msgstr "klucz %s: ,,%s'' %d nowych identyfikatorów użytkownika\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "klucz %s: ,,%s'' 1 nowy podpis\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
- msgstr "klucz %s: ,,%s'' %d nowych podpis�w\n"
+ msgstr "klucz %s: ,,%s'' %d nowych podpisów\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "klucz %s: ,,%s'' 1 nowy podklucz\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "klucz %s: ,,%s'' %d nowych podkluczy\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "klucz %s: ,,%s'' %d podpis wyczyszczony\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
- msgstr "klucz %s: ,,%s'' %d podpis�w wyczyszczonych\n"
+ msgstr "klucz %s: ,,%s'' %d podpisów wyczyszczonych\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
- msgstr "klucz %s: ,,%s'' %d identyfikator u�ytkownika wyczyszczony\n"
+ msgstr "klucz %s: ,,%s'' %d identyfikator użytkownika wyczyszczony\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
- msgstr "klucz %s: ,,%s'' %d identyfikator�w u�ytkownika wyczyszczonych\n"
+ msgstr "klucz %s: ,,%s'' %d identyfikatorów użytkownika wyczyszczonych\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "klucz %s: ,,%s'' bez zmian\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "klucz %s: klucz tajny wczytany do zbioru\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
- msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
+ msgstr "pominięty: klucz prywatny jest już wpisany\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "key %s: error sending to agent: %s\n"
- msgstr "b��d wysy�ania polecenia %s: %s\n"
+ msgstr "błąd wysyłania polecenia %s: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
- msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
+ msgstr "klucz prywatny ,,%s'' nie został odnaleziony: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
- msgstr "klucz %s: klucz tajny z b��dnym szyfrem %d - pomini�ty\n"
+ msgstr "klucz %s: klucz tajny z błędnym szyfrem %d - pominięty\n"
  
  #. TRANSLATORS: For smartcard, each private key on
  #. host has a reference (stub) to a smartcard and
@@@ -3669,689 -2905,560 +3684,696 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
- "klucz %s: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
- "              uniewa�nienia\n"
+ "klucz %s: brak klucza publicznego którego dotyczy wczytany certyfikat\n"
+ "              unieważnienia\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
- msgstr "klucz %s: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
+ msgstr "klucz %s: niepoprawny certyfikat unieważnienia: %s - odrzucony\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
- msgstr "klucz %s: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
+ msgstr "klucz %s: ,,%s'' certyfikat unieważnienia został już wczytany\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
- msgstr "klucz %s: brak identyfikatora u�ytkownika do podpisu\n"
+ msgstr "klucz %s: brak identyfikatora użytkownika do podpisu\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
- msgstr "klucz %s: algorytm asymetryczny dla id ,,%s'' nie jest obs�ugiwany\n"
+ msgstr "klucz %s: algorytm asymetryczny dla id ,,%s'' nie jest obsługiwany\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "klucz %s: niepoprawny podpis na identyfikatorze ,,%s''\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
- msgstr "klucz %s: nieobs�ugiwany algorytm asymetryczny\n"
+ msgstr "klucz %s: nieobsługiwany algorytm asymetryczny\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
- msgstr "klucz %s: nieprawid�owy bezpo�redni podpis\n"
+ msgstr "klucz %s: nieprawidłowy bezpośredni podpis\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
- msgstr "klucz %s: brak podklucza do dowi�zania\n"
+ msgstr "klucz %s: brak podklucza do dowiązania\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
- msgstr "klucz %s: niepoprawne dowi�zanie podklucza\n"
+ msgstr "klucz %s: niepoprawne dowiązanie podklucza\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
- msgstr "klucz %s: usuni�to wielokrotne dowi�zanie podklucza\n"
+ msgstr "klucz %s: usunięto wielokrotne dowiązanie podklucza\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
- msgstr "klucz %s: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
+ msgstr "klucz %s: brak podklucza, którego dotyczy unieważnienie\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
- msgstr "klucz %s: niepoprawne uniewa�nienie podklucza\n"
+ msgstr "klucz %s: niepoprawne unieważnienie podklucza\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
- msgstr "klucz %s: usuni�to wielokrotne uniewa�nienie podklucza\n"
+ msgstr "klucz %s: usunięto wielokrotne unieważnienie podklucza\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
- msgstr "klucz %s: pomini�to identyfikator u�ytkownika ,,%s''\n"
+ msgstr "klucz %s: pominięto identyfikator użytkownika ,,%s''\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
- msgstr "klucz %s: podklucz pomini�ty\n"
+ msgstr "klucz %s: podklucz pominięty\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
- msgstr "klucz %s: podpis nieeksportowalny (klasy 0x%02X) - pomini�ty\n"
+ msgstr "klucz %s: podpis nieeksportowalny (klasy 0x%02X) - pominięty\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr ""
- "klucz %s: pomini�to certyfikat uniewa�nienia umieszczony\n"
- "              w niew�a�ciwym miejscu\n"
+ "klucz %s: pominięto certyfikat unieważnienia umieszczony\n"
+ "              w niewłaściwym miejscu\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
- msgstr "klucz %s: pomini�to -  niepoprawny certyfikat uniewa�nienia: %s\n"
+ msgstr "klucz %s: pominięto -  niepoprawny certyfikat unieważnienia: %s\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
- msgstr "klucz %s: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
+ msgstr "klucz %s: pominięto - podpis na podkluczu w niewłaściwym miejscu\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
- msgstr "klucz %s: pomini�to - nieoczekiwana klasa podpisu (0x%02X)\n"
+ msgstr "klucz %s: pominięto - nieoczekiwana klasa podpisu (0x%02X)\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
- msgstr "key %s: do��czono powt�rzony identyfikator u�ytkownika\n"
+ msgstr "key %s: dołączono powtórzony identyfikator użytkownika\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
- "OSTRZE�ENIE: klucz %s m�g� zosta� uniewa�niony:\n"
- "             zapytanie o uniewa�niaj�cy klucz %s w serwerze kluczy\n"
+ "OSTRZEŻENIE: klucz %s mógł zostać unieważniony:\n"
+ "             zapytanie o unieważniający klucz %s w serwerze kluczy\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
- "OSTRZE�ENIE: klucz %s m�g� zosta� uniewa�niony:\n"
- "             brak uniewa�niaj�cego klucza %s.\n"
+ "OSTRZEŻENIE: klucz %s mógł zostać unieważniony:\n"
+ "             brak unieważniającego klucza %s.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
- msgstr "klucz %s: ,,%s'' dodany certyfikat uniewa�nienia\n"
+ msgstr "klucz %s: ,,%s'' dodany certyfikat unieważnienia\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
- msgstr "klucz %s: dodano bezpo�redni podpis\n"
+ msgstr "klucz %s: dodano bezpośredni podpis\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  #| msgid "error creating keybox `%s': %s\n"
  msgid "error creating keybox '%s': %s\n"
- msgstr "b��d tworzenia keyboksa ,,%s'': %s\n"
+ msgstr "błąd tworzenia keyboksa ,,%s'': %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
- msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
+ msgstr "błąd tworzenia zbioru kluczy `%s': %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  #| msgid "keybox `%s' created\n"
  msgid "keybox '%s' created\n"
  msgstr "keybox ,,%s'' utworzony\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
- msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
+ msgstr "zbiór kluczy ,,%s'' został utworzony\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  #| msgid "keyblock resource `%s': %s\n"
  msgid "keyblock resource '%s': %s\n"
- msgstr "zas�b bloku klucza `%s': %s\n"
+ msgstr "zasób bloku klucza `%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening key DB: %s\n"
- msgstr "b��d podczas otwierania ,,%s'': %s\n"
+ msgstr "błąd podczas otwierania ,,%s'': %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
- msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
+ msgstr "nie powiodła się odbudowa bufora bazy: %s\n"
  
 +#: g10/keyedit.c:264
  msgid "[revocation]"
- msgstr "[uniewa�nienie]"
+ msgstr "[unieważnienie]"
  
 +#: g10/keyedit.c:264
  msgid "[self-signature]"
  msgstr "[podpis klucza nim samym]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ #| msgid "error allocating enough memory: %s\n"
+ msgid "error allocating memory: %s\n"
+ msgstr "błąd przydzielania wystarczającej ilości pamięci: %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "klucz %s: nieobs�ugiwany algorytm asymetryczny\n"
+ msgstr "klucz %s: nieobsługiwany algorytm asymetryczny\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "karta nie obs�uguje algorytmu skr�tu %s\n"
+ msgstr "karta nie obsługuje algorytmu skrótu %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
- msgstr "Poprawny podpis z�o�ony przez"
+ msgstr "Poprawny podpis złożony przez"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
- msgstr "pomini�ty ,,%s'': %s\n"
+ msgstr "pominięty ,,%s'': %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
- msgstr[1] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
- msgstr[2] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
+ msgstr[0] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
+ msgstr[1] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
+ msgstr[2] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
- msgstr[1] "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
- msgstr[2] "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
+ msgstr[0] "1 podpis nie został sprawdzony z powodu braku klucza\n"
+ msgstr[1] "1 podpis nie został sprawdzony z powodu braku klucza\n"
+ msgstr[2] "1 podpis nie został sprawdzony z powodu braku klucza\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
- msgstr[0] "%d niepoprawnych podpis�w\n"
- msgstr[1] "%d niepoprawnych podpis�w\n"
- msgstr[2] "%d niepoprawnych podpis�w\n"
+ msgstr[0] "%d niepoprawnych podpisów\n"
+ msgstr[1] "%d niepoprawnych podpisów\n"
+ msgstr[2] "%d niepoprawnych podpisów\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
- msgstr[0] "Poprawny podpis z�o�ony przez"
- msgstr[1] "Poprawny podpis z�o�ony przez"
- msgstr[2] "Poprawny podpis z�o�ony przez"
+ msgstr[0] "Poprawny podpis złożony przez"
+ msgstr[1] "Poprawny podpis złożony przez"
+ msgstr[2] "Poprawny podpis złożony przez"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
  "(by looking at passports, checking fingerprints from different sources, "
  "etc.)\n"
  msgstr ""
- "Zastan�w si� jak bardzo ufasz temu u�ytkownikowi w kwestii sprawdzania\n"
- "to�samo�ci innych u�ytkownik�w (czy sprawdzi on odciski kluczy pobrane\n"
- "z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.).\n"
+ "Zastanów się jak bardzo ufasz temu użytkownikowi w kwestii sprawdzania\n"
+ "tożsamości innych użytkowników (czy sprawdzi on odciski kluczy pobrane\n"
+ "z różnych źródeł, dokumenty potwierdzające tożsamość, itd.).\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = mam ograniczone zaufanie\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
- msgstr "  %d = mam pe�ne zaufanie\n"
+ msgstr "  %d = mam pełne zaufanie\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
- "Prosz� wpisa� poziom tego podpisu zaufania.\n"
- "Poziom wy�szy ni� 1 umo�liwia u�ywanie podpisywanego w�a�nie klucza\n"
- "do wykonywania zaufanych podpis�w w twoim imieniu.\n"
+ "Proszę wpisać poziom tego podpisu zaufania.\n"
+ "Poziom wyższy niż 1 umożliwia używanie podpisywanego właśnie klucza\n"
+ "do wykonywania zaufanych podpisów w twoim imieniu.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
- msgstr "Prosz� wpisa� domen� ograniczaj�c� ten podpis lub Enter dla �adnej.\n"
+ msgstr "Proszę wpisać domenę ograniczającą ten podpis lub Enter dla żadnej.\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
- msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
+ msgstr "Identyfikator użytkownika ,,%s'' został unieważniony."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
- msgstr "Czy na pewno chcesz podpisa�? (t/N) "
+ msgstr "Czy na pewno chcesz podpisać? (t/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
- msgstr " Nie da si� z�o�y� podpisu.\n"
+ msgstr " Nie da się złożyć podpisu.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
- msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
+ msgstr "Identyfikator użytkownika ,,%s'' przekroczył swój termin ważności."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
- msgstr "Identyfikator u�ytkownika ,,%s'' jest podpisywalny. "
+ msgstr "Identyfikator użytkownika ,,%s'' jest podpisywalny. "
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
- msgstr "Podpisa� go? (t/N) "
+ msgstr "Podpisać go? (t/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
  "is a PGP 2.x-style signature.\n"
  msgstr ""
  "Podpis klucza nim samym na ,,%s''\n"
- "jest podpisem z�o�onym przez PGP 2.x.\n"
+ "jest podpisem złożonym przez PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
- msgstr "Czy chcesz zamieni� go na podpis OpenPGP? (t/N) "
+ msgstr "Czy chcesz zamienić go na podpis OpenPGP? (t/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "has expired.\n"
  msgstr ""
- "Tw�j podpis na ,,%s''\n"
- "przekroczy� dat� wa�no�ci.\n"
+ "Twój podpis na ,,%s''\n"
+ "przekroczył datę ważności.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
- msgstr "Czy chcesz zast�pi� przeterminowany podpis nowym? (t/N) "
+ msgstr "Czy chcesz zastąpić przeterminowany podpis nowym? (t/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "is a local signature.\n"
  msgstr ""
- "Tw�j podpis na ,,%s''\n"
+ "Twój podpis na ,,%s''\n"
  "jest podpisem prywatnym (lokalnym).\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
- "Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis? (t/N) "
+ "Czy chcesz zamienić go na pełny, publiczny, eksportowalny podpis? (t/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
- msgstr ",,%s'' jest ju� lokalnie podpisany kluczem %s\n"
+ msgstr ",,%s'' jest już lokalnie podpisany kluczem %s\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
- msgstr ",,%s'' jest ju� podpisany kluczem %s\n"
+ msgstr ",,%s'' jest już podpisany kluczem %s\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
- msgstr "Czy na pewno chcesz to podpisa� jeszcze raz? (t/N) "
+ msgstr "Czy na pewno chcesz to podpisać jeszcze raz? (t/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nie ma nic do podpisania kluczem %s\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
- msgstr "Data wa�no�ci tego klucza up�yn�a!"
+ msgstr "Data ważności tego klucza upłynęła!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
- msgstr "Wa�no�� tego klucza wygasa %s.\n"
+ msgstr "Ważność tego klucza wygasa %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr ""
- "Czy chcesz �eby wa�no�� Twojego podpisu wygasa�a w tej samej chwili? (T/n) "
+ "Czy chcesz żeby ważność Twojego podpisu wygasała w tej samej chwili? (T/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
  "to the person named above?  If you don't know what to answer, enter \"0\".\n"
  msgstr ""
- "Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
- "Je�li nie wiesz co odpowiedzie�, podaj ,,0''.\n"
+ "Jak dokładnie została przez Ciebie sprawdzona tożsamość tej osoby?\n"
+ "Jeśli nie wiesz co odpowiedzieć, podaj ,,0''.\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
- msgstr "   (1) W og�le nie.%s\n"
+ msgstr "   (1) W ogóle nie.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
- msgstr "   (2) Pobie�nie.%s\n"
+ msgstr "   (2) Pobieżnie.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
- msgstr "   (3) Bardzo dok�adnie.%s\n"
+ msgstr "   (3) Bardzo dokładnie.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
- msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
+ msgstr "Twój wybór (,,?'' podaje więcej informacji): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr ""
- "Czy jeste� naprawd� pewien, �e chcesz podpisa� ten klucz\n"
+ "Czy jesteś naprawdę pewien, że chcesz podpisać ten klucz\n"
  "swoim kluczem ,,%s'' (%s)\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
- msgstr "To b�dzie podpis klucza nim samym.\n"
+ msgstr "To będzie podpis klucza nim samym.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
- "OSTRZE�ENIE: podpis nie zostanie oznaczony jako prywatny "
+ "OSTRZEŻENIE: podpis nie zostanie oznaczony jako prywatny "
  "(nieeksportowalny).\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
- "OSTRZE�ENIE: podpis nie zostanie oznaczony jako nie podlegaj�cy "
- "uniewa�nieniu.\n"
+ "OSTRZEŻENIE: podpis nie zostanie oznaczony jako nie podlegający "
+ "unieważnieniu.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
- msgstr "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
+ msgstr "Podpis zostanie oznaczony jako nie podlegający unieważnieniu.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
- msgstr "To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
+ msgstr "Tożsamość użytkownika nie została w ogóle sprawdzona.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
- msgstr "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
+ msgstr "Tożsamość użytkownika została sprawdzona pobieżnie.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
- msgstr "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
+ msgstr "Tożsamość użytkownika została dokładnie sprawdzona.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
- msgstr "Czy na pewno podpisa�? (t/N) "
+ msgstr "Czy na pewno podpisać? (t/N) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
- msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
+ msgstr "złożenie podpisu nie powiodło się: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
- "Klucz ma tylko za�lepk� albo elementy na karcie - nie ma has�a do zmiany.\n"
+ "Klucz ma tylko zaślepkę albo elementy na karcie - nie ma hasła do zmiany.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
- msgstr "b��d podczas tworzenia has�a: %s\n"
+ msgstr "błąd podczas tworzenia hasła: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
- msgstr "zapis zmian i wyj�cie"
+ msgstr "zapis zmian i wyjście"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "okazanie odcisku klucza"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  #| msgid "Enter the keygrip: "
  msgid "show the keygrip"
  msgstr "Uchwyt klucza: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
- msgstr "lista kluczy i identyfikator�w u�ytkownika"
+ msgstr "lista kluczy i identyfikatorów użytkownika"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
- msgstr "wyb�r identyfikatora u�ytkownika N"
+ msgstr "wybór identyfikatora użytkownika N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
- msgstr "wyb�r podklucza N"
+ msgstr "wybór podklucza N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
- msgstr "sprawdzenie podpis�w"
+ msgstr "sprawdzenie podpisów"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
- "z�o�enie podpisu na wybranych identyfikatorach u�ytkownika [* poni�ej "
- "powi�zane polecenia]"
+ "złożenie podpisu na wybranych identyfikatorach użytkownika [* poniżej "
+ "powiązane polecenia]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr ""
- "z�o�enie prywatnego (lokalnego) podpisu na wybranych identyfikatorach "
- "u�ytkownika"
+ "złożenie prywatnego (lokalnego) podpisu na wybranych identyfikatorach "
+ "użytkownika"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
- msgstr "podpisanie wybranych identyfikator�w u�ytkownika sygnatur� zaufania"
+ msgstr "podpisanie wybranych identyfikatorów użytkownika sygnaturą zaufania"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
- "podpisanie wybranych identyfikator�w u�ytkownika sygnatur� nie podlegaj�c� "
- "uniewa�nieniu"
+ "podpisanie wybranych identyfikatorów użytkownika sygnaturą nie podlegającą "
+ "unieważnieniu"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
- msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
+ msgstr "dodanie nowego identyfikatora użytkownika do klucza"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
- msgstr "dodanie zdj�cia u�ytkownika do klucza"
+ msgstr "dodanie zdjęcia użytkownika do klucza"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
- msgstr "usuni�cie wybranych identyfikator�w u�ytkownika z klucza"
+ msgstr "usunięcie wybranych identyfikatorów użytkownika z klucza"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "dodanie podklucza"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "dodanie klucza do karty procesorowej"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
- msgstr "przeniesienie klucza na kart� procesorow�"
+ msgstr "przeniesienie klucza na kartę procesorową"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
- msgstr "przeniesienie klucza zapasowego na kart� procesorow�"
+ msgstr "przeniesienie klucza zapasowego na kartę procesorową"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
- msgstr "usuni�cie wybranych podkluczy"
+ msgstr "usunięcie wybranych podkluczy"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
- msgstr "dodanie klucza uniewa�niaj�cego"
+ msgstr "dodanie klucza unieważniającego"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
- msgstr "usuni�cie podpis�w z wybranych identyfikator�w u�ytkownika"
+ msgstr "usunięcie podpisów z wybranych identyfikatorów użytkownika"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
- msgstr "zmiana daty wyga�ni�cia dla klucza lub wybranych podkluczy"
+ msgstr "zmiana daty wygaśnięcia dla klucza lub wybranych podkluczy"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
- msgstr "oznaczenie wybranego identyfikatora u�ytkownika jako g��wnego"
+ msgstr "oznaczenie wybranego identyfikatora użytkownika jako głównego"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "ustawienia (zaawansowane)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
- msgstr "rozbudowana lista ustawie�"
+ msgstr "rozbudowana lista ustawień"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
- msgstr "ustawienie listy preferencji dla wybranych identyfikator�w u�ytkownika"
+ msgstr "ustawienie listy preferencji dla wybranych identyfikatorów użytkownika"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
- "ustawienie URL-a preferowanego serwera kluczy dla wybranych identyfikator�w "
- "u�ytkownika"
+ "ustawienie URL-a preferowanego serwera kluczy dla wybranych identyfikatorów "
+ "użytkownika"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
- msgstr "ustawienie adnotacji dla wybranych identyfikator�w u�ytkownika"
+ msgstr "ustawienie adnotacji dla wybranych identyfikatorów użytkownika"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
- msgstr "zmiana has�a klucza"
+ msgstr "zmiana hasła klucza"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
- msgstr "zmiana zaufania w�a�ciciela"
+ msgstr "zmiana zaufania właściciela"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
- msgstr "uniewa�nienie podpis�w na wybranych identyfikatorach u�ytkownika"
+ msgstr "unieważnienie podpisów na wybranych identyfikatorach użytkownika"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
- msgstr "uniewa�nienie wybranych identyfikator�w u�ytkownika"
+ msgstr "unieważnienie wybranych identyfikatorów użytkownika"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
- msgstr "uniewa�nienie klucza lub wybranych podkluczy"
+ msgstr "unieważnienie klucza lub wybranych podkluczy"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
- msgstr "w��czenie klucza do u�ycia"
+ msgstr "włączenie klucza do użycia"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
- msgstr "wy��czenie klucza z u�ycia"
+ msgstr "wyłączenie klucza z użycia"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
- msgstr "okazanie wybranych identyfikator�w - zdj��"
+ msgstr "okazanie wybranych identyfikatorów - zdjęć"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
- "zag�szczanie bezu�ytecznych ID u�ytkownik�w i usuwanie bezu�ytecznych "
- "podpis�w z kluczy"
+ "zagęszczanie bezużytecznych ID użytkowników i usuwanie bezużytecznych "
+ "podpisów z kluczy"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
- "zag�szczanie bezu�ytecznych ID u�ytkownik�w i usuwanie wszystkich podpis�w z "
+ "zagęszczanie bezużytecznych ID użytkowników i usuwanie wszystkich podpisów z "
  "kluczy"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
- msgstr "Dost�pny jest klucz tajny.\n"
+ msgstr "Dostępny jest klucz tajny.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4371,666 -3478,525 +4393,667 @@@ msgstr "
  "(ltsign,\n"
  "  tnrsign itd.).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
- msgstr "Klucz uniewa�niony."
+ msgstr "Klucz unieważniony."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
- msgstr "Czy na pewno podpisa� wszystkie identyfikatory u�ytkownika? (t/N) "
+ msgstr "Czy na pewno podpisać wszystkie identyfikatory użytkownika? (t/N) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
- msgstr "Czy na pewno podpisa� wszystkie identyfikatory u�ytkownika? (t/N) "
+ msgstr "Czy na pewno podpisać wszystkie identyfikatory użytkownika? (t/N) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
- msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
+ msgstr "Podpowiedź: wybierz identyfikatory użytkownika do podpisania.\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "Nieznany rodzaj podpisu ,,%s''\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
- msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
+ msgstr "To polecenie nie jest dostępne w trybie %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
- msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
+ msgstr "Musisz wybrać co najmniej jeden identyfikator użytkownika.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
- msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
+ msgstr "Nie możesz usunąć ostatniego identyfikatora użytkownika!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr ""
- "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? (t/N) "
+ "Czy na pewno usunąć wszystkie wybrane identyfikatory użytkownika? (t/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
- msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? (t/N) "
+ msgstr "Czy na pewno usunąć ten identyfikator użytkownika? (t/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
- msgstr "Czy na pewno przenie�� g��wny klucz (t/N) "
+ msgstr "Czy na pewno przenieść główny klucz (t/N) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
- msgstr "Musisz wybra� dok�adnie jeden klucz.\n"
+ msgstr "Musisz wybrać dokładnie jeden klucz.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
- msgstr "Polecenie oczekuje argumentu b�d�cego nazw� pliku\n"
+ msgstr "Polecenie oczekuje argumentu będącego nazwą pliku\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
- msgstr "Nie mo�na otworzy� ,,%s'': %s\n"
+ msgstr "Nie można otworzyć ,,%s'': %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
- msgstr "B��d podczas odczytu klucza zapasowego z `%s': %s\n"
+ msgstr "Błąd podczas odczytu klucza zapasowego z `%s': %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
- msgstr "Musisz wybra� co najmniej jeden klucz.\n"
+ msgstr "Musisz wybrać co najmniej jeden klucz.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
- msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
+ msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
- msgstr "Czy na pewno chcesz usun�� ten klucz? (t/N) "
+ msgstr "Czy na pewno chcesz usunąć ten klucz? (t/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr ""
- "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? (t/N) "
+ "Czy na pewno unieważnić wszystkie wybrane identyfikatory użytkownika? (t/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
- msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? (t/N) "
+ msgstr "Czy na pewno unieważnić ten identyfikator użytkownika? (t/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
- msgstr "Czy na pewno chcesz uniewa�ni� ca�y klucz? (t/N) "
+ msgstr "Czy na pewno chcesz unieważnić cały klucz? (t/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgstr "Czy na pewno chcesz uniewa�ni� wybrane podklucze? (t/N) "
+ msgstr "Czy na pewno chcesz unieważnić wybrane podklucze? (t/N) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
- msgstr "Czy na pewno chcesz uniewa�ni� ten podklucz? (t/N) "
+ msgstr "Czy na pewno chcesz unieważnić ten podklucz? (t/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
- "Zaufanie u�ytkownika nie mo�e by� ustawione podczas u�ywania bazy zaufania\n"
- "dostarczonej przez u�ytkownika\n"
+ "Zaufanie użytkownika nie może być ustawione podczas używania bazy zaufania\n"
+ "dostarczonej przez użytkownika\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
- msgstr "Ustawienie listy ustawie� na:\n"
+ msgstr "Ustawienie listy ustawień na:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
- "Czy na pewno uaktualni� ustawienia dla wybranych identyfikator�w? (t/N) "
+ "Czy na pewno uaktualnić ustawienia dla wybranych identyfikatorów? (t/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
- msgstr "Czy na pewno uaktualni� ustawienia? (t/N) "
+ msgstr "Czy na pewno uaktualnić ustawienia? (t/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
- msgstr "Zapisa� zmiany? (t/N) "
+ msgstr "Zapisać zmiany? (t/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
- msgstr "Wyj�� bez zapisania zmian? (t/N) "
+ msgstr "Wyjść bez zapisania zmian? (t/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
- msgstr "zapis zmian nie powi�d� si�: %s\n"
+ msgstr "zapis zmian nie powiódł się: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
- msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
+ msgstr "Klucz nie został zmieniony więc zapis zmian nie jest konieczny.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
- msgstr "Generacja klucza nie powiod�a si�: %s\n"
+ msgstr "Generacja klucza nie powiodła się: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
- msgstr "niew�a�ciwy odcisk"
+ msgstr "niewłaściwy odcisk"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  #| msgid "failed to get the fingerprint\n"
  msgid "\"%s\" is not the primary fingerprint\n"
- msgstr "nie uda�o si� pobra� odcisku\n"
+ msgstr "nie udało się pobrać odcisku\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
- msgstr "niepoprawna warto��\n"
+ msgstr "niepoprawna wartość\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
- msgstr "Brak takiego identyfikatora u�ytkownika.\n"
+ msgstr "Brak takiego identyfikatora użytkownika.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "Nothing to sign with key %s\n"
  msgid "Nothing to sign.\n"
  msgstr "Nie ma nic do podpisania kluczem %s\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
- msgstr "Skr�t: "
+ msgstr "Skrót: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Ustawienia: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "no-modify dla serwera kluczy"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Preferowany serwer kluczy: "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "Adnotacje: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
- msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
+ msgstr "Klucze PGP 2.x nie zawierają opisu ustawień.\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
- msgstr "Ten klucz zosta� uniewa�niony %s przez klucz u�ytkownika %s %s\n"
+ msgstr "Ten klucz został unieważniony %s przez klucz użytkownika %s %s\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, 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"
+ msgstr "Klucz może zostać unieważniony przez klucz %s użytkownika %s"
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(poufne)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "utworzono: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
- msgstr "uniewa�niono: %s"
+ msgstr "unieważniono: %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
- msgstr "wygas�: %s"
+ msgstr "wygasł: %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "wygasa: %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
- msgstr "u�ycie: %s"
+ msgstr "użycie: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "nr-karty: "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "zaufanie: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
- msgstr "poprawno��: %s"
+ msgstr "poprawność: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
- msgstr "Ten klucz zosta� wy��czony z u�ytku"
+ msgstr "Ten klucz został wyłączony z użytku"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  msgstr ""
- "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
- "dop�ki program nie zostanie uruchomiony ponownie.\n"
+ "Pokazana wartość wiarygodności klucza może być niepoprawna,\n"
+ "dopóki program nie zostanie uruchomiony ponownie.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
- msgstr "uniewa�niony"
+ msgstr "unieważniony"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
- msgstr "wygas�"
+ msgstr "wygasł"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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 ""
- "OSTRZE�ENIE: �aden identyfikator u�ytkownika nie zosta� oznaczony explicite\n"
- "             jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
- "             wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
+ "OSTRZEŻENIE: żaden identyfikator użytkownika nie został oznaczony explicite\n"
+ "             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:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
- msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
+ msgstr "Nie można zmienić daty ważności klucza w wersji 3.\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  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 ""
- "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
- "             niekt�re wersje przestan� go rozumie�.\n"
+ "OSTRZEŻENIE: To jest klucz PGP wersji 2. Dodanie zdjęcia spowoduje, że\n"
+ "             niektóre wersje przestaną go rozumieć.\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
- msgstr "Czy dalej chcesz je doda�? (t/N) "
+ msgstr "Czy dalej chcesz je dodać? (t/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  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"
+ msgstr "Do klucza dla PGP 2.x nie można dodać zdjęcia.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
- msgstr "Taki identyfikator u�ytkownika ju� istnieje na tym kluczu!\n"
+ msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
- msgstr "Usun�� ten poprawny podpis? (t/N/w) "
+ msgstr "Usunąć ten poprawny podpis? (t/N/w) "
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
- msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
+ msgstr "Usunąć ten niepoprawny podpis? (t/N/w) "
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
- msgstr "Usun�� ten nieznany podpis? (t/N/w) "
+ msgstr "Usunąć ten nieznany podpis? (t/N/w) "
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
- msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
+ msgstr "Na pewno usunąć ten podpis klucza nim samym? (t/N) "
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
- msgstr[0] "%d podpis usuni�ty.\n"
- msgstr[1] "%d podpis usuni�ty.\n"
- msgstr[2] "%d podpis usuni�ty.\n"
+ msgstr[0] "%d podpis usunięty.\n"
+ msgstr[1] "%d podpis usunięty.\n"
+ msgstr[2] "%d podpis usunięty.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
- msgstr "Nic nie zosta�o usuni�te.\n"
+ msgstr "Nic nie zostało usunięte.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "niepoprawny"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
- msgstr "Identyfikator u�ytkownika ,,%s'' upakowany: %s\n"
+ msgstr "Identyfikator użytkownika ,,%s'' upakowany: %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
- msgstr[0] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
- msgstr[1] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
- msgstr[2] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
+ msgstr[0] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
+ msgstr[1] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
+ msgstr[2] "Identyfikator użytkownika ,,%s'': %d podpis wyczyszczony\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
- msgstr "Identyfikator u�ytkownika ,,%s'': ju� zmniejszony.\n"
+ msgstr "Identyfikator użytkownika ,,%s'': już zmniejszony.\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
- msgstr "Identyfikator u�ytkownika ,,%s'': ju� czysty.\n"
+ msgstr "Identyfikator użytkownika ,,%s'': już czysty.\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  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 ""
- "OSTRZE�ENIE: To jest klucz PGP wersji 2.x. Wyznaczenie mu klucza\n"
- "             uniewa�niaj�cego spowoduje, �e niekt�re wersje PGP przestan�\n"
- "             go rozumie�.\n"
+ "OSTRZEŻENIE: To jest klucz PGP wersji 2.x. Wyznaczenie mu klucza\n"
+ "             unieważniającego spowoduje, że niektóre wersje PGP przestaną\n"
+ "             go rozumieć.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  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"
+ msgstr "Do klucza dla PGP 2.x nie można wyznaczyć klucza unieważniającego.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
- msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
+ msgstr "Podaj identyfikator klucza unieważniającego: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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"
+ msgstr "klucza PGP 2.x nie można wyznaczyć jako unieważniającego\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
- msgstr "nie mo�na wyznaczy� klucza do uniewa�niania jego samego\n"
+ msgstr "nie można wyznaczyć klucza do unieważniania jego samego\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
- msgstr "ten klucz zosta� ju� uznany kluczem uniewa�niaj�cym\n"
+ msgstr "ten klucz został już uznany kluczem unieważniającym\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  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"
+ "OSTRZEŻENIE: nie można cofnąć wyznaczenia klucza jako unieważniającego!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  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) "
+ msgstr "Czy na pewno chcesz wyznaczyć ten klucz jako unieważniający? (t/N) "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
- msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N) "
+ msgstr "Czy na pewno chcesz wyznaczyć ten klucz jako unieważniający? (t/N) "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
- msgstr "Zmiana daty wa�no�ci podklucza.\n"
+ msgstr "Zmiana daty ważności podklucza.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
- msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
+ msgstr "Zmiana daty ważności głównego klucza.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  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"
+ msgstr "Nie można zmienić daty ważności klucza w wersji 3.\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
- msgstr "podklucz podpisuj�cy %s jest ju� skro�nie podpisany\n"
+ msgstr "podklucz podpisujący %s jest już skrośnie podpisany\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, 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"
+ "podklucz %s nie jest podpisujący, więc nie musi być skrośnie podpisany\n"
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
- msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
+ msgstr "Proszę wybrać dokładnie jeden identyfikator użytkownika.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
- msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
+ msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pominięty\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "Podaj preferowany URL serwera kluczy: "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  msgid "Are you sure you want to replace it? (y/N) "
- msgstr "Czy na pewno chcesz go zast�pi�? (t/N) "
+ msgstr "Czy na pewno chcesz go zastąpić? (t/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
- msgstr "Czy na pewno chcesz go usun��? (t/N) "
+ msgstr "Czy na pewno chcesz go usunąć? (t/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "Adnotacje: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
- msgstr "Kontynuowa�? (t/N) "
+ msgstr "Kontynuować? (t/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
- msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
+ msgstr "Brak identyfikatora użytkownika o numerze %d.\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
- msgstr "Brak identyfikatora u�ytkownika o skr�cie %s\n"
+ msgstr "Brak identyfikatora użytkownika o skrócie %s\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Brak podklucza o numerze %d.\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Brak podklucza o numerze %d.\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
- msgstr "identyfikator u�ytkownika: ,,%s''\n"
+ msgstr "identyfikator użytkownika: ,,%s''\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (podpis nieeksportowalny) "
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
- msgstr "Wa�no�� tego klucza wygas�a %s.\n"
+ msgstr "Ważność tego klucza wygasła %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
- msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
+ msgstr "Czy dalej chcesz go unieważnić? (t/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
- msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
+ msgstr "Stworzyć certyfikat unieważnienia tego podpisu? (t/N) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr "Nie podpisane przez ciebie.\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
- msgstr "Te identyfikatory na kluczu %s s� podpisane przez Ciebie:\n"
+ msgstr "Te identyfikatory na kluczu %s są podpisane przez Ciebie:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
- msgstr " (podpis nieuniewa�nialny) "
+ msgstr " (podpis nieunieważnialny) "
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
- msgstr "uniewa�niony przez tw�j klucz %s w %s\n"
+ msgstr "unieważniony przez twój klucz %s w %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
- msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
+ msgstr "Czy na pewno chcesz unieważnić te podpisy:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
- msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
+ msgstr "Na pewno utworzyć certyfikaty unieważnienia ? (t/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "brak klucza tajnego\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
- msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
+ msgstr "identyfikator użytkownika ,,%s'' został już unieważniony\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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"
+ "OSTRZEŻENIE: identyfikator użytkownika podpisany za %d sekund (w "
+ "przyszłości)\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
- msgstr "Klucz %s jest ju� uniewa�niony.\n"
+ msgstr "Klucz %s jest już unieważniony.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
- msgstr "Podklucz %s jest ju� uniewa�niony.\n"
+ msgstr "Podklucz %s jest już unieważniony.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
- "Wy�wietlanie zdj�cia w formacie %s o rozmiarze %ld bajt�w dla klucza %s (id "
+ "Wyświetlanie zdjęcia w formacie %s o rozmiarze %ld bajtów dla klucza %s (id "
  "%d).\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
- msgstr "ustawienie ,,%s'' powtarza si�\n"
+ msgstr "ustawienie ,,%s'' powtarza się\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
- msgstr "zbyt wiele ustawie� szyfru\n"
+ msgstr "zbyt wiele ustawień szyfru\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
- msgstr "zbyt wiele ustawie� funkcji skr�tu\n"
+ msgstr "zbyt wiele ustawień funkcji skrótu\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
- msgstr "zbyt wiele ustawie� kompresji\n"
+ msgstr "zbyt wiele ustawień kompresji\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
- msgstr "niew�a�ciwy element `%s' w tek�cie ustawie�\n"
+ msgstr "niewłaściwy element `%s' w tekście ustawień\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
- msgstr "zapis podpisu bezpo�redniego\n"
+ msgstr "zapis podpisu bezpośredniego\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "zapis podpisu klucza nim samym\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
- msgstr "zapis podpisu wi���cego klucz\n"
+ msgstr "zapis podpisu wiążącego klucz\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
- msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
+ msgstr "niewłaściwa długość klucza; wykorzystano %u bitów\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
- msgstr "rozmiar klucza zaokr�glony w g�r� do %u bit�w\n"
+ msgstr "rozmiar klucza zaokrąglony w górę do %u bitów\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
- "OSTRZE�ENIE: niekt�re programy OpenPGP nie potrafi� obs�u�y� klucza RSA o "
- "tej d�ugo�ci skr�tu\n"
+ "OSTRZEŻENIE: niektóre programy OpenPGP nie potrafią obsłużyć klucza RSA o "
+ "tej długości skrótu\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "Podpisywanie"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "Certyfikowanie"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "Szyfrowanie"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "Uwierzytelnianie"
  
@@@ -5044,158 -4010,127 +5067,158 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "PpSsUuZz"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
- msgstr "Mo�liwe akcje dla klucza %s: "
+ msgstr "Możliwe akcje dla klucza %s: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "Aktualnie dopuszczalne akcje: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
- msgstr "   (%c) Prze��czenie mo�liwo�ci podpisywania\n"
+ msgstr "   (%c) Przełączenie możliwości podpisywania\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
- msgstr "   (%c) Prze��czenie mo�liwo�ci szyfrowania\n"
+ msgstr "   (%c) Przełączenie możliwości szyfrowania\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
- msgstr "   (%c) Prze��czenie mo�liwo�ci uwierzytelniania\n"
+ msgstr "   (%c) Przełączenie możliwości uwierzytelniania\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
- msgstr "   (%c) Zako�czenie\n"
+ msgstr "   (%c) Zakończenie\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
- msgstr "Prosz� wybra� rodzaj klucza:\n"
+ msgstr "Proszę wybrać rodzaj klucza:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
- msgstr "   (%d) RSA i RSA (domy�lne)\n"
+ msgstr "   (%d) RSA i RSA (domyślne)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA i Elgamala\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (tylko do podpisywania)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (tylko do podpisywania)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamala (tylko do szyfrowania)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (tylko do szyfrowania)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
- msgstr "   (%d) DSA (mo�liwo�ci do ustawienia)\n"
+ msgstr "   (%d) DSA (możliwości do ustawienia)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (mo�liwo�ci do ustawienia)\n"
+ msgstr "   (%d) RSA (możliwości do ustawienia)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  #| msgid "   (%d) DSA and Elgamal\n"
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA i Elgamala\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (tylko do podpisywania)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
- msgstr "   (%d) DSA (mo�liwo�ci do ustawienia)\n"
+ msgstr "   (%d) DSA (możliwości do ustawienia)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (tylko do szyfrowania)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
- msgstr "   (%d) Istniej�cy klucz\n"
+ msgstr "   (%d) Istniejący klucz\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Uchwyt klucza: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
- msgstr "Nieprawid�owy uchwyt klucza (oczekiwano 40 cyfr szesnastkowych)\n"
+ msgstr "Nieprawidłowy uchwyt klucza (oczekiwano 40 cyfr szesnastkowych)\n"
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Brak klucza o tym uchwycie\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
- msgstr "zaokr�glono do %u bit�w\n"
+ msgstr "zaokrąglono do %u bitów\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
- msgstr "Klucze %s b�d� mia�y od %u do %u bit�w d�ugo�ci.\n"
+ msgstr "Klucze %s będą miały od %u do %u bitów długości.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
- msgstr "Jakiej d�ugo�ci podklucz wygenerowa�? (%u) "
+ msgstr "Jakiej długości podklucz wygenerować? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
- msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (%u) "
+ msgstr "Jakiej długości klucz wygenerować? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
- msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
+ msgstr "Żądana długość klucza to %u bitów.\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
- msgstr "Prosz� wybra� rodzaj klucza:\n"
+ msgstr "Proszę wybrać rodzaj klucza:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5204,14 -4139,13 +5227,14 @@@
  "      <n>m = key expires in n months\n"
  "      <n>y = key expires in n years\n"
  msgstr ""
- "Okres wa�no�ci klucza.\n"
- "         0 = klucz nie ma okre�lonego terminu wa�no�ci\n"
- "      <n>  = termin wa�no�ci klucza up�ywa za n dni\n"
- "      <n>w = termin wa�no�ci klucza up�ywa za n tygodni\n"
- "      <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
- "      <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
+ "Okres ważności klucza.\n"
+ "         0 = klucz nie ma określonego terminu ważności\n"
+ "      <n>  = termin ważności klucza upływa za n dni\n"
+ "      <n>w = termin ważności klucza upływa za n tygodni\n"
+ "      <n>m = termin ważności klucza upływa za n miesięcy\n"
+ "      <n>y = termin ważności klucza upływa za n lat\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5220,57 -4154,47 +5243,57 @@@
  "      <n>m = signature expires in n months\n"
  "      <n>y = signature expires in n years\n"
  msgstr ""
- "Okres wa�no�ci podpisu.\n"
- "         0 = klucz nie ma okre�lonego terminu wa�no�ci\n"
- "      <n>  = termin wa�no�ci podpisu up�ywa za n dni\n"
- "      <n>w = termin wa�no�ci podpisu up�ywa za n tygodni\n"
- "      <n>m = termin wa�no�ci podpisu up�ywa za n miesi�cy\n"
- "      <n>y = termin wa�no�ci podpisu up�ywa za n lat\n"
+ "Okres ważności podpisu.\n"
+ "         0 = klucz nie ma określonego terminu ważności\n"
+ "      <n>  = termin ważności podpisu upływa za n dni\n"
+ "      <n>w = termin ważności podpisu upływa za n tygodni\n"
+ "      <n>m = termin ważności podpisu upływa za n miesięcy\n"
+ "      <n>y = termin ważności podpisu upływa za n lat\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
- msgstr "Okres wa�no�ci klucza? (0) "
+ msgstr "Okres ważności klucza? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
- msgstr "Okres wa�no�ci podpisu? (%s) "
+ msgstr "Okres ważności podpisu? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
- msgstr "niepoprawna warto��\n"
+ msgstr "niepoprawna wartość\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
- msgstr "Klucz nie wyga�nie w og�le\n"
+ msgstr "Klucz nie wygaśnie w ogóle\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
- msgstr "Podpis nie wyga�nie w og�le\n"
+ msgstr "Podpis nie wygaśnie w ogóle\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
- msgstr "Klucz traci wa�no�� %s\n"
+ msgstr "Klucz traci ważność %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
- msgstr "Wa�no�� podpisu wygasa %s\n"
+ msgstr "Ważność podpisu wygasa %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
- "Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
- "Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
+ "Twój system nie potrafi pokazać daty po roku 2038.\n"
+ "Niemniej daty do roku 2106 będą poprawnie obsługiwane.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
- msgstr "Czy wszystko si� zgadza (t/N)? "
+ msgstr "Czy wszystko się zgadza (t/N)? "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5284,7 -4208,6 +5307,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5294,56 -4217,45 +5317,56 @@@
  "\n"
  msgstr ""
  "\n"
- "Musisz poda� identyfikator u�ytkownika aby mo�na by�o rozpozna� tw�j klucz;\n"
- "program z�o�y go z twojego imienia i nazwiska, komentarza i adresu poczty\n"
- "elektronicznej. B�dzie on mia�, na przyk�ad, tak� posta�:\n"
- "    \"Tadeusz �ele�ski (Boy) <tzb at ziemianska.pl>\"\n"
+ "Musisz podać identyfikator użytkownika aby można było rozpoznać twój klucz;\n"
+ "program złoży go z twojego imienia i nazwiska, komentarza i adresu poczty\n"
+ "elektronicznej. Będzie on miał, na przykład, taką postać:\n"
+ "    \"Tadeusz Żeleński (Boy) <tzb at ziemianska.pl>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
- msgstr "Imi� i nazwisko: "
+ msgstr "Imię i nazwisko: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
- msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
+ msgstr "Niewłaściwy znak w imieniu lub nazwisku\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
- msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
+ msgstr "Imię lub nazwisko nie może zaczynać się od cyfry\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
- msgstr "Imi� i nazwisko musz� mie� co najmniej 5 znak�w d�ugo�ci.\n"
+ msgstr "Imię i nazwisko muszą mieć co najmniej 5 znaków długości.\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "Adres poczty elektronicznej: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "To nie jest poprawny adres poczty elektronicznej\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Komentarz: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
- msgstr "Niew�a�ciwy znak w komentarzu\n"
+ msgstr "Niewłaściwy znak w komentarzu\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
- msgstr "U�ywasz zestawu znak�w %s.\n"
+ msgstr "Używasz zestawu znaków %s.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5354,10 -4266,9 +5377,10 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
- "Nie nale�y umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
+ "Nie należy umieszczać adresu poczty elektronicznej w polu nazwiska czy\n"
  "komentarza.\n"
  
  #. TRANSLATORS: These are the allowed answers in
@@@ -5371,61 -4282,51 +5394,61 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "IiKkEeDdWw"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
- msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
+ msgstr "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, czy (W)yjść? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
- "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
- "czy (W)yj�� z programu? "
+ "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, przejść (D)alej,\n"
+ "czy (W)yjść z programu? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
- msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
+ msgstr "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, czy (W)yjść? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr ""
- "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
- "czy (W)yj�� z programu? "
+ "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, przejść (D)alej,\n"
+ "czy (W)yjść z programu? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
- msgstr "Najpierw trzeba poprawi� ten b��d\n"
+ msgstr "Najpierw trzeba poprawić ten błąd\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
  "disks) during the prime generation; this gives the random number\n"
  "generator a better chance to gain enough entropy.\n"
  msgstr ""
- "Musimy wygenerowa� du�o losowych bajt�w. Dobrym pomys�em aby pom�c "
+ "Musimy wygenerować dużo losowych bajtów. Dobrym pomysłem aby pomóc "
  "komputerowi\n"
  "podczas generowania liczb pierwszych jest wykonywanie w tym czasie innych\n"
- "dzia�a� (pisanie na klawiaturze, poruszanie myszk�, odwo�anie si� do "
- "dysk�w);\n"
- "dzi�ki temu generator liczb losowych ma mo�liwo�� zebrania odpowiedniej "
- "ilo�ci\n"
+ "działań (pisanie na klawiaturze, poruszanie myszką, odwołanie się do "
+ "dysków);\n"
+ "dzięki temu generator liczb losowych ma możliwość zebrania odpowiedniej "
+ "ilości\n"
  "entropii.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
- msgstr "Generacja klucza nie powiod�a si�: %s\n"
+ msgstr "Generacja klucza nie powiodła się: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5433,114 -4334,94 +5456,114 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
- msgstr "klucz ju� istnieje\n"
+ msgstr "klucz już istnieje\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  #| msgid "Use this key anyway? (y/N) "
  msgid "Create anyway? (y/N) "
- msgstr "U�y� tego klucza pomimo to? (t/N) "
+ msgstr "Użyć tego klucza pomimo to? (t/N) "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "generowanie nowego klucza\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
- msgstr "Procedura generacji klucza zosta�a anulowana.\n"
+ msgstr "Procedura generacji klucza została anulowana.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
- msgstr "nie mo�na utworzy� pliku kopii zapasowej ,,%s'': %s\n"
+ msgstr "nie można utworzyć pliku kopii zapasowej ,,%s'': %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "UWAGA: kopia zapasowa klucza karty zapisana do ,,%s''\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
- msgstr "zapisuj� klucz publiczny w ,,%s''\n"
+ msgstr "zapisuję klucz publiczny w ,,%s''\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
- msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
+ msgstr "błąd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
- msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
+ msgstr "klucz publiczny i prywatny (tajny) zostały utworzone i podpisane.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
  msgstr ""
- "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
- "mo�na doda� do niego podklucz szyfruj�cy.\n"
+ "Ten klucz nie może być wykorzystany do szyfrowania. Komendą \"--edit-key\"\n"
+ "można dodać do niego podklucz szyfrujący.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr ""
- "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
- "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
+ "klucz został stworzony %lu sekundę w przyszłości (zaburzenia\n"
+ "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr ""
- "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
- "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
+ "klucz został stworzony %lu sekund w przyszłości (zaburzenia\n"
+ "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr ""
  "UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
- msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
+ msgstr "Część tajna głównego klucza jest niedostępna.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
- msgstr "Cz�� tajna g��wnego klucza jest zapisana na karcie.\n"
+ msgstr "Część tajna głównego klucza jest zapisana na karcie.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
- msgstr "Czy na pewno utworzy�? (t/N) "
+ msgstr "Czy na pewno utworzyć? (t/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "nigdy     "
  
@@@ -5569,20 -4444,18 +5592,20 @@@ msgstr "Adnotacje podpisu: 
  #| msgid "%d bad signatures\n"
  msgid "%d good signature\n"
  msgid_plural "%d good signatures\n"
- msgstr[0] "%d niepoprawnych podpis�w\n"
- msgstr[1] "%d niepoprawnych podpis�w\n"
- msgstr[2] "%d niepoprawnych podpis�w\n"
+ msgstr[0] "%d niepoprawnych podpisów\n"
+ msgstr[1] "%d niepoprawnych podpisów\n"
+ msgstr[2] "%d niepoprawnych podpisów\n"
  
 +#: g10/keylist.c:485
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to an error\n"
  msgid "%d signature not checked due to an error\n"
  msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
- msgstr[1] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
- msgstr[2] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
+ msgstr[0] "1 podpis nie został sprawdzony z powodu błędu\n"
+ msgstr[1] "1 podpis nie został sprawdzony z powodu błędu\n"
+ msgstr[2] "1 podpis nie został sprawdzony z powodu błędu\n"
  
 +#: g10/keylist.c:567
  #, c-format
  msgid "Warning: %lu key skipped due to its large size\n"
  msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@@ -5590,33 -4463,26 +5613,33 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
 +#: g10/keylist.c:589
  msgid "Keyring"
- msgstr "Zbi�r kluczy"
+ msgstr "Zbiór kluczy"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
- msgstr "Odcisk klucza g��wnego:"
+ msgstr "Odcisk klucza głównego:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "      Odcisk podklucza:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
- msgstr " Odcisk klucza g��wnego:"
+ msgstr " Odcisk klucza głównego:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "       Odcisk podklucza:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "       Odcisk klucza ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr "    Nr seryjny karty ="
  
@@@ -5631,11 -4495,10 +5654,11 @@@ msgstr "buforowanie zbioru kluczy ,,%s'
  #| msgid "%lu keys cached so far (%lu signatures)\n"
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
- msgstr[0] "%lu kluczy zbuforowano do tej pory (%lu podpis�w)\n"
- msgstr[1] "%lu kluczy zbuforowano do tej pory (%lu podpis�w)\n"
- msgstr[2] "%lu kluczy zbuforowano do tej pory (%lu podpis�w)\n"
+ msgstr[0] "%lu kluczy zbuforowano do tej pory (%lu podpisów)\n"
+ msgstr[1] "%lu kluczy zbuforowano do tej pory (%lu podpisów)\n"
+ msgstr[2] "%lu kluczy zbuforowano do tej pory (%lu podpisów)\n"
  
 +#: g10/keyring.c:1588
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
@@@ -5652,122 -4514,97 +5675,122 @@@ msgstr[0] "1 niepoprawny podpis\n
  msgstr[1] "1 niepoprawny podpis\n"
  msgstr[2] "1 niepoprawny podpis\n"
  
 +#: g10/keyring.c:1665
  #, c-format
  msgid "%s: keyring created\n"
- msgstr "%s: zbi�r kluczy utworzony\n"
+ msgstr "%s: zbiór kluczy utworzony\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
- msgstr "w��czenie uniewa�nionych kluczy do wynik�w wyszukiwania"
+ msgstr "włączenie unieważnionych kluczy do wyników wyszukiwania"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
- msgstr "w��czenie podkluczy przy poszukiwaniu po ID klucza"
+ msgstr "włączenie podkluczy przy poszukiwaniu po ID klucza"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
- msgstr "automatyczne pobieranie kluczy przy sprawdzaniu podpis�w"
+ msgstr "automatyczne pobieranie kluczy przy sprawdzaniu podpisów"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "honorowanie URL-a preferowanego serwera kluczy ustawionego w kluczu"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr "honorowanie rekordu PKA ustawionego w kluczu przy pobieraniu kluczy"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
- msgstr "wy��czony"
+ msgstr "wyłączony"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
- msgstr "Wprowad� numer(y), N)ast�pny lub Q)uit > "
+ msgstr "Wprowadź numer(y), N)astępny lub Q)uit > "
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
- msgstr "niepoprawny protok� serwera kluczy (nasz %d != modu� obs�ugi %d)\n"
+ msgstr "niepoprawny protokół serwera kluczy (nasz %d != moduł obsługi %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
- msgstr ",,%s'' nie jest identyfikatorem klucza - pomini�to\n"
+ msgstr ",,%s'' nie jest identyfikatorem klucza - pominięto\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  #| msgid "refreshing %d keys from %s\n"
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
- msgstr[0] "od�wie�anie %d kluczy z %s\n"
- msgstr[1] "od�wie�anie %d kluczy z %s\n"
- msgstr[2] "od�wie�anie %d kluczy z %s\n"
+ msgstr[0] "odświeżanie %d kluczy z %s\n"
+ msgstr[1] "odświeżanie %d kluczy z %s\n"
+ msgstr[2] "odświeżanie %d kluczy z %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
- msgstr "OSTRZE�ENIE: nie mo�na od�wie�y� klucza %s przez %s: %s\n"
+ msgstr "OSTRZEŻENIE: nie można odświeżyć klucza %s przez %s: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
- msgstr "klucz ,,%s'' nie zosta� odnaleziony na serwerze kluczy\n"
+ msgstr "klucz ,,%s'' nie został odnaleziony na serwerze kluczy\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
- msgstr "klucz nie zosta� odnaleziony na serwerze kluczy\n"
+ msgstr "klucz nie został odnaleziony na serwerze kluczy\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
- msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
+ msgstr "brak znanyk serwerów kluczy (użyj opcji --keyserver)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "zapytanie o klucz %s z serwera %s %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "zapytanie o klucz %s z %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  #| msgid "no keyserver action!\n"
  msgid "no keyserver known\n"
  msgstr "brak akcji serwera kluczy!\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
- msgstr "pomini�ty ,,%s'': %s\n"
+ msgstr "pominięty ,,%s'': %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
- msgstr "wysy�anie klucza %s na %s\n"
+ msgstr "wysyłanie klucza %s na %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  #| msgid "requesting key %s from %s\n"
  msgid "requesting key from '%s'\n"
  msgstr "zapytanie o klucz %s z %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
- msgstr "OSTRZE�ENIE: nie mo�na pobra� URI %s: %s\n"
+ msgstr "OSTRZEŻENIE: nie można pobrać URI %s: %s\n"
  
 +#: g10/mainproc.c:254
  #, c-format
  msgid "weird size for an encrypted session key (%d)\n"
  msgstr "dziwny rozmiar jak na zaszyfrowany klucz sesyjny (%d)\n"
@@@ -5777,12 -4613,10 +5800,12 @@@
  msgid "%s encrypted session key\n"
  msgstr "klucz sesyjny zaszyfrowany %s\n"
  
 +#: g10/mainproc.c:312
  #, c-format
  msgid "passphrase generated with unknown digest algorithm %d\n"
- msgstr "has�o wygenerowane nieznanym algorytmem skr�tu %d\n"
+ msgstr "hasło wygenerowane nieznanym algorytmem skrótu %d\n"
  
 +#: g10/mainproc.c:378
  #, c-format
  msgid "public key is %s\n"
  msgstr "klucz publiczny to %s\n"
@@@ -5807,188 -4637,149 +5830,188 @@@ msgstr "      ,,%s''\n
  msgid "encrypted with %s key, ID %s\n"
  msgstr "zaszyfrowano kluczem %s o identyfikatorze %s\n"
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
- msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
+ msgstr "błąd odszyfrowywania kluczem publicznym: %s\n"
  
 +#: g10/mainproc.c:530
  #, c-format
  msgid "encrypted with %lu passphrases\n"
- msgstr "zaszyfrowane za pomoc� %lu hase�\n"
+ msgstr "zaszyfrowane za pomocą %lu haseł\n"
  
 +#: g10/mainproc.c:532
  msgid "encrypted with 1 passphrase\n"
- msgstr "zaszyfrowane jednym has�em\n"
+ msgstr "zaszyfrowane jednym hasłem\n"
  
 +#: g10/mainproc.c:566 g10/mainproc.c:587
  #, c-format
  msgid "assuming %s encrypted data\n"
- msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
+ msgstr "przyjmując że dane zostały zaszyfrowane za pomocą %s\n"
  
 +#: g10/mainproc.c:573
  #, c-format
  msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
- msgstr "szyfr IDEA nie jest dost�pny, pr�ba u�ycia %s zamiast niego\n"
+ msgstr "szyfr IDEA nie jest dostępny, próba użycia %s zamiast niego\n"
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  msgid "WARNING: message was not integrity protected\n"
- msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
+ msgstr "OSTRZEŻENIE: wiadomość nie była zabezpieczona przed manipulacją\n"
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
  msgstr "odszyfrowanie poprawne\n"
  
 +#: g10/mainproc.c:637
  msgid "WARNING: encrypted message has been manipulated!\n"
- msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
+ msgstr "OSTRZEŻENIE: zaszyfrowana wiadomość była manipulowana!\n"
  
 +#: g10/mainproc.c:653
  #, c-format
  msgid "decryption failed: %s\n"
- msgstr "b��d odszyfrowywania: %s\n"
+ msgstr "błąd odszyfrowywania: %s\n"
  
 +#: g10/mainproc.c:676
  #, fuzzy
  #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
  msgid "Note: sender requested \"for-your-eyes-only\"\n"
- msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
+ msgstr "UWAGA: nadawca zaznaczył że wiadomość nie powinna być zapisywana\n"
  
 +#: g10/mainproc.c:678
  #, c-format
  msgid "original file name='%.*s'\n"
  msgstr "pierwotna nazwa pliku='%.*s'\n"
  
 +#: g10/mainproc.c:748
  msgid "WARNING: multiple plaintexts seen\n"
- msgstr "OSTRZE�ENIE: widziano wiele czystych tekst�w\n"
+ msgstr "OSTRZEŻENIE: widziano wiele czystych tekstów\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr ""
- "osobny certyfikat uniewa�nienia - u�yj ,,gpg --import'' aby go wczyta�\n"
+ "osobny certyfikat unieważnienia - użyj ,,gpg --import'' aby go wczytać\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "nie znaleziono podpisu\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
- msgstr "NIEPOPRAWNY podpis z�o�ony przez ,,%s''"
+ msgstr "NIEPOPRAWNY podpis złożony przez ,,%s''"
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
- msgstr "Przeterminowany podpis z�o�ony przez ,,%s''"
+ msgstr "Przeterminowany podpis złożony przez ,,%s''"
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
- msgstr "Poprawny podpis z�o�ony przez ,,%s''"
+ msgstr "Poprawny podpis złożony przez ,,%s''"
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
- msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
+ msgstr "wymuszono pominięcie sprawdzenia podpisu\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
- msgstr "nie mo�na obs�u�y� tych wieloznacznych danych podpisu\n"
+ msgstr "nie można obsłużyć tych wieloznacznych danych podpisu\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Podpisano w %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
- msgstr "               przy u�yciu klucza %s %s\n"
+ msgstr "               przy użyciu klucza %s %s\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Podpisano w %s kluczem %s o numerze %s\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                        alias ,,%s''"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
- msgstr "Klucz dost�pny w: "
+ msgstr "Klucz dostępny w: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[niepewne]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                        alias ,,%s''"
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
- msgstr "Wa�no�� podpisu wygas�a %s.\n"
+ msgstr "Ważność podpisu wygasła %s.\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
- msgstr "Wa�no�� podpisu wygasa %s.\n"
+ msgstr "Ważność podpisu wygasa %s.\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
- msgstr "podpis %s, skr�t %s\n"
+ msgstr "podpis %s, skrót %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binarny"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "tekstowy"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "nieznany"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "algorithm: %s"
  msgid ", key algorithm "
  msgstr "algorytm: %s"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
- msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
+ msgstr "Nie można sprawdzić podpisu: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "nie jest oddzielonym podpisem.\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
- "OSTRZE�ENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
+ "OSTRZEŻENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "oddzielony podpis klasy 0x%02x.\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "podpis starego typu (PGP 2.x).\n"
  
@@@ -5996,96 -4786,79 +6019,96 @@@
  #, fuzzy, c-format
  #| msgid "fstat of `%s' failed in %s: %s\n"
  msgid "fstat of '%s' failed in %s: %s\n"
- msgstr "fstat na ,,%s'' nie powiod�o si� w %s: %s\n"
+ msgstr "fstat na ,,%s'' nie powiodło się w %s: %s\n"
  
 +#: g10/misc.c:170
  #, c-format
  msgid "fstat(%d) failed in %s: %s\n"
- msgstr "fstat(%d) nie powiod�o si� w %s: %s\n"
+ msgstr "fstat(%d) nie powiodło się w %s: %s\n"
  
 +#: g10/misc.c:279
  #, c-format
  msgid "WARNING: using experimental public key algorithm %s\n"
  msgstr ""
- "OSTRZE�ENIE: u�ycie eksperymentalnego algorytmu klucza publicznego %s\n"
+ "OSTRZEŻENIE: użycie eksperymentalnego algorytmu klucza publicznego %s\n"
  
 +#: g10/misc.c:286
  msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
  msgstr ""
- "OSTRZE�ENIE: klucze do podpisywania i szyfrowania Elgamala s� odradzane\n"
+ "OSTRZEŻENIE: klucze do podpisywania i szyfrowania Elgamala są odradzane\n"
  
 +#: g10/misc.c:300
  #, c-format
  msgid "WARNING: using experimental cipher algorithm %s\n"
- msgstr "OSTRZE�ENIE: u�ycie eksperymentalnego szyfru %s\n"
+ msgstr "OSTRZEŻENIE: użycie eksperymentalnego szyfru %s\n"
  
 +#: g10/misc.c:319
  #, c-format
  msgid "WARNING: using experimental digest algorithm %s\n"
- msgstr "OSTRZE�ENIE: u�ycie eksperymentalnego algorytmu skr�tu %s\n"
+ msgstr "OSTRZEŻENIE: użycie eksperymentalnego algorytmu skrótu %s\n"
  
 +#: g10/misc.c:328
  #, c-format
  msgid "WARNING: digest algorithm %s is deprecated\n"
- msgstr "OSTRZE�ENIE: algorytm skr�tu %s jest odradzany\n"
+ msgstr "OSTRZEŻENIE: algorytm skrótu %s jest odradzany\n"
  
 +#: g10/misc.c:353
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "Note: signatures using the %s algorithm are rejected\n"
- msgstr "podpis %s, skr�t %s\n"
+ msgstr "podpis %s, skrót %s\n"
  
 +#: g10/misc.c:375
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "(reported error: %s)\n"
- msgstr "b��d odczytu w ,,%s'': %s\n"
+ msgstr "błąd odczytu w ,,%s'': %s\n"
  
 +#: g10/misc.c:378
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "(reported error: %s <%s>)\n"
- msgstr "b��d odczytu w ,,%s'': %s\n"
+ msgstr "błąd odczytu w ,,%s'': %s\n"
  
 +#: g10/misc.c:397
  msgid "(further info: "
  msgstr ""
  
 +#: g10/misc.c:1056
  #, c-format
  msgid "%s:%d: deprecated option \"%s\"\n"
- msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
+ msgstr "%s:%d jest przestarzałą opcją ,,%s''\n"
  
 +#: g10/misc.c:1060
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated option\n"
- msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
+ msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
  
 +#: g10/misc.c:1062
  #, c-format
  msgid "please use \"%s%s\" instead\n"
- msgstr "w jej miejsce nale�y u�y� ,,%s%s''\n"
+ msgstr "w jej miejsce należy użyć ,,%s%s''\n"
  
 +#: g10/misc.c:1069
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
  msgstr ""
- "OSTRZE�ENIE: ,,%s'' jest przestarza�ym poleceniem - nie nale�y go u�ywa�\n"
+ "OSTRZEŻENIE: ,,%s'' jest przestarzałym poleceniem - nie należy go używać\n"
  
 +#: g10/misc.c:1079
  #, fuzzy, c-format
  #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
  msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
- msgstr "%s:%u: przestarza�a opcja ,,%s'' - nie ma efektu\n"
+ msgstr "%s:%u: przestarzała opcja ,,%s'' - nie ma efektu\n"
  
 +#: g10/misc.c:1083
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
  msgid ""
  "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
- msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj� - nie ma efektu\n"
+ msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją - nie ma efektu\n"
  
 +#: g10/misc.c:1147
  msgid "Uncompressed"
  msgstr "Nieskompresowany"
  
@@@ -6094,30 -4866,25 +6117,30 @@@
  msgid "uncompressed|none"
  msgstr "nieskompresowany|brak"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
- msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
+ msgstr "ta wiadomość może nie dać się odczytać za pomocą %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  #| msgid "ambiguous option `%s'\n"
  msgid "ambiguous option '%s'\n"
  msgstr "niejednoznaczna opcja ,,%s''\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown option '%s'\n"
  msgstr "nieznana opcja ,,%s''\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  #, fuzzy
  #| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
- msgstr "DSA wymaga d�ugo�ci skr�tu b�d�cego wielokrotno�ci� 8 bit�w\n"
+ msgstr "DSA wymaga długości skrótu będącego wielokrotnością 8 bitów\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "unknown weak digest '%s'\n"
@@@ -6127,55 -4893,45 +6150,55 @@@ msgstr "Nieznany rodzaj podpisu ,,%s''\
  #, fuzzy, c-format
  #| msgid "File `%s' exists. "
  msgid "File '%s' exists. "
- msgstr "Plik ,,%s'' ju� istnieje. "
+ msgstr "Plik ,,%s'' już istnieje. "
  
 +#: g10/openfile.c:88
  msgid "Overwrite? (y/N) "
- msgstr "Nadpisa�? (t/N) "
+ msgstr "Nadpisać? (t/N) "
  
 +#: g10/openfile.c:123
  #, c-format
  msgid "%s: unknown suffix\n"
- msgstr "%s: nieznana ko�c�wka nazwy\n"
+ msgstr "%s: nieznana końcówka nazwy\n"
  
 +#: g10/openfile.c:147
  msgid "Enter new filename"
  msgstr "Nazwa pliku"
  
 +#: g10/openfile.c:218
  msgid "writing to stdout\n"
- msgstr "zapisywanie na wyj�cie standardowe\n"
+ msgstr "zapisywanie na wyjście standardowe\n"
  
 +#: g10/openfile.c:366
  #, fuzzy, c-format
  #| msgid "assuming signed data in `%s'\n"
  msgid "assuming signed data in '%s'\n"
- msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
+ msgstr "przyjęto obecność podpisanych danych w '%s'\n"
  
 +#: g10/openfile.c:457
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new configuration file '%s' created\n"
- msgstr "nowy plik ustawie� ,,%s'' zosta� utworzony\n"
+ msgstr "nowy plik ustawień ,,%s'' został utworzony\n"
  
 +#: g10/openfile.c:498
  #, fuzzy, c-format
  #| msgid "WARNING: options in `%s' are not yet active during this run\n"
  msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
+ msgstr "OSTRZEŻENIE: opcje w ,,%s'' nie są jeszcze uwzględnione.\n"
  
 +#: g10/parse-packet.c:257
  #, c-format
  msgid "can't handle public key algorithm %d\n"
- msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
+ msgstr "nie można obsłużyć tego algorytmu klucza publicznego: %d\n"
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
  msgstr ""
- "OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
+ "OSTRZEŻENIE: symetrycznie zaszyfrowany klucz sesyjny może nie być "
  "bezpieczny\n"
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@@ -6185,56 -4940,46 +6208,56 @@@
  msgid "problem with the agent: %s\n"
  msgstr "problem z agentem: %s\n"
  
 +#: g10/passphrase.c:241
  msgid "Enter passphrase\n"
- msgstr "Has�o\n"
+ msgstr "Hasło\n"
  
 +#: g10/passphrase.c:252
  msgid "cancelled by user\n"
- msgstr "anulowano przez u�ytkownika\n"
+ msgstr "anulowano przez użytkownika\n"
  
 +#: g10/passphrase.c:489
  #, c-format
  msgid " (main key ID %s)"
- msgstr " (ID g��wnego klucza %s)"
+ msgstr " (ID głównego klucza %s)"
  
 +#: g10/passphrase.c:496
  #, fuzzy
  #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
- msgstr "Prosz� wprowadzi� has�o do odbezpieczenia obiektu PKCS#12."
+ msgstr "Proszę wprowadzić hasło do odbezpieczenia obiektu PKCS#12."
  
 +#: g10/passphrase.c:500
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
- msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
+ msgstr "Proszę wprowadzić hasło do zabezpieczenia obiektu PKCS#12."
  
 +#: g10/passphrase.c:505
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
- msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
+ msgstr "Proszę wprowadzić hasło do zabezpieczenia obiektu PKCS#12."
  
 +#: g10/passphrase.c:508
  #, fuzzy
  #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
- msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
+ msgstr "Proszę wprowadzić hasło do zabezpieczenia obiektu PKCS#12."
  
 +#: g10/passphrase.c:513
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
- msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
+ msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
  
 +#: g10/passphrase.c:516
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
- msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
+ msgstr "Czy na pewno chcesz usunąć wybrane klucze? (t/N) "
  
 +#: g10/passphrase.c:525
  #, fuzzy, c-format
  #| msgid "%u-bit %s key, ID %s, created %s"
  msgid ""
@@@ -6243,9 -4988,8 +6266,9 @@@
  "%u-bit %s key, ID %s,\n"
  "created %s%s.\n"
  "%s"
- msgstr "d�ugo�� %u bit�w, typ %s, numer %s, stworzony %s"
+ msgstr "długość %u bitów, typ %s, numer %s, stworzony %s"
  
 +#: g10/photoid.c:77
  msgid ""
  "\n"
  "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@@ -6254,71 -4998,57 +6277,71 @@@
  "Keeping the image close to 240x288 is a good size to use.\n"
  msgstr ""
  "\n"
- "Wybierz zdj�cie kt�re chcesz do��czy� do swojego klucza jako identyfikator.\n"
- "Musi to by� plik w formacie JPEG. Zostanie on zapisany w Twoim kluczu\n"
- "publicznym. Je�li b�dzie du�y, powi�kszy to tak�e rozmiar Twojego klucza!\n"
- "Dobry rozmiar to oko�o 240 na 288 pikseli.\n"
+ "Wybierz zdjęcie które chcesz dołączyć do swojego klucza jako identyfikator.\n"
+ "Musi to być plik w formacie JPEG. Zostanie on zapisany w Twoim kluczu\n"
+ "publicznym. Jeśli będzie duży, powiększy to także rozmiar Twojego klucza!\n"
+ "Dobry rozmiar to około 240 na 288 pikseli.\n"
  
 +#: g10/photoid.c:99
  msgid "Enter JPEG filename for photo ID: "
- msgstr "Nazwa pliku ze zdj�ciem w formacie JPEG: "
+ msgstr "Nazwa pliku ze zdjęciem w formacie JPEG: "
  
 +#: g10/photoid.c:120
  #, fuzzy, c-format
  #| msgid "unable to open JPEG file `%s': %s\n"
  msgid "unable to open JPEG file '%s': %s\n"
- msgstr "nie mo�na otworzy� pliku JPEG ,,%s'': %s\n"
+ msgstr "nie można otworzyć pliku JPEG ,,%s'': %s\n"
  
 +#: g10/photoid.c:131
  #, c-format
  msgid "This JPEG is really large (%d bytes) !\n"
- msgstr "Ten JPEG jest naprawd� du�y (%d bajt�w)!\n"
+ msgstr "Ten JPEG jest naprawdę duży (%d bajtów)!\n"
  
 +#: g10/photoid.c:133
  msgid "Are you sure you want to use it? (y/N) "
- msgstr "Czy na pewno chcesz go u�y�? (t/N) "
+ msgstr "Czy na pewno chcesz go użyć? (t/N) "
  
 +#: g10/photoid.c:149
  #, fuzzy, c-format
  #| msgid "`%s' is not a JPEG file\n"
  msgid "'%s' is not a JPEG file\n"
  msgstr ",,%s'' nie jest plikiem JPEG\n"
  
 +#: g10/photoid.c:168
  msgid "Is this photo correct (y/N/q)? "
- msgstr "Czy zdj�cie jest w porz�dku? (t/N/w) "
+ msgstr "Czy zdjęcie jest w porządku? (t/N/w) "
  
 +#: g10/photoid.c:380
  msgid "unable to display photo ID!\n"
- msgstr "nie mo�na wy�wietli� zdj�cia!\n"
+ msgstr "nie można wyświetlić zdjęcia!\n"
  
 +#: g10/pkclist.c:72 g10/revoke.c:757
  msgid "No reason specified"
  msgstr "nie podano przyczyny"
  
 +#: g10/pkclist.c:74 g10/revoke.c:759
  msgid "Key is superseded"
- msgstr "klucz zosta� zast�piony"
+ msgstr "klucz został zastąpiony"
  
 +#: g10/pkclist.c:76 g10/revoke.c:758
  msgid "Key has been compromised"
- msgstr "klucz zosta� skompromitowany"
+ msgstr "klucz został skompromitowany"
  
 +#: g10/pkclist.c:78 g10/revoke.c:760
  msgid "Key is no longer used"
- msgstr "klucz nie jest ju� u�ywany"
+ msgstr "klucz nie jest już używany"
  
 +#: g10/pkclist.c:80 g10/revoke.c:761
  msgid "User ID is no longer valid"
- msgstr "identyfikator u�ytkownika przesta� by� poprawny"
+ msgstr "identyfikator użytkownika przestał być poprawny"
  
 +#: g10/pkclist.c:84
  msgid "reason for revocation: "
- msgstr "pow�d uniewa�nienia: "
+ msgstr "powód unieważnienia: "
  
 +#: g10/pkclist.c:100
  msgid "revocation comment: "
- msgstr "komentarz do uniewa�nienia: "
+ msgstr "komentarz do unieważnienia: "
  
  #. TRANSLATORS: These are the allowed answers in lower and
  #. uppercase.  Below you will find the matching strings which
@@@ -6334,21 -5063,17 +6357,21 @@@
  msgid "iImMqQsS"
  msgstr "iImMwWpP"
  
 +#: g10/pkclist.c:224
  msgid "No trust value assigned to:\n"
- msgstr "Brak warto�ci zaufania dla:\n"
+ msgstr "Brak wartości zaufania dla:\n"
  
 +#: g10/pkclist.c:257
  #, c-format
  msgid "  aka \"%s\"\n"
  msgstr "  alias ,,%s''\n"
  
 +#: g10/pkclist.c:267
  msgid ""
  "How much do you trust that this key actually belongs to the named user?\n"
- msgstr "Jak bardzo ufasz, �e ten klucz naprawd� nale�y do tej osoby?\n"
+ msgstr "Jak bardzo ufasz, że ten klucz naprawdę należy do tej osoby?\n"
  
 +#: g10/pkclist.c:282
  #, c-format
  msgid "  %d = I don't know or won't say\n"
  msgstr "  %d = nie wiem albo nie powiem\n"
@@@ -6363,19 -5086,15 +6386,19 @@@ msgstr "  %d = NIE ufam\n
  msgid "  %d = I trust ultimately\n"
  msgstr "  %d = ufam absolutnie\n"
  
 +#: g10/pkclist.c:296
  msgid "  m = back to the main menu\n"
- msgstr "  m = powr�t do g��wnego menu\n"
+ msgstr "  m = powrót do głównego menu\n"
  
 +#: g10/pkclist.c:299
  msgid "  s = skip this key\n"
- msgstr "  p = pomini�cie tego klucza\n"
+ msgstr "  p = pominięcie tego klucza\n"
  
 +#: g10/pkclist.c:300
  msgid "  q = quit\n"
- msgstr "  w = wyj�cie\n"
+ msgstr "  w = wyjście\n"
  
 +#: g10/pkclist.c:304
  #, c-format
  msgid ""
  "The minimum trust level for this key is: %s\n"
@@@ -6388,222 -5106,196 +6411,243 @@@ msgstr "
  msgid "Your decision? "
  msgstr "Twoja decyzja? "
  
 +#: g10/pkclist.c:331
  msgid "Do you really want to set this key to ultimate trust? (y/N) "
- msgstr "Czy na pewno chcesz przypisa� absolutne zaufanie temu kluczowi? (t/N) "
+ msgstr "Czy na pewno chcesz przypisać absolutne zaufanie temu kluczowi? (t/N) "
  
 +#: g10/pkclist.c:345
  msgid "Certificates leading to an ultimately trusted key:\n"
- msgstr "Certyfikaty prowadz�ce do ostatecznie zaufanego klucza:\n"
+ msgstr "Certyfikaty prowadzące do ostatecznie zaufanego klucza:\n"
  
 +#: g10/pkclist.c:434
  #, c-format
  msgid "%s: There is no assurance this key belongs to the named user\n"
- msgstr "%s: Nie ma �adnej pewno�ci, czy ten klucz nale�y do tej osoby\n"
+ msgstr "%s: Nie ma żadnej pewności, czy ten klucz należy do tej osoby\n"
  
 +#: g10/pkclist.c:439
  #, c-format
  msgid "%s: There is limited assurance this key belongs to the named user\n"
- msgstr "%s: Nie ma ca�kowitej pewno�ci, czy ten klucz nale�y do tej osoby\n"
+ msgstr "%s: Nie ma całkowitej pewności, czy ten klucz należy do tej osoby\n"
  
 +#: g10/pkclist.c:445
  msgid "This key probably belongs to the named user\n"
- msgstr "Ten klucz prawdopodobnie nale�y do tej osoby\n"
+ msgstr "Ten klucz prawdopodobnie należy do tej osoby\n"
  
 +#: g10/pkclist.c:450
  msgid "This key belongs to us\n"
- msgstr "Ten klucz nale�y do nas\n"
+ msgstr "Ten klucz należy do nas\n"
+ 
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ #| msgid "root certificate has now been marked as trusted\n"
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "główny certyfikat nie został oznaczony jako zaufany\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "NIE MA pewności, czy klucz należy do osoby wymienionej w identyfikatorze.\n"
+ "Jeśli nie masz co do tego żadnych wątpliwości i *naprawdę* wiesz co robisz,\n"
+ "możesz odpowiedzieć ,,tak'' na następne pytanie.\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
  "you may answer the next question with yes.\n"
  msgstr ""
- "NIE MA pewno�ci, czy klucz nale�y do osoby wymienionej w identyfikatorze.\n"
- "Je�li nie masz co do tego �adnych w�tpliwo�ci i *naprawd�* wiesz co robisz,\n"
- "mo�esz odpowiedzie� ,,tak'' na nast�pne pytanie.\n"
+ "NIE MA pewności, czy klucz należy do osoby wymienionej w identyfikatorze.\n"
+ "Jeśli nie masz co do tego żadnych wątpliwości i *naprawdę* wiesz co robisz,\n"
+ "możesz odpowiedzieć ,,tak'' na następne pytanie.\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
- msgstr "U�y� tego klucza pomimo to? (t/N) "
+ msgstr "Użyć tego klucza pomimo to? (t/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
- msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
+ msgstr "OSTRZEŻENIE: używany jest klucz nie obdarzony zaufaniem!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
- "OSTRZE�ENIE: ten klucz m�g� zosta� uniewa�niony\n"
- "             (brak klucza uniewa�niaj�cego aby to sprawdzi�)\n"
+ "OSTRZEŻENIE: ten klucz mógł zostać unieważniony\n"
+ "             (brak klucza unieważniającego aby to sprawdzić)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
- msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
+ msgstr "OSTRZEŻENIE: Ten klucz został unieważniony kluczem unieważniającym!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
- msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
+ msgstr "OSTRZEŻENIE: Ten klucz został unieważniony przez właściciela!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
- msgstr "             To mo�e oznacza�, �e podpis jest fa�szerstwem.\n"
+ msgstr "             To może oznaczać, że podpis jest fałszerstwem.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
- msgstr "OSTRZE�ENIE: Ten podklucz zosta� uniewa�niony przez w�a�ciciela!\n"
+ msgstr "OSTRZEŻENIE: Ten podklucz został unieważniony przez właściciela!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
- msgstr "Uwaga: Ten klucz zosta� wy��czony z u�ytku.\n"
+ msgstr "Uwaga: Ten klucz został wyłączony z użytku.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, fuzzy, c-format
  #| msgid "Note: Verified signer's address is `%s'\n"
  msgid "Note: Verified signer's address is '%s'\n"
- msgstr "Uwaga: Sprawdzony adres pospisuj�cego to `%s'\n"
+ msgstr "Uwaga: Sprawdzony adres pospisującego to `%s'\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, fuzzy, c-format
  #| msgid "Note: Signer's address `%s' does not match DNS entry\n"
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
- msgstr "Uwaga: Adres podpisuj�cego `%s' nie pasuje do wpisu DNS\n"
+ msgstr "Uwaga: Adres podpisującego `%s' nie pasuje do wpisu DNS\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
- "poziom zaufania poprawiony na PE�NY ze wzgl�du na poprawne informacje PKA\n"
+ "poziom zaufania poprawiony na PEŁNY ze względu na poprawne informacje PKA\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
- "poziom zaufania poprawiony na �ADEN ze wzgl�du na b��dne informacje PKA\n"
+ "poziom zaufania poprawiony na ŻADEN ze względu na błędne informacje PKA\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
- msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
+ msgstr "Uwaga: Data ważności tego klucza upłynęła!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
- msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
+ msgstr "OSTRZEŻENIE: Ten klucz nie jest poświadczony zaufanym podpisem!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
- "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a podpis.\n"
+ "             Nie ma pewności co do tożsamości osoby która złożyła podpis.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
- msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
+ msgstr "OSTRZEŻENIE: NIE UFAMY temu kluczowi!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
- msgstr "             Ten podpis prawdopodobnie jest FA�SZYWY.\n"
+ msgstr "             Ten podpis prawdopodobnie jest FAŁSZYWY.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
- "OSTRZE�ENIE: Tego klucza nie po�wiadczaj� wystarczaj�co zaufane podpisy!\n"
+ "OSTRZEŻENIE: Tego klucza nie poświadczają wystarczająco zaufane podpisy!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr ""
- "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a ten "
+ "             Nie ma pewności co do tożsamości osoby która złożyła ten "
  "podpis.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
- msgstr "%s: pomini�ty: %s\n"
+ msgstr "%s: pominięty: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
- msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ytku\n"
+ msgstr "%s: pominięty: klucz publiczny wyłączony z użytku\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
- msgstr "%s: pomini�ty: zosta� ju� wybrany w innej opcji\n"
+ msgstr "%s: pominięty: został już wybrany w innej opcji\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
- msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
+ msgstr "nie można się połączyć z ,,%s'': %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "option '%s' given, but no valid default keys given\n"
- msgstr "linia %d: niew�a�ciwy algorytm\n"
+ msgstr "linia %d: niewłaściwy algorytm\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "option '%s' given, but option '%s' not given\n"
- msgstr "linia %d: niew�a�ciwy algorytm\n"
+ msgstr "linia %d: niewłaściwy algorytm\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
- msgstr "Nie zosta� podany identyfikator u�ytkownika (np. za pomoc� ,,-r'')\n"
+ msgstr "Nie został podany identyfikator użytkownika (np. za pomocą ,,-r'')\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "Aktualni odbiorcy:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
  msgstr ""
  "\n"
- "Identyfikator u�ytkownika (pusta linia oznacza koniec): "
+ "Identyfikator użytkownika (pusta linia oznacza koniec): "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
- msgstr "Brak takiego identyfikatora u�ytkownika.\n"
+ msgstr "Brak takiego identyfikatora użytkownika.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
- msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
+ msgstr "pominięty: klucz publiczny już jest domyślnym adresatem\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
- msgstr "Klucz publiczny wy��czony z u�ycia.\n"
+ msgstr "Klucz publiczny wyłączony z użycia.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
- msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
+ msgstr "pominięty: został już wybrany w innej opcji\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
- msgstr "nieznany domy�lny adresat ,,%s''\n"
+ msgstr "nieznany domyślny adresat ,,%s''\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
- msgstr "brak poprawnych adresat�w\n"
+ msgstr "brak poprawnych adresatów\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Uwaga: klucz %s nie ma cechy %s\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Uwaga: klucz %s nie ma preferencji dla %s\n"
  
 +#: g10/plaintext.c:84
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr ""
- "dane nie zosta�y zapisane; aby to zrobi�, nale�y u�y� opcji \"--output\"\n"
+ "dane nie zostały zapisane; aby to zrobić, należy użyć opcji \"--output\"\n"
  
 +#: g10/plaintext.c:598
  msgid "Detached signature.\n"
  msgstr "Podpis oddzielony od danych.\n"
  
@@@ -6611,11 -5302,9 +6655,11 @@@
  msgid "Please enter name of data file: "
  msgstr "Nazwa pliku danych: "
  
 +#: g10/plaintext.c:643
  msgid "reading stdin ...\n"
- msgstr "czytam strumie� standardowego wej�cia\n"
+ msgstr "czytam strumień standardowego wejścia\n"
  
 +#: g10/plaintext.c:688
  msgid "no signed data\n"
  msgstr "brak podpisanych danych\n"
  
@@@ -6623,102 -5311,81 +6667,102 @@@
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
- msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
+ msgstr "nie można otworzyć podpisanego pliku ,,%s''\n"
  
 +#: g10/plaintext.c:741
  #, c-format
  msgid "can't open signed data fd=%d: %s\n"
- msgstr "nie mo�na otworzy� podpisanych danych z fd=%d: %s\n"
+ msgstr "nie można otworzyć podpisanych danych z fd=%d: %s\n"
  
 +#: g10/pubkey-enc.c:116
  #, c-format
  msgid "anonymous recipient; trying secret key %s ...\n"
  msgstr "adresat anonimowy; sprawdzanie klucza tajnego %s...\n"
  
 +#: g10/pubkey-enc.c:123
  msgid "okay, we are the anonymous recipient.\n"
- msgstr "OK, to my jeste�my adresatem anonimowym.\n"
+ msgstr "OK, to my jesteśmy adresatem anonimowym.\n"
  
 +#: g10/pubkey-enc.c:282
  msgid "old encoding of the DEK is not supported\n"
- msgstr "stary, nieobs�ugiwany algorytm szyfrowania klucza sesyjnego\n"
+ msgstr "stary, nieobsługiwany algorytm szyfrowania klucza sesyjnego\n"
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
- msgstr "algorytm szyfruj�cy %d%s jest nieznany lub zosta� wy��czony\n"
+ msgstr "algorytm szyfrujący %d%s jest nieznany lub został wyłączony\n"
  
 +#: g10/pubkey-enc.c:352
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
- msgstr "OSTRZE�ENIE: brak algorytmu szyfruj�cego %s w ustawieniach odbiorcy\n"
+ msgstr "OSTRZEŻENIE: brak algorytmu szyfrującego %s w ustawieniach odbiorcy\n"
  
 +#: g10/pubkey-enc.c:377
  #, fuzzy, c-format
  #| msgid "NOTE: secret key %s expired at %s\n"
  msgid "Note: secret key %s expired at %s\n"
- msgstr "UWAGA: wa�no�� klucza tajnego %s wygas�a %s\n"
+ msgstr "UWAGA: ważność klucza tajnego %s wygasła %s\n"
  
 +#: g10/pubkey-enc.c:384
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
- msgstr "UWAGA: klucz zosta� uniewa�niony"
+ msgstr "UWAGA: klucz został unieważniony"
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, c-format
  msgid "build_packet failed: %s\n"
- msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
+ msgstr "wywołanie funkcji build_packet nie powiodło się: %s\n"
  
 +#: g10/revoke.c:144
  #, c-format
  msgid "key %s has no user IDs\n"
- msgstr "klucz %s nie ma identyfikator�w u�ytkownika\n"
+ msgstr "klucz %s nie ma identyfikatorów użytkownika\n"
  
 +#: g10/revoke.c:312
  msgid "To be revoked by:\n"
- msgstr "Zostanie uniewa�niony przez:\n"
+ msgstr "Zostanie unieważniony przez:\n"
  
 +#: g10/revoke.c:316
  msgid "(This is a sensitive revocation key)\n"
- msgstr "(to jest czu�y klucz uniewa�niaj�cy)\n"
+ msgstr "(to jest czuły klucz unieważniający)\n"
  
 +#: g10/revoke.c:322
  #, fuzzy
  #| msgid "Secret key is available.\n"
  msgid "Secret key is not available.\n"
- msgstr "Dost�pny jest klucz tajny.\n"
+ msgstr "Dostępny jest klucz tajny.\n"
  
 +#: g10/revoke.c:327
  msgid "Create a designated revocation certificate for this key? (y/N) "
- msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
+ msgstr "Stworzyć certyfikat unieważnienia tego klucza? (t/N) "
  
 +#: g10/revoke.c:336 g10/revoke.c:727
  msgid "ASCII armored output forced.\n"
  msgstr "wymuszono opakowanie ASCII wyniku.\n"
  
 +#: g10/revoke.c:352 g10/revoke.c:479
  #, c-format
  msgid "make_keysig_packet failed: %s\n"
- msgstr "wywo�anie funkcji make_keysig_packet nie powiod�o si�: %s\n"
+ msgstr "wywołanie funkcji make_keysig_packet nie powiodło się: %s\n"
  
 +#: g10/revoke.c:415
  msgid "Revocation certificate created.\n"
- msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
+ msgstr "Certyfikat unieważnienia został utworzony.\n"
  
 +#: g10/revoke.c:421
  #, c-format
  msgid "no revocation keys found for \"%s\"\n"
- msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
+ msgstr "brak kluczy unieważniających dla ,,%s''\n"
  
 +#: g10/revoke.c:551
  #, fuzzy
  #| msgid "Create a revocation certificate for this key? (y/N) "
  msgid "This is a revocation certificate for the OpenPGP key:"
- msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
+ msgstr "Stworzyć certyfikat unieważnienia tego klucza? (t/N) "
  
 +#: g10/revoke.c:567
  msgid ""
  "A revocation certificate is a kind of \"kill switch\" to publicly\n"
  "declare that a key shall not anymore be used.  It is not possible\n"
@@@ -6745,9 -5409,8 +6789,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
- msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
+ msgstr "Certyfikat unieważnienia został utworzony.\n"
  
 +#: g10/revoke.c:634
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key \"%s\" not found\n"
@@@ -6765,13 -5426,11 +6809,13 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
- msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
+ msgstr "błąd tworzenia zbioru kluczy `%s': %s\n"
  
 +#: g10/revoke.c:711
  msgid "Create a revocation certificate for this key? (y/N) "
- msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
+ msgstr "Stworzyć certyfikat unieważnienia tego klucza? (t/N) "
  
 +#: g10/revoke.c:735
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6781,43 -5440,37 +6825,43 @@@
  "your media become unreadable.  But have some caution:  The print system of\n"
  "your machine might store the data and make it available to others!\n"
  msgstr ""
- "Certyfikat uniewa�nienia zosta� utworzony.\n"
+ "Certyfikat unieważnienia został utworzony.\n"
  "\n"
- "Nale�y przenie�� go na no�nik kt�ry mo�na bezpiecznie ukry�; je�li �li "
+ "Należy przenieść go na nośnik który można bezpiecznie ukryć; jeśli źli "
  "ludzie\n"
- "dostan� ten certyfikat w swoje r�ce, mog� u�y� go do uczynienia klucza\n"
- "nieu�ytecznym.\n"
+ "dostaną ten certyfikat w swoje ręce, mogą użyć go do uczynienia klucza\n"
+ "nieużytecznym.\n"
  "\n"
- "Niez�ym pomys�em jest wydrukowanie certyfikatu uniewa�nienia i schowanie\n"
- "wydruku w bezpiecznym miejscu, na wypadek gdyby no�nik z certyfikatem sta� "
- "si�\n"
- "nieczytelny. Ale nale�y zachowa� ostro�no��, systemy drukowania r�nych\n"
- "komputer�w mog� zachowa� tre�� wydruku i udost�pni� j� osobom "
- "nieupowa�nionym.\n"
+ "Niezłym pomysłem jest wydrukowanie certyfikatu unieważnienia i schowanie\n"
+ "wydruku w bezpiecznym miejscu, na wypadek gdyby nośnik z certyfikatem stał "
+ "się\n"
+ "nieczytelny. Ale należy zachować ostrożność, systemy drukowania różnych\n"
+ "komputerów mogą zachować treść wydruku i udostępnić ją osobom "
+ "nieupoważnionym.\n"
  
 +#: g10/revoke.c:769
  msgid "Please select the reason for the revocation:\n"
- msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
+ msgstr "Proszę wybrać powód unieważnienia:\n"
  
 +#: g10/revoke.c:779
  msgid "Cancel"
  msgstr "Anuluj"
  
 +#: g10/revoke.c:781
  #, c-format
  msgid "(Probably you want to select %d here)\n"
- msgstr "(Prawdopodobnie chcesz tu wybra� %d)\n"
+ msgstr "(Prawdopodobnie chcesz tu wybrać %d)\n"
  
 +#: g10/revoke.c:822
  msgid "Enter an optional description; end it with an empty line:\n"
- msgstr "Wprowad� opis (nieobowi�zkowy) i zako�cz go pust� lini�:\n"
+ msgstr "Wprowadź opis (nieobowiązkowy) i zakończ go pustą linią:\n"
  
 +#: g10/revoke.c:850
  #, c-format
  msgid "Reason for revocation: %s\n"
- msgstr "Pow�d uniewa�nienia: %s\n"
+ msgstr "Powód unieważnienia: %s\n"
  
 +#: g10/revoke.c:852
  msgid "(No description given)\n"
  msgstr "(nie podano)\n"
  
@@@ -6825,68 -5477,57 +6869,68 @@@
  msgid "Is this okay? (y/N) "
  msgstr "Informacje poprawne? (t/N) "
  
 +#: g10/seskey.c:62 sm/encrypt.c:123
  msgid "weak key created - retrying\n"
- msgstr "wygenerowano s�aby klucz - operacja zostaje powt�rzona\n"
+ msgstr "wygenerowano słaby klucz - operacja zostaje powtórzona\n"
  
 +#: g10/seskey.c:66
  #, c-format
  msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
  msgstr ""
- "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
- "operacja by�a powtarzana %d razy!\n"
+ "brak możliwości generacji dobrego klucza dla szyfru symetrycznego;\n"
+ "operacja była powtarzana %d razy!\n"
  
 +#: g10/seskey.c:306
  #, fuzzy, c-format
  #| msgid "%s key uses an unsafe (%u bit) hash\n"
  msgid "%s key %s uses an unsafe (%zu bit) hash\n"
- msgstr "Klucz %s u�ywa niebezpiecznego (%u-bitowego) skr�tu\n"
+ msgstr "Klucz %s używa niebezpiecznego (%u-bitowego) skrótu\n"
  
 +#: g10/seskey.c:324
  #, fuzzy, c-format
  #| msgid "DSA key %s requires a %u bit or larger hash\n"
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
- msgstr "Klucz DSA %s wymaga %u-bitowego lub wi�kszego skr�tu\n"
+ msgstr "Klucz DSA %s wymaga %u-bitowego lub większego skrótu\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
- msgstr "OSTRZE�ENIE: konflikt skr�t�w podpis�w w wiadomo�ci\n"
+ msgstr "OSTRZEŻENIE: konflikt skrótów podpisów w wiadomości\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
- msgstr "OSTRZE�ENIE: podklucz podpisuj�cy %s nie jest skro�nie podpisany\n"
+ msgstr "OSTRZEŻENIE: podklucz podpisujący %s nie jest skrośnie podpisany\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
- msgstr "obja�nienie mo�na przeczyta� tutaj: %s\n"
+ msgstr "objaśnienie można przeczytać tutaj: %s\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
- "OSTRZE�ENIE: podklucz podpisuj�cy %s jest niepoprawnie skro�nie podpisany\n"
+ "OSTRZEŻENIE: podklucz podpisujący %s jest niepoprawnie skrośnie podpisany\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
- msgstr[0] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
- msgstr[1] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
- msgstr[2] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
+ msgstr[0] "klucz publiczny %s jest o %lu sekundę młodszy od podpisu\n"
+ msgstr[1] "klucz publiczny %s jest o %lu sekundę młodszy od podpisu\n"
+ msgstr[2] "klucz publiczny %s jest o %lu sekundę młodszy od podpisu\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
- msgstr[0] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
- msgstr[1] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
- msgstr[2] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
+ msgstr[0] "klucz publiczny %s jest o %lu sekundę młodszy od podpisu\n"
+ msgstr[1] "klucz publiczny %s jest o %lu sekundę młodszy od podpisu\n"
+ msgstr[2] "klucz publiczny %s jest o %lu sekundę młodszy od podpisu\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6895,16 -5536,15 +6939,16 @@@ msgid "
  msgid_plural ""
  "key %s was created %lu seconds in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "klucz %s zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
- "czasoprzestrzeni lub �le ustawiony zegar systemowy)\n"
+ "klucz %s został stworzony %lu sekundę w przyszłości (zaburzenia\n"
+ "czasoprzestrzeni lub źle ustawiony zegar systemowy)\n"
  msgstr[1] ""
- "klucz %s zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
- "czasoprzestrzeni lub �le ustawiony zegar systemowy)\n"
+ "klucz %s został stworzony %lu sekundę w przyszłości (zaburzenia\n"
+ "czasoprzestrzeni lub źle ustawiony zegar systemowy)\n"
  msgstr[2] ""
- "klucz %s zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
- "czasoprzestrzeni lub �le ustawiony zegar systemowy)\n"
+ "klucz %s został stworzony %lu sekundę w przyszłości (zaburzenia\n"
+ "czasoprzestrzeni lub źle ustawiony zegar systemowy)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6912,207 -5552,172 +6956,207 @@@ msgid "key %s was created %lu day in th
  msgid_plural ""
  "key %s was created %lu days in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "klucz %s zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
- "czasoprzestrzeni lub �le ustawiony zegar systemowy)\n"
+ "klucz %s został stworzony %lu sekundę w przyszłości (zaburzenia\n"
+ "czasoprzestrzeni lub źle ustawiony zegar systemowy)\n"
  msgstr[1] ""
- "klucz %s zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
- "czasoprzestrzeni lub �le ustawiony zegar systemowy)\n"
+ "klucz %s został stworzony %lu sekundę w przyszłości (zaburzenia\n"
+ "czasoprzestrzeni lub źle ustawiony zegar systemowy)\n"
  msgstr[2] ""
- "klucz %s zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
- "czasoprzestrzeni lub �le ustawiony zegar systemowy)\n"
+ "klucz %s został stworzony %lu sekundę w przyszłości (zaburzenia\n"
+ "czasoprzestrzeni lub źle ustawiony zegar systemowy)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  #| msgid "NOTE: signature key %s expired %s\n"
  msgid "Note: signature key %s expired %s\n"
- msgstr "UWAGA: klucz podpisuj�cy %s przekroczy� dat� wa�no�ci %s\n"
+ msgstr "UWAGA: klucz podpisujący %s przekroczył datę ważności %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  #| msgid "NOTE: signature key %s has been revoked\n"
  msgid "Note: signature key %s has been revoked\n"
- msgstr "UWAGA: klucz podpisuj�cy %s zosta� uniewa�niony\n"
+ msgstr "UWAGA: klucz podpisujący %s został unieważniony\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
- "uznano za z�y podpis utworzony kluczem %s z powodu nieznanego bitu "
+ "uznano za zły podpis utworzony kluczem %s z powodu nieznanego bitu "
  "krytycznego\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
- msgstr "klucz %s: brak podklucza dla podpisu uniewa�nienia podklucza\n"
+ msgstr "klucz %s: brak podklucza dla podpisu unieważnienia podklucza\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
- msgstr "klucz %s: brak podklucza dowi�zywanego podpisem\n"
+ msgstr "klucz %s: brak podklucza dowiązywanego podpisem\n"
  
 +#: g10/sign.c:88
  #, c-format
  msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
  msgstr ""
- "OSTRZE�ENIE: nie mo�na rozwin�� %% w URL adnotacji (jest zbyt d�ugi).\n"
- "             U�yty zostanie nie rozwini�ty.\n"
+ "OSTRZEŻENIE: nie można rozwinąć %% w URL adnotacji (jest zbyt długi).\n"
+ "             Użyty zostanie nie rozwinięty.\n"
  
 +#: g10/sign.c:114
  #, c-format
  msgid ""
  "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
  msgstr ""
- "OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
- "           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
+ "OSTRZEŻENIE: nie można rozwinąć znaczników %% w URL regulaminu\n"
+ "           (jest zbyt długi). Użyty zostanie nie rozwinięty.\n"
  
 +#: g10/sign.c:137
  #, c-format
  msgid ""
  "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
  "unexpanded.\n"
  msgstr ""
- "OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL-u preferowanego\n"
- "           serwera kluczy (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
+ "OSTRZEŻENIE: nie można rozwinąć znaczników %% w URL-u preferowanego\n"
+ "           serwera kluczy (jest zbyt długi). Użyty zostanie nie rozwinięty.\n"
  
 +#: g10/sign.c:329
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
- msgstr "podpis %s/%s z�o�ony przez: ,,%s''\n"
+ msgstr "podpis %s/%s złożony przez: ,,%s''\n"
  
 +#: g10/sign.c:878
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
- "OSTRZE�ENIE: wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami "
+ "OSTRZEŻENIE: wymuszone użycie skrótu %s (%d) kłóci się z ustawieniami "
  "adresata\n"
  
 +#: g10/sign.c:1009
  msgid "signing:"
  msgstr "podpis:"
  
 +#: g10/sign.c:1286
  #, c-format
  msgid "%s encryption will be used\n"
- msgstr "zostanie u�yty szyfr %s\n"
+ msgstr "zostanie użyty szyfr %s\n"
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
  msgstr ""
- "klucz nie jest oznaczony jako niepewny - nie mo�na go u�y� z atrap�\n"
+ "klucz nie jest oznaczony jako niepewny - nie można go użyć z atrapą\n"
  "generatora liczb losowych!\n"
  
 +#: g10/skclist.c:187
  #, c-format
  msgid "skipped \"%s\": duplicated\n"
- msgstr "pomini�ty ,,%s'': duplikat\n"
+ msgstr "pominięty ,,%s'': duplikat\n"
  
 +#: g10/skclist.c:206
  msgid "skipped: secret key already present\n"
- msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
+ msgstr "pominięty: klucz prywatny jest już wpisany\n"
  
 +#: g10/skclist.c:225
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr ""
- "klucz algorytmu Elgamala wygenerowany przez PGP nie zapewniaj�cy "
- "bezpiecznych podpis�w!"
+ "klucz algorytmu Elgamala wygenerowany przez PGP nie zapewniający "
+ "bezpiecznych podpisów!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
- msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
+ msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powiódł się: %s\n"
  
 +#: g10/tdbdump.c:105
  #, c-format
  msgid ""
  "# List of assigned trustvalues, created %s\n"
  "# (Use \"gpg --import-ownertrust\" to restore them)\n"
  msgstr ""
- "# Lista przypisanych warto�ci zaufania, stworzona %s\n"
- "# (u�yj \"gpg --import-ownertrust\" aby j� przywr�ci�)\n"
+ "# Lista przypisanych wartości zaufania, stworzona %s\n"
+ "# (użyj \"gpg --import-ownertrust\" aby ją przywrócić)\n"
  
 +#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
  #, fuzzy, c-format
  #| msgid "error in `%s': %s\n"
  msgid "error in '%s': %s\n"
- msgstr "b��d w ,,%s'': %s\n"
+ msgstr "błąd w ,,%s'': %s\n"
  
 +#: g10/tdbdump.c:162
  msgid "line too long"
- msgstr "linia zbyt d�uga"
+ msgstr "linia zbyt długa"
  
 +#: g10/tdbdump.c:170
  msgid "colon missing"
  msgstr "brak dwukropka"
  
 +#: g10/tdbdump.c:176
  msgid "invalid fingerprint"
- msgstr "niew�a�ciwy odcisk"
+ msgstr "niewłaściwy odcisk"
  
 +#: g10/tdbdump.c:181
  msgid "ownertrust value missing"
- msgstr "brak warto�ci zaufania w�a�ciciela"
+ msgstr "brak wartości zaufania właściciela"
  
 +#: g10/tdbdump.c:217
  #, fuzzy, c-format
  #| msgid "error finding trust record in `%s': %s\n"
  msgid "error finding trust record in '%s': %s\n"
- msgstr "b��d podczas szukania zapisu warto�ci zaufania w ,,%s'': %s\n"
+ msgstr "błąd podczas szukania zapisu wartości zaufania w ,,%s'': %s\n"
  
 +#: g10/tdbdump.c:221
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "read error in '%s': %s\n"
- msgstr "b��d odczytu w ,,%s'': %s\n"
+ msgstr "błąd odczytu w ,,%s'': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
- msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
+ msgstr "baza zaufania: synchronizacja nie powiodła się %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  #| msgid "can't create lock for `%s'\n"
  msgid "can't create lock for '%s'\n"
- msgstr "nie mo�na utworzy� blokady dla ,,%s''\n"
+ msgstr "nie można utworzyć blokady dla ,,%s''\n"
  
 +#: g10/tdbio.c:146
  #, fuzzy, c-format
  #| msgid "can't lock `%s'\n"
  msgid "can't lock '%s'\n"
- msgstr "nie mo�na zablokowa� ,,%s''\n"
+ msgstr "nie można zablokować ,,%s''\n"
  
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
  #, c-format
  msgid "trustdb rec %lu: lseek failed: %s\n"
- msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiod�a si�: %s\n"
+ msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiodła się: %s\n"
  
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
  #, c-format
  msgid "trustdb rec %lu: write failed (n=%d): %s\n"
- msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
+ msgstr "baza zaufania, wpis %lu: zapis nie powiódł się (n=%d): %s\n"
  
 +#: g10/tdbio.c:352
  msgid "trustdb transaction too large\n"
- msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
+ msgstr "zbyt duże zlecenie dla bazy zaufania\n"
  
 +#: g10/tdbio.c:682
  #, c-format
  msgid "%s: directory does not exist!\n"
  msgstr "%s: katalog nie istnieje!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
- msgstr "nie mo�na dosta� si� do ,,%s'': %s\n"
+ msgstr "nie można dostać się do ,,%s'': %s\n"
  
 +#: g10/tdbio.c:724
  #, c-format
  msgid "%s: failed to create version record: %s"
- msgstr "%s: stworzenie zapisu o wersji nie powiod�o si�: %s"
+ msgstr "%s: stworzenie zapisu o wersji nie powiodło się: %s"
  
 +#: g10/tdbio.c:729
  #, c-format
  msgid "%s: invalid trustdb created\n"
  msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
@@@ -7126,45 -5729,36 +7170,45 @@@ msgstr "%s: baza zaufania utworzona\n
  #, fuzzy
  #| msgid "NOTE: trustdb not writable\n"
  msgid "Note: trustdb not writable\n"
- msgstr "UWAGA: nie mo�na zapisywa� bazy zaufania\n"
+ msgstr "UWAGA: nie można zapisywać bazy zaufania\n"
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
  msgstr "%s: niepoprawny plik bazy zaufania\n"
  
 +#: g10/tdbio.c:834
  #, c-format
  msgid "%s: failed to create hashtable: %s\n"
- msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
+ msgstr "%s: tworzenie tablicy skrótów nie powiodło się: %s\n"
  
 +#: g10/tdbio.c:842
  #, c-format
  msgid "%s: error updating version record: %s\n"
- msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
+ msgstr "%s: błąd przy uaktualnianiu numeru wersji: %s\n"
  
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
  #, c-format
  msgid "%s: error reading version record: %s\n"
- msgstr "%s: b��d odczytu numeru wersji: %s\n"
+ msgstr "%s: błąd odczytu numeru wersji: %s\n"
  
 +#: g10/tdbio.c:938
  #, c-format
  msgid "%s: error writing version record: %s\n"
- msgstr "%s: b��d zapisu numeru wersji: %s\n"
+ msgstr "%s: błąd zapisu numeru wersji: %s\n"
  
 +#: g10/tdbio.c:1461
  #, c-format
  msgid "trustdb: lseek failed: %s\n"
- msgstr "baza zaufania: funkcja lseek() zawiod�a: %s\n"
+ msgstr "baza zaufania: funkcja lseek() zawiodła: %s\n"
  
 +#: g10/tdbio.c:1472
  #, c-format
  msgid "trustdb: read failed (n=%d): %s\n"
- msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
+ msgstr "baza zaufania: funkcja read() (n=%d) zawiodła: %s\n"
  
 +#: g10/tdbio.c:1497
  #, c-format
  msgid "%s: not a trustdb file\n"
  msgstr "%s: to nie jest plik bazy zaufania\n"
@@@ -7174,140 -5767,118 +7218,146 @@@
  msgid "%s: version record with recnum %lu\n"
  msgstr "%s: wpis wersji z numerem %lu\n"
  
 +#: g10/tdbio.c:1528
  #, c-format
  msgid "%s: invalid file version %d\n"
- msgstr "%s: niew�a�ciwa wersja pliku %d\n"
+ msgstr "%s: niewłaściwa wersja pliku %d\n"
  
 +#: g10/tdbio.c:1748
  #, c-format
  msgid "%s: error reading free record: %s\n"
- msgstr "%s: b��d odczytu pustego wpisu: %s\n"
+ msgstr "%s: błąd odczytu pustego wpisu: %s\n"
  
 +#: g10/tdbio.c:1757
  #, c-format
  msgid "%s: error writing dir record: %s\n"
- msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
+ msgstr "%s: błąd zapisu wpisu katalogowego: %s\n"
  
 +#: g10/tdbio.c:1768
  #, c-format
  msgid "%s: failed to zero a record: %s\n"
- msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
+ msgstr "%s: zerowanie rekordu nie powiodło się: %s\n"
  
 +#: g10/tdbio.c:1804
  #, c-format
  msgid "%s: failed to append a record: %s\n"
- msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
+ msgstr "%s: dopisanie rekordu nie powiodło się: %s\n"
  
 +#: g10/tdbio.c:1865
  msgid "Error: The trustdb is corrupted.\n"
- msgstr "B��d: uszkodzona baza zaufania.\n"
+ msgstr "Błąd: uszkodzona baza zaufania.\n"
  
 +#: g10/textfilter.c:146
  #, c-format
  msgid "can't handle text lines longer than %d characters\n"
- msgstr "nie mo�na obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
+ msgstr "nie można obsłużyć linii tekstu dłuższej niż %d znaków\n"
  
 +#: g10/textfilter.c:241
  #, c-format
  msgid "input line longer than %d characters\n"
- msgstr "linia d�u�sza ni� %d znak�w\n"
+ msgstr "linia dłuższa niż %d znaków\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
- msgstr "b��d wysy�ania standardowych opcji: %s\n"
+ msgstr "błąd wysyłania standardowych opcji: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
- msgstr "nieobs�ugiwany algorytm: %s"
+ msgstr "nieobsługiwany algorytm: %s"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
- msgstr "b��d wysy�ania polecenia %s: %s\n"
+ msgstr "błąd wysyłania polecenia %s: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
- msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
+ msgstr "błąd podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
- msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
+ msgstr "%s: błąd zapisu wpisu katalogowego: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
- msgstr "b��d podczas otwierania ,,%s'': %s\n"
+ msgstr "błąd podczas otwierania ,,%s'': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
- msgstr "b��d wysy�ania polecenia %s: %s\n"
+ msgstr "błąd wysyłania polecenia %s: %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr ""
+ 
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
- msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
+ msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "lista kluczy i identyfikatorów użytkownika"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
- msgstr "poprawno��: %s"
+ msgstr "poprawność: %s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
- msgstr "b��d pobierania zapisanych flag: %s\n"
+ msgstr "błąd pobierania zapisanych flag: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -7315,83 -5886,88 +7365,106 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "lista kluczy"
  
- #: g10/tofu.c:1342
++#: g10/tofu.c:1715
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "wypisanie skrótów wiadomości"
+ msgstr[1] "wypisanie skrótów wiadomości"
+ msgstr[2] "wypisanie skrótów wiadomości"
+ 
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1351
- #, fuzzy, c-format
- #| msgid "print message digests"
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "wypisanie skr�t�w wiadomo�ci"
- msgstr[1] "wypisanie skr�t�w wiadomo�ci"
- msgstr[2] "wypisanie skr�t�w wiadomo�ci"
- 
- #: g10/tofu.c:1357
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  msgstr[2] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ #| msgid "error writing key: %s\n"
+ msgid "resetting keydb: %s\n"
+ msgstr "błąd zapisu klucza: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
  msgid "error setting TOFU binding's trust level to %s\n"
- msgstr "b��d zapisywania flag: %s\n"
+ msgstr "błąd zapisywania flag: %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
@@@ -7399,7 -5975,6 +7472,7 @@@ msgstr "błąd tworzenia potoku: %s\n
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
@@@ -7407,7 -5982,6 +7480,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
@@@ -7415,7 -5989,6 +7488,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
@@@ -7423,7 -5996,6 +7496,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
@@@ -7431,7 -6003,6 +7504,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
@@@ -7439,7 -6010,6 +7512,7 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
@@@ -7447,53 -6017,53 +7520,63 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "%d podpisów usuniętych.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "wypisanie skr�t�w wiadomo�ci"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "wypisanie skrótów wiadomości"
+ msgstr[1] "wypisanie skrótów wiadomości"
+ msgstr[2] "wypisanie skrótów wiadomości"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "zaszyfrowane za pomocą %lu haseł\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "wypisanie skrótów wiadomości"
+ msgstr[1] "wypisanie skrótów wiadomości"
+ msgstr[2] "wypisanie skrótów wiadomości"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
- msgstr[2] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7508,102 -6078,91 +7591,114 @@@ msgstr[0] "
  msgstr[1] ""
  msgstr[2] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error opening TOFU database: %s\n"
- msgstr "b��d wysy�ania polecenia %s: %s\n"
+ msgstr "błąd wysyłania polecenia %s: %s\n"
+ 
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "błąd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
- msgstr ",,%s'' nie jest poprawnym d�ugim numerem klucza\n"
+ msgstr ",,%s'' nie jest poprawnym długim numerem klucza\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "klucz %s: zaakceptowany jako klucz zaufany\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
- msgstr "klucz %s jest wpisany wi�cej ni� raz w bazie zaufania\n"
+ msgstr "klucz %s jest wpisany więcej niż raz w bazie zaufania\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
- msgstr "klucz %s: brak klucza publicznego dla zaufanego klucza - pomini�ty\n"
+ msgstr "klucz %s: brak klucza publicznego dla zaufanego klucza - pominięty\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
- msgstr "klucz %s zosta� oznaczony jako obdarzony absolutnym zaufaniem.\n"
+ msgstr "klucz %s został oznaczony jako obdarzony absolutnym zaufaniem.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
- msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powi�d� si�: %s\n"
+ msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powiódł się: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
- msgstr "wpis zaufania %lu jest typu innego ni� poszukiwany %d\n"
+ msgstr "wpis zaufania %lu jest typu innego niż poszukiwany %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
- msgstr "Mo�na pr�bowa� odtworzy� baz� zaufania przy u�yciu polece�:\n"
+ msgstr "Można próbować odtworzyć bazę zaufania przy użyciu poleceń:\n"
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
- msgstr "Je�li to nie dzia�a, nale�y poradzi� si� instrukcji\n"
+ msgstr "Jeśli to nie działa, należy poradzić się instrukcji\n"
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
- "nie mo�na u�y� nieznanego modelu zaufania (%d) - przyj�to model zaufania %s\n"
+ "nie można użyć nieznanego modelu zaufania (%d) - przyjęto model zaufania %s\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
- msgstr "u�ycie modelu zaufania %s\n"
+ msgstr "użycie modelu zaufania %s\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "sprawdzanie bazy jest niepotrzebne\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
- msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
+ msgstr "następne sprawdzanie bazy odbędzie się %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  #| msgid "no need for a trustdb check with `%s' trust model\n"
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "sprawdzanie bazy jest niepotrzebne przy modelu zaufania ,,%s''\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  #| msgid "no need for a trustdb update with `%s' trust model\n"
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "aktualizacja bazy jest niepotrzebna przy modelu zaufania ,,%s''\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "klucz publiczny %s nie odnaleziony: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
- msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
+ msgstr "należy uruchomić gpg z opcją ,,--check-trustdb''\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "sprawdzanie bazy zaufania\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7612,25 -6171,21 +7707,25 @@@ msgstr[0] "%lu kluczy przetworzonych d
  msgstr[1] "%lu kluczy przetworzonych do tej chwili\n"
  msgstr[2] "%lu kluczy przetworzonych do tej chwili\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
- msgstr[0] "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
- msgstr[1] "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
- msgstr[2] "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
+ msgstr[0] "przetworzono %d kluczy (rozwiązano %d przeliczeń zaufania)\n"
+ msgstr[1] "przetworzono %d kluczy (rozwiązano %d przeliczeń zaufania)\n"
+ msgstr[2] "przetworzono %d kluczy (rozwiązano %d przeliczeń zaufania)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "brak absolutnie zaufanych kluczy\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "klucz publiczny absolutnie zaufanego klucza %s nie odnaleziony\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7638,18 -6193,15 +7733,18 @@@ msgstr "
  "poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,"
  "%du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
- "nie mo�na uaktualni� rekordu wersji bazy zaufania: zapis nie powi�d� si�: "
+ "nie można uaktualnić rekordu wersji bazy zaufania: zapis nie powiódł się: "
  "%s\n"
  
 +#: g10/trust.c:105
  msgid "undefined"
- msgstr "nieokre�lone"
+ msgstr "nieokreślone"
  
 +#: g10/trust.c:106
  msgid "never"
  msgstr "nigdy"
  
@@@ -7657,11 -6208,9 +7752,11 @@@
  msgid "marginal"
  msgstr "marginalne"
  
 +#: g10/trust.c:108
  msgid "full"
- msgstr "pe�ne"
+ msgstr "pełne"
  
 +#: g10/trust.c:109
  msgid "ultimate"
  msgstr "absolutne"
  
@@@ -7679,11 -6227,9 +7774,11 @@@
  msgid "10 translator see trust.c:uid_trust_string_fixed"
  msgstr "17"
  
 +#: g10/trust.c:149
  msgid "[ revoked]"
- msgstr "[  uniewa�niony ]"
+ msgstr "[  unieważniony ]"
  
 +#: g10/trust.c:151 g10/trust.c:157
  msgid "[ expired]"
  msgstr "[przeterminowany]"
  
@@@ -7691,11 -6236,9 +7786,11 @@@
  msgid "[ unknown]"
  msgstr "[    nieznane   ]"
  
 +#: g10/trust.c:158
  msgid "[  undef ]"
- msgstr "[  nieokre�lone ]"
+ msgstr "[  nieokreślone ]"
  
 +#: g10/trust.c:159
  #, fuzzy
  #| msgid "never"
  msgid "[  never ]"
@@@ -7705,11 -6247,9 +7800,11 @@@ msgstr "nigdy
  msgid "[marginal]"
  msgstr "[   marginalne  ]"
  
 +#: g10/trust.c:161
  msgid "[  full  ]"
- msgstr "[      pe�ne    ]"
+ msgstr "[      pełne    ]"
  
 +#: g10/trust.c:162
  msgid "[ultimate]"
  msgstr "[    absolutne   ]"
  
@@@ -7719,184 -6258,146 +7814,184 @@@ msgid "
  "Please remember that the signature file (.sig or .asc)\n"
  "should be the first file given on the command line.\n"
  msgstr ""
- "nie mo�na sprawdzi� podpisu.\n"
- "Nale�y pami�ta� o podawaniu pliku podpisu (.sig lub .asc) jako pierwszego\n"
- "argumentu linii polece�.\n"
+ "nie można sprawdzić podpisu.\n"
+ "Należy pamiętać o podawaniu pliku podpisu (.sig lub .asc) jako pierwszego\n"
+ "argumentu linii poleceń.\n"
  
 +#: g10/verify.c:204
  #, c-format
  msgid "input line %u too long or missing LF\n"
- msgstr "linia wej�cia %u zbyt d�uga lub brak znaku LF\n"
+ msgstr "linia wejścia %u zbyt długa lub brak znaku LF\n"
  
 +#: g10/verify.c:253
  #, c-format
  msgid "can't open fd %d: %s\n"
- msgstr "nie mo�na otworzy� fd %d: %s\n"
+ msgstr "nie można otworzyć fd %d: %s\n"
  
 +#: kbx/kbxutil.c:92
  msgid "set debugging flags"
  msgstr "ustawienie flag diagnostycznych"
  
 +#: kbx/kbxutil.c:93
  msgid "enable full debugging"
- msgstr "w��czenie pe�nej diagnostyki"
+ msgstr "włączenie pełnej diagnostyki"
  
 +#: kbx/kbxutil.c:117
  msgid "Usage: kbxutil [options] [files] (-h for help)"
- msgstr "Wywo�anie: kbxutil [opcje] [pliki] (-h podaje pomoc)"
+ msgstr "Wywołanie: kbxutil [opcje] [pliki] (-h podaje pomoc)"
  
 +#: kbx/kbxutil.c:120
  msgid ""
  "Syntax: kbxutil [options] [files]\n"
  "List, export, import Keybox data\n"
  msgstr ""
- "Sk�adnia: kbxutil [opcje] [pliki]\n"
+ "Składnia: kbxutil [opcje] [pliki]\n"
  "Wypisywanie, eksport, import danych Keybox\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
- msgstr "reszta RSA brakuj�ca lub o rozmiarze innym ni� %d bity\n"
+ msgstr "reszta RSA brakująca lub o rozmiarze innym niż %d bity\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
- msgstr "publiczny wyk�adnik RSA brakuj�cy lub wi�kszy ni� %d bity\n"
+ msgstr "publiczny wykładnik RSA brakujący lub większy niż %d bity\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
- msgstr "Zapytanie zwrotne o PIN zwr�ci�o b��d: %s\n"
+ msgstr "Zapytanie zwrotne o PIN zwróciło błąd: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
- msgstr "NullPIN nie zosta� jeszcze zmieniony\n"
+ msgstr "NullPIN nie został jeszcze zmieniony\n"
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
- msgstr "|N|Prosz� wprowadzi� nowy PIN dla zwyk�ych kluczy."
+ msgstr "|N|Proszę wprowadzić nowy PIN dla zwykłych kluczy."
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
- msgstr "||Prosz� wprowadzi� PIN dla zwyk�ych kluczy."
+ msgstr "||Proszę wprowadzić PIN dla zwykłych kluczy."
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr ""
- "|NP|Prosz� wprowadzi� nowy kod oblokowuj�cy PIN (PUK) dla zwyk�ych kluczy."
+ "|NP|Proszę wprowadzić nowy kod oblokowujący PIN (PUK) dla zwykłych kluczy."
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
- msgstr "|P|Prosz� wprowadzi� kod odblokowuj�cy PIN (PUK) dla zwyk�ych kluczy."
+ msgstr "|P|Proszę wprowadzić kod odblokowujący PIN (PUK) dla zwykłych kluczy."
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
- "|N|Prosz� wprowadzi� nowy PIN dla klucza do tworzenia podpis�w "
+ "|N|Proszę wprowadzić nowy PIN dla klucza do tworzenia podpisów "
  "kwalifikowanych."
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
- "||Prosz� wprowadzi� PIN PIN dla klucza do tworzenia podpis�w kwalifikowanych."
+ "||Proszę wprowadzić PIN PIN dla klucza do tworzenia podpisów kwalifikowanych."
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
- "|NP|Prosz� wprowadzi� nowy kod odblokowuj�cy PIN (PUK) dla klucza do "
- "tworzenia podpis�w kwalifikowanych."
+ "|NP|Proszę wprowadzić nowy kod odblokowujący PIN (PUK) dla klucza do "
+ "tworzenia podpisów kwalifikowanych."
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
- "|P|Prosz� wprowadzi� kod odblokowuj�cy PIN (PUK) dla klucza do tworzenia "
- "podpis�w kwalifikowanych."
+ "|P|Proszę wprowadzić kod odblokowujący PIN (PUK) dla klucza do tworzenia "
+ "podpisów kwalifikowanych."
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
- msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
+ msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
- msgstr "nie powi�d� si� zapis odcisku: %s\n"
+ msgstr "nie powiódł się zapis odcisku: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
- msgstr "nie powi�d� si� zapis daty utworzenia: %s\n"
+ msgstr "nie powiódł się zapis daty utworzenia: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "odczyt klucza publicznego nie powi�d� si�: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "odpowied� nie zawiera danych klucza publicznego\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
- msgstr "odpowied� nie zawiera wsp�czynnika RSA\n"
+ msgstr "odpowiedź nie zawiera współczynnika RSA\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
- msgstr "odpowied� nie zawiera publicznego wyk�adnika RSA\n"
+ msgstr "odpowiedź nie zawiera publicznego wykładnika RSA\n"
  
- #: scd/app-openpgp.c:1322
++#: scd/app-openpgp.c:1353
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
- msgid "response does not contain the EC public point\n"
- msgstr "odpowied� nie zawiera publicznego wyk�adnika RSA\n"
+ msgid "response does not contain the EC public key\n"
+ msgstr "odpowiedź nie zawiera publicznego wykładnika RSA\n"
+ 
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "odpowiedź nie zawiera danych klucza publicznego\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "odczyt klucza publicznego nie powiódł się: %s\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
- msgstr "u�ycie domy�lnego PIN-u jako %s\n"
+ msgstr "użycie domyślnego PIN-u jako %s\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
- "nie uda�o si� u�y� domy�lnego PIN-u jako %s: %s - wy��czenie dalszego "
- "domy�lnego u�ycia\n"
+ "nie udało się użyć domyślnego PIN-u jako %s: %s - wyłączenie dalszego "
+ "domyślnego użycia\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Prosz� wpisa� PIN%%0A[podpis�w wykonanych: %lu]"
+ msgstr "||Proszę wpisać PIN%%0A[podpisów wykonanych: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
- msgstr "||Prosz� wpisa� PIN"
+ msgstr "||Proszę wpisać PIN"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
- msgstr "PIN dla CHV%d jest zbyt kr�tki; minimalna d�ugo�� to %d\n"
+ msgstr "PIN dla CHV%d jest zbyt krótki; minimalna długość to %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
- msgstr "weryfikacja CHV%d nie powiod�a si�: %s\n"
+ msgstr "weryfikacja CHV%d nie powiodła się: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
- msgstr "b��d podczas odczytu stanu CHV z karty\n"
+ msgstr "błąd podczas odczytu stanu CHV z karty\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
- msgstr "karta zosta�a trwale zablokowana!\n"
+ msgstr "karta została trwale zablokowana!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7911,204 -6412,160 +8006,204 @@@ msgstr[2] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "|A|Prosz� wprowadzi� PIN administracyjny%%0A[pozosta�o pr�b: %d]"
+ msgstr "|A|Proszę wprowadzić PIN administracyjny%%0A[pozostało prób: %d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
- msgstr "|A|Prosz� wprowadzi� PIN administracyjny"
+ msgstr "|A|Proszę wprowadzić PIN administracyjny"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
- msgstr "dost�p do polece� administratora nie zosta� skonfigurowany\n"
+ msgstr "dostęp do poleceń administratora nie został skonfigurowany\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
- msgstr "||Prosz� wprowadzi� kod resetuj�cy dla karty"
+ msgstr "||Proszę wprowadzić kod resetujący dla karty"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
- msgstr "Kod resetuj�cy zbyt kr�tki; minimalna d�ugo�� to %d\n"
+ msgstr "Kod resetujący zbyt krótki; minimalna długość to %d\n"
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
- msgstr "|RN|Nowy kod resetuj�cy"
+ msgstr "|RN|Nowy kod resetujący"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Nowy PIN administracyjny"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|Nowy PIN"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  msgid "||Please enter the Admin PIN and New Admin PIN"
- msgstr "||Prosz� wprowadzi� PIN administracyjny i nowy PIN administracyjny"
+ msgstr "||Proszę wprowadzić PIN administracyjny i nowy PIN administracyjny"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  msgid "||Please enter the PIN and New PIN"
- msgstr "||Prosz� wprowadzi� PIN i nowy PIN"
+ msgstr "||Proszę wprowadzić PIN i nowy PIN"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
- msgstr "b��d podczas odczytu danych aplikacji\n"
+ msgstr "błąd podczas odczytu danych aplikacji\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
- msgstr "b��d podczas odczytu odcisku DO\n"
+ msgstr "błąd podczas odczytu odcisku DO\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
- msgstr "klucz ju� istnieje\n"
+ msgstr "klucz już istnieje\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
- msgstr "istniej�cy klucz zostanie zast�piony\n"
+ msgstr "istniejący klucz zostanie zastąpiony\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "generowanie nowego klucza\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
  msgstr "zapisywanie nowego klucza\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "brak datownika utworzenia\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
- msgstr "liczba pierwsza %s RSA brakuj�ca lub o rozmiarze innym ni� %d bit�w\n"
+ msgstr "liczba pierwsza %s RSA brakująca lub o rozmiarze innym niż %d bitów\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
- msgstr "nie powi�d� si� zapis klucza: %s\n"
+ msgstr "nie powiódł się zapis klucza: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported curve\n"
- msgstr "nieobs�ugiwany algorytm: %s"
+ msgstr "nieobsługiwany algorytm: %s"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
- msgstr "prosz� czeka� na wygenerowanie klucza...\n"
+ msgstr "proszę czekać na wygenerowanie klucza...\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
- msgstr "generowanie klucza nie powiod�o si�\n"
+ msgstr "generowanie klucza nie powiodło się\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
- msgstr[0] "generowanie klucza zako�czone (%d sekund)\n"
- msgstr[1] "generowanie klucza zako�czone (%d sekund)\n"
- msgstr[2] "generowanie klucza zako�czone (%d sekund)\n"
+ msgstr[0] "generowanie klucza zakończone (%d sekund)\n"
+ msgstr[1] "generowanie klucza zakończone (%d sekund)\n"
+ msgstr[2] "generowanie klucza zakończone (%d sekund)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
- msgstr "odcisk na karcie nie zgadza si� z ��danym\n"
+ msgstr "odcisk na karcie nie zgadza się z żądanym\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
- msgstr "karta nie obs�uguje algorytmu skr�tu %s\n"
+ msgstr "karta nie obsługuje algorytmu skrótu %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
- msgstr "dotychczas stworzono podpis�w: %lu\n"
+ msgstr "dotychczas stworzono podpisów: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "weryfikacja PIN-u administracyjnego tym poleceniem jest aktualnie "
  "zabroniona\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
- msgstr "nie mo�na dosta� si� do %s - niepoprawna karta OpenPGP?\n"
+ msgstr "nie można dostać się do %s - niepoprawna karta OpenPGP?\n"
  
 +#: scd/app-dinsig.c:299
  msgid "||Please enter your PIN at the reader's pinpad"
- msgstr "||Prosz� wprowadzi� PIN na klawiaturze czytnika"
+ msgstr "||Proszę wprowadzić PIN na klawiaturze czytnika"
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
 +#: scd/app-dinsig.c:529
  msgid "|N|Initial New PIN"
- msgstr "|N|Pocz�tkowy nowy PIN"
+ msgstr "|N|Początkowy nowy PIN"
  
 +#: scd/scdaemon.c:114
  msgid "run in multi server mode (foreground)"
  msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
  
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
  msgid "|FILE|write a log to FILE"
- msgstr "|PLIK|zapisanie log�w do PLIKu"
+ msgstr "|PLIK|zapisanie logów do PLIKu"
  
 +#: scd/scdaemon.c:134
  msgid "|N|connect to reader at port N"
- msgstr "|N|po��czenie z czytnikiem na porcie N"
+ msgstr "|N|połączenie z czytnikiem na porcie N"
  
 +#: scd/scdaemon.c:136
  msgid "|NAME|use NAME as ct-API driver"
- msgstr "|NAZWA|u�ycie NAZWY jako sterownika ct-API"
+ msgstr "|NAZWA|użycie NAZWY jako sterownika ct-API"
  
 +#: scd/scdaemon.c:138
  msgid "|NAME|use NAME as PC/SC driver"
- msgstr "|NAZWA|u�ycie NAZWY jako sterownika PC/SC"
+ msgstr "|NAZWA|użycie NAZWY jako sterownika PC/SC"
  
 +#: scd/scdaemon.c:141
  msgid "do not use the internal CCID driver"
- msgstr "nie u�ywanie wewn�trznego sterownika CCID"
+ msgstr "nie używanie wewnętrznego sterownika CCID"
  
 +#: scd/scdaemon.c:147
  msgid "|N|disconnect the card after N seconds of inactivity"
- msgstr "|N|od��czenie karty po N sekundach nieaktywno�ci"
+ msgstr "|N|odłączenie karty po N sekundach nieaktywności"
  
 +#: scd/scdaemon.c:150
  msgid "do not use a reader's pinpad"
- msgstr "nie u�ywanie klawiatury czytnika"
+ msgstr "nie używanie klawiatury czytnika"
  
 +#: scd/scdaemon.c:155
  msgid "deny the use of admin card commands"
- msgstr "zabronienie u�ywania polece� karty administratora"
+ msgstr "zabronienie używania poleceń karty administratora"
  
 +#: scd/scdaemon.c:158
  msgid "use variable length input for pinpad"
- msgstr "u�ycie wej�cia z klawiatury czytnika o zmiennej d�ugo�ci"
+ msgstr "użycie wejścia z klawiatury czytnika o zmiennej długości"
  
 +#: scd/scdaemon.c:287
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
- msgstr "Wywo�anie: gpgconf [opcje] (-h podaje pomoc)"
+ msgstr "Wywołanie: gpgconf [opcje] (-h podaje pomoc)"
  
 +#: scd/scdaemon.c:289
  #, fuzzy
  #| msgid ""
  #| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8117,56 -6574,46 +8212,56 @@@ msgid "
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
- "Sk�adnia: scdaemon [opcje] [polecenie [argumenty]]\n"
+ "Składnia: scdaemon [opcje] [polecenie [argumenty]]\n"
  "Demon kart procesorowych dla GnuPG\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  #, fuzzy
  #| msgid ""
  #| "please use the option `--daemon' to run the program in the background\n"
  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"
+ msgstr "proszę użyć opcji ,,--daemon'' do uruchomienia programu w tle\n"
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
- msgstr "obs�uga fd %d uruchomiona\n"
+ msgstr "obsługa fd %d uruchomiona\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
- msgstr "obs�uga fd %d zako�czona\n"
+ msgstr "obsługa fd %d zakończona\n"
  
 +#: sm/base64.c:327
  #, c-format
  msgid "invalid radix64 character %02x skipped\n"
- msgstr "niew�a�ciwy znak formatu radix64 %02x zosta� pomini�ty\n"
+ msgstr "niewłaściwy znak formatu radix64 %02x został pominięty\n"
  
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  #| msgid "no gpg-agent running in this session\n"
  msgid "no dirmngr running in this session\n"
- msgstr "brak dzia�aj�cego gpg-agenta w tej sesji\n"
+ msgstr "brak działającego gpg-agenta w tej sesji\n"
  
 +#: sm/certchain.c:194
  #, c-format
  msgid "validation model requested by certificate: %s"
- msgstr "model poprawno�ci ��dany przez certyfikat: %s"
+ msgstr "model poprawności żądany przez certyfikat: %s"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
- msgstr "�a�cuchowy"
+ msgstr "łańcuchowy"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
- msgstr "pow�okowy"
+ msgstr "powłokowy"
  
 +#: sm/certchain.c:256 dirmngr/validate.c:107
  #, c-format
  msgid "critical certificate extension %s is not supported"
- msgstr "krytyczne rozszerzenie certyfikatu %s nie jest obs�ugiwane"
+ msgstr "krytyczne rozszerzenie certyfikatu %s nie jest obsługiwane"
  
 +#: sm/certchain.c:295 dirmngr/validate.c:205
  msgid "issuer certificate is not marked as a CA"
  msgstr "wystawca certyfikatu nie jest oznaczony jako CA"
  
@@@ -8178,9 -6623,8 +8273,9 @@@ msgstr "polityka oznaczona jako krytycz
  #, fuzzy, c-format
  #| msgid "failed to open `%s': %s\n"
  msgid "failed to open '%s': %s\n"
- msgstr "nie uda�o si� otworzy� ,,%s'': %s\n"
+ msgstr "nie udało się otworzyć ,,%s'': %s\n"
  
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
  #, fuzzy
  #| msgid "note: non-critical certificate policy not allowed"
  msgid "Note: non-critical certificate policy not allowed"
@@@ -8190,205 -6633,156 +8285,205 @@@ msgstr "uwaga: niekrytyczna polityka ce
  msgid "certificate policy not allowed"
  msgstr "polityka certyfikatu niedozwolona"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
- msgstr "poszukiwanie wystawcy na zewn�trz\n"
+ msgstr "poszukiwanie wystawcy na zewnątrz\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
- msgstr "liczba pasuj�cych wystawc�w: %d\n"
+ msgstr "liczba pasujących wystawców: %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
- msgstr "poszukiwanie wystawcy w pami�ci podr�cznej Dirmngr\n"
+ msgstr "poszukiwanie wystawcy w pamięci podręcznej Dirmngr\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
- msgstr "liczba pasuj�cych certyfikat�w: %d\n"
+ msgstr "liczba pasujących certyfikatów: %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr ""
- "wyszukiwanie klucza tylko w pami�ci podr�cznej dirmngr nie powiod�o si�: %s\n"
+ "wyszukiwanie klucza tylko w pamięci podręcznej dirmngr nie powiodło się: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
- msgstr "nie uda�o si� przydzieli� uchwytu keyDB\n"
+ msgstr "nie udało się przydzielić uchwytu keyDB\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
- msgstr "certyfikat zosta� uniewa�niony"
+ msgstr "certyfikat został unieważniony"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "status certyfikatu jest nieznany"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
- msgstr "prosz� upewni� si�, �e ,,dirmngr'' jest poprawnie zainstalowany\n"
+ msgstr "proszę upewnić się, że ,,dirmngr'' jest poprawnie zainstalowany\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
- msgstr "sprawdzenie CRL nie powiod�o si�: %s"
+ msgstr "sprawdzenie CRL nie powiodło się: %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
- msgstr "certyfikat o niewa�nej wa�no�ci: %s"
+ msgstr "certyfikat o nieważnej ważności: %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
- msgstr "certyfikat jeszcze nie jest wa�ny"
+ msgstr "certyfikat jeszcze nie jest ważny"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
- msgstr "certyfikat g��wny jeszcze nie jest wa�ny"
+ msgstr "certyfikat główny jeszcze nie jest ważny"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
- msgstr "certyfikat po�redni jeszcze nie jest wa�ny"
+ msgstr "certyfikat pośredni jeszcze nie jest ważny"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
- msgstr "certyfikat wygas�"
+ msgstr "certyfikat wygasł"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
- msgstr "certyfikat g��wny wygas�"
+ msgstr "certyfikat główny wygasł"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
- msgstr "certyfikat po�redni wygas�"
+ msgstr "certyfikat pośredni wygasł"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
- msgstr "brak wymaganych atrybut�w certyfikatu: %s%s%s"
+ msgstr "brak wymaganych atrybutów certyfikatu: %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
- msgstr "certyfikat o niewa�nej wa�no�ci"
+ msgstr "certyfikat o nieważnej ważności"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
- msgstr "podpis nie utworzony w czasie �ycia certyfikatu"
+ msgstr "podpis nie utworzony w czasie życia certyfikatu"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
- msgstr "certyfikat nie utworzony w czasie �ycia wystawcy"
+ msgstr "certyfikat nie utworzony w czasie życia wystawcy"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
- msgstr "po�redni certyfikat nie utworzony w czasie �ycia wystawcy"
+ msgstr "pośredni certyfikat nie utworzony w czasie życia wystawcy"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  (  podpis utworzony "
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "  (certyfikat utworzony "
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
- msgstr "  (certyfikat wa�ny od "
+ msgstr "  (certyfikat ważny od "
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
- msgstr "  (     wystawca wa�ny od "
+ msgstr "  (     wystawca ważny od "
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "odcisk=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
- msgstr "g��wny certyfikat nie zosta� oznaczony jako zaufany\n"
+ msgstr "główny certyfikat nie został oznaczony jako zaufany\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
- msgstr "interaktywne oznaczanie zaufania nie w��czone w gpg-agencie\n"
+ msgstr "interaktywne oznaczanie zaufania nie włączone w gpg-agencie\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
- msgstr "interaktywne oznaczanie zaufania wy��czone dla tej sesji\n"
+ msgstr "interaktywne oznaczanie zaufania wyłączone dla tej sesji\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
- msgstr "UWAGA: czas utworzenia podpisu nie jest znany - przyj�to czas bie��cy"
+ msgstr "UWAGA: czas utworzenia podpisu nie jest znany - przyjęto czas bieżący"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "nie znaleziono wystawcy w certyfikacie"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
- msgstr "w�asnor�cznie podpisany certyfikat ma Z�Y podpis"
+ msgstr "własnoręcznie podpisany certyfikat ma ZŁY podpis"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
- msgstr "g��wny certyfikat nie jest oznaczony jako zaufany"
+ msgstr "główny certyfikat nie jest oznaczony jako zaufany"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
- msgstr "sprawdzenie listy zaufania nie powiod�o si�: %s\n"
+ msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
- msgstr "�a�cuch certyfikat�w zbyt d�ugi\n"
+ msgstr "łańcuch certyfikatów zbyt długi\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "nie znaleziono wystawcy certyfikatu"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
- msgstr "certyfikat ma Z�Y podpis"
+ msgstr "certyfikat ma ZŁY podpis"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
- msgstr "znaleziono inny by� mo�e pasuj�cy certyfikat CA - ponawianie pr�by"
+ msgstr "znaleziono inny być może pasujący certyfikat CA - ponawianie próby"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
- msgstr "�a�cuch certyfikat�w d�u�szy ni� zezwala CA (%d)"
+ msgstr "łańcuch certyfikatów dłuższy niż zezwala CA (%d)"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "certyfikat jest dobry\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
- msgstr "certyfikat po�redni jest dobry\n"
+ msgstr "certyfikat pośredni jest dobry\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
- msgstr "certyfikat g��wny jest dobry\n"
+ msgstr "certyfikat główny jest dobry\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
- msgstr "prze��czanie do modelu �a�cuchowego"
+ msgstr "przełączanie do modelu łańcuchowego"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
- msgstr "u�yty model poprawno�ci: %s"
+ msgstr "użyty model poprawności: %s"
  
 +#: sm/certcheck.c:107
  #, c-format
  msgid "a %u bit hash is not valid for a %u bit %s key\n"
- msgstr "skr�t %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
+ msgstr "skrót %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
  
 +#: sm/certcheck.c:244 sm/verify.c:202
  msgid "(this is the MD2 algorithm)\n"
  msgstr "(to jest algorytm MD2)\n"
  
@@@ -8396,23 -6789,18 +8491,23 @@@
  msgid "none"
  msgstr "brak"
  
 +#: sm/certdump.c:552 sm/certdump.c:617
  msgid "[Error - invalid encoding]"
- msgstr "[B��d - niew�a�ciwe kodowanie]"
+ msgstr "[Błąd - niewłaściwe kodowanie]"
  
 +#: sm/certdump.c:560
  msgid "[Error - out of core]"
- msgstr "[B��d - brak pami�ci]"
+ msgstr "[Błąd - brak pamięci]"
  
 +#: sm/certdump.c:596
  msgid "[Error - No name]"
- msgstr "[B��d - Brak nazwy]"
+ msgstr "[Błąd - Brak nazwy]"
  
 +#: sm/certdump.c:623
  msgid "[Error - invalid DN]"
- msgstr "[B��d - niew�a�ciwe DN]"
+ msgstr "[Błąd - niewłaściwe DN]"
  
 +#: sm/certdump.c:833
  #, c-format
  msgid ""
  "Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -8426,51 -6814,40 +8521,51 @@@ msgstr "
  "S/N %s, ID 0x%08lX,\n"
  "stworzony %s, wygasa %s.\n"
  
 +#: sm/certlist.c:122 dirmngr/validate.c:1075
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
- "nie okre�lono sposobu wykorzystania klucza - przyj�to wszystkie sposoby\n"
+ "nie określono sposobu wykorzystania klucza - przyjęto wszystkie sposoby\n"
  
 +#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
  #, c-format
  msgid "error getting key usage information: %s\n"
- msgstr "b��d podczas pobierania informacji o wykorzystaniu klucza: %s\n"
+ msgstr "błąd podczas pobierania informacji o wykorzystaniu klucza: %s\n"
  
 +#: sm/certlist.c:142 dirmngr/validate.c:1095
  msgid "certificate should not have been used for certification\n"
- msgstr "certyfikat nie powinien by� u�ywany do po�wiadczania\n"
+ msgstr "certyfikat nie powinien być używany do poświadczania\n"
  
 +#: sm/certlist.c:154 dirmngr/validate.c:1107
  msgid "certificate should not have been used for OCSP response signing\n"
- msgstr "certyfikat nie powinien by� u�ywany do podpisywania odpowiedzi OCSP\n"
+ msgstr "certyfikat nie powinien być używany do podpisywania odpowiedzi OCSP\n"
  
 +#: sm/certlist.c:165 dirmngr/validate.c:1127
  msgid "certificate should not have been used for encryption\n"
- msgstr "certyfikat nie powinien by� u�ywany do szyfrowania\n"
+ msgstr "certyfikat nie powinien być używany do szyfrowania\n"
  
 +#: sm/certlist.c:166 dirmngr/validate.c:1129
  msgid "certificate should not have been used for signing\n"
- msgstr "certyfikat nie powinien by� u�ywany do podpisywania\n"
+ msgstr "certyfikat nie powinien być używany do podpisywania\n"
  
 +#: sm/certlist.c:167 dirmngr/validate.c:1130
  msgid "certificate is not usable for encryption\n"
- msgstr "certyfikat nie nadaje si� do szyfrowania\n"
+ msgstr "certyfikat nie nadaje się do szyfrowania\n"
  
 +#: sm/certlist.c:168 dirmngr/validate.c:1131
  msgid "certificate is not usable for signing\n"
- msgstr "certyfikat nie nadaje si� do podpisywania\n"
+ msgstr "certyfikat nie nadaje się do podpisywania\n"
  
 +#: sm/certreqgen.c:464
  #, c-format
  msgid "line %d: invalid algorithm\n"
- msgstr "linia %d: niew�a�ciwy algorytm\n"
+ msgstr "linia %d: niewłaściwy algorytm\n"
  
 +#: sm/certreqgen.c:478
  #, c-format
  msgid "line %d: invalid key length %u (valid are %d to %d)\n"
- msgstr "linia %d: niew�a�ciwa d�ugo�� klucza %u (poprawne s� od %d do %d)\n"
+ msgstr "linia %d: niewłaściwa długość klucza %u (poprawne są od %d do %d)\n"
  
 +#: sm/certreqgen.c:496
  #, c-format
  msgid "line %d: no subject name given\n"
  msgstr "linia %d: nie podano nazwy przedmiotu\n"
@@@ -8479,15 -6855,13 +8574,15 @@@
  #, fuzzy, c-format
  #| msgid "line %d: invalid subject name label `%.*s'\n"
  msgid "line %d: invalid subject name label '%.*s'\n"
- msgstr "linia %d: niew�a�ciwa etykieta nazwy przedmiotu ,,%.*s''\n"
+ msgstr "linia %d: niewłaściwa etykieta nazwy przedmiotu ,,%.*s''\n"
  
 +#: sm/certreqgen.c:508
  #, fuzzy, c-format
  #| msgid "line %d: invalid subject name `%s' at pos %d\n"
  msgid "line %d: invalid subject name '%s' at pos %d\n"
- msgstr "linia %d: niew�a�ciwa nazwa przedmiotu ,,%s'' na pozycji %d\n"
+ msgstr "linia %d: niewłaściwa nazwa przedmiotu ,,%s'' na pozycji %d\n"
  
 +#: sm/certreqgen.c:525
  #, c-format
  msgid "line %d: not a valid email address\n"
  msgstr "linia %d: niepoprawny adres e-mail\n"
@@@ -8496,116 -6869,96 +8591,116 @@@
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "line %d: invalid serial number\n"
- msgstr "linia %d: niew�a�ciwy algorytm\n"
+ msgstr "linia %d: niewłaściwy algorytm\n"
  
 +#: sm/certreqgen.c:560
  #, fuzzy, c-format
  #| msgid "line %d: invalid subject name label `%.*s'\n"
  msgid "line %d: invalid issuer name label '%.*s'\n"
- msgstr "linia %d: niew�a�ciwa etykieta nazwy przedmiotu ,,%.*s''\n"
+ msgstr "linia %d: niewłaściwa etykieta nazwy przedmiotu ,,%.*s''\n"
  
 +#: sm/certreqgen.c:563
  #, fuzzy, c-format
  #| msgid "line %d: invalid subject name `%s' at pos %d\n"
  msgid "line %d: invalid issuer name '%s' at pos %d\n"
- msgstr "linia %d: niew�a�ciwa nazwa przedmiotu ,,%s'' na pozycji %d\n"
+ msgstr "linia %d: niewłaściwa nazwa przedmiotu ,,%s'' na pozycji %d\n"
  
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "line %d: invalid date given\n"
- msgstr "linia %d: niew�a�ciwy algorytm\n"
+ msgstr "linia %d: niewłaściwy algorytm\n"
  
 +#: sm/certreqgen.c:599
  #, fuzzy, c-format
  #| msgid "line %d: error getting key by keygrip `%s': %s\n"
  msgid "line %d: error getting signing key by keygrip '%s': %s\n"
- msgstr "linia %d: b��d pobierania klucza z uchwytu ,,%s'': %s\n"
+ msgstr "linia %d: błąd pobierania klucza z uchwytu ,,%s'': %s\n"
  
 +#: sm/certreqgen.c:618
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "line %d: invalid hash algorithm given\n"
- msgstr "linia %d: niew�a�ciwy algorytm\n"
+ msgstr "linia %d: niewłaściwy algorytm\n"
  
 +#: sm/certreqgen.c:633
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "line %d: invalid authority-key-id\n"
- msgstr "linia %d: niew�a�ciwy algorytm\n"
+ msgstr "linia %d: niewłaściwy algorytm\n"
  
 +#: sm/certreqgen.c:648
  #, fuzzy, c-format
  #| msgid "line %d: invalid subject name `%s' at pos %d\n"
  msgid "line %d: invalid subject-key-id\n"
- msgstr "linia %d: niew�a�ciwa nazwa przedmiotu ,,%s'' na pozycji %d\n"
+ msgstr "linia %d: niewłaściwa nazwa przedmiotu ,,%s'' na pozycji %d\n"
  
 +#: sm/certreqgen.c:686
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "line %d: invalid extension syntax\n"
- msgstr "linia %d: niew�a�ciwy algorytm\n"
+ msgstr "linia %d: niewłaściwy algorytm\n"
  
 +#: sm/certreqgen.c:699
  #, fuzzy, c-format
  #| msgid "line %d: error reading key `%s' from card: %s\n"
  msgid "line %d: error reading key '%s' from card: %s\n"
- msgstr "linia %d: b��d odczytu klucza ,,%s'' z karty: %s\n"
+ msgstr "linia %d: błąd odczytu klucza ,,%s'' z karty: %s\n"
  
 +#: sm/certreqgen.c:712
  #, fuzzy, c-format
  #| msgid "line %d: error getting key by keygrip `%s': %s\n"
  msgid "line %d: error getting key by keygrip '%s': %s\n"
- msgstr "linia %d: b��d pobierania klucza z uchwytu ,,%s'': %s\n"
+ msgstr "linia %d: błąd pobierania klucza z uchwytu ,,%s'': %s\n"
  
 +#: sm/certreqgen.c:729
  #, c-format
  msgid "line %d: key generation failed: %s <%s>\n"
- msgstr "linia %d: generowanie klucza nie powiod�o si�: %s <%s>\n"
+ msgstr "linia %d: generowanie klucza nie powiodło się: %s <%s>\n"
  
 +#: sm/certreqgen.c:1324
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
  msgstr ""
- "Aby zako�czy� to ��danie certyfikatu prosz� wprowadzi� jeszcze raz has�o dla "
+ "Aby zakończyć to żądanie certyfikatu proszę wprowadzić jeszcze raz hasło dla "
  "utworzonego klucza.\n"
  
 +#: sm/certreqgen-ui.c:162
  #, c-format
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA\n"
  
 +#: sm/certreqgen-ui.c:163
  #, c-format
  msgid "   (%d) Existing key\n"
- msgstr "   (%d) Istniej�cy klucz\n"
+ msgstr "   (%d) Istniejący klucz\n"
  
 +#: sm/certreqgen-ui.c:164
  #, c-format
  msgid "   (%d) Existing key from card\n"
- msgstr "   (%d) Istniej�cy klucz z karty\n"
+ msgstr "   (%d) Istniejący klucz z karty\n"
  
 +#: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
  #, c-format
  msgid "error reading the card: %s\n"
- msgstr "b��d odczytu karty: %s\n"
+ msgstr "błąd odczytu karty: %s\n"
  
 +#: sm/certreqgen-ui.c:237
  #, c-format
  msgid "Serial number of the card: %s\n"
  msgstr "Numer seryjny karty: %s\n"
  
 +#: sm/certreqgen-ui.c:249
  msgid "Available keys:\n"
- msgstr "Dost�pne klucze:\n"
+ msgstr "Dostępne klucze:\n"
  
 +#: sm/certreqgen-ui.c:280
  #, c-format
  msgid "Possible actions for a %s key:\n"
- msgstr "Mo�liwe akcje dla klucza %s:\n"
+ msgstr "Możliwe akcje dla klucza %s:\n"
  
 +#: sm/certreqgen-ui.c:281
  #, c-format
  msgid "   (%d) sign, encrypt\n"
  msgstr "   (%d) podpisywanie, szyfrowanie\n"
@@@ -8643,9 -6990,8 +8738,9 @@@ msgstr "Nieprawidłowa etykieta nazwy p
  #, fuzzy, c-format
  #| msgid "Invalid subject name `%s'\n"
  msgid "Invalid subject name '%s'\n"
- msgstr "Nieprawid�owa nazwa przedmiotu ,,%s''\n"
+ msgstr "Nieprawidłowa nazwa przedmiotu ,,%s''\n"
  
 +#: sm/certreqgen-ui.c:326
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr "33"
  
@@@ -8673,9 -7013,8 +8768,9 @@@ msgstr "URI
  #, fuzzy
  #| msgid "Create a designated revocation certificate for this key? (y/N) "
  msgid "Create self-signed certificate? (y/N) "
- msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
+ msgstr "Stworzyć certyfikat unieważnienia tego klucza? (t/N) "
  
 +#: sm/certreqgen-ui.c:382
  msgid "These parameters are used:\n"
  msgstr ""
  
@@@ -8683,15 -7021,13 +8778,15 @@@
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "Now creating self-signed certificate.  "
- msgstr "w�asnor�cznie podpisany certyfikat ma Z�Y podpis"
+ msgstr "własnoręcznie podpisany certyfikat ma ZŁY podpis"
  
 +#: sm/certreqgen-ui.c:402
  #, fuzzy
  #| msgid "Now creating certificate request.  This may take a while ...\n"
  msgid "Now creating certificate request.  "
- msgstr "Tworzenie ��dania certyfikatu. Mo�e to chwil� potrwa�...\n"
+ msgstr "Tworzenie żądania certyfikatu. Może to chwilę potrwać...\n"
  
 +#: sm/certreqgen-ui.c:403
  msgid "This may take a while ...\n"
  msgstr ""
  
@@@ -8699,174 -7034,134 +8794,174 @@@
  msgid "Ready.\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:417
  msgid "Ready.  You should now send this request to your CA.\n"
  msgstr ""
- "Gotowe. Teraz nale�y wys�a� to ��danie do w�asnego centrum certyfikacji.\n"
+ "Gotowe. Teraz należy wysłać to żądanie do własnego centrum certyfikacji.\n"
  
 +#: sm/certreqgen-ui.c:423
  msgid "resource problem: out of core\n"
- msgstr "problem z zasobami: brak pami�ci\n"
+ msgstr "problem z zasobami: brak pamięci\n"
  
 +#: sm/decrypt.c:330
  msgid "(this is the RC2 algorithm)\n"
  msgstr "(to jest algorytm RC2)\n"
  
 +#: sm/decrypt.c:332
  msgid "(this does not seem to be an encrypted message)\n"
- msgstr "(to nie wygl�da na zaszyfrowan� wiadomo��)\n"
+ msgstr "(to nie wygląda na zaszyfrowaną wiadomość)\n"
  
 +#: sm/delete.c:51 sm/delete.c:112
  #, fuzzy, c-format
  #| msgid "certificate `%s' not found: %s\n"
  msgid "certificate '%s' not found: %s\n"
  msgstr "nie znaleziono certyfikatu ,,%s'': %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
- msgstr "b��d blokowania keyboksa: %s\n"
+ msgstr "błąd blokowania keyboksa: %s\n"
  
 +#: sm/delete.c:143
  #, fuzzy, c-format
  #| msgid "duplicated certificate `%s' deleted\n"
  msgid "duplicated certificate '%s' deleted\n"
- msgstr "powt�rzony certyfikat ,,%s'' usuni�ty\n"
+ msgstr "powtórzony certyfikat ,,%s'' usunięty\n"
  
 +#: sm/delete.c:145
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' deleted\n"
- msgstr "certyfikat ,,%s'' usuni�ty\n"
+ msgstr "certyfikat ,,%s'' usunięty\n"
  
 +#: sm/delete.c:175
  #, c-format
  msgid "deleting certificate \"%s\" failed: %s\n"
- msgstr "usuni�cie certyfikatu ,,%s'' nie powiod�o si�: %s\n"
+ msgstr "usunięcie certyfikatu ,,%s'' nie powiodło się: %s\n"
  
 +#: sm/encrypt.c:328
  msgid "no valid recipients given\n"
- msgstr "nie podano poprawnych adresat�w\n"
+ msgstr "nie podano poprawnych adresatów\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
- msgstr "wypisanie kluczy zewn�trznych"
+ msgstr "wypisanie kluczy zewnętrznych"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
- msgstr "wypisanie �a�cucha certyfikat�w"
+ msgstr "wypisanie łańcucha certyfikatów"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
- msgstr "import certyfikat�w"
+ msgstr "import certyfikatów"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
- msgstr "eksport certyfikat�w"
+ msgstr "eksport certyfikatów"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "zarejestrowanie karty procesorowej"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "przekazanie polecenia do dirmngr"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
- msgstr "wywo�anie gpg-protect-tool"
+ msgstr "wywołanie gpg-protect-tool"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
- msgstr "tworzenie wyj�cia zakodowanego base-64"
+ msgstr "tworzenie wyjścia zakodowanego base-64"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
- msgstr "przyj�cie wej�cia w formacie PEM"
+ msgstr "przyjęcie wejścia w formacie PEM"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
- msgstr "przyj�cie wej�cia w formacie base-64"
+ msgstr "przyjęcie wejścia w formacie base-64"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
- msgstr "przyj�cie wej�cia w formacie binarnym"
+ msgstr "przyjęcie wejścia w formacie binarnym"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
- msgstr "pomini�cie CRL"
+ msgstr "pominięcie CRL"
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
- msgstr "sprawdzenie poprawno�ci przy u�yciu OCSP"
+ msgstr "sprawdzenie poprawności przy użyciu OCSP"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
- msgstr "|N|liczba certyfikat�w do do��czenia"
+ msgstr "|N|liczba certyfikatów do dołączenia"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
- msgstr "nie sprawdzanie polityk certyfikat�w"
+ msgstr "nie sprawdzanie polityk certyfikatów"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
- msgstr "pobranie brakuj�cych certyfikat�w wystawc�w"
+ msgstr "pobranie brakujących certyfikatów wystawców"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
- msgstr "nie u�ywanie w og�le terminala"
+ msgstr "nie używanie w ogóle terminala"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
- msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKU"
+ msgstr "|PLIK|zapisanie logów trybu serwerowego do PLIKU"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
- msgstr "|PLIK|zapisanie log�w audytowych do PLIKU"
+ msgstr "|PLIK|zapisanie logów audytowych do PLIKU"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
- msgstr "tryb wsadowy: bez �adnych pyta�"
+ msgstr "tryb wsadowy: bez żadnych pytań"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
- msgstr "przyj�cie odpowiedzi ,,tak'' na wi�kszo�� pyta�"
+ msgstr "przyjęcie odpowiedzi ,,tak'' na większość pytań"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
- msgstr "przyj�cie odpowiedzi ,,nie'' na wi�kszo�� pyta�"
+ msgstr "przyjęcie odpowiedzi ,,nie'' na większość pytań"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
- msgstr "|PLIK|dodanie tego zbioru kluczy do listy zbior�w kluczy"
+ msgstr "|PLIK|dodanie tego zbioru kluczy do listy zbiorów kluczy"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
- msgstr "|U�YTKOWNIK|u�ycie tego identyfikatora jako domy�lnego klucza tajnego"
+ msgstr "|UŻYTKOWNIK|użycie tego identyfikatora jako domyślnego klucza tajnego"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
- msgstr "|SPEC|u�ycie tego serwera do wyszukiwania kluczy"
+ msgstr "|SPEC|użycie tego serwera do wyszukiwania kluczy"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
- msgstr "|NAZWA|u�ycie tego algorytmu szyfrowania NAZWA"
+ msgstr "|NAZWA|użycie tego algorytmu szyfrowania NAZWA"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
- msgstr "|NAZWA|u�ycie tego algorytmu skr�tu wiadomo�ci"
+ msgstr "|NAZWA|użycie tego algorytmu skrótu wiadomości"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
- msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
+ msgstr "Wywołanie: gpg [opcje] [pliki] (-h podaje pomoc)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgsm [options] [files]\n"
@@@ -8877,138 -7172,112 +8972,138 @@@ msgid "
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "Sk�adnia: gpgsm [opcje] [pliki]\n"
- "Podpisywanie, sprawdzanie podpis�w, szyfrowanie, rozszyfrowywanie z u�yciem "
+ "Składnia: gpgsm [opcje] [pliki]\n"
+ "Podpisywanie, sprawdzanie podpisów, szyfrowanie, rozszyfrowywanie z użyciem "
  "S/MIME\n"
- "Domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
+ "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  #| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
  msgid "Note: won't be able to encrypt to '%s': %s\n"
- msgstr "UWAGA: nie mo�na zaszyfrowa� do ,,%s'': %s\n"
+ msgstr "UWAGA: nie można zaszyfrować do ,,%s'': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  #| msgid "unknown validation model `%s'\n"
  msgid "unknown validation model '%s'\n"
- msgstr "nieznany model poprawno�ci ,,%s''\n"
+ msgstr "nieznany model poprawności ,,%s''\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: nie podano nazwy hosta\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
- msgstr "%s:%u: podano has�o bez u�ytkownika\n"
+ msgstr "%s:%u: podano hasło bez użytkownika\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
- msgstr "%s:%u: linia pomini�ta\n"
+ msgstr "%s:%u: linia pominięta\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
- msgstr "niezrozumia�y adres serwera kluczy\n"
+ msgstr "niezrozumiały adres serwera kluczy\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  #| msgid "importing common certificates `%s'\n"
  msgid "importing common certificates '%s'\n"
- msgstr "import wsp�lnych certyfikat�w ,,%s''\n"
+ msgstr "import wspólnych certyfikatów ,,%s''\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  #| msgid "can't sign using `%s': %s\n"
  msgid "can't sign using '%s': %s\n"
- msgstr "nie mo�na podpisa� z u�yciem ,,%s'': %s\n"
+ msgstr "nie można podpisać z użyciem ,,%s'': %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
- msgstr "b��dne polecenie (nie ma polecenia domy�lnego)\n"
+ msgstr "błędne polecenie (nie ma polecenia domyślnego)\n"
  
 +#: sm/import.c:127
  #, c-format
  msgid "total number processed: %lu\n"
- msgstr "ca�kowita liczba przetworzonych: %lu\n"
+ msgstr "całkowita liczba przetworzonych: %lu\n"
  
 +#: sm/import.c:246
  msgid "error storing certificate\n"
- msgstr "b��d zapisywania certyfikatu\n"
+ msgstr "błąd zapisywania certyfikatu\n"
  
 +#: sm/import.c:254
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
- "podstawowe sprawdzenia certyikatu nie powiod�y si� - nie zaimportowany\n"
+ "podstawowe sprawdzenia certyikatu nie powiodły się - nie zaimportowany\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
- msgstr "b��d pobierania zapisanych flag: %s\n"
+ msgstr "błąd pobierania zapisanych flag: %s\n"
  
 +#: sm/import.c:526 sm/import.c:558
  #, c-format
  msgid "error importing certificate: %s\n"
- msgstr "b��d importu certyfikatu: %s\n"
+ msgstr "błąd importu certyfikatu: %s\n"
  
 +#: sm/import.c:746 tools/gpg-connect-agent.c:1433
  #, c-format
  msgid "error reading input: %s\n"
- msgstr "b��d odczytu wej�cia: %s\n"
+ msgstr "błąd odczytu wejścia: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
- msgstr "nie uda�o si� pobra� odcisku\n"
+ msgstr "nie udało się pobrać odcisku\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
- msgstr "problem odszukaniem istniej�cego certyfikatu: %s\n"
+ msgstr "problem odszukaniem istniejącego certyfikatu: %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
- msgstr "b��d podczas szukania zapisywalnego keyDB: %s\n"
+ msgstr "błąd podczas szukania zapisywalnego keyDB: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
- msgstr "b��d zapisywania certyfikatu: %s\n"
+ msgstr "błąd zapisywania certyfikatu: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "problem z ponownym odszukaniem certyfikatu: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
- msgstr "b��d zapisywania flag: %s\n"
+ msgstr "błąd zapisywania flag: %s\n"
  
 +#: sm/keylist.c:657
  msgid "Error - "
- msgstr "B��d - "
+ msgstr "Błąd - "
  
 +#: sm/misc.c:58
  msgid "GPG_TTY has not been set - using maybe bogus default\n"
  msgstr ""
- "GPG_TTY nie zosta�o ustawione - u�ycie by� mo�e nieprawid�owego domy�lnego\n"
+ "GPG_TTY nie zostało ustawione - użycie być może nieprawidłowego domyślnego\n"
  
 +#: sm/qualified.c:105
  #, fuzzy, c-format
  #| msgid "invalid formatted fingerprint in `%s', line %d\n"
  msgid "invalid formatted fingerprint in '%s', line %d\n"
- msgstr "niew�a�ciwie sformatowany odcisk w ,,%s'', w linii %d\n"
+ msgstr "niewłaściwie sformatowany odcisk w ,,%s'', w linii %d\n"
  
 +#: sm/qualified.c:123
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "invalid country code in '%s', line %d\n"
- msgstr "niew�a�ciwy kod kraju w ,,%s'', w linii %d\n"
+ msgstr "niewłaściwy kod kraju w ,,%s'', w linii %d\n"
  
 +#: sm/qualified.c:206
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
@@@ -9018,49 -7287,43 +9113,49 @@@
  "\n"
  "%s%sAre you really sure that you want to do this?"
  msgstr ""
- "Ta operacja z�o�y podpis przy u�yciu certyfikatu:\n"
+ "Ta operacja złoży podpis przy użyciu certyfikatu:\n"
  ",,%s''\n"
- "Utworzy to kwalifikowany podpis r�wnowa�ny prawnie podpisowi odr�cznemu.\n"
+ "Utworzy to kwalifikowany podpis równoważny prawnie podpisowi odręcznemu.\n"
  "\n"
- "%s%sNa pewno chcesz to zrobi�?"
+ "%s%sNa pewno chcesz to zrobić?"
  
 +#: sm/qualified.c:215 sm/verify.c:617
  msgid ""
  "Note, that this software is not officially approved to create or verify such "
  "signatures.\n"
  msgstr ""
- "Nale�y zauwa�y�, �e to oprogramowaie nie jest oficjalnie zatwierdzone do "
- "tworzenia i sprawdzania takich podpis�w.\n"
+ "Należy zauważyć, że to oprogramowaie nie jest oficjalnie zatwierdzone do "
+ "tworzenia i sprawdzania takich podpisów.\n"
  
 +#: sm/qualified.c:282
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
  "\"%s\"\n"
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
- "Ta operacja z�o�y podpis przy u�yciu certyfikatu:\n"
+ "Ta operacja złoży podpis przy użyciu certyfikatu:\n"
  ",,%s''\n"
- "Nale�y zauwa�y�, �e ten certyfikat NIE utworzy kwalifikowanego podpisu!"
+ "Należy zauważyć, że ten certyfikat NIE utworzy kwalifikowanego podpisu!"
  
 +#: sm/sign.c:451
  #, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
  msgstr ""
- "algorytm skr�tu %d (%s) dla podpisuj�cego %d nie jest obs�ugiwany; u�ycie "
+ "algorytm skrótu %d (%s) dla podpisującego %d nie jest obsługiwany; użycie "
  "%s\n"
  
 +#: sm/sign.c:465
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
- msgstr "algorytm skr�tu u�yty dla podpisuj�cego %d: %s (%s)\n"
+ msgstr "algorytm skrótu użyty dla podpisującego %d: %s (%s)\n"
  
 +#: sm/sign.c:517
  #, c-format
  msgid "checking for qualified certificate failed: %s\n"
- msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiod�o si�: %s\n"
+ msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiodło się: %s\n"
  
 +#: sm/verify.c:450
  msgid "Signature made "
  msgstr "Podpisano w "
  
@@@ -9068,21 -7330,17 +9163,21 @@@
  msgid "[date not given]"
  msgstr "[nie podano daty]"
  
 +#: sm/verify.c:455
  #, c-format
  msgid " using certificate ID 0x%08lX\n"
- msgstr " przy u�yciu certyfikatu o ID 0x%08lX\n"
+ msgstr " przy użyciu certyfikatu o ID 0x%08lX\n"
  
 +#: sm/verify.c:474
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
- msgstr "b��dny podpis: atrybut skr�tu wiadomo�ci nie zgadza si� z obliczonym\n"
+ msgstr "błędny podpis: atrybut skrótu wiadomości nie zgadza się z obliczonym\n"
  
 +#: sm/verify.c:595
  msgid "Good signature from"
- msgstr "Poprawny podpis z�o�ony przez"
+ msgstr "Poprawny podpis złożony przez"
  
 +#: sm/verify.c:596
  msgid "                aka"
  msgstr "                        alias"
  
@@@ -9094,9 -7350,8 +9189,9 @@@ msgstr "To jest podpis kwalifikowany\n
  #, fuzzy, c-format
  #| msgid "checking for qualified certificate failed: %s\n"
  msgid "can't initialize certificate cache lock: %s\n"
- msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiod�o si�: %s\n"
+ msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiodło się: %s\n"
  
 +#: dirmngr/certcache.c:117
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
@@@ -9110,39 -7363,33 +9205,39 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "problem looking for existing certificate: %s\n"
  msgid "can't release lock on the certificate cache: %s\n"
- msgstr "problem odszukaniem istniej�cego certyfikatu: %s\n"
+ msgstr "problem odszukaniem istniejącego certyfikatu: %s\n"
  
 +#: dirmngr/certcache.c:267
  #, fuzzy, c-format
  #| msgid "looking up issuer from the Dirmngr cache\n"
  msgid "dropping %u certificates from the cache\n"
- msgstr "poszukiwanie wystawcy w pami�ci podr�cznej Dirmngr\n"
+ msgstr "poszukiwanie wystawcy w pamięci podręcznej Dirmngr\n"
  
 +#: dirmngr/certcache.c:387
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
- msgstr "nie mo�na utworzy� ,,%s'': %s\n"
+ msgstr "nie można utworzyć ,,%s'': %s\n"
  
 +#: dirmngr/certcache.c:395
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' already cached\n"
- msgstr "certyfikat ,,%s'' usuni�ty\n"
+ msgstr "certyfikat ,,%s'' usunięty\n"
  
 +#: dirmngr/certcache.c:399
  #, fuzzy, c-format
  #| msgid "duplicated certificate `%s' deleted\n"
  msgid "trusted certificate '%s' loaded\n"
- msgstr "powt�rzony certyfikat ,,%s'' usuni�ty\n"
+ msgstr "powtórzony certyfikat ,,%s'' usunięty\n"
  
 +#: dirmngr/certcache.c:401
  #, fuzzy, c-format
  #| msgid "certificate `%s' deleted\n"
  msgid "certificate '%s' loaded\n"
- msgstr "certyfikat ,,%s'' usuni�ty\n"
+ msgstr "certyfikat ,,%s'' usunięty\n"
  
 +#: dirmngr/certcache.c:405
  #, fuzzy, c-format
  #| msgid "fingerprint=%s\n"
  msgid "  SHA1 fingerprint = %s\n"
@@@ -9160,21 -7404,18 +9255,21 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error loading certificate '%s': %s\n"
- msgstr "b��d zapisywania certyfikatu: %s\n"
+ msgstr "błąd zapisywania certyfikatu: %s\n"
  
 +#: dirmngr/certcache.c:489
  #, fuzzy, c-format
  #| msgid "Included certificates"
  msgid "permanently loaded certificates: %u\n"
- msgstr "Do��czone certyfikaty"
+ msgstr "Dołączone certyfikaty"
  
 +#: dirmngr/certcache.c:491
  #, fuzzy, c-format
  #| msgid "number of matching certificates: %d\n"
  msgid "    runtime cached certificates: %u\n"
- msgstr "liczba pasuj�cych certyfikat�w: %d\n"
+ msgstr "liczba pasujących certyfikatów: %d\n"
  
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
  #, fuzzy
  #| msgid "  (certificate created at "
  msgid "certificate already cached\n"
@@@ -9191,27 -7429,23 +9286,27 @@@ msgstr "certyfikat jest dobry\n
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error caching certificate: %s\n"
- msgstr "b��d zapisywania certyfikatu: %s\n"
+ msgstr "błąd zapisywania certyfikatu: %s\n"
  
 +#: dirmngr/certcache.c:593
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "invalid SHA1 fingerprint string '%s'\n"
- msgstr "niew�a�ciwy odcisk"
+ msgstr "niewłaściwy odcisk"
  
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by S/N: %s\n"
- msgstr "b��d zapisywania certyfikatu: %s\n"
+ msgstr "błąd zapisywania certyfikatu: %s\n"
  
 +#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error fetching certificate by subject: %s\n"
- msgstr "b��d zapisywania certyfikatu: %s\n"
+ msgstr "błąd zapisywania certyfikatu: %s\n"
  
 +#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
  #, fuzzy
  #| msgid "no issuer found in certificate"
  msgid "no issuer found in certificate\n"
@@@ -9221,87 -7454,73 +9316,87 @@@ msgstr "nie znaleziono wystawcy w certy
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error getting authorityKeyIdentifier: %s\n"
- msgstr "b��d pobierania zapisanych flag: %s\n"
+ msgstr "błąd pobierania zapisanych flag: %s\n"
  
 +#: dirmngr/crlcache.c:213
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "creating directory '%s'\n"
- msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
+ msgstr "nie można utworzyć katalogu ,,%s'': %s\n"
  
 +#: dirmngr/crlcache.c:217
  #, fuzzy, c-format
  #| msgid "error creating keybox `%s': %s\n"
  msgid "error creating directory '%s': %s\n"
- msgstr "b��d tworzenia keyboksa ,,%s'': %s\n"
+ msgstr "błąd tworzenia keyboksa ,,%s'': %s\n"
  
 +#: dirmngr/crlcache.c:245
  #, fuzzy, c-format
  #| msgid "ignoring garbage line"
  msgid "ignoring database dir '%s'\n"
- msgstr "zignorowano b��dn� lini�"
+ msgstr "zignorowano błędną linię"
  
 +#: dirmngr/crlcache.c:254
  #, fuzzy, c-format
  #| msgid "error reading from %s: %s\n"
  msgid "error reading directory '%s': %s\n"
- msgstr "b��d odczytu z %s: %s\n"
+ msgstr "błąd odczytu z %s: %s\n"
  
 +#: dirmngr/crlcache.c:275
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "removing cache file '%s'\n"
- msgstr "odbieranie linii nie powiod�o si�: %s\n"
+ msgstr "odbieranie linii nie powiodło się: %s\n"
  
 +#: dirmngr/crlcache.c:284
  #, fuzzy, c-format
  #| msgid "enarmoring failed: %s\n"
  msgid "not removing file '%s'\n"
- msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
+ msgstr "opakowywanie ASCII nie powiodło się: %s\n"
  
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
  #, fuzzy, c-format
  #| msgid "error closing %s: %s\n"
  msgid "error closing cache file: %s\n"
- msgstr "b��d zamykania %s: %s\n"
+ msgstr "błąd zamykania %s: %s\n"
  
 +#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
  #, fuzzy, c-format
  #| msgid "failed to open `%s': %s\n"
  msgid "failed to open cache dir file '%s': %s\n"
- msgstr "nie uda�o si� otworzy� ,,%s'': %s\n"
+ msgstr "nie udało się otworzyć ,,%s'': %s\n"
  
 +#: dirmngr/crlcache.c:421
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error creating new cache dir file '%s': %s\n"
- msgstr "b��d tworzenia pliku tymczasowego: %s\n"
+ msgstr "błąd tworzenia pliku tymczasowego: %s\n"
  
 +#: dirmngr/crlcache.c:428
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing new cache dir file '%s': %s\n"
- msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
+ msgstr "błąd podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
  
 +#: dirmngr/crlcache.c:435
  #, fuzzy, c-format
  #| msgid "error closing %s: %s\n"
  msgid "error closing new cache dir file '%s': %s\n"
- msgstr "b��d zamykania %s: %s\n"
+ msgstr "błąd zamykania %s: %s\n"
  
 +#: dirmngr/crlcache.c:440
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new cache dir file '%s' created\n"
- msgstr "nowy plik ustawie� ,,%s'' zosta� utworzony\n"
+ msgstr "nowy plik ustawień ,,%s'' został utworzony\n"
  
 +#: dirmngr/crlcache.c:445
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "failed to re-open cache dir file '%s': %s\n"
- msgstr "nie uda�o si� utworzy� pliku tymczasowego ,,%s'': %s\n"
+ msgstr "nie udało się utworzyć pliku tymczasowego ,,%s'': %s\n"
  
 +#: dirmngr/crlcache.c:473
  #, c-format
  msgid "first record of '%s' is not the version\n"
  msgstr ""
@@@ -9323,15 -7538,13 +9418,15 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "invalid line detected in '%s' line %u\n"
- msgstr "niew�a�ciwy kod kraju w ,,%s'', w linii %d\n"
+ msgstr "niewłaściwy kod kraju w ,,%s'', w linii %d\n"
  
 +#: dirmngr/crlcache.c:632
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "duplicate entry detected in '%s' line %u\n"
- msgstr "niew�a�ciwy kod kraju w ,,%s'', w linii %d\n"
+ msgstr "niewłaściwy kod kraju w ,,%s'', w linii %d\n"
  
 +#: dirmngr/crlcache.c:647
  #, c-format
  msgid "unsupported record type in '%s' line %u skipped\n"
  msgstr ""
@@@ -9340,27 -7552,23 +9435,27 @@@
  #, fuzzy, c-format
  #| msgid "invalid keyflag in `%s', line %d\n"
  msgid "invalid issuer hash in '%s' line %u\n"
- msgstr "nieprawid�owa flaga klucza w ,,%s'', w linii %d\n"
+ msgstr "nieprawidłowa flaga klucza w ,,%s'', w linii %d\n"
  
 +#: dirmngr/crlcache.c:679
  #, fuzzy, c-format
  #| msgid "bad fingerprint in `%s', line %d\n"
  msgid "no issuer DN in '%s' line %u\n"
- msgstr "b��dny odcisk w ,,%s'', w linii %d\n"
+ msgstr "błędny odcisk w ,,%s'', w linii %d\n"
  
 +#: dirmngr/crlcache.c:686
  #, fuzzy, c-format
  #| msgid "invalid keyflag in `%s', line %d\n"
  msgid "invalid timestamp in '%s' line %u\n"
- msgstr "nieprawid�owa flaga klucza w ,,%s'', w linii %d\n"
+ msgstr "nieprawidłowa flaga klucza w ,,%s'', w linii %d\n"
  
 +#: dirmngr/crlcache.c:692
  #, fuzzy, c-format
  #| msgid "invalid keyflag in `%s', line %d\n"
  msgid "WARNING: invalid cache file hash in '%s' line %u\n"
- msgstr "nieprawid�owa flaga klucza w ,,%s'', w linii %d\n"
+ msgstr "nieprawidłowa flaga klucza w ,,%s'', w linii %d\n"
  
 +#: dirmngr/crlcache.c:698
  msgid "detected errors in cache dir file\n"
  msgstr ""
  
@@@ -9372,45 -7578,38 +9467,45 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "failed to create temporary cache dir file '%s': %s\n"
- msgstr "nie uda�o si� utworzy� pliku tymczasowego ,,%s'': %s\n"
+ msgstr "nie udało się utworzyć pliku tymczasowego ,,%s'': %s\n"
  
 +#: dirmngr/crlcache.c:937
  #, fuzzy, c-format
  #| msgid "error closing %s: %s\n"
  msgid "error closing '%s': %s\n"
- msgstr "b��d zamykania %s: %s\n"
+ msgstr "błąd zamykania %s: %s\n"
  
 +#: dirmngr/crlcache.c:949
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error renaming '%s' to '%s': %s\n"
- msgstr "b��d odczytu ,,%s'': %s\n"
+ msgstr "błąd odczytu ,,%s'': %s\n"
  
 +#: dirmngr/crlcache.c:1003
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't hash '%s': %s\n"
- msgstr "nie mo�na dosta� si� do ,,%s'': %s\n"
+ msgstr "nie można dostać się do ,,%s'': %s\n"
  
 +#: dirmngr/crlcache.c:1011
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error setting up MD5 hash context: %s\n"
- msgstr "b��d wysy�ania polecenia %s: %s\n"
+ msgstr "błąd wysyłania polecenia %s: %s\n"
  
 +#: dirmngr/crlcache.c:1027
  #, fuzzy, c-format
  #| msgid "error in `%s': %s\n"
  msgid "error hashing '%s': %s\n"
- msgstr "b��d w ,,%s'': %s\n"
+ msgstr "błąd w ,,%s'': %s\n"
  
 +#: dirmngr/crlcache.c:1055
  #, fuzzy, c-format
  #| msgid "invalid formatted fingerprint in `%s', line %d\n"
  msgid "invalid formatted checksum for '%s'\n"
- msgstr "niew�a�ciwie sformatowany odcisk w ,,%s'', w linii %d\n"
+ msgstr "niewłaściwie sformatowany odcisk w ,,%s'', w linii %d\n"
  
 +#: dirmngr/crlcache.c:1108
  msgid "too many open cache files; can't open anymore\n"
  msgstr ""
  
@@@ -9418,15 -7616,13 +9513,15 @@@
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "opening cache file '%s'\n"
- msgstr "wysy�anie linii nie powiod�o si�: %s\n"
+ msgstr "wysyłanie linii nie powiodło się: %s\n"
  
 +#: dirmngr/crlcache.c:1145
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening cache file '%s': %s\n"
- msgstr "b��d podczas otwierania ,,%s'': %s\n"
+ msgstr "błąd podczas otwierania ,,%s'': %s\n"
  
 +#: dirmngr/crlcache.c:1154
  #, c-format
  msgid "error initializing cache file '%s' for reading: %s\n"
  msgstr ""
@@@ -9443,9 -7636,8 +9538,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "failed to create stream from socket: %s\n"
  msgid "failed to create a new cache object: %s\n"
- msgstr "nie uda�o si� utworzy� strumienia z gniazda: %s\n"
+ msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
  
 +#: dirmngr/crlcache.c:1286
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "no CRL available for issuer id %s\n"
@@@ -9486,9 -7671,8 +9581,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "problem reading cache record for S/N %s: %s\n"
- msgstr "B��d podczas odczytu klucza zapasowego z `%s': %s\n"
+ msgstr "Błąd podczas odczytu klucza zapasowego z `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1360
  #, c-format
  msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
  msgstr ""
@@@ -9502,15 -7684,13 +9597,15 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error getting data from cache file: %s\n"
- msgstr "b��d pobierania zapisanych flag: %s\n"
+ msgstr "błąd pobierania zapisanych flag: %s\n"
  
 +#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
- msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
+ msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
  
 +#: dirmngr/crlcache.c:1549
  #, c-format
  msgid "gcry_md_open for algorithm %d failed: %s\n"
  msgstr ""
@@@ -9523,27 -7701,23 +9618,27 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "iconv_open failed: %s\n"
  msgid "converting S-expression failed: %s\n"
- msgstr "iconv_open nie powiod�o si�: %s\n"
+ msgstr "iconv_open nie powiodło się: %s\n"
  
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "creating S-expression failed: %s\n"
- msgstr "odbieranie linii nie powiod�o si�: %s\n"
+ msgstr "odbieranie linii nie powiodło się: %s\n"
  
 +#: dirmngr/crlcache.c:1699
  #, fuzzy, c-format
  #| msgid "build_packet failed: %s\n"
  msgid "ksba_crl_parse failed: %s\n"
- msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
+ msgstr "wywołanie funkcji build_packet nie powiodło się: %s\n"
  
 +#: dirmngr/crlcache.c:1714
  #, fuzzy, c-format
  #| msgid "error getting serial number of card: %s\n"
  msgid "error getting update times of CRL: %s\n"
- msgstr "b��d pobierania numeru seryjnego karty: %s\n"
+ msgstr "błąd pobierania numeru seryjnego karty: %s\n"
  
 +#: dirmngr/crlcache.c:1721
  #, c-format
  msgid "update times of this CRL: this=%s next=%s\n"
  msgstr ""
@@@ -9556,15 -7728,13 +9651,15 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error getting CRL item: %s\n"
- msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
+ msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
  
 +#: dirmngr/crlcache.c:1760
  #, fuzzy, c-format
  #| msgid "error writing to temporary file: %s\n"
  msgid "error inserting item into temporary cache file: %s\n"
- msgstr "b��d zapisu do pliku tymczasowego: %s\n"
+ msgstr "błąd zapisu do pliku tymczasowego: %s\n"
  
 +#: dirmngr/crlcache.c:1787
  #, fuzzy, c-format
  #| msgid "no issuer found in certificate"
  msgid "no CRL issuer found in CRL: %s\n"
@@@ -9578,63 -7746,53 +9673,63 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "signature verification suppressed\n"
  msgid "CRL signature verification failed: %s\n"
- msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
+ msgstr "wymuszono pominięcie sprawdzenia podpisu\n"
  
 +#: dirmngr/crlcache.c:1858
  #, fuzzy, c-format
  #| msgid "error reading list of trusted root certificates\n"
  msgid "error checking validity of CRL issuer certificate: %s\n"
- msgstr "b��d odczytu listy zaufanych certyfikat�w g��wnych\n"
+ msgstr "błąd odczytu listy zaufanych certyfikatów głównych\n"
  
 +#: dirmngr/crlcache.c:2001
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "ksba_crl_new failed: %s\n"
- msgstr "select nie powiod�o si�: %s\n"
+ msgstr "select nie powiodło się: %s\n"
  
 +#: dirmngr/crlcache.c:2008
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "ksba_crl_set_reader failed: %s\n"
- msgstr "odczyt nie powi�d� si�: %s\n"
+ msgstr "odczyt nie powiódł się: %s\n"
  
 +#: dirmngr/crlcache.c:2042
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "removed stale temporary cache file '%s'\n"
- msgstr "nie uda�o si� utworzy� pliku tymczasowego ,,%s'': %s\n"
+ msgstr "nie udało się utworzyć pliku tymczasowego ,,%s'': %s\n"
  
 +#: dirmngr/crlcache.c:2046
  #, fuzzy, c-format
  #| msgid "failed to create temporary file `%s': %s\n"
  msgid "problem removing stale temporary cache file '%s': %s\n"
- msgstr "nie uda�o si� utworzy� pliku tymczasowego ,,%s'': %s\n"
+ msgstr "nie udało się utworzyć pliku tymczasowego ,,%s'': %s\n"
  
 +#: dirmngr/crlcache.c:2056
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error creating temporary cache file '%s': %s\n"
- msgstr "b��d tworzenia pliku tymczasowego: %s\n"
+ msgstr "błąd tworzenia pliku tymczasowego: %s\n"
  
 +#: dirmngr/crlcache.c:2066
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
- msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
+ msgstr "zapis zmian na kluczu prywatnym nie powiódł się: %s\n"
  
 +#: dirmngr/crlcache.c:2076
  #, fuzzy, c-format
  #| msgid "error writing to temporary file: %s\n"
  msgid "error finishing temporary cache file '%s': %s\n"
- msgstr "b��d zapisu do pliku tymczasowego: %s\n"
+ msgstr "błąd zapisu do pliku tymczasowego: %s\n"
  
 +#: dirmngr/crlcache.c:2083
  #, fuzzy, c-format
  #| msgid "error creating temporary file: %s\n"
  msgid "error closing temporary cache file '%s': %s\n"
- msgstr "b��d tworzenia pliku tymczasowego: %s\n"
+ msgstr "błąd tworzenia pliku tymczasowego: %s\n"
  
 +#: dirmngr/crlcache.c:2108
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
@@@ -9653,21 -7808,18 +9748,21 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error reading input: %s\n"
  msgid "error reading CRL extensions: %s\n"
- msgstr "b��d odczytu wej�cia: %s\n"
+ msgstr "błąd odczytu wejścia: %s\n"
  
 +#: dirmngr/crlcache.c:2189
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "creating cache file '%s'\n"
- msgstr "b��d tworzenia potoku: %s\n"
+ msgstr "błąd tworzenia potoku: %s\n"
  
 +#: dirmngr/crlcache.c:2221
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "problem renaming '%s' to '%s': %s\n"
- msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiod�a si�: %s\n"
+ msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
  
 +#: dirmngr/crlcache.c:2235
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9701,15 -7847,13 +9796,15 @@@ msgstr "
  #, fuzzy
  #| msgid "WARNING: invalid notation data found\n"
  msgid " WARNING: invalid cache record length\n"
- msgstr "OSTRZE�ENIE: napotkano b��dne dane adnotacji\n"
+ msgstr "OSTRZEŻENIE: napotkano błędne dane adnotacji\n"
  
 +#: dirmngr/crlcache.c:2333
  #, fuzzy, c-format
  #| msgid "error reading the card: %s\n"
  msgid "problem reading cache record: %s\n"
- msgstr "b��d odczytu karty: %s\n"
+ msgstr "błąd odczytu karty: %s\n"
  
 +#: dirmngr/crlcache.c:2344
  #, fuzzy, c-format
  #| msgid "problem re-searching certificate: %s\n"
  msgid "problem reading cache key: %s\n"
@@@ -9719,9 -7862,8 +9814,9 @@@ msgstr "problem z ponownym odszukaniem 
  #, fuzzy, c-format
  #| msgid "error reading nonce on fd %d: %s\n"
  msgid "error reading cache entry from db: %s\n"
- msgstr "b��d odczytu nonce z fd %d: %s\n"
+ msgstr "błąd odczytu nonce z fd %d: %s\n"
  
 +#: dirmngr/crlcache.c:2378
  msgid "End CRL dump\n"
  msgstr ""
  
@@@ -9729,21 -7870,18 +9824,21 @@@
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "crl_fetch via DP failed: %s\n"
- msgstr "odczyt nie powi�d� si�: %s\n"
+ msgstr "odczyt nie powiódł się: %s\n"
  
 +#: dirmngr/crlcache.c:2510
  #, fuzzy, c-format
  #| msgid "checking the trust list failed: %s\n"
  msgid "crl_cache_insert via DP failed: %s\n"
- msgstr "sprawdzenie listy zaufania nie powiod�o si�: %s\n"
+ msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
  
 +#: dirmngr/crlcache.c:2570
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "crl_cache_insert via issuer failed: %s\n"
- msgstr "odbieranie linii nie powiod�o si�: %s\n"
+ msgstr "odbieranie linii nie powiodło się: %s\n"
  
 +#: dirmngr/crlfetch.c:74
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
@@@ -9762,9 -7895,8 +9857,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
- msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
+ msgstr "%s: błąd zapisu wpisu katalogowego: %s\n"
  
 +#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
@@@ -9773,22 -7904,18 +9868,22 @@@
  #, fuzzy
  #| msgid "too many cipher preferences\n"
  msgid "too many redirections\n"
- msgstr "zbyt wiele ustawie� szyfru\n"
+ msgstr "zbyt wiele ustawień szyfru\n"
  
 +#: dirmngr/crlfetch.c:274
  #, fuzzy, c-format
  #| msgid "error retrieving `%s' via %s: %s\n"
  msgid "error retrieving '%s': %s\n"
- msgstr "b��d odtwarzania ,,%s'' poprzez %s: %s\n"
+ msgstr "błąd odtwarzania ,,%s'' poprzez %s: %s\n"
  
 +#: dirmngr/crlfetch.c:279
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error retrieving '%s': http status %u\n"
- msgstr "b��d uruchamiania ,,%s'': kod wyj�cia %d\n"
+ msgstr "błąd uruchamiania ,,%s'': kod wyjścia %d\n"
  
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
  #, fuzzy
  #| msgid "certificate `%s' not found: %s\n"
  msgid "CRL access not possible due to Tor mode\n"
@@@ -9818,21 -7940,18 +9913,21 @@@ msgstr "  (certyfikat utworzony 
  #, fuzzy
  #| msgid "Included certificates"
  msgid "validate a certificate"
- msgstr "Do��czone certyfikaty"
+ msgstr "Dołączone certyfikaty"
  
 +#: dirmngr/dirmngr-client.c:75
  #, fuzzy
  #| msgid "Included certificates"
  msgid "lookup a certificate"
- msgstr "Do��czone certyfikaty"
+ msgstr "Dołączone certyfikaty"
  
 +#: dirmngr/dirmngr-client.c:76
  #, fuzzy
  #| msgid "Included certificates"
  msgid "lookup only locally stored certificates"
- msgstr "Do��czone certyfikaty"
+ msgstr "Dołączone certyfikaty"
  
 +#: dirmngr/dirmngr-client.c:77
  msgid "expect an URL for --lookup"
  msgstr ""
  
@@@ -9850,21 -7966,18 +9945,21 @@@ msgstr "
  #, fuzzy
  #| msgid "export certificates"
  msgid "expect certificates in PEM format"
- msgstr "eksport certyfikat�w"
+ msgstr "eksport certyfikatów"
  
 +#: dirmngr/dirmngr-client.c:82
  #, fuzzy
  #| msgid "Enter the user ID of the designated revoker: "
  msgid "force the use of the default OCSP responder"
- msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
+ msgstr "Podaj identyfikator klucza unieważniającego: "
  
 +#: dirmngr/dirmngr-client.c:169
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
- msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
+ msgstr "Wywołanie: gpg [opcje] [pliki] (-h podaje pomoc)"
  
 +#: dirmngr/dirmngr-client.c:173
  msgid ""
  "Syntax: dirmngr-client [options] [certfile|pattern]\n"
  "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9876,15 -7988,13 +9971,15 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error reading certificate from stdin: %s\n"
- msgstr "b��d zapisywania certyfikatu: %s\n"
+ msgstr "błąd zapisywania certyfikatu: %s\n"
  
 +#: dirmngr/dirmngr-client.c:281
  #, fuzzy, c-format
  #| msgid "error reading from %s: %s\n"
  msgid "error reading certificate from '%s': %s\n"
- msgstr "b��d odczytu z %s: %s\n"
+ msgstr "błąd odczytu z %s: %s\n"
  
 +#: dirmngr/dirmngr-client.c:295
  msgid "certificate too large to make any sense\n"
  msgstr ""
  
@@@ -9892,21 -8001,18 +9987,21 @@@
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to the dirmngr: %s\n"
- msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
+ msgstr "nie można się połączyć z ,,%s'': %s\n"
  
 +#: dirmngr/dirmngr-client.c:332
  #, fuzzy, c-format
  #| msgid "update failed: %s\n"
  msgid "lookup failed: %s\n"
- msgstr "zapis zmian nie powi�d� si�: %s\n"
+ msgstr "zapis zmian nie powiódł się: %s\n"
  
 +#: dirmngr/dirmngr-client.c:347
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "loading CRL '%s' failed: %s\n"
- msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiod�a si�: %s\n"
+ msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
  
 +#: dirmngr/dirmngr-client.c:375
  msgid "a dirmngr daemon is up and running\n"
  msgstr ""
  
@@@ -9914,9 -8019,8 +10009,9 @@@
  #, fuzzy, c-format
  #| msgid "deleting certificate \"%s\" failed: %s\n"
  msgid "validation of certificate failed: %s\n"
- msgstr "usuni�cie certyfikatu ,,%s'' nie powiod�o si�: %s\n"
+ msgstr "usunięcie certyfikatu ,,%s'' nie powiodło się: %s\n"
  
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate is valid\n"
@@@ -9926,15 -8029,13 +10021,15 @@@ msgstr "certyfikat jest dobry\n
  #, fuzzy
  #| msgid "certificate has been revoked"
  msgid "certificate has been revoked\n"
- msgstr "certyfikat zosta� uniewa�niony"
+ msgstr "certyfikat został unieważniony"
  
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
  #, fuzzy, c-format
  #| msgid "deleting certificate \"%s\" failed: %s\n"
  msgid "certificate check failed: %s\n"
- msgstr "usuni�cie certyfikatu ,,%s'' nie powiod�o si�: %s\n"
+ msgstr "usunięcie certyfikatu ,,%s'' nie powiodło się: %s\n"
  
 +#: dirmngr/dirmngr-client.c:428
  #, c-format
  msgid "got status: '%s'\n"
  msgstr ""
@@@ -9943,15 -8043,13 +10038,15 @@@
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing base64 encoding: %s\n"
- msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
+ msgstr "błąd podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
  
 +#: dirmngr/dirmngr-client.c:701
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported inquiry '%s'\n"
- msgstr "nieobs�ugiwany algorytm: %s"
+ msgstr "nieobsługiwany algorytm: %s"
  
 +#: dirmngr/dirmngr-client.c:803
  msgid "absolute file name expected\n"
  msgstr ""
  
@@@ -9960,123 -8057,99 +10055,127 @@@
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "|FILE|run commands from FILE on startup"
  msgid "|FILE|load CRL from FILE into cache"
- msgstr "|PLIK|uruchomienie polece� z PLIKU przy starcie"
+ msgstr "|PLIK|uruchomienie poleceń z PLIKU przy starcie"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "przekazanie polecenia do dirmngr"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
- msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
+ msgstr "|PLIK|zapisanie logów trybu serwerowego do PLIKu"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
- msgstr "Wyj�� bez zapisania zmian? (t/N) "
+ msgstr "Wyjść bez zapisania zmian? (t/N) "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
- msgstr "zezwolenie na wyszukiwania PKA (��dania DNS)"
+ msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  #| msgid "|FILE|read options from FILE"
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|PLIK|odczyt opcji z PLIKU"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
- "|N|ustawienie maksymalnego czasu �ycia pami�ci podr�cznej PIN-�w na N sekund"
+ "|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  #| msgid "|URL|use keyserver at URL"
  msgid "|URL|use OCSP responder at URL"
- msgstr "|URL|u�ywaj serwera kluczy URL"
+ msgstr "|URL|używaj serwera kluczy URL"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10087,15 -8160,13 +10186,15 @@@ msgid "
  "options)\n"
  msgstr ""
  "@\n"
- "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
+ "(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
- msgstr "Wywo�anie: gpgconf [opcje] (-h podaje pomoc)"
+ msgstr "Wywołanie: gpgconf [opcje] (-h podaje pomoc)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10104,91 -8175,74 +10203,91 @@@ msgid "
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
- "Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
- "Zarz�dzanie kluczem tajnym dla GnuPG\n"
+ "Składnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
+ "Zarządzanie kluczem tajnym dla GnuPG\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "valid debug levels are: %s\n"
- msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
+ msgstr "podano błędny poziom diagnostyki ,,%s''\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
- msgstr "wywo�anie: gpgsm [opcje]"
+ msgstr "wywołanie: gpgsm [opcje]"
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
- msgstr "Nie wolno u�ywa� %s z %s!\n"
+ msgstr "Nie wolno używać %s z %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "fetching CRL from '%s' failed: %s\n"
- msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiod�a si�: %s\n"
+ msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  #| msgid "conversion from `%s' to `%s' failed: %s\n"
  msgid "processing CRL from '%s' failed: %s\n"
- msgstr "konwersja z ,,%s'' do ,,%s'' nie powiod�a si�: %s\n"
+ msgstr "konwersja z ,,%s'' do ,,%s'' nie powiodła się: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  #| msgid "line too long - skipped\n"
  msgid "%s:%u: line too long - skipped\n"
- msgstr "linia zbyt d�uga - pomini�ta\n"
+ msgstr "linia zbyt długa - pominięta\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
- msgstr "niew�a�ciwy odcisk"
+ msgstr "niewłaściwy odcisk"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "%s:%u: read error: %s\n"
- msgstr "b��d odczytu w ,,%s'': %s\n"
+ msgstr "błąd odczytu w ,,%s'': %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "nie wymuszono"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10205,15 -8256,13 +10304,15 @@@ msgstr "
  #, fuzzy
  #| msgid "|NAME|connect to Assuan socket NAME"
  msgid "|NAME|connect to host NAME"
- msgstr "|NAZWA|po��czenie z gniazdem Assuan o tej nazwie"
+ msgstr "|NAZWA|połączenie z gniazdem Assuan o tej nazwie"
  
 +#: dirmngr/dirmngr_ldap.c:143
  #, fuzzy
  #| msgid "|N|connect to reader at port N"
  msgid "|N|connect to port N"
- msgstr "|N|po��czenie z czytnikiem na porcie N"
+ msgstr "|N|połączenie z czytnikiem na porcie N"
  
 +#: dirmngr/dirmngr_ldap.c:144
  msgid "|NAME|use user NAME for authentication"
  msgstr ""
  
@@@ -10241,9 -8284,8 +10340,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
- msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
+ msgstr "Wywołanie: gpg [opcje] [pliki] (-h podaje pomoc)"
  
 +#: dirmngr/dirmngr_ldap.c:212
  msgid ""
  "Syntax: dirmngr_ldap [options] [URL]\n"
  "Internal LDAP helper for Dirmngr\n"
@@@ -10267,9 -8304,8 +10366,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error writing to %s: %s\n"
  msgid "error writing to stdout: %s\n"
- msgstr "b��d zapisu do %s: %s\n"
+ msgstr "błąd zapisu do %s: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:437
  #, c-format
  msgid "          available attribute '%s'\n"
  msgstr ""
@@@ -10313,9 -8342,8 +10412,9 @@@ msgstr "          bez identyfikatora: %
  #, fuzzy, c-format
  #| msgid "          not imported: %lu\n"
  msgid "          port %d\n"
- msgstr "      nie w��czono do zbioru: %lu\n"
+ msgstr "      nie włączono do zbioru: %lu\n"
  
 +#: dirmngr/dirmngr_ldap.c:600
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "            DN '%s'\n"
@@@ -10347,27 -8370,23 +10446,27 @@@ msgstr "
  #, fuzzy
  #| msgid "WARNING: Using untrusted key!\n"
  msgid "WARNING: using first attribute only\n"
- msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
+ msgstr "OSTRZEŻENIE: używany jest klucz nie obdarzony zaufaniem!\n"
  
 +#: dirmngr/dirmngr_ldap.c:636
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "LDAP init to '%s:%d' failed: %s\n"
- msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiod�a si�: %s\n"
+ msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:659
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "binding to '%s:%d' failed: %s\n"
- msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiod�a si�: %s\n"
+ msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:686
  #, fuzzy, c-format
  #| msgid "dearmoring failed: %s\n"
  msgid "searching '%s' failed: %s\n"
- msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
+ msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:718
  #, fuzzy, c-format
  #| msgid "`%s' is not a JPEG file\n"
  msgid "'%s' is not an LDAP URL\n"
@@@ -10378,32 -8396,21 +10477,25 @@@ msgstr ",,%s'' nie jest plikiem JPEG\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- #| msgid "error allocating enough memory: %s\n"
- msgid "error allocating memory: %s\n"
- msgstr "b��d przydzielania wystarczaj�cej ilo�ci pami�ci: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  #| msgid "error writing to %s: %s\n"
  msgid "error printing log line: %s\n"
- msgstr "b��d zapisu do %s: %s\n"
+ msgstr "błąd zapisu do %s: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:236
  #, fuzzy, c-format
  #| msgid "error reading from %s: %s\n"
  msgid "error reading log from ldap wrapper %d: %s\n"
- msgstr "b��d odczytu z %s: %s\n"
+ msgstr "błąd odczytu z %s: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:304
  #, fuzzy, c-format
  #| msgid "pth_select failed: %s - waiting 1s\n"
  msgid "npth_select failed: %s - waiting 1s\n"
- msgstr "pth_select nie powiod�o si�: %s - czekanie 1s\n"
+ msgstr "pth_select nie powiodło się: %s - czekanie 1s\n"
  
 +#: dirmngr/ldap-wrapper.c:343
  #, c-format
  msgid "ldap wrapper %d ready"
  msgstr ""
@@@ -10422,9 -8426,8 +10514,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "waiting for process %d to terminate failed: %s\n"
  msgid "waiting for ldap wrapper %d failed: %s\n"
- msgstr "oczekiwanie na zako�czenie procesu %d nie powiod�o si�: %s\n"
+ msgstr "oczekiwanie na zakończenie procesu %d nie powiodło się: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:376
  #, c-format
  msgid "ldap wrapper %d stalled - killing\n"
  msgstr ""
@@@ -10438,9 -8439,8 +10530,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "reading public key failed: %s\n"
  msgid "reading from ldap wrapper %d failed: %s\n"
- msgstr "odczyt klucza publicznego nie powi�d� si�: %s\n"
+ msgstr "odczyt klucza publicznego nie powiódł się: %s\n"
  
 +#: dirmngr/ldap.c:91
  #, c-format
  msgid "invalid char 0x%02x in host name - not added\n"
  msgstr ""
@@@ -10449,15 -8448,13 +10541,15 @@@
  #, fuzzy, c-format
  #| msgid "sending key %s to %s server %s\n"
  msgid "adding '%s:%d' to the ldap server list\n"
- msgstr "wysy�anie klucza %s na serwer %s %s\n"
+ msgstr "wysyłanie klucza %s na serwer %s %s\n"
  
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "malloc failed: %s\n"
- msgstr "select nie powiod�o si�: %s\n"
+ msgstr "select nie powiodło się: %s\n"
  
 +#: dirmngr/ldap.c:627
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
@@@ -10470,21 -8465,18 +10562,21 @@@ msgstr "
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
- msgstr "%s: niew�a�ciwa wersja pliku %d\n"
+ msgstr "%s: niewłaściwa wersja pliku %d\n"
  
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
  #, fuzzy, c-format
  #| msgid "iconv_open failed: %s\n"
  msgid "gcry_md_open failed: %s\n"
- msgstr "iconv_open nie powiod�o si�: %s\n"
+ msgstr "iconv_open nie powiodło się: %s\n"
  
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
- msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
+ msgstr "zapis zmian na kluczu prywatnym nie powiódł się: %s\n"
  
 +#: dirmngr/misc.c:518
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10492,15 -8483,13 +10584,15 @@@
  #, fuzzy, c-format
  #| msgid "error reading from %s: %s\n"
  msgid "error reading from responder: %s\n"
- msgstr "b��d odczytu z %s: %s\n"
+ msgstr "błąd odczytu z %s: %s\n"
  
 +#: dirmngr/ocsp.c:98
  #, fuzzy, c-format
  #| msgid "Error: Private DO too long (limit is %d characters).\n"
  msgid "response from server too large; limit is %d bytes\n"
- msgstr "B��d: prywatne DO zbyt d�ugie (limit to %d znak�w).\n"
+ msgstr "Błąd: prywatne DO zbyt długie (limit to %d znaków).\n"
  
 +#: dirmngr/ocsp.c:139
  #, fuzzy
  #| msgid "certificate `%s' not found: %s\n"
  msgid "OCSP request not possible due to Tor mode\n"
@@@ -10514,39 -8501,33 +10606,39 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
  msgid "error setting OCSP target: %s\n"
- msgstr "b��d zapisywania flag: %s\n"
+ msgstr "błąd zapisywania flag: %s\n"
  
 +#: dirmngr/ocsp.c:170
  #, fuzzy, c-format
  #| msgid "error loading `%s': %s\n"
  msgid "error building OCSP request: %s\n"
- msgstr "b��d odczytu ,,%s'': %s\n"
+ msgstr "błąd odczytu ,,%s'': %s\n"
  
 +#: dirmngr/ocsp.c:181
  #, fuzzy, c-format
  #| msgid "error writing to `%s': %s\n"
  msgid "error connecting to '%s': %s\n"
- msgstr "b��d zapisu do ,,%s'': %s\n"
+ msgstr "błąd zapisu do ,,%s'': %s\n"
  
 +#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
  #, fuzzy, c-format
  #| msgid "error reading from %s: %s\n"
  msgid "error reading HTTP response for '%s': %s\n"
- msgstr "b��d odczytu z %s: %s\n"
+ msgstr "błąd odczytu z %s: %s\n"
  
 +#: dirmngr/ocsp.c:240
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error accessing '%s': http status %u\n"
- msgstr "b��d uruchamiania ,,%s'': kod wyj�cia %d\n"
+ msgstr "błąd uruchamiania ,,%s'': kod wyjścia %d\n"
  
 +#: dirmngr/ocsp.c:265
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error parsing OCSP response for '%s': %s\n"
- msgstr "b��d podczas przypisywania gniazda do ,,%s'': %s\n"
+ msgstr "błąd podczas przypisywania gniazda do ,,%s'': %s\n"
  
 +#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
@@@ -10555,9 -8535,8 +10647,9 @@@
  #, fuzzy, c-format
  #| msgid "checking the trust list failed: %s\n"
  msgid "hashing the OCSP response for '%s' failed: %s\n"
- msgstr "sprawdzenie listy zaufania nie powiod�o si�: %s\n"
+ msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
  
 +#: dirmngr/ocsp.c:328
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
@@@ -10569,21 -8546,18 +10661,21 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "receiving line failed: %s\n"
  msgid "allocating list item failed: %s\n"
- msgstr "odbieranie linii nie powiod�o si�: %s\n"
+ msgstr "odbieranie linii nie powiodło się: %s\n"
  
 +#: dirmngr/ocsp.c:479
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error getting responder ID: %s\n"
- msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
+ msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
  
 +#: dirmngr/ocsp.c:514
  #, fuzzy
  #| msgid "certificate should not have been used for OCSP response signing\n"
  msgid "no suitable certificate found to verify the OCSP response\n"
- msgstr "certyfikat nie powinien by� u�ywany do podpisywania odpowiedzi OCSP\n"
+ msgstr "certyfikat nie powinien być używany do podpisywania odpowiedzi OCSP\n"
  
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
  #, fuzzy, c-format
  #| msgid "issuer certificate not found"
  msgid "issuer certificate not found: %s\n"
@@@ -10593,27 -8566,23 +10685,27 @@@ msgstr "nie znaleziono wystawcy certyfi
  #, fuzzy
  #| msgid "error reading list of trusted root certificates\n"
  msgid "caller did not return the target certificate\n"
- msgstr "b��d odczytu listy zaufanych certyfikat�w g��wnych\n"
+ msgstr "błąd odczytu listy zaufanych certyfikatów głównych\n"
  
 +#: dirmngr/ocsp.c:570
  #, fuzzy
  #| msgid "error storing certificate\n"
  msgid "caller did not return the issuing certificate\n"
- msgstr "b��d zapisywania certyfikatu\n"
+ msgstr "błąd zapisywania certyfikatu\n"
  
 +#: dirmngr/ocsp.c:580
  #, fuzzy, c-format
  #| msgid "failed to allocate keyDB handle\n"
  msgid "failed to allocate OCSP context: %s\n"
- msgstr "nie uda�o si� przydzieli� uchwytu keyDB\n"
+ msgstr "nie udało się przydzielić uchwytu keyDB\n"
  
 +#: dirmngr/ocsp.c:614
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
- msgstr "nie mo�na dosta� si� do ,,%s'': %s\n"
+ msgstr "nie można dostać się do ,,%s'': %s\n"
  
 +#: dirmngr/ocsp.c:621
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
@@@ -10621,15 -8589,13 +10713,15 @@@
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
- msgstr "brak domy�lnego zbioru kluczy tajnych: %s\n"
+ msgstr "brak domyślnego zbioru kluczy tajnych: %s\n"
  
 +#: dirmngr/ocsp.c:634
  #, fuzzy, c-format
  #| msgid "using default PIN as %s\n"
  msgid "using default OCSP responder '%s'\n"
- msgstr "u�ycie domy�lnego PIN-u jako %s\n"
+ msgstr "użycie domyślnego PIN-u jako %s\n"
  
 +#: dirmngr/ocsp.c:639
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
@@@ -10644,9 -8608,8 +10736,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error getting OCSP status for target certificate: %s\n"
- msgstr "b��d zapisywania certyfikatu: %s\n"
+ msgstr "błąd zapisywania certyfikatu: %s\n"
  
 +#: dirmngr/ocsp.c:701
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
@@@ -10659,9 -8620,8 +10751,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "certificate has been revoked"
  msgid "certificate has been revoked at: %s due to: %s\n"
- msgstr "certyfikat zosta� uniewa�niony"
+ msgstr "certyfikat został unieważniony"
  
 +#: dirmngr/ocsp.c:743
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
@@@ -10673,92 -8631,75 +10765,92 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire(%s) failed: %s\n"
- msgstr "wysy�anie linii nie powiod�o si�: %s\n"
+ msgstr "wysyłanie linii nie powiodło się: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire failed: %s\n"
- msgstr "wysy�anie linii nie powiod�o si�: %s\n"
+ msgstr "wysyłanie linii nie powiodło się: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_cert_by_url failed: %s\n"
- msgstr "select nie powiod�o si�: %s\n"
+ msgstr "select nie powiodło się: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error sending data: %s\n"
- msgstr "b��d wysy�ania polecenia %s: %s\n"
+ msgstr "błąd wysyłania polecenia %s: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "start_cert_fetch failed: %s\n"
- msgstr "select nie powiod�o si�: %s\n"
+ msgstr "select nie powiodło się: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_next_cert failed: %s\n"
- msgstr "select nie powiod�o si�: %s\n"
+ msgstr "select nie powiodło się: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  #| msgid "cannot allocate outfile string: %s\n"
  msgid "can't allocate control structure: %s\n"
- msgstr "nie mo�na przydzieli� �a�cucha pliku wyj�ciowego: %s\n"
+ msgstr "nie można przydzielić łańcucha pliku wyjściowego: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  #| msgid "failed to create stream from socket: %s\n"
  msgid "failed to allocate assuan context: %s\n"
- msgstr "nie uda�o si� utworzy� strumienia z gniazda: %s\n"
+ msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
- msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
+ msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  #| msgid "failed to store the creation date: %s\n"
  msgid "failed to the register commands with Assuan: %s\n"
- msgstr "nie powi�d� si� zapis daty utworzenia: %s\n"
+ msgstr "nie powiódł się zapis daty utworzenia: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
- msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
+ msgstr "złożenie podpisu nie powiodło się: %s\n"
  
 +#: dirmngr/validate.c:201
  #, fuzzy
  #| msgid "issuer certificate is not marked as a CA"
  msgid "accepting root CA not marked as a CA"
@@@ -10778,21 -8716,18 +10870,21 @@@ msgstr "
  #, fuzzy
  #| msgid "checking the CRL failed: %s"
  msgid "checking CRL for"
- msgstr "sprawdzenie CRL nie powiod�o si�: %s"
+ msgstr "sprawdzenie CRL nie powiodło się: %s"
  
 +#: dirmngr/validate.c:528
  #, fuzzy
  #| msgid "self-signed certificate has a BAD signature"
  msgid "selfsigned certificate has a BAD signature"
- msgstr "w�asnor�cznie podpisany certyfikat ma Z�Y podpis"
+ msgstr "własnoręcznie podpisany certyfikat ma ZŁY podpis"
  
 +#: dirmngr/validate.c:561
  #, fuzzy, c-format
  #| msgid "checking for qualified certificate failed: %s\n"
  msgid "checking trustworthiness of root certificate failed: %s\n"
- msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiod�o si�: %s\n"
+ msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiodło się: %s\n"
  
 +#: dirmngr/validate.c:738
  #, fuzzy
  #| msgid "certificate is good\n"
  msgid "certificate chain is good\n"
@@@ -10806,9 -8739,8 +10898,9 @@@ msgstr "
  #, fuzzy
  #| msgid "certificate should not have been used for signing\n"
  msgid "certificate should not have been used for CRL signing\n"
- msgstr "certyfikat nie powinien by� u�ywany do podpisywania\n"
+ msgstr "certyfikat nie powinien być używany do podpisywania\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "cicho"
  
@@@ -10826,29 -8755,23 +10918,29 @@@ msgstr "dekodowanie otrzymanych linii d
  msgid "connect to the dirmngr"
  msgstr "przekazanie polecenia do dirmngr"
  
 +#: tools/gpg-connect-agent.c:84
  msgid "|NAME|connect to Assuan socket NAME"
- msgstr "|NAZWA|po��czenie z gniazdem Assuan o tej nazwie"
+ msgstr "|NAZWA|połączenie z gniazdem Assuan o tej nazwie"
  
 +#: tools/gpg-connect-agent.c:86
  #, fuzzy
  #| msgid "|NAME|connect to Assuan socket NAME"
  msgid "|ADDR|connect to Assuan server at ADDR"
- msgstr "|NAZWA|po��czenie z gniazdem Assuan o tej nazwie"
+ msgstr "|NAZWA|połączenie z gniazdem Assuan o tej nazwie"
  
 +#: tools/gpg-connect-agent.c:88
  msgid "run the Assuan server given on the command line"
- msgstr "uruchomienie serwera Assuan podanego z linii polece�"
+ msgstr "uruchomienie serwera Assuan podanego z linii poleceń"
  
 +#: tools/gpg-connect-agent.c:90
  msgid "do not use extended connect mode"
- msgstr "nie u�ywanie rozszerzonego trybu po��czenia"
+ msgstr "nie używanie rozszerzonego trybu połączenia"
  
 +#: tools/gpg-connect-agent.c:92
  msgid "|FILE|run commands from FILE on startup"
- msgstr "|PLIK|uruchomienie polece� z PLIKU przy starcie"
+ msgstr "|PLIK|uruchomienie poleceń z PLIKU przy starcie"
  
 +#: tools/gpg-connect-agent.c:93
  msgid "run /subst on startup"
  msgstr "uruchomienie /subst przy starcie"
  
@@@ -10856,9 -8778,8 +10948,9 @@@
  #, fuzzy
  #| msgid "Usage: gpg-connect-agent [options] (-h for help)"
  msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
- msgstr "Wywo�anie: gpg-connect-agent [opcje] (-h podaje pomoc)"
+ msgstr "Wywołanie: gpg-connect-agent [opcje] (-h podaje pomoc)"
  
 +#: tools/gpg-connect-agent.c:208
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-connect-agent [options]\n"
@@@ -10867,304 -8788,239 +10959,310 @@@ msgid "
  "Syntax: @GPG at -connect-agent [options]\n"
  "Connect to a running agent and send commands\n"
  msgstr ""
- "Sk�adnia: gpg-connect-agent [opcje]\n"
- "Po��czenie z dzia�aj�cym agentem i wysy�anie polece�\n"
+ "Składnia: gpg-connect-agent [opcje]\n"
+ "Połączenie z działającym agentem i wysyłanie poleceń\n"
  
 +#: tools/gpg-connect-agent.c:1247
  #, c-format
  msgid "option \"%s\" requires a program and optional arguments\n"
- msgstr "opcja ,,%s'' wymaga programu i opcjonalnych argument�w\n"
+ msgstr "opcja ,,%s'' wymaga programu i opcjonalnych argumentów\n"
  
 +#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
 +#: tools/gpg-connect-agent.c:1270
  #, c-format
  msgid "option \"%s\" ignored due to \"%s\"\n"
  msgstr "opcja ,,%s'' zignorowana z powodu ,,%s''\n"
  
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
  #, c-format
  msgid "receiving line failed: %s\n"
- msgstr "odbieranie linii nie powiod�o si�: %s\n"
+ msgstr "odbieranie linii nie powiodło się: %s\n"
  
 +#: tools/gpg-connect-agent.c:1458
  msgid "line too long - skipped\n"
- msgstr "linia zbyt d�uga - pomini�ta\n"
+ msgstr "linia zbyt długa - pominięta\n"
  
 +#: tools/gpg-connect-agent.c:1462
  msgid "line shortened due to embedded Nul character\n"
- msgstr "linia skr�cona z powodu osadzonego znaku Nul\n"
+ msgstr "linia skrócona z powodu osadzonego znaku Nul\n"
  
 +#: tools/gpg-connect-agent.c:1837
  #, fuzzy, c-format
  #| msgid "unknown command `%s'\n"
  msgid "unknown command '%s'\n"
  msgstr "nieznane polecenie ,,%s''\n"
  
 +#: tools/gpg-connect-agent.c:1855
  #, c-format
  msgid "sending line failed: %s\n"
- msgstr "wysy�anie linii nie powiod�o si�: %s\n"
+ msgstr "wysyłanie linii nie powiodło się: %s\n"
  
 +#: tools/gpg-connect-agent.c:2251
  #, c-format
  msgid "error sending standard options: %s\n"
- msgstr "b��d wysy�ania standardowych opcji: %s\n"
+ msgstr "błąd wysyłania standardowych opcji: %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
 +#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
  msgid "Options controlling the diagnostic output"
- msgstr "Opcje steruj�ce wyj�ciem diagnostycznym"
+ msgstr "Opcje sterujące wyjściem diagnostycznym"
  
 +#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
 +#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
  msgid "Options controlling the configuration"
- msgstr "Opcje steruj�ce konfiguracj�"
+ msgstr "Opcje sterujące konfiguracją"
  
 +#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
 +#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
  msgid "Options useful for debugging"
  msgstr "Opcje przydatne do diagnostyki"
  
 +#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
  msgid "Options controlling the security"
- msgstr "Opcje steruj�ce bezpiecze�stwem"
+ msgstr "Opcje sterujące bezpieczeństwem"
  
 +#: tools/gpgconf-comp.c:528
  msgid "|N|expire SSH keys after N seconds"
  msgstr "|N|przedawnienie kluczy SSH po N sekundach"
  
 +#: tools/gpgconf-comp.c:532
  msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgstr ""
- "|N|ustawienie maksymalnego czasu �ycia pami�ci podr�cznej PIN-�w na N sekund"
+ "|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
  
 +#: tools/gpgconf-comp.c:536
  msgid "|N|set maximum SSH key lifetime to N seconds"
- msgstr "|N|ustawienie maksymalnego czasu �ycia kluczy SSH na N sekund"
+ msgstr "|N|ustawienie maksymalnego czasu życia kluczy SSH na N sekund"
  
 +#: tools/gpgconf-comp.c:560
  msgid "Options enforcing a passphrase policy"
- msgstr "Opcje wymuszaj�ce polityk� hase�"
+ msgstr "Opcje wymuszające politykę haseł"
  
 +#: tools/gpgconf-comp.c:563
  msgid "do not allow bypassing the passphrase policy"
- msgstr "nie zezwalanie na pomini�cie polityki hase�"
+ msgstr "nie zezwalanie na pominięcie polityki haseł"
  
 +#: tools/gpgconf-comp.c:567
  msgid "|N|set minimal required length for new passphrases to N"
- msgstr "|N|ustawienie minimalnej d�ugo�ci nowych hase� na N"
+ msgstr "|N|ustawienie minimalnej długości nowych haseł na N"
  
 +#: tools/gpgconf-comp.c:571
  msgid "|N|require at least N non-alpha characters for a new passphrase"
- msgstr "|N|wymaganie przynajmniej N znak�w niealfanumerycznych w nowym ha�le"
+ msgstr "|N|wymaganie przynajmniej N znaków niealfanumerycznych w nowym haśle"
  
 +#: tools/gpgconf-comp.c:575
  msgid "|FILE|check new passphrases against pattern in FILE"
- msgstr "|PLIK|sprawdzanie nowych hase� pod k�tem wzorc�w z PLIKU"
+ msgstr "|PLIK|sprawdzanie nowych haseł pod kątem wzorców z PLIKU"
  
 +#: tools/gpgconf-comp.c:579
  msgid "|N|expire the passphrase after N days"
- msgstr "|N|przedawnianie hase� po N dniach"
+ msgstr "|N|przedawnianie haseł po N dniach"
  
 +#: tools/gpgconf-comp.c:583
  msgid "do not allow the reuse of old passphrases"
- msgstr "nie zezwalanie na ponowne u�ycie starych hase�"
+ msgstr "nie zezwalanie na ponowne użycie starych haseł"
  
 +#: tools/gpgconf-comp.c:587
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
- "|N|ustawienie maksymalnego czasu �ycia pami�ci podr�cznej PIN-�w na N sekund"
+ "|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
  
 +#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
  msgid "|NAME|use NAME as default secret key"
- msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego klucza tajnego"
+ msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
  
 +#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
  msgid "|NAME|encrypt to user ID NAME as well"
- msgstr "|NAZWA|szyfrowanie tak�e dla odbiorcy NAZWA"
+ msgstr "|NAZWA|szyfrowanie także dla odbiorcy NAZWA"
  
 +#: tools/gpgconf-comp.c:704
  msgid "|SPEC|set up email aliases"
- msgstr "|SPEC|okre�l adres email"
+ msgstr "|SPEC|określ adres email"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
- msgstr "Konfiguracja dla serwer�w kluczy"
+ msgstr "Konfiguracja dla serwerów kluczy"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
- msgstr "|URL|u�ywaj serwera kluczy URL"
+ msgstr "|URL|używaj serwera kluczy URL"
  
 +#: tools/gpgconf-comp.c:735
  msgid "allow PKA lookups (DNS requests)"
- msgstr "zezwolenie na wyszukiwania PKA (��dania DNS)"
+ msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
  
 +#: tools/gpgconf-comp.c:738
  msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
  msgstr ""
  "|MECHANIZMY|wykorzystaj MECHANIZMY do wyszukiwania kluczy na podstawie "
- "adres�w e-mail"
+ "adresów e-mail"
  
 +#: tools/gpgconf-comp.c:787
  msgid "disable all access to the dirmngr"
- msgstr "zablokuj dost�p do dirmngr"
+ msgstr "zablokuj dostęp do dirmngr"
  
 +#: tools/gpgconf-comp.c:790
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
- msgstr "|NAZWA|u�ycie kodowania NAZWA dla hase� PKCS#12"
+ msgstr "|NAZWA|użycie kodowania NAZWA dla haseł PKCS#12"
  
 +#: tools/gpgconf-comp.c:820
  msgid "do not check CRLs for root certificates"
- msgstr "nie sprawdzanie CRL dla g��wnych certyfikat�w"
+ msgstr "nie sprawdzanie CRL dla głównych certyfikatów"
  
 +#: tools/gpgconf-comp.c:869
  msgid "Options controlling the format of the output"
- msgstr "Opcje steruj�ce formatem wyj�cia"
+ msgstr "Opcje sterujące formatem wyjścia"
  
 +#: tools/gpgconf-comp.c:905
  msgid "Options controlling the interactivity and enforcement"
- msgstr "Opcje steruj�ce interaktywno�ci� i wymuszaniem"
+ msgstr "Opcje sterujące interaktywnością i wymuszaniem"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
- msgstr "Opcje steruj�ce bezpiecze�stwem"
+ msgstr "Opcje sterujące bezpieczeństwem"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
- msgstr "Konfiguracja dla serwer�w HTTP"
+ msgstr "Konfiguracja dla serwerów HTTP"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
- msgstr "u�ycie systemowego ustawienia proxy HTTP"
+ msgstr "użycie systemowego ustawienia proxy HTTP"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
- msgstr "Konfiguracja u�ywanych serwer�w LDAP"
+ msgstr "Konfiguracja używanych serwerów LDAP"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
- msgstr "lista serwer�w LDAP"
+ msgstr "lista serwerów LDAP"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr "Konfiguracja dla OCSP"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
++#: tools/gpgconf-comp.c:1070
+ msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
  #| msgid "Bad Passphrase"
- msgid "PIN and Passphrase Entry"
- msgstr "Niepoprawne has�o"
+ msgid "Passphrase Entry"
+ msgstr "Niepoprawne hasło"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Nie znaleziono komponentu"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
- msgstr "Zewn�trzna weryfikacja komponentu %s nie powiod�a si�"
+ msgstr "Zewnętrzna weryfikacja komponentu %s nie powiodła się"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
- msgstr "Uwaga, okre�lenia grup s� ignorowane\n"
+ msgstr "Uwaga, określenia grup są ignorowane\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
- msgstr "lista wszystkich komponent�w"
+ msgstr "lista wszystkich komponentów"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
- msgstr "sprawdzenie wszystkich program�w"
+ msgstr "sprawdzenie wszystkich programów"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|KOMPONENT|wypisanie opcji"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|KOMPONENT|zmiana opcji"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|KOMPONENT|zaznaczenie opcji"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
- msgstr "zastosowanie globalnych warto�ci domy�lnych"
+ msgstr "zastosowanie globalnych wartości domyślnych"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  #, fuzzy
  #| msgid "get the configuration directories for gpgconf"
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "katalogi konfiguracyjne programu gpgconf"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
- msgstr "wy�wietl globalny plik konfiguracyjny"
+ msgstr "wyświetl globalny plik konfiguracyjny"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
  msgstr "sprawdzenie globalnego pliku konfiguracyjnego"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "uaktualnienie bazy zaufania"
+ 
++#: tools/gpgconf.c:86
  #, fuzzy
  #| msgid "list all components"
  msgid "reload all or a given component"
- msgstr "lista wszystkich komponent�w"
+ msgstr "lista wszystkich komponentów"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  #| msgid "list all components"
  msgid "launch a given component"
- msgstr "lista wszystkich komponent�w"
+ msgstr "lista wszystkich komponentów"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  #, fuzzy
  #| msgid "list all components"
  msgid "kill a given component"
- msgstr "lista wszystkich komponent�w"
+ msgstr "lista wszystkich komponentów"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
- msgstr "plik wyj�ciowy"
+ msgstr "plik wyjściowy"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
- msgstr "uaktywnienie zmian w czasie dzia�ania o ile to mo�liwe"
+ msgstr "uaktywnienie zmian w czasie działania o ile to możliwe"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
- msgstr "Wywo�anie: gpgconf [opcje] (-h podaje pomoc)"
+ msgstr "Wywołanie: gpgconf [opcje] (-h podaje pomoc)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgconf [options]\n"
@@@ -11173,18 -9029,15 +11271,18 @@@ msgid "
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
- "Sk�adnia: gpgconf [opcje]\n"
- "Zarz�dzanie opcjami konfiguracji dla narz�dzi z systemu GnuPG\n"
+ "Składnia: gpgconf [opcje]\n"
+ "Zarządzanie opcjami konfiguracji dla narzędzi z systemu GnuPG\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "Wymagany jest jeden argument komponentu"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "Nie znaleziono komponentu"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr "Argument nie jest dozwolony"
  
@@@ -11206,11 -9056,9 +11304,11 @@@ msgstr "tryb rozszyfrowywania
  msgid "encryption modus"
  msgstr "tryb szyfrowania"
  
 +#: tools/symcryptrun.c:161
  msgid "tool class (confucius)"
- msgstr "klasa narz�dzia (confucius)"
+ msgstr "klasa narzędzia (confucius)"
  
 +#: tools/symcryptrun.c:162
  msgid "program filename"
  msgstr "nazwa programu"
  
@@@ -11218,150 -9065,120 +11316,150 @@@
  msgid "secret key file (required)"
  msgstr "plik klucza tajnego (wymagany)"
  
 +#: tools/symcryptrun.c:165
  msgid "input file name (default stdin)"
- msgstr "nazwa pliku wej�ciowego (domy�lnie standardowe wej�cie)"
+ msgstr "nazwa pliku wejściowego (domyślnie standardowe wejście)"
  
 +#: tools/symcryptrun.c:209
  msgid "Usage: symcryptrun [options] (-h for help)"
- msgstr "Wywo�anie: symcryptrun [opcje] (-h podaje pomoc)"
+ msgstr "Wywołanie: symcryptrun [opcje] (-h podaje pomoc)"
  
 +#: tools/symcryptrun.c:212
  msgid ""
  "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
  "[options...] COMMAND [inputfile]\n"
  "Call a simple symmetric encryption tool\n"
  msgstr ""
- "Sk�adnia: symcryptrun --class KLASA --program PROGRAM --keyfile PLIK_KLUCZA "
- "[opcje...] POLECENIE [plik-we�ciowy]\n"
- "Wywo�anie prostego narz�dzia do szyfrowania symetrycznego\n"
+ "Składnia: symcryptrun --class KLASA --program PROGRAM --keyfile PLIK_KLUCZA "
+ "[opcje...] POLECENIE [plik-weściowy]\n"
+ "Wywołanie prostego narzędzia do szyfrowania symetrycznego\n"
  
 +#: 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:285
  #, c-format
  msgid "%s on %s failed with status %i\n"
- msgstr "%s na %s nie powi�d� si� ze stanem %i\n"
+ msgstr "%s na %s nie powiódł się ze stanem %i\n"
  
 +#: tools/symcryptrun.c:317
  #, fuzzy, c-format
  #| msgid "can't create temporary directory `%s': %s\n"
  msgid "can't create temporary directory '%s': %s\n"
- msgstr "nie mo�na utworzy� katalogu tymczasowego,,%s'': %s\n"
+ msgstr "nie można utworzyć katalogu tymczasowego,,%s'': %s\n"
  
 +#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
  #, c-format
  msgid "could not open %s for writing: %s\n"
- msgstr "nie uda�o si� otworzy� %s do zapisu: %s\n"
+ msgstr "nie udało się otworzyć %s do zapisu: %s\n"
  
 +#: tools/symcryptrun.c:385
  #, c-format
  msgid "error writing to %s: %s\n"
- msgstr "b��d zapisu do %s: %s\n"
+ msgstr "błąd zapisu do %s: %s\n"
  
 +#: tools/symcryptrun.c:392
  #, c-format
  msgid "error reading from %s: %s\n"
- msgstr "b��d odczytu z %s: %s\n"
+ msgstr "błąd odczytu z %s: %s\n"
  
 +#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
  #, c-format
  msgid "error closing %s: %s\n"
- msgstr "b��d zamykania %s: %s\n"
+ msgstr "błąd zamykania %s: %s\n"
  
 +#: tools/symcryptrun.c:490
  msgid "no --program option provided\n"
  msgstr "nie podano opcji --program\n"
  
 +#: tools/symcryptrun.c:496
  msgid "only --decrypt and --encrypt are supported\n"
- msgstr "obs�ugiwane s� tylko --decrypt i --encrypt\n"
+ msgstr "obsługiwane są tylko --decrypt i --encrypt\n"
  
 +#: tools/symcryptrun.c:502
  msgid "no --keyfile option provided\n"
  msgstr "nie podano opcji --keyfile\n"
  
 +#: tools/symcryptrun.c:513
  msgid "cannot allocate args vector\n"
- msgstr "nie mo�na przydzieli� wektora args\n"
+ msgstr "nie można przydzielić wektora args\n"
  
 +#: tools/symcryptrun.c:531
  #, c-format
  msgid "could not create pipe: %s\n"
- msgstr "nie uda�o si� utworzy� potoku: %s\n"
+ msgstr "nie udało się utworzyć potoku: %s\n"
  
 +#: tools/symcryptrun.c:538
  #, c-format
  msgid "could not create pty: %s\n"
- msgstr "nie uda�o si� utworzy� pty: %s\n"
+ msgstr "nie udało się utworzyć pty: %s\n"
  
 +#: tools/symcryptrun.c:554
  #, c-format
  msgid "could not fork: %s\n"
- msgstr "nie uda�o si� wykona� fork: %s\n"
+ msgstr "nie udało się wykonać fork: %s\n"
  
 +#: tools/symcryptrun.c:582
  #, c-format
  msgid "execv failed: %s\n"
- msgstr "execv nie powiod�o si�: %s\n"
+ msgstr "execv nie powiodło się: %s\n"
  
 +#: tools/symcryptrun.c:611
  #, c-format
  msgid "select failed: %s\n"
- msgstr "select nie powiod�o si�: %s\n"
+ msgstr "select nie powiodło się: %s\n"
  
 +#: tools/symcryptrun.c:628
  #, c-format
  msgid "read failed: %s\n"
- msgstr "odczyt nie powi�d� si�: %s\n"
+ msgstr "odczyt nie powiódł się: %s\n"
  
 +#: tools/symcryptrun.c:680
  #, c-format
  msgid "pty read failed: %s\n"
- msgstr "odczyt pty nie powi�d� si�: %s\n"
+ msgstr "odczyt pty nie powiódł się: %s\n"
  
 +#: tools/symcryptrun.c:732
  #, c-format
  msgid "waitpid failed: %s\n"
- msgstr "waitpid nie powiod�o si�: %s\n"
+ msgstr "waitpid nie powiodło się: %s\n"
  
 +#: tools/symcryptrun.c:746
  #, c-format
  msgid "child aborted with status %i\n"
- msgstr "potomek zosta� przerwany ze stanem %i\n"
+ msgstr "potomek został przerwany ze stanem %i\n"
  
 +#: tools/symcryptrun.c:801
  #, c-format
  msgid "cannot allocate infile string: %s\n"
- msgstr "nie mo�na przydzieli� �a�cucha pliku wej�ciowego: %s\n"
+ msgstr "nie można przydzielić łańcucha pliku wejściowego: %s\n"
  
 +#: tools/symcryptrun.c:814
  #, c-format
  msgid "cannot allocate outfile string: %s\n"
- msgstr "nie mo�na przydzieli� �a�cucha pliku wyj�ciowego: %s\n"
+ msgstr "nie można przydzielić łańcucha pliku wyjściowego: %s\n"
  
 +#: tools/symcryptrun.c:987
  #, c-format
  msgid "either %s or %s must be given\n"
- msgstr "musi by� podane %s lub %s\n"
+ msgstr "musi być podane %s lub %s\n"
  
 +#: tools/symcryptrun.c:1009
  msgid "no class provided\n"
  msgstr "nie podano klasy\n"
  
 +#: tools/symcryptrun.c:1018
  #, c-format
  msgid "class %s is not supported\n"
- msgstr "klasa %s nie jest obs�ugiwana\n"
+ msgstr "klasa %s nie jest obsługiwana\n"
  
 +#: tools/gpg-check-pattern.c:144
  msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
- msgstr "Wywo�anie: gpg-check-pattern [opcje] plik-wzorc�w (-h podaje pomoc)\n"
+ msgstr "Wywołanie: gpg-check-pattern [opcje] plik-wzorców (-h podaje pomoc)\n"
  
 +#: tools/gpg-check-pattern.c:147
  msgid ""
  "Syntax: gpg-check-pattern [options] patternfile\n"
  "Check a passphrase given on stdin against the patternfile\n"
diff --cc po/pt.po
index fc932d0,f0bbe97..ea2da07
--- a/po/pt.po
+++ b/po/pt.po
@@@ -9,19 -9,17 +9,19 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2015-02-11 19:17+0100\n"
  "Last-Translator: Pedro Morais <morais at kde.org>\n"
  "Language-Team: pt <morais at kde.org>\n"
  "Language: pt\n"
  "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-1\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, 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"
+ msgstr "falha ao inicializar a base de dados de confiança: %s\n"
  
  #. TRANSLATORS: These are labels for buttons etc used in
  #. Pinentries.  An underscore indicates that the next letter
@@@ -29,40 -27,31 +29,40 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
- msgstr "Voc� quer realmente remover as chaves selecionadas? "
+ msgstr "Você quer realmente remover as chaves selecionadas? "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "frase-secreta inválida
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr ""
  
@@@ -80,114 -68,81 +80,114 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, 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:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "frase secreta incorrecta"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
  msgstr "frase secreta demasiado longa\n"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "frase secreta demasiado longa\n"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
- msgstr "Caracter inv�lido no nome\n"
+ msgstr "Caracter inválido no nome\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
  msgstr "MPI incorreto"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "frase secreta incorrecta"
  
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
  #, fuzzy, c-format
  msgid "ssh keys greater than %d bits are not supported\n"
- msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
+ msgstr "algoritmo de protecção %d%s não é suportado\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
- msgstr "imposs�vel criar `%s': %s\n"
+ msgstr "impossível criar `%s': %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
- msgstr "imposs�vel abrir `%s': %s\n"
+ msgstr "impossível abrir `%s': %s\n"
  
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: agent/command-ssh.c:2419
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
@@@ -197,63 -151,43 +197,53 @@@
  msgid "no authentication key for ssh on card: %s\n"
  msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
  
 +#: agent/command-ssh.c:2444
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
- msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
+ msgstr "nenhum porta-chaves secreto com permissões de escrita encontrado: %s\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "erro na escrita do porta-chaves `%s': %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Por favor digite a frase secreta \n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "muda a frase secreta"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "Por favor digite a frase secreta \n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
- msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
+ msgstr "%s: falha ao criar tabela de dispersão: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -291,32 -218,26 +281,32 @@@ msgstr "Repita a frase secreta: 
  msgid "Repeat this PIN"
  msgstr "Repita a frase secreta: "
  
 +#: agent/divert-scd.c:299
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
- msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
+ msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
  
 +#: agent/divert-scd.c:301
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
- msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
+ msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
  
 +#: agent/divert-scd.c:302
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
- msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
+ msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
  
 +#: agent/divert-scd.c:314
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
 +#: agent/genkey.c:110 sm/certreqgen-ui.c:394
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: agent/genkey.c:117
  #, fuzzy, c-format
  msgid "error writing to temporary file: %s\n"
  msgstr "a escrever para `%s'\n"
@@@ -377,87 -288,69 +367,93 @@@ msgstr "
  #, fuzzy, c-format
  msgid "Please enter the passphrase to%0Aprotect your new key"
  msgstr ""
- "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
+ "Você precisa de uma frase secreta para proteger a sua chave.\n"
  "\n"
  
 +#: agent/genkey.c:606
  #, fuzzy
  msgid "Please enter the new passphrase"
  msgstr "muda a frase secreta"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
  " "
  msgstr ""
  "@\n"
- "Op��es:\n"
+ "Opções:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "A chave foi substituída"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "detalhado"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "ser mais silencioso"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
- msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+ msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
  msgstr "procurar chaves num servidor de chaves"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
- msgstr "actualizar a base de dados de confian�a"
+ msgstr "actualizar a base de dados de confiança"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|accept some commands via NAME"
@@@ -465,51 -358,40 +461,51 @@@ msgstr "
  "|NOME|definir mapa de caracteres do terminal como\n"
  "NOME"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
- msgstr "n�o suportado"
+ msgstr "não suportado"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -518,178 -400,132 +514,178 @@@ msgstr "não suportado
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Por favor comunique bugs para <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
- msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
+ msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
- msgstr "ficheiro de op��es `%s': %s\n"
+ msgstr "ficheiro de opções `%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
- msgstr "a ler op��es de `%s'\n"
+ msgstr "a ler opções de `%s'\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
- msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+ msgstr "AVISO: \"%s\" é uma opção depreciada\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
- msgstr "imposs�vel criar %s: %s\n"
+ msgstr "impossível criar %s: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, 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"
+ msgstr "o gpg-agent não está disponível nesta sessão\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
- msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+ msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  msgid "can't create directory '%s': %s\n"
- msgstr "%s: imposs�vel criar directoria: %s\n"
+ msgstr "%s: impossível criar directoria: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
  msgstr "%s: directoria criada\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
- msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
+ msgstr "base de dados de confiança: leitura falhou (n=%d): %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
- msgstr "%s: imposs�vel criar directoria: %s\n"
+ msgstr "%s: impossível criar directoria: %s\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
- msgstr "actualiza��o da chave secreta falhou: %s\n"
+ msgstr "actualização da chave secreta falhou: %s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s: ignorado: %s\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
- msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
+ msgstr "o gpg-agent não está disponível nesta sessão\n"
  
 +#: agent/preset-passphrase.c:99
  #, fuzzy
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
 +#: agent/preset-passphrase.c:102
  msgid ""
  "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -697,24 -533,19 +693,24 @@@ msgstr "
  "@Comandos:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
  " "
  msgstr ""
  "@\n"
- "Op��es:\n"
+ "Opções:\n"
  " "
  
 +#: agent/protect-tool.c:154
  #, fuzzy
  msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
 +#: agent/protect-tool.c:156
  msgid ""
  "Syntax: gpg-protect-tool [options] [args]\n"
  "Secret key maintenance tool\n"
@@@ -748,42 -574,34 +744,43 @@@ msgstr "Por favor digite a frase secret
  msgid "cancelled\n"
  msgstr "cancelado pelo utilizador\n"
  
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
  #, fuzzy, c-format
  msgid "error while asking for the passphrase: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
 +#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
  #, fuzzy, c-format
  msgid "file '%s', line %d: %s\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
 +#: agent/trustlist.c:192 agent/trustlist.c:200
  #, fuzzy, c-format
  msgid "statement \"%s\" ignored in '%s', line %d\n"
  msgstr "armadura: %s\n"
  
 +#: agent/trustlist.c:206
  #, fuzzy, c-format
  msgid "system trustlist '%s' not available\n"
- msgstr "partes da chave secreta n�o dispon�veis\n"
+ msgstr "partes da chave secreta não disponíveis\n"
  
 +#: agent/trustlist.c:250
  #, fuzzy, c-format
  msgid "bad fingerprint in '%s', line %d\n"
  msgstr "armadura: %s\n"
  
 +#: agent/trustlist.c:275 agent/trustlist.c:282
  #, fuzzy, c-format
  msgid "invalid keyflag in '%s', line %d\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: agent/trustlist.c:316 common/helpfile.c:136
  #, fuzzy, c-format
  msgid "error reading '%s', line %d: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -812,8 -627,6 +809,8 @@@ msgstr "
  msgid "Yes"
  msgstr "sim"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -843,40 -653,33 +840,40 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
  msgstr "muda a frase secreta"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
- msgstr "Voc� quer realmente remover as chaves selecionadas? "
+ msgstr "Você quer realmente remover as chaves selecionadas? "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  msgid "Delete key"
  msgstr "activa uma chave"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -891,116 -692,98 +888,127 @@@ msgstr "
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
- msgstr "verifica��o da assinatura criada falhou: %s\n"
+ msgstr "verificação da assinatura criada falhou: %s\n"
  
 +#: agent/cvt-openpgp.c:338
  msgid "secret key parts are not available\n"
- msgstr "partes da chave secreta n�o dispon�veis\n"
+ msgstr "partes da chave secreta não disponíveis\n"
  
 +#: agent/cvt-openpgp.c:344
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "public key algorithm %d (%s) is not supported\n"
- msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
+ msgstr "algoritmo de protecção %d%s não é suportado\n"
  
 +#: agent/cvt-openpgp.c:448
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection algorithm %d (%s) is not supported\n"
- msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
+ msgstr "algoritmo de protecção %d%s não é suportado\n"
  
 +#: agent/cvt-openpgp.c:455
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection hash algorithm %d (%s) is not supported\n"
- msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
+ msgstr "algoritmo de protecção %d%s não é suportado\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "actualização falhou: %s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
- msgstr "imposs�vel ligar a `%s': %s\n"
+ msgstr "impossível ligar a `%s': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  #, fuzzy
  msgid "problem setting the gpg-agent options\n"
  msgstr "problema com o agente: o agente returnou 0x%lx\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
- msgstr "imposs�vel desactivar core dumps: %s\n"
+ msgstr "impossível desactivar core dumps: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
- msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+ msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
+ 
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "actualização falhou: %s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "criação de armadura falhou: %s\n"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  #, fuzzy
  msgid "yes"
  msgstr "sim"
@@@ -1010,11 -792,9 +1018,11 @@@ msgid "yY
  msgstr "sS"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:48 common/yesno.c:84
  msgid "no"
- msgstr "n�o"
+ msgstr "não"
  
 +#: common/yesno.c:49 common/yesno.c:88
  msgid "nN"
  msgstr "nN"
  
@@@ -1056,7 -828,6 +1064,7 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
@@@ -1066,46 -836,37 +1074,46 @@@
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
  msgstr ""
  
 +#: common/miscellaneous.c:146
  #, fuzzy, c-format
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
- msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+ msgstr "AVISO: \"%s\" é uma opção depreciada\n"
  
 +#: common/miscellaneous.c:554
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  msgid "connection to agent is in restricted mode\n"
- msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
+ msgstr "impossível fazer isso em modo não-interativo\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1171,12 -919,10 +1179,12 @@@ msgstr "certificado incorrecto
  msgid "Data encryption succeeded"
  msgstr ""
  
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
  #, fuzzy
  msgid "Data available"
- msgstr "Nenhuma ajuda dispon�vel"
+ msgstr "Nenhuma ajuda disponível"
  
 +#: common/audit.c:767
  #, fuzzy
  msgid "Session key created"
  msgstr "%s: porta-chaves criado\n"
@@@ -1186,20 -931,16 +1194,20 @@@
  msgid "algorithm: %s"
  msgstr "armadura: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
  "\n"
  "Algoritmos suportados:\n"
  
 +#: common/audit.c:778 common/audit.c:925
  #, fuzzy
  msgid "seems to be not encrypted"
- msgstr "n�o cifrado"
+ msgstr "não cifrado"
  
 +#: common/audit.c:784 common/audit.c:933
  msgid "Number of recipients"
  msgstr ""
  
@@@ -1212,36 -951,29 +1220,36 @@@ msgstr "
  msgid "Data signing succeeded"
  msgstr ""
  
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
  #, fuzzy, c-format
  msgid "data hash algorithm: %s"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: common/audit.c:862
  #, fuzzy, c-format
  msgid "Signer %d"
  msgstr "Esta assinatura expirou em %s.\n"
  
 +#: common/audit.c:866 common/audit.c:1065
  #, fuzzy, c-format
  msgid "attr hash algorithm: %s"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: common/audit.c:901
  msgid "Data decryption succeeded"
  msgstr ""
  
 +#: common/audit.c:910
  #, fuzzy
  msgid "Encryption algorithm supported"
- msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
+ msgstr "algoritmo de protecção %d%s não é suportado\n"
  
 +#: common/audit.c:993
  #, fuzzy
  msgid "Data verification succeeded"
- msgstr "verifica��o de assinatura suprimida\n"
+ msgstr "verificação de assinatura suprimida\n"
  
 +#: common/audit.c:1002
  #, fuzzy
  msgid "Signature available"
  msgstr "Esta assinatura expirou em %s.\n"
@@@ -1251,12 -982,10 +1259,12 @@@
  msgid "Parsing data succeeded"
  msgstr "Assinatura correcta de \""
  
 +#: common/audit.c:1036
  #, fuzzy, c-format
  msgid "bad data hash algorithm: %s"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: common/audit.c:1051
  #, fuzzy, c-format
  msgid "Signature %d"
  msgstr "Esta assinatura expirou em %s.\n"
@@@ -1271,17 -998,14 +1279,17 @@@ msgstr "Esta chave expirou!
  msgid "Root certificate trustworthy"
  msgstr "certificado incorrecto"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
  msgstr "certificado incorrecto"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
- msgstr "Nenhuma ajuda dispon�vel"
+ msgstr "Nenhuma ajuda disponível"
  
 +#: common/audit.c:1119
  #, fuzzy
  msgid "CRL/OCSP check of certificates"
  msgstr "certificado incorrecto"
@@@ -1295,12 -1017,10 +1303,12 @@@ msgstr "certificado incorrecto
  msgid "No audit log entries."
  msgstr ""
  
 +#: common/audit.c:1243
  #, fuzzy
  msgid "Unknown operation"
- msgstr "vers�o desconhecida"
+ msgstr "versão desconhecida"
  
 +#: common/audit.c:1261
  msgid "Gpg-Agent usable"
  msgstr ""
  
@@@ -1308,22 -1027,18 +1316,22 @@@
  msgid "Dirmngr usable"
  msgstr ""
  
 +#: common/audit.c:1307
  #, fuzzy, c-format
  msgid "No help available for '%s'."
- msgstr "Nenhuma ajuda dispon�vel para `%s'"
+ msgstr "Nenhuma ajuda disponível para `%s'"
  
 +#: common/helpfile.c:90
  #, fuzzy
  msgid "ignoring garbage line"
- msgstr "erro na �ltima linha\n"
+ msgstr "erro na última linha\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
- msgstr "vers�o desconhecida"
+ msgstr "versão desconhecida"
  
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "a escrever chave privada para `%s'\n"
@@@ -1338,58 -1051,47 +1346,58 @@@ msgstr "erro de leitura
  msgid "keyword too long"
  msgstr "frase secreta demasiado longa\n"
  
 +#: common/argparse.c:371
  #, fuzzy
  msgid "missing argument"
- msgstr "argumento inv�lido"
+ msgstr "argumento inválido"
  
 +#: common/argparse.c:373
  #, fuzzy
  #| msgid "invalid armor"
  msgid "invalid argument"
- msgstr "armadura inv�lida"
+ msgstr "armadura inválida"
  
 +#: common/argparse.c:375
  #, fuzzy
  msgid "invalid command"
  msgstr "comandos em conflito\n"
  
 +#: common/argparse.c:377
  #, fuzzy
  msgid "invalid alias definition"
- msgstr "op��es de importa��o inv�lidas\n"
+ msgstr "opções de importação inválidas\n"
  
 +#: common/argparse.c:379
  #, fuzzy
  msgid "out of core"
- msgstr "n�o processado"
+ msgstr "não processado"
  
 +#: common/argparse.c:381
  #, fuzzy
  msgid "invalid option"
- msgstr "op��es de importa��o inv�lidas\n"
+ msgstr "opções de importação inválidas\n"
  
 +#: common/argparse.c:389
  #, c-format
  msgid "missing argument for option \"%.50s\"\n"
  msgstr ""
  
 +#: common/argparse.c:391
  #, fuzzy, c-format
  msgid "invalid argument for option \"%.50s\"\n"
- msgstr "op��es de importa��o inv�lidas\n"
+ msgstr "opções de importação inválidas\n"
  
 +#: common/argparse.c:393
  #, c-format
  msgid "option \"%.50s\" does not expect an argument\n"
  msgstr ""
  
 +#: common/argparse.c:395
  #, fuzzy, c-format
  msgid "invalid command \"%.50s\"\n"
- msgstr "Comando inv�lido (tente \"help\")\n"
+ msgstr "Comando inválido (tente \"help\")\n"
  
 +#: common/argparse.c:397
  #, c-format
  msgid "option \"%.50s\" is ambiguous\n"
  msgstr ""
@@@ -1399,37 -1100,30 +1407,37 @@@
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
- msgstr "n�o processado"
+ msgstr "não processado"
  
 +#: common/argparse.c:403
  #, fuzzy, c-format
  msgid "invalid option \"%.50s\"\n"
- msgstr "op��es de importa��o inv�lidas\n"
+ msgstr "opções de importação inválidas\n"
  
 +#: common/utf8conv.c:123
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' not available\n"
- msgstr "cria��o de armadura falhou: %s\n"
+ msgstr "criação de armadura falhou: %s\n"
  
 +#: common/utf8conv.c:131
  #, fuzzy, c-format
  msgid "iconv_open failed: %s\n"
- msgstr "imposs�vel abrir %s: %s\n"
+ msgstr "impossível abrir %s: %s\n"
  
 +#: common/utf8conv.c:385 common/utf8conv.c:651
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' failed: %s\n"
- msgstr "cria��o de armadura falhou: %s\n"
+ msgstr "criação de armadura falhou: %s\n"
  
 +#: common/dotlock.c:707
  #, fuzzy, c-format
  msgid "failed to create temporary file '%s': %s\n"
- msgstr "%s: imposs�vel criar directoria: %s\n"
+ msgstr "%s: impossível criar directoria: %s\n"
  
 +#: common/dotlock.c:771
  #, fuzzy, c-format
  msgid "error writing to '%s': %s\n"
  msgstr "erro na escrita do porta-chaves `%s': %s\n"
@@@ -1448,18 -1139,14 +1456,18 @@@ msgstr "a escrever chave privada para `
  msgid "(deadlock?) "
  msgstr ""
  
 +#: common/dotlock.c:1192
  #, fuzzy, c-format
  msgid "lock '%s' not made: %s\n"
- msgstr "chave p�blica %08lX n�o encontrada: %s\n"
+ msgstr "chave pública %08lX não encontrada: %s\n"
  
 +#: common/dotlock.c:1219
  #, fuzzy, c-format
  msgid "waiting for lock %s...\n"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1469,24 -1155,19 +1477,24 @@@
  msgid "armor: %s\n"
  msgstr "armadura: %s\n"
  
 +#: g10/armor.c:463
  msgid "invalid armor header: "
- msgstr "cabe�alho de armadura inv�lido: "
+ msgstr "cabeçalho de armadura inválido: "
  
 +#: g10/armor.c:474
  msgid "armor header: "
- msgstr "cabe�alho de armadura: "
+ msgstr "cabeçalho de armadura: "
  
 +#: g10/armor.c:487
  msgid "invalid clearsig header\n"
- msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
+ msgstr "cabeçalho de assinatura em texto puro inválido\n"
  
 +#: g10/armor.c:500
  #, fuzzy
  msgid "unknown armor header: "
- msgstr "cabe�alho de armadura: "
+ msgstr "cabeçalho de armadura: "
  
 +#: g10/armor.c:553
  msgid "nested clear text signatures\n"
  msgstr "assinaturas em texto puro aninhadas\n"
  
@@@ -1495,16 -1175,13 +1503,16 @@@
  msgid "unexpected armor: "
  msgstr "armadura inesperada:"
  
 +#: g10/armor.c:701
  msgid "invalid dash escaped line: "
- msgstr "linha com h�fen inv�lida: "
+ msgstr "linha com hífen inválida: "
  
 +#: g10/armor.c:873 g10/armor.c:1490
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
- msgstr "caracter radix64 inv�lido %02x ignorado\n"
+ msgstr "caracter radix64 inválido %02x ignorado\n"
  
 +#: g10/armor.c:916
  msgid "premature eof (no CRC)\n"
  msgstr "fim de ficheiro prematuro (sem CRC)\n"
  
@@@ -1526,133 -1199,104 +1534,132 @@@ msgstr "erro de CRC; %06lx - %06lx\n
  msgid "premature eof (in trailer)\n"
  msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
  
 +#: g10/armor.c:986
  msgid "error in trailer line\n"
- msgstr "erro na �ltima linha\n"
+ msgstr "erro na última linha\n"
  
 +#: g10/armor.c:1303
  msgid "no valid OpenPGP data found.\n"
- msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
+ msgstr "nenhum dado OpenPGP válido encontrado.\n"
  
 +#: g10/armor.c:1308
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
- msgstr "armadura inv�lida: linha maior que %d caracteres\n"
+ msgstr "armadura inválida: linha maior que %d caracteres\n"
  
 +#: g10/armor.c:1312
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
  "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
  "foi usado\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
- msgstr "n�o leg�vel por humanos"
+ msgstr "não legível por humanos"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr ""
- "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
+ "um nome de notação deve ter apenas caracteres imprimíveis ou espaços, e "
  "terminar com um '='\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
- msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
+ msgstr "um valor de notação de utilizador não deve conter o caracter '@'\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  #, fuzzy
  msgid "a notation name must not contain more than one '@' character\n"
- msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
+ msgstr "um valor de notação de utilizador não deve conter o caracter '@'\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
- msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
+ msgstr "um valor de notação não deve usar caracteres de controle\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  msgid "a notation name may not contain an '=' character\n"
- msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
+ msgstr "um valor de notação de utilizador não deve conter o caracter '@'\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
  #| "with an '='\n"
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr ""
- "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
+ "um nome de notação deve ter apenas caracteres imprimíveis ou espaços, e "
  "terminar com um '='\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
- msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
+ msgstr "AVISO: dados de notação inválidos encontrados\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr ""
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Digite a frase secreta: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
- msgstr "AVISO: %s sobrep�e %s\n"
+ msgstr "AVISO: %s sobrepõe %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, fuzzy, c-format
  msgid "OpenPGP card not available: %s\n"
- msgstr "chave secreta n�o dispon�vel"
+ msgstr "chave secreta não disponível"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  #, fuzzy
  msgid "can't do this in batch mode\n"
- msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
+ msgstr "impossível fazer isso em modo não-interativo\n"
  
 +#: g10/card-util.c:107
  #, fuzzy
  msgid "This command is only available for version 2 cards\n"
- msgstr "Este comando n�o � permitido no modo %s.\n"
+ msgstr "Este comando não é permitido no modo %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
- msgstr "partes da chave secreta n�o dispon�veis\n"
+ msgstr "partes da chave secreta não disponíveis\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
- msgstr "Op��o? "
+ msgstr "Opção? "
  
 +#: g10/card-util.c:279 g10/card-util.c:330
  msgid "[not set]"
  msgstr ""
  
@@@ -1671,193 -1312,149 +1678,193 @@@ msgstr "enable
  msgid "unspecified"
  msgstr "Nenhum motivo especificado"
  
 +#: g10/card-util.c:561
  #, fuzzy
  msgid "not forced"
- msgstr "n�o processado"
+ msgstr "não processado"
  
 +#: g10/card-util.c:561
  msgid "forced"
  msgstr ""
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr ""
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr ""
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr ""
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  #, fuzzy
  msgid "URL to retrieve public key: "
- msgstr "a escrever chave p�blica para `%s'\n"
+ msgstr "a escrever chave pública para `%s'\n"
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "erro na escrita do porta-chaves `%s': %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr ""
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr ""
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  #, fuzzy
  msgid "Language preferences: "
- msgstr "prefer�ncias actualizadas"
+ msgstr "preferências actualizadas"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  #, fuzzy
  msgid "Error: invalid length of preference string.\n"
- msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
+ msgstr "caracter inválido na cadeia de caractéres da preferência\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  #, fuzzy
  msgid "Error: invalid characters in preference string.\n"
- msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
+ msgstr "caracter inválido na cadeia de caractéres da preferência\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr ""
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  #, fuzzy
  msgid "Error: invalid response.\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  #, fuzzy
  msgid "CA fingerprint: "
- msgstr "mostra impress�o digital"
+ msgstr "mostra impressão digital"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  #, fuzzy
  msgid "Error: invalid formatted fingerprint.\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, fuzzy, c-format
  msgid "key operation not possible: %s\n"
- msgstr "A gera��o de chaves falhou: %s\n"
+ msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  #, fuzzy
  msgid "not an OpenPGP card"
- msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
+ msgstr "nenhum dado OpenPGP válido encontrado.\n"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
  msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Qual o tamanho de chave desejado? (1024) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "Qual o tamanho de chave desejado? (1024) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Qual o tamanho de chave desejado? (1024) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "arredondado para %u bits\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
- msgstr "ignorado: a chave secreta j� est� presente\n"
+ msgstr "ignorado: a chave secreta já está presente\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1865,213 -1462,162 +1872,213 @@@
  "You should change them using the command --change-pin\n"
  msgstr ""
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  #, fuzzy
  msgid "Please select the type of key to generate:\n"
  msgstr "Por favor selecione o tipo de chave desejado:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  #, fuzzy
  msgid "   (1) Signature key\n"
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  #, fuzzy
  msgid "   (2) Encryption key\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
- msgstr "Op��o inv�lida.\n"
+ msgstr "Opção inválida.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  #, fuzzy
  msgid "Please select where to store the key:\n"
- msgstr "motivo da revoca��o: "
+ msgstr "motivo da revocação: "
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
- msgstr "Este comando n�o � permitido no modo %s.\n"
+ msgstr "Este comando não é permitido no modo %s.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
- msgstr "ignorado: a chave secreta j� est� presente\n"
+ msgstr "ignorado: a chave secreta já está presente\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  msgid "Continue? (y/N) "
  msgstr "Realmente assinar? "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "sair deste menu"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  #, fuzzy
  msgid "show admin commands"
  msgstr "comandos em conflito\n"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "mostra esta ajuda"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  #, fuzzy
  msgid "list all available data"
- msgstr "Nenhuma ajuda dispon�vel"
+ msgstr "Nenhuma ajuda disponível"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr ""
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr ""
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr ""
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  #, fuzzy
  msgid "change the login name"
  msgstr "muda a data de validade"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  #, fuzzy
  msgid "change the language preferences"
- msgstr "muda os valores de confian�a"
+ msgstr "muda os valores de confiança"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr ""
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  #, fuzzy
  msgid "change a CA fingerprint"
- msgstr "mostra impress�o digital"
+ msgstr "mostra impressão digital"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr ""
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  #, fuzzy
  msgid "generate new keys"
  msgstr "gerar um novo par de chaves"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr ""
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr ""
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  #, fuzzy
  msgid "Admin-only command\n"
  msgstr "comandos em conflito\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  #, fuzzy
  msgid "Admin commands are allowed\n"
  msgstr "comandos em conflito\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  #, fuzzy
  msgid "Admin commands are not allowed\n"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
- msgstr "Comando inv�lido (tente \"help\")\n"
+ msgstr "Comando inválido (tente \"help\")\n"
  
 +#: g10/decrypt.c:191 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
- msgstr "--output n�o funciona para este comando\n"
+ msgstr "--output não funciona para este comando\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
- msgstr "imposs�vel abrir `%s'\n"
+ msgstr "impossível abrir `%s'\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "erro na leitura do bloco de chave: %s\n"
  
 +#: g10/delkey.c:118 g10/getkey.c:579
  #, fuzzy, c-format
  msgid "key \"%s\" not found\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
 +#: g10/delkey.c:129 g10/delkey.c:136
  msgid "(unless you specify the key by fingerprint)\n"
- msgstr "(a n�o ser que escolha a chave pela sua impress�o digital)\n"
+ msgstr "(a não ser que escolha a chave pela sua impressão digital)\n"
  
 +#: g10/delkey.c:135
  #, fuzzy
  msgid "can't do this in batch mode without \"--yes\"\n"
- msgstr "imposs�vel fazer isso em modo n�o-interactivo sem utilizar \"--yes\"\n"
+ msgstr "impossível fazer isso em modo não-interactivo sem utilizar \"--yes\"\n"
  
 +#: g10/delkey.c:148
  #, fuzzy
  msgid "Delete this key from the keyring? (y/N) "
  msgstr "Remover esta chave do porta-chaves?"
  
 +#: g10/delkey.c:158
  #, fuzzy
  msgid "This is a secret key! - really delete? (y/N) "
- msgstr "Esta chave � secreta! - apagar de qualquer modo? "
+ msgstr "Esta chave é secreta! - apagar de qualquer modo? "
  
 +#: g10/delkey.c:201
  #, fuzzy, c-format
  msgid "deleting secret %s failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: g10/delkey.c:203
  msgid "key"
  msgstr "key"
  
@@@ -2079,36 -1624,29 +2086,36 @@@
  #, fuzzy
  #| msgid "Pubkey: "
  msgid "subkey"
- msgstr "Chave p�blica: "
+ msgstr "Chave pública: "
  
 +#: g10/delkey.c:226
  #, c-format
  msgid "deleting keyblock failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: g10/delkey.c:239
  msgid "ownertrust information cleared\n"
- msgstr "informa��es de 'ownertrust' limpas\n"
+ msgstr "informações de 'ownertrust' limpas\n"
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
- msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
+ msgstr "há uma chave secreta para a chave pública \"%s\"!\n"
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
- msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
+ msgstr "utilize a opção \"--delete-secret-keys\" para a apagar primeiro.\n"
  
 +#: g10/encrypt.c:232 g10/sign.c:1292
  #, c-format
  msgid "error creating passphrase: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: g10/encrypt.c:239
  msgid "can't use a symmetric ESK packet due to the S2K mode\n"
- msgstr "n�o � poss�vel utilizar o pacote ESK sim�trico devido ao modo S2K\n"
+ msgstr "não é possível utilizar o pacote ESK simétrico devido ao modo S2K\n"
  
 +#: g10/encrypt.c:253
  #, fuzzy, c-format
  msgid "using cipher %s\n"
  msgstr "assinatura falhou: %s\n"
@@@ -2117,15 -1654,13 +2124,15 @@@
  #, fuzzy, c-format
  #| msgid "`%s' already compressed\n"
  msgid "'%s' already compressed\n"
- msgstr "%s' j� comprimido\n"
+ msgstr "%s' já comprimido\n"
  
 +#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
- msgstr "AVISO: `%s' � um ficheiro vazio\n"
+ msgstr "AVISO: `%s' é um ficheiro vazio\n"
  
 +#: g10/encrypt.c:557
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "reading from '%s'\n"
@@@ -2136,34 -1670,29 +2143,34 @@@ msgstr "lendo de `%s'\n
  msgid ""
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
- "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
+ "ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n"
  
 +#: g10/encrypt.c:707 g10/sign.c:984
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
  "preferences\n"
  msgstr ""
- "ao for�ar o algoritmo de compress�o %s (%d) viola as prefer�ncias do "
- "destinat�rio\n"
+ "ao forçar o algoritmo de compressão %s (%d) viola as preferências do "
+ "destinatário\n"
  
 +#: g10/encrypt.c:817
  #, c-format
  msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
- "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
+ "ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n"
  
 +#: g10/encrypt.c:903
  #, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s cifrado para: \"%s\"\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
- msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
+ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
  
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
  #, c-format
  msgid "%s encrypted data\n"
  msgstr "dados cifrados com %s\n"
@@@ -2177,9 -1704,8 +2184,9 @@@ msgstr "cifrado com algoritmo desconhec
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
- "AVISO: A mensagem foi cifrada com uma chave fraca na cifragem sim�trica.\n"
+ "AVISO: A mensagem foi cifrada com uma chave fraca na cifragem simétrica.\n"
  
 +#: g10/decrypt-data.c:176
  msgid "problem handling encrypted packet\n"
  msgstr "problema ao tratar pacote cifrado\n"
  
@@@ -2192,41 -1716,33 +2199,41 @@@ msgid "
  "external program calls are disabled due to unsafe options file permissions\n"
  msgstr ""
  
 +#: g10/exec.c:349
  #, fuzzy
  msgid "this platform requires temporary files when calling external programs\n"
- msgstr "%s: erro ao ler registo de vers�o: %s\n"
+ msgstr "%s: erro ao ler registo de versão: %s\n"
  
 +#: g10/exec.c:427
  #, fuzzy, c-format
  msgid "unable to execute program '%s': %s\n"
- msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
+ msgstr "não foi possível alterar o exec-path para %s\n"
  
 +#: g10/exec.c:430
  #, fuzzy, c-format
  msgid "unable to execute shell '%s': %s\n"
- msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
+ msgstr "não foi possível alterar o exec-path para %s\n"
  
 +#: g10/exec.c:521
  #, fuzzy, c-format
  msgid "system error while calling external program: %s\n"
- msgstr "%s: erro ao ler registo de vers�o: %s\n"
+ msgstr "%s: erro ao ler registo de versão: %s\n"
  
 +#: g10/exec.c:532 g10/exec.c:599
  msgid "unnatural exit of external program\n"
  msgstr ""
  
 +#: g10/exec.c:547
  #, fuzzy
  msgid "unable to execute external program\n"
- msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
+ msgstr "não foi possível alterar o exec-path para %s\n"
  
 +#: g10/exec.c:564
  #, fuzzy, c-format
  msgid "unable to read external program response: %s\n"
- msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
+ msgstr "não foi possível alterar o exec-path para %s\n"
  
 +#: g10/exec.c:610 g10/exec.c:617
  #, fuzzy, c-format
  msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
  msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
@@@ -2236,81 -1751,63 +2243,81 @@@
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  #, fuzzy
  msgid "export signatures that are marked as local-only"
  msgstr ""
  "\n"
- "A assinatura ser� marcada como n�o-revoc�vel.\n"
+ "A assinatura será marcada como não-revocável.\n"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr ""
  
- #: g10/export.c:108
++#: g10/export.c:112
  #, fuzzy
  msgid "remove unusable parts from key during export"
- msgstr "chave secreta n�o utiliz�vel"
+ msgstr "chave secreta não utilizável"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: ignorado: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "a escrever para `%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "AVISO: nada exportado\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
  msgstr "erro ao criar `%s': %s\n"
  
 +#: g10/getkey.c:257
  #, fuzzy
  msgid "[User ID not found]"
- msgstr "[Utilizador n�o encontrado]"
+ msgstr "[Utilizador não encontrado]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
- msgstr "op��es de importa��o inv�lidas\n"
+ msgstr "opções de importação inválidas\n"
  
 +#: g10/getkey.c:516
  #, c-format
  msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
  msgstr ""
@@@ -2326,278 -1821,218 +2333,278 @@@ msgstr "erro na leitura de `%s': %s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "erro ao criar `%s': %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "erro ao criar `%s': %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
- msgstr "mostra impress�o digital"
+ msgstr "mostra impressão digital"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
- msgstr "|NOME|usar NOME como chave secreta por omiss�o"
+ msgstr "|NOME|usar NOME como chave secreta por omissão"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
- msgstr "|NOME|usar NOME como chave secreta por omiss�o"
+ msgstr "|NOME|usar NOME como chave secreta por omissão"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, fuzzy, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
- msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
+ msgstr "Chave inválida %08lX tornada válida por --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, fuzzy, c-format
  msgid "using subkey %s instead of primary key %s\n"
- msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
+ msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "fazer uma assinatura separada"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "fazer uma assinatura separada"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "cifrar dados"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
- msgstr "cifrar apenas com cifra sim�trica"
+ msgstr "cifrar apenas com cifra simétrica"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
- msgstr "decifrar dados (ac��o por omiss�o)"
+ msgstr "decifrar dados (acção por omissão)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "verificar uma assinatura"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "listar as chaves"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "listar as chaves e as assinaturas"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  #, fuzzy
  msgid "list and check key signatures"
  msgstr "verificar as assinaturas das chaves"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
- msgstr "listar as chaves e as impress�es digitais"
+ msgstr "listar as chaves e as impressões digitais"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "listar as chaves secretas"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "gerar um novo par de chaves"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "gerar um novo par de chaves"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "gerar um novo par de chaves"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "gerar um novo par de chaves"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
- msgstr "gerar um certificado de revoga��o"
+ msgstr "gerar um certificado de revogação"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
- msgstr "remover chaves do porta-chaves p�blico"
+ msgstr "remover chaves do porta-chaves público"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "remover chaves do porta-chaves secreto"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "assinar uma chave"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "assinar uma chave localmente"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "assinar uma chave"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "assinar uma chave localmente"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "assinar ou editar uma chave"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
  msgstr "muda a frase secreta"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "exportar chaves"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "exportar chaves para um servidor de chaves"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "importar chaves de um servidor de chaves"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "procurar chaves num servidor de chaves"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "actualizar todas as chaves a partir de um servidor de chaves"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "importar/fundir chaves"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
- msgstr "actualizar a base de dados de confian�a"
+ msgstr "actualizar a base de dados de confiança"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
  msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
- msgstr "criar sa�da com armadura ascii"
+ msgstr "criar saída com armadura ascii"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NOME|cifrar para NOME"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, 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:535
++#: g10/gpg.c:539
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr ""
- "|N|estabelecer n�vel de compress�o N\n"
+ "|N|estabelecer nível de compressão N\n"
  "(0 desactiva)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
- msgstr "usar modo de texto can�nico"
+ msgstr "usar modo de texto canônico"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
- msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+ msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
- msgstr "n�o fazer altera��es"
+ msgstr "não fazer alterações"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
- msgstr "perguntar antes de sobrep�r"
+ msgstr "perguntar antes de sobrepôr"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
  msgstr ""
  "@\n"
- "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
+ "(Veja a página man para uma lista completa de comandos e opções)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2615,15 -2050,13 +2622,15 @@@ msgstr "
  " --clearsign [ficheiro]     criar uma assinatura em texto puro\n"
  " --detach-sign [ficheiro]   criar uma assinatura separada\n"
  " --list-keys [nomes]        mostrar chaves\n"
- " --fingerprint [nomes]      mostrar impress�es digitais\n"
+ " --fingerprint [nomes]      mostrar impressões digitais\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2634,11 -2067,10 +2641,11 @@@ msgid "
  "Sign, check, encrypt or decrypt\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "Sintaxe: gpg [op��es] [ficheiros]\n"
+ "Sintaxe: gpg [opções] [ficheiros]\n"
  "assina, verifica, cifra ou decifra\n"
- "a opera��o por omiss�o depende dos dados de entrada\n"
+ "a operação por omissão depende dos dados de entrada\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2646,971 -2078,772 +2653,976 @@@ msgstr "
  "\n"
  "Algoritmos suportados:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
- msgstr "Chave p�blica: "
+ msgstr "Chave pública: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Cifra: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
- msgstr "Dispers�o: "
+ msgstr "Dispersão: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
- msgstr "Compress�o: "
+ msgstr "Compressão: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
- msgstr "uso: gpg [op��es] "
+ msgstr "uso: gpg [opções] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "comandos em conflito\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  msgid "no = sign found in group definition '%s'\n"
- msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
+ msgstr "nenhum sinal = encontrada na definição de grupo \"%s\"\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
- msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+ msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
- msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+ msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
- msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+ msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, 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:1556
++#: g10/gpg.c:1564
  #, 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:1559
++#: g10/gpg.c:1567
  #, 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:1565
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
- msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+ msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
- msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+ msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, fuzzy, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
- msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+ msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
- msgstr "criado um novo ficheiro de configura��o `%s'\n"
+ msgstr "criado um novo ficheiro de configuração `%s'\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  msgid "show key usage information during key listings"
  msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  #, fuzzy
  msgid "show all notations during signature listings"
  msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
- msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
+ msgstr "a URL de política de assinatura dada é inválida\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  #, fuzzy
  msgid "show the keyring name in key listings"
- msgstr "mostrar em que porta-chave a chave est�"
+ msgstr "mostrar em que porta-chave a chave está"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  #, fuzzy
  msgid "show expiration dates during signature listings"
  msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "desactiva uma chave"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
- msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
+ msgstr "destinatário por omissão desconhecido `%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "opções de importação inválidas\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
- msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
+ msgstr "NOTA: o ficheiro antigo de opções por omissão `%s' foi ignorado\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
- msgstr "NOTA: %s n�o � para uso normal!\n"
+ msgstr "NOTA: %s não é para uso normal!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
- msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+ msgstr "%s não é um conjunto de caracteres válido\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
- msgstr "Endere�o eletr�nico inv�lido\n"
+ msgstr "Endereço eletrónico inválido\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
- msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+ msgstr "%s não é um conjunto de caracteres válido\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  #, fuzzy
  msgid "could not parse keyserver URL\n"
- msgstr "n�o consegui processar a URI do servidor de chaves\n"
+ msgstr "não consegui processar a URI do servidor de chaves\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
- msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
+ msgstr "%s:%d: opções de exportação inválidas\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  #, fuzzy
  msgid "invalid keyserver options\n"
- msgstr "op��es de exporta��o inv�lidas\n"
+ msgstr "opções de exportação inválidas\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
- msgstr "%s:%d: op��es de importa��o inv�lidas\n"
+ msgstr "%s:%d: opções de importação inválidas\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
- msgstr "op��es de importa��o inv�lidas\n"
+ msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
- msgstr "op��es de importa��o inv�lidas\n"
+ msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
- msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
+ msgstr "%s:%d: opções de exportação inválidas\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
- msgstr "op��es de exporta��o inv�lidas\n"
+ msgstr "opções de exportação inválidas\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
- msgstr "%s:%d: op��es de importa��o inv�lidas\n"
+ msgstr "%s:%d: opções de importação inválidas\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  #, fuzzy
  msgid "invalid list options\n"
- msgstr "op��es de importa��o inv�lidas\n"
+ msgstr "opções de importação inválidas\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  #, fuzzy
  msgid "show all notations during signature verification"
- msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+ msgstr "%s não é um conjunto de caracteres válido\n"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
- msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
+ msgstr "a URL de política de assinatura dada é inválida\n"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "show user ID validity during signature verification"
- msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+ msgstr "%s não é um conjunto de caracteres válido\n"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
- msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+ msgstr "%s não é um conjunto de caracteres válido\n"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
- msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
+ msgstr "%s:%d: opções de exportação inválidas\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  #, fuzzy
  msgid "invalid verify options\n"
- msgstr "op��es de exporta��o inv�lidas\n"
+ msgstr "opções de exportação inválidas\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
- msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
+ msgstr "não foi possível alterar o exec-path para %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
- msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
+ msgstr "%s:%d: opções de exportação inválidas\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "AVISO: O programa pode criar um ficheiro core!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
- msgstr "AVISO: %s sobrep�e %s\n"
+ msgstr "AVISO: %s sobrepõe %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
- msgstr "%s n�o � permitido com %s!\n"
+ msgstr "%s não é permitido com %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
- msgstr "%s n�o faz sentido com %s!\n"
+ msgstr "%s não faz sentido com %s!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, 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:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
- msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
+ msgstr "o algoritmo de cifragem selecionado é inválido\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
- msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
+ msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
- msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
+ msgstr "o algoritmo de cifragem selecionado é inválido\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
- msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
+ msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed deve ser maior que 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed deve ser maior que 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  #, 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:3588
++#: g10/gpg.c:3686
  #, 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"
+ msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  #, 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"
+ msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
- msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
+ msgstr "NOTA: o modo S2K simples (0) não é recomendável\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
- msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
+ msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
- msgstr "prefer�ncias por omiss�o inv�lidas\n"
+ msgstr "preferências por omissão inválidas\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
- msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
+ msgstr "preferências pessoais de cifra inválidas\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
- msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
+ msgstr "preferências pessoais de 'digest' inválidas\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
- msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
+ msgstr "preferências pessoais de compressão inválidas\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, fuzzy, c-format
  msgid "%s does not yet work with %s\n"
- msgstr "%s n�o faz sentido com %s!\n"
+ msgstr "%s não faz sentido com %s!\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, 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"
+ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, 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"
+ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, 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"
+ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
- msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+ msgstr "falha ao inicializar a base de dados de confiança: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  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"
+ "AVISO: destinatários (-r) dados sem utilizar uma cifra de chave pública\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [nome_do_ficheiro]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [nome_do_ficheiro]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "decifragem falhou: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [nome_do_ficheiro]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  #, fuzzy
  msgid "--symmetric --encrypt [filename]"
  msgstr "--sign --encrypt [nome_do_ficheiro]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, 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"
+ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [nome_do_ficheiro]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [nome_do_ficheiro]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  #, fuzzy
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--sign --encrypt [nome_do_ficheiro]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, 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"
+ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [nome_do_ficheiro]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [nome_do_ficheiro]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [nome_do_ficheiro]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key id-utilizador"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key id-utilizador"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key id-utilizador [comandos]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
  msgstr "--sign-key id-utilizador"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, fuzzy, c-format
  msgid "keyserver send failed: %s\n"
- msgstr "A gera��o de chaves falhou: %s\n"
+ msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, fuzzy, c-format
  msgid "keyserver receive failed: %s\n"
- msgstr "A gera��o de chaves falhou: %s\n"
+ msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, fuzzy, c-format
  msgid "key export failed: %s\n"
- msgstr "A gera��o de chaves falhou: %s\n"
+ msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  msgid "export as ssh key failed: %s\n"
- msgstr "A gera��o de chaves falhou: %s\n"
+ msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, fuzzy, c-format
  msgid "keyserver search failed: %s\n"
- msgstr "A gera��o de chaves falhou: %s\n"
+ msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, fuzzy, c-format
  msgid "keyserver refresh failed: %s\n"
- msgstr "actualiza��o da chave secreta falhou: %s\n"
+ msgstr "actualização da chave secreta falhou: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "retirada de armadura falhou: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
- msgstr "cria��o de armadura falhou: %s\n"
+ msgstr "criação de armadura falhou: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[nome_do_ficheiro]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Digite a sua mensagem ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
- msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
+ msgstr "a URL de política de certificação dada é inválida\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
- msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
+ msgstr "a URL de política de assinatura dada é inválida\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
- msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
+ msgstr "a URL de política de assinatura dada é inválida\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "Remover esta chave do porta-chaves?"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  #, fuzzy
  msgid "make timestamp conflicts only a warning"
  msgstr "conflito de \"timestamp\""
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr ""
- "|DF|escrever informa��es de estado para o\n"
+ "|DF|escrever informações de estado para o\n"
  "descritor de ficheiro DF"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  #, fuzzy
  msgid "Usage: gpgv [options] [files] (-h for help)"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
  msgstr ""
  
 +#: g10/helptext.c:72
  msgid "No help available"
- msgstr "Nenhuma ajuda dispon�vel"
+ msgstr "Nenhuma ajuda disponível"
  
 +#: g10/helptext.c:82
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "No help available for '%s'"
- msgstr "Nenhuma ajuda dispon�vel para `%s'"
+ msgstr "Nenhuma ajuda disponível para `%s'"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
- msgstr "actualizar a base de dados de confian�a"
+ msgstr "actualizar a base de dados de confiança"
  
- #: g10/import.c:147
++#: g10/import.c:160
  #, fuzzy
  msgid "do not update the trustdb after import"
- msgstr "actualizar a base de dados de confian�a"
+ msgstr "actualizar a base de dados de confiança"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  msgid "show key during import"
- msgstr "mostra impress�o digital"
+ msgstr "mostra impressão digital"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  #, fuzzy
  msgid "remove unusable parts from key after import"
- msgstr "chave secreta n�o utiliz�vel"
+ msgstr "chave secreta não utilizável"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "ignorando bloco do tipo %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
- msgstr "%lu chaves processadas at� agora\n"
+ msgstr "%lu chaves processadas até agora\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
- msgstr "N�mero total processado: %lu\n"
+ msgstr "Número total processado: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "      ignorei novas chaves: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "      ignorei novas chaves: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "          sem IDs de utilizadores: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "              importados: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
- msgstr "             n�o modificados: %lu\n"
+ msgstr "             não modificados: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "          novos IDs de utilizadores: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "           novas subchaves: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        novas assinaturas: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
- msgstr "   novas revoga��es de chaves: %lu\n"
+ msgstr "   novas revogações de chaves: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "      chaves secretas lidas: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  chaves secretas importadas: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
- msgstr " chaves secretas n�o modificadas: %lu\n"
+ msgstr " chaves secretas não modificadas: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
- msgstr "        n�o importadas: %lu\n"
+ msgstr "        não importadas: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "        novas assinaturas: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "      chaves secretas lidas: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "assinatura %s de: \"%s\"\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
  msgstr "chave %08lX: sem ID de utilizador\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  msgid "key %s: %s\n"
  msgstr "ignorado `%s': %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
- msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
+ msgstr "chave %08lX: sem IDs de utilizadores válidos\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "isto pode ser causado por falta de auto-assinatura\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
- msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
+ msgstr "chave %08lX: chave pública não encontrada: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "chave %08lX: chave nova - ignorada\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
- msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
+ msgstr "não foi encontrada nenhum porta-chaves onde escrever: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "erro na escrita do porta-chaves `%s': %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
- msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
+ msgstr "chave %08lX: chave pública \"%s\" importada\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
- msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
+ msgstr "chave %08lX: não corresponde à nossa cópia\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
- msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
+ msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
- msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
+ msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
- msgstr "chave %08lX: \"%s\" n�o modificada\n"
+ msgstr "chave %08lX: \"%s\" não modificada\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
  msgstr "chave %08lX: chave secreta importada\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
- msgstr "ignorado: a chave secreta j� est� presente\n"
+ msgstr "ignorado: a chave secreta já está presente\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  #, fuzzy
  msgid "importing secret keys not allowed\n"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
- msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
+ msgstr "chave %08lX: chave secreta com cifra inválida %d - ignorada\n"
  
  #. TRANSLATORS: For smartcard, each private key on
  #. host has a reference (stub) to a smartcard and
@@@ -3622,230 -2855,191 +3634,236 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
- "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
- "de revoga��o\n"
+ "chave %08lX: sem chave pública - impossível aplicar certificado\n"
+ "de revogação\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
- msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
+ msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
- msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
+ msgstr "chave %08lX: \"%s\" certificado de revogação importado\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
- "chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
+ "chave %08lX: algoritmo de chave pública não suportado no utilizador \"%s\"\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
- msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
+ msgstr "chave %08lX: auto-assinatura inválida do utilizador \"%s\"\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
- msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
+ msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "chave %08lX: assinatura directa de chave adicionada\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
- msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
+ msgstr "chave %08lX: sem subchave para ligação de chaves\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
- msgstr "chave %08lX: liga��o de subchave inv�lida\n"
+ msgstr "chave %08lX: ligação de subchave inválida\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
- msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
+ msgstr "chave %08lX: apagada ligação múltipla de subchave \n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
- msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
+ msgstr "chave %08lX: sem subchave para revocação de chave\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
- msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
+ msgstr "chave %08lX: revocação de subchave inválida\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
- msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
+ msgstr "chave %08lX: removida revogação múltiplace de subchaves\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "chave %08lX: ignorado ID de utilizador '"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "chave %08lX: subchave ignorada\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
- msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
+ msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
- msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
+ msgstr "chave %08lX: certificado de revogação no local errado - ignorado\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
- msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
+ msgstr "chave %08lX: certificado de revogação inválido: %s - ignorado\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
- "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o "
+ "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revocação "
  "%08lX\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
- "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
+ "AVISO: a chave %08lX pode estar revocada: chave de revocação %08lX não "
  "presente.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
- msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+ msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "chave %08lX: assinatura directa de chave adicionada\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
  msgstr "porta-chaves `%s' criado\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
  msgstr "porta-chaves `%s' criado\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "erro ao criar `%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
  
 +#: g10/keyedit.c:264
  msgid "[revocation]"
- msgstr "[revoga��o]"
+ msgstr "[revogação]"
  
 +#: g10/keyedit.c:264
  msgid "[self-signature]"
  msgstr "[auto-assinatura]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "erro ao criar porta-chaves `%s': %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
+ msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "assinatura %s de: \"%s\"\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "Assinatura correcta de \""
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  msgid "key %s:\n"
  msgstr "ignorado `%s': %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "Utilizador \"%s\" est� revocado."
- msgstr[1] "Utilizador \"%s\" est� revocado."
+ msgstr[0] "Utilizador \"%s\" está revocado."
+ msgstr[1] "Utilizador \"%s\" está revocado."
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 assinatura n�o verificada por falta de chave\n"
- msgstr[1] "1 assinatura n�o verificada por falta de chave\n"
+ msgstr[0] "1 assinatura não verificada por falta de chave\n"
+ msgstr[1] "1 assinatura não verificada por falta de chave\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3853,21 -3047,18 +3871,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d assinaturas incorrectas\n"
  msgstr[1] "%d assinaturas incorrectas\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "Assinatura correcta de \""
  msgstr[1] "Assinatura correcta de \""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3877,449 -3068,361 +3895,449 @@@
  msgstr ""
  "Por favor decida quanto confia neste utilizador para\n"
  "verificar correctamente as chaves de outros utilizadores\n"
- "(vendo passaportes, verificando impress�es digitais...)?\n"
+ "(vendo passaportes, verificando impressões digitais...)?\n"
  "\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Confio moderadamente\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Confio plenamente\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
- msgstr "Utilizador \"%s\" est� revocado."
+ msgstr "Utilizador \"%s\" está revocado."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
- msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
+ msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
- msgstr "  N�o foi poss�vel assinar.\n"
+ msgstr "  Não foi possível assinar.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, fuzzy, c-format
  msgid "User ID \"%s\" is expired."
- msgstr "Utilizador \"%s\" est� revocado."
+ msgstr "Utilizador \"%s\" está revocado."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, fuzzy, c-format
  msgid "User ID \"%s\" is not self-signed."
- msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
+ msgstr "AVISO: o ID do utilizador \"%s\" não é auto-assinado.\n"
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
- msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
+ msgstr "AVISO: o ID do utilizador \"%s\" não é auto-assinado.\n"
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  #, fuzzy
  msgid "Sign it? (y/N) "
  msgstr "Realmente assinar? "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
  "is a PGP 2.x-style signature.\n"
  msgstr ""
  "A sua auto-assinatura em \"%s\"\n"
- "� uma assinatura do tipo PGP 2.x.\n"
+ "é uma assinatura do tipo PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
- msgstr "Quer promov�-la a uma auto-assinatura OpenPGP? (s/N) "
+ msgstr "Quer promovê-la a uma auto-assinatura OpenPGP? (s/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, fuzzy, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "has expired.\n"
  msgstr ""
  "A sua assinatura actual em \"%s\"\n"
- "� uma assinatura local.\n"
+ "é uma assinatura local.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  #, fuzzy
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "is a local signature.\n"
  msgstr ""
  "A sua assinatura actual em \"%s\"\n"
- "� uma assinatura local.\n"
+ "é uma assinatura local.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
- msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
+ msgstr "Quer promovê-la a uma assinatura exportável? (s/N)"
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
- msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
+ msgstr "\"%s\" já foi assinado localmente pela chave %08lX\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
- msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
+ msgstr "\"%s\" já foi assinado pela chave %08lX\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  #, fuzzy
  msgid "Do you want to sign it again anyway? (y/N) "
- msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
+ msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nada para assinar com a chave %08lX\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "Esta chave expirou!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Esta chave vai expirar em %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
  "to the person named above?  If you don't know what to answer, enter \"0\".\n"
  msgstr ""
- "Com que cuidado � que verificou que chave que est� prestes a assinar "
+ "Com que cuidado é que verificou que chave que está prestes a assinar "
  "pertence\n"
- "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
+ "à pessoa correcta? Se não sabe o que responder, escolha \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
- msgstr "   (0) N�o vou responder.%s\n"
+ msgstr "   (0) Não vou responder.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
- msgstr "   (1) N�o verifiquei.%s\n"
+ msgstr "   (1) Não verifiquei.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Verifiquei por alto.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
- msgstr " i = mostrar mais informa��es\n"
+ msgstr " i = mostrar mais informações\n"
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr ""
- "Voc� tem certeza de que quer assinar esta chave com\n"
+ "Você tem certeza de que quer assinar esta chave com\n"
  "a sua chave: \""
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
- "Isto ser� uma auto-assinatura.\n"
+ "Isto será uma auto-assinatura.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
- "AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
+ "AVISO: a assinatura não será marcada como não-exportável.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
- "AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
+ "AVISO: a assinatura não será marcada como não-revocável.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
- "A assinatura ser� marcada como n�o-export�vel.\n"
+ "A assinatura será marcada como não-exportável.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
- "A assinatura ser� marcada como n�o-revoc�vel.\n"
+ "A assinatura será marcada como não-revocável.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
- "N�o verifiquei esta chave.\n"
+ "Não verifiquei esta chave.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
  "Verifiquei por alto esta chave.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
  "Verifiquei esta chave com muito cuidado.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  #, fuzzy
  msgid "Really sign? (y/N) "
  msgstr "Realmente assinar? "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "assinatura falhou: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "gravar e sair"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  #, fuzzy
  msgid "show key fingerprint"
- msgstr "mostra impress�o digital"
+ msgstr "mostra impressão digital"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
- msgstr "Nota��o de assinatura: "
+ msgstr "Notação de assinatura: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "lista chave e identificadores de utilizadores"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "seleciona ID de utilizador N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  #, fuzzy
  msgid "select subkey N"
  msgstr "seleciona ID de utilizador N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "check signatures"
  msgstr "revoga assinaturas"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  #, fuzzy
  msgid "sign selected user IDs locally"
  msgstr "assina a chave localmente"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
- msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
+ msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "adiciona um novo ID de utilizador"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
- msgstr "adiciona um identificador fotogr�fico"
+ msgstr "adiciona um identificador fotográfico"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  #, fuzzy
  msgid "delete selected user IDs"
  msgstr "remove ID de utilizador"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  #, fuzzy
  msgid "delete selected subkeys"
- msgstr "remove uma chave secund�ria"
+ msgstr "remove uma chave secundária"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
- msgstr "adiciona uma chave de revoca��o"
+ msgstr "adiciona uma chave de revocação"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
  msgstr ""
- "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
+ "Realmente actualizar as preferências para os utilizadores seleccionados?"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
- msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
+ msgstr "Você não pode modificar a data de validade de uma chave v3\n"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  #, fuzzy
  msgid "flag the selected user ID as primary"
- msgstr "seleccionar o identificador do utilizador como prim�rio"
+ msgstr "seleccionar o identificador do utilizador como primário"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
- msgstr "lista prefer�ncias (perito)"
+ msgstr "lista preferências (perito)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
- msgstr "lista prefer�ncias (detalhadamente)"
+ msgstr "lista preferências (detalhadamente)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  #, fuzzy
  msgid "set preference list for the selected user IDs"
  msgstr ""
- "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
+ "Realmente actualizar as preferências para os utilizadores seleccionados?"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
- msgstr "n�o consegui processar a URI do servidor de chaves\n"
+ msgstr "não consegui processar a URI do servidor de chaves\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  #, fuzzy
  msgid "set a notation for the selected user IDs"
  msgstr ""
- "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
+ "Realmente actualizar as preferências para os utilizadores seleccionados?"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "muda a frase secreta"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
- msgstr "muda os valores de confian�a"
+ msgstr "muda os valores de confiança"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
  msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  #, fuzzy
  msgid "revoke selected user IDs"
  msgstr "revocar um ID de utilizador"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  #, fuzzy
  msgid "revoke key or selected subkeys"
- msgstr "revoga uma chave secund�ria"
+ msgstr "revoga uma chave secundária"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  #, fuzzy
  msgid "enable key"
  msgstr "activa uma chave"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "disable key"
  msgstr "desactiva uma chave"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  #, fuzzy
  msgid "show selected photo IDs"
- msgstr "mostrar identificador fotogr�fico"
+ msgstr "mostrar identificador fotográfico"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
- msgstr "Chave secreta dispon�vel.\n"
+ msgstr "Chave secreta disponível.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
- msgstr "A chave secreta � necess�ria para fazer isto.\n"
+ msgstr "A chave secreta é necessária para fazer isto.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4327,354 -3430,279 +4345,355 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
- msgstr "A chave est� revogada."
+ msgstr "A chave está revogada."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Realmente assinar todos os IDs de utilizador? "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Realmente assinar todos os IDs de utilizador? "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
- msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
+ msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "classe de assinatura desconhecida"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
- msgstr "Este comando n�o � permitido no modo %s.\n"
+ msgstr "Este comando não é permitido no modo %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
- msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
+ msgstr "Você precisa selecionar pelo menos um ID de utilizador.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
- msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
+ msgstr "Você não pode remover o último ID de utilizador!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
  msgstr "Realmente remover este ID de utilizador? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "Realmente remover este ID de utilizador? "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  #, fuzzy
  msgid "You must select exactly one key.\n"
- msgstr "Voc� deve selecionar pelo menos uma chave.\n"
+ msgstr "Você deve selecionar pelo menos uma chave.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
- msgstr "imposs�vel abrir `%s': %s\n"
+ msgstr "impossível abrir `%s': %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
- msgstr "Voc� deve selecionar pelo menos uma chave.\n"
+ msgstr "Você deve selecionar pelo menos uma chave.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
- msgstr "Voc� quer realmente remover as chaves selecionadas? "
+ msgstr "Você quer realmente remover as chaves selecionadas? "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
- msgstr "Voc� quer realmente remover esta chave? "
+ msgstr "Você quer realmente remover esta chave? "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Realmente revocar este ID de utilizador? "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
- msgstr "Voc� quer realmente revogar esta chave? "
+ msgstr "Você quer realmente revogar esta chave? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgstr "Voc� quer realmente revogar as chaves selecionadas? "
+ msgstr "Você quer realmente revogar as chaves selecionadas? "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
- msgstr "Voc� quer realmente revogar esta chave? "
+ msgstr "Você quer realmente revogar esta chave? "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  #, fuzzy
  msgid "Set preference list to:\n"
- msgstr "configurar lista de prefer�ncias"
+ msgstr "configurar lista de preferências"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
- "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
+ "Realmente actualizar as preferências para os utilizadores seleccionados?"
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
- msgstr "Realmente actualizar as prefer�ncias?"
+ msgstr "Realmente actualizar as preferências?"
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  #, fuzzy
  msgid "Save changes? (y/N) "
- msgstr "Gravar altera��es? "
+ msgstr "Gravar alterações? "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  #, fuzzy
  msgid "Quit without saving? (y/N) "
  msgstr "Sair sem gravar? "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
- msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
+ msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
- msgstr "A gera��o de chaves falhou: %s\n"
+ msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
- msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+ msgstr "falha ao inicializar a base de dados de confiança: %s\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
- msgstr "valor inv�lido\n"
+ msgstr "valor inválido\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Identificador de utilizador inexistente.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  msgid "Nothing to sign.\n"
  msgstr "Nada para assinar com a chave %08lX\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "'Digest': "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
- msgstr "Caracter�sticas: "
+ msgstr "Características: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  #, fuzzy
  msgid "Notations: "
- msgstr "Nota��o: "
+ msgstr "Notação: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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"
+ msgstr "Não há preferências no ID de utilizador tipo PGP 2.x.\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Esta chave pode ser revogada pela chave %s "
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, 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:3853
++#: g10/keyedit.c:3866
  #, fuzzy
  msgid "(sensitive)"
- msgstr " (sens�vel)"
+ msgstr " (sensível)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
- msgstr "imposs�vel criar %s: %s\n"
+ msgstr "impossível criar %s: %s\n"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
  msgstr "revkey"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
  msgstr "[expira: %s]"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
  msgstr "[expira: %s]"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "usage: %s"
- msgstr " confian�a: %c/%c"
+ msgstr " confiança: %c/%c"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, fuzzy, c-format
  msgid "trust: %s"
- msgstr " confian�a: %c/%c"
+ msgstr " confiança: %c/%c"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Esta chave foi desactivada"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  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"
+ "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:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
  msgstr "revkey"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
- msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
+ msgstr "Você não pode modificar a data de validade de uma chave v3\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  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 ""
- "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
- "       algumas vers�o do PGP podem rejeit�-la.\n"
+ "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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  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) "
+ msgstr "Tem a certeza de que quer adicioná-la de qualquer forma? (s/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  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"
+ "Não pode adicionar um identificador fotográfico a uma chave tipo PGP2.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
- msgstr "Apagar esta assinatura v�lida? (s/N/q)"
+ msgstr "Apagar esta assinatura válida? (s/N/q)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
- msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
+ msgstr "Apagar esta assinatura inválida? (s/N/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Realmente remover esta auto-assinatura? (s/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4682,320 -3710,254 +4701,320 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "%d assinatura removida.\n"
  msgstr[1] "%d assinatura removida.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Nada removido.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  #, fuzzy
  msgid "invalid"
- msgstr "armadura inv�lida"
+ msgstr "armadura inválida"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
- msgstr "Utilizador \"%s\" est� revocado."
+ msgstr "Utilizador \"%s\" está revocado."
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
- msgstr[0] "Utilizador \"%s\" est� revocado."
- msgstr[1] "Utilizador \"%s\" est� revocado."
+ msgstr[0] "Utilizador \"%s\" está revocado."
+ msgstr[1] "Utilizador \"%s\" está revocado."
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
- msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+ msgstr "o utilizador com o id \"%s\" já está revocado\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
- msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+ msgstr "o utilizador com o id \"%s\" já está revocado\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  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 ""
- "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
- "       algumas vers�o do PGP podem rejeit�-la.\n"
+ "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:4585
++#: g10/keyedit.c:4601
  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"
+ msgstr "Não pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Insira o ID de utilizador do revogador escolhido: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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"
+ msgstr "não pode escolher uma chave do tipo PGP 2.x como revogadora\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  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"
+ msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  #, 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:4682
++#: g10/keyedit.c:4698
  #, 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"
+ msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  #, 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"
+ msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
- msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
+ msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
- msgstr "A modificar a data de validade para uma chave secund�ria.\n"
+ msgstr "A modificar a data de validade para uma chave secundária.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
- msgstr "Modificar a data de validade para uma chave prim�ria.\n"
+ msgstr "Modificar a data de validade para uma chave primária.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  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"
+ msgstr "Você não pode modificar a data de validade de uma chave v3\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, 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"
+ msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Seleccione exactamente um identificador de utilizador.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, 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:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  #, 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) "
+ msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  #, 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) "
+ msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  #, fuzzy
  msgid "Enter the notation: "
- msgstr "Nota��o de assinatura: "
+ msgstr "Notação de assinatura: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Escrever por cima (s/N)? "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
- msgstr "Nenhum ID de utilizador com �ndice %d\n"
+ msgstr "Nenhum ID de utilizador com índice %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
- msgstr "Nenhum ID de utilizador com �ndice %d\n"
+ msgstr "Nenhum ID de utilizador com índice %d\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
- msgstr "Nenhum ID de utilizador com �ndice %d\n"
+ msgstr "Nenhum ID de utilizador com índice %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
- msgstr "Nenhum ID de utilizador com �ndice %d\n"
+ msgstr "Nenhum ID de utilizador com índice %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID de utilizador: \""
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
- msgstr "  (n�o-export�vel)"
+ msgstr "  (não-exportável)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  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) "
+ msgstr "Tem a certeza de que quer revogá-la de qualquer forma? (s/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
- msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
+ msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  #, fuzzy
  msgid "Not signed by you.\n"
  msgstr "   assinado por %08lX em %s%s\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, fuzzy, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Assinou estes identificadores de utilizadores:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  #, fuzzy
  msgid " (non-revocable)"
- msgstr "  (n�o-export�vel)"
+ msgstr "  (não-exportável)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "   revogado por %08lX em %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
- msgstr "Est� prestes a revogar estas assinaturas:\n"
+ msgstr "Está prestes a revogar estas assinaturas:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
- msgstr "Realmente criar os certificados de revoga��o? (s/N) "
+ msgstr "Realmente criar os certificados de revogação? (s/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "nenhuma chave secreta\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
- msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+ msgstr "o utilizador com o id \"%s\" já está revocado\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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:6370
++#: g10/keyedit.c:6386
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
- msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+ msgstr "o utilizador com o id \"%s\" já está revocado\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
- msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+ msgstr "o utilizador com o id \"%s\" já está revocado\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
- msgstr "prefer�ncia %c%lu duplicada\n"
+ msgstr "preferência %c%lu duplicada\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  #, fuzzy
  msgid "too many cipher preferences\n"
- msgstr "demasiadas prefer�ncias `%c'\n"
+ msgstr "demasiadas preferências `%c'\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  #, fuzzy
  msgid "too many digest preferences\n"
- msgstr "demasiadas prefer�ncias `%c'\n"
+ msgstr "demasiadas preferências `%c'\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  #, fuzzy
  msgid "too many compression preferences\n"
- msgstr "demasiadas prefer�ncias `%c'\n"
+ msgstr "demasiadas preferências `%c'\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
- msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
+ msgstr "caracter inválido na cadeia de caractéres da preferência\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "a escrever a assinatura directa\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "a escrever a auto-assinatura\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "a escrever a assinatura ligada a uma chave\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
- msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
+ msgstr "tamanho de chave inválido; a utilizar %u bits\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "tamanho da chave arredondado para %u bits\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  #, fuzzy
  msgid "Encrypt"
  msgstr "cifrar dados"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr ""
  
@@@ -5009,157 -3971,126 +5028,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%d) ElGamal (apenas cifragem)\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Por favor selecione o tipo de chave desejado:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
- msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
+ msgstr "   (%d) DSA e ElGamal (por omissão)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
- msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
+ msgstr "   (%d) DSA e ElGamal (por omissão)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (apenas assinatura)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (apenas assinatura)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (apenas cifragem)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
- msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
+ msgstr "   (%d) DSA e ElGamal (por omissão)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (apenas assinatura)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) RSA (apenas cifragem)\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
- msgstr "Nota��o de assinatura: "
+ msgstr "Notação de assinatura: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
- msgstr "Nenhum ID de utilizador com �ndice %d\n"
+ msgstr "Nenhum ID de utilizador com índice %d\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "arredondado para %u bits\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Qual o tamanho de chave desejado? (1024) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Qual o tamanho de chave desejado? (1024) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
- msgstr "O tamanho de chave pedido � %u bits\n"
+ msgstr "O tamanho de chave pedido é %u bits\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Por favor selecione o tipo de chave desejado:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5175,7 -4106,6 +5194,7 @@@ msgstr "
  "      <n>m = chave expira em n meses\n"
  "      <n>y = chave expira em n anos\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5191,53 -4121,43 +5210,53 @@@ msgstr "
  "      <n>m = assinatura expira em n meses\n"
  "      <n>y = assinatura expira em n anos\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
- msgstr "A chave � valida por? (0) "
+ msgstr "A chave é valida por? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
- msgstr "A assinatura � valida por? (0) "
+ msgstr "A assinatura é valida por? (0) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
- msgstr "valor inv�lido\n"
+ msgstr "valor inválido\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  #, fuzzy
  msgid "Key does not expire at all\n"
- msgstr "A %s n�o expira nunca\n"
+ msgstr "A %s não expira nunca\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  #, fuzzy
  msgid "Signature does not expire at all\n"
- msgstr "A %s n�o expira nunca\n"
+ msgstr "A %s não expira nunca\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
  msgstr "%s expira em %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
- "O seu sistema n�o consegue mostrar datas para al�m de 2038.\n"
- "No entanto, estas v�o ser tratadas correctamente at� 2106.\n"
+ "O seu sistema não consegue mostrar datas para além de 2038.\n"
+ "No entanto, estas vão ser tratadas correctamente até 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  #, fuzzy
  msgid "Is this correct? (y/N) "
- msgstr "Est� correto (s/n)? "
+ msgstr "Está correto (s/n)? "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5248,7 -4168,6 +5267,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  #, fuzzy
  msgid ""
  "\n"
@@@ -5266,50 -4185,39 +5285,50 @@@ msgstr "
  "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Nome completo: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
- msgstr "Caracter inv�lido no nome\n"
+ msgstr "Caracter inválido no nome\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
- msgstr "O nome n�o pode come�ar com um d�gito\n"
+ msgstr "O nome não pode começar com um dígito\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "O nome deve ter pelo menos 5 caracteres\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
- msgstr "Endere�o de correio eletr�nico: "
+ msgstr "Endereço de correio eletrónico: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
- msgstr "Endere�o eletr�nico inv�lido\n"
+ msgstr "Endereço eletrónico inválido\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
- msgstr "Coment�rio: "
+ msgstr "Comentário: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
- msgstr "Caracter inv�lido no coment�rio\n"
+ msgstr "Caracter inválido no comentário\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
- msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
+ msgstr "Você está usando o conjunto de caracteres `%s'.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5320,11 -4228,10 +5339,11 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
- "Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
- "coment�rio\n"
+ "Por favor não coloque o endereço de email no nome verdadeiro ou no "
+ "comentário\n"
  
  #. TRANSLATORS: These are the allowed answers in
  #. lower and uppercase.  Below you will find the matching
@@@ -5337,53 -4244,43 +5356,53 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoSs"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
- msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
+ msgstr "Mudar (N)ome, (C)omentário, (E)mail ou (S)air? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
- msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
+ msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
- msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
+ msgstr "Mudar (N)ome, (C)omentário, (E)mail ou (S)air? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
- msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
+ msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Por favor corrija primeiro o erro\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
  "disks) during the prime generation; this gives the random number\n"
  "generator a better chance to gain enough entropy.\n"
  msgstr ""
- "Precisamos gerar muitos bytes aleat�rios. � uma boa ideia realizar outra\n"
+ "Precisamos gerar muitos bytes aleatórios. É uma boa ideia realizar outra\n"
  "actividade (escrever no teclado, mover o rato, usar os discos) durante a\n"
- "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
- "uma hip�tese maior de ganhar entropia suficiente.\n"
+ "geração dos números primos; isso dá ao gerador de números aleatórios\n"
+ "uma hipótese maior de ganhar entropia suficiente.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
- msgstr "A gera��o de chaves falhou: %s\n"
+ msgstr "A geração de chaves falhou: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5391,121 -4288,99 +5410,121 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
- msgstr "%s' j� comprimido\n"
+ msgstr "%s' já comprimido\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
  msgstr "Criar mesmo assim?"
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
  msgstr "Criar mesmo assim?"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
- msgstr "Gera��o de chave cancelada.\n"
+ msgstr "Geração de chave cancelada.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
- msgstr "imposs�vel criar `%s': %s\n"
+ msgstr "impossível criar `%s': %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "NOTA: chave secreta %08lX expirou em %s\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
- msgstr "a escrever chave p�blica para `%s'\n"
+ msgstr "a escrever chave pública para `%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
- msgstr "nenhum porta-chaves p�blico com permiss�es de escrita encontrado: %s\n"
+ msgstr "nenhum porta-chaves público com permissões de escrita encontrado: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
- msgstr "erro ao escrever no porta-chaves p�blico `%s': %s\n"
+ msgstr "erro ao escrever no porta-chaves público `%s': %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
- msgstr "chaves p�blica e privada criadas e assinadas.\n"
+ msgstr "chaves pública e privada criadas e assinadas.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
  msgstr ""
- "Note que esta chave n�o pode ser usada para cifragem. Voc� pode usar\n"
- "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
+ "Note que esta chave não pode ser usada para cifragem. Você pode usar\n"
+ "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr ""
  "a chave foi criada %lu segundo no futuro\n"
- "(viagem no tempo ou problema no rel�gio)\n"
+ "(viagem no tempo ou problema no relógio)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr ""
  "a chave foi criada %lu segundos no futuro\n"
- "(viagem no tempo ou problema no rel�gio)\n"
+ "(viagem no tempo ou problema no relógio)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
- msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
+ msgstr "NOTA: a criação de sub-chave para chaves v3 não respeito o OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
- msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
+ msgstr "Componentes secretas da chave primária não disponíveis.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
- msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
+ msgstr "Componentes secretas da chave primária não disponíveis.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  #, fuzzy
  msgid "Really create? (y/N) "
  msgstr "Realmente criar? "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr ""
  
 +#: g10/keylist.c:331
  msgid "Critical signature policy: "
- msgstr "Politica de assinatura cr�tica: "
+ msgstr "Politica de assinatura crítica: "
  
 +#: g10/keylist.c:333
  msgid "Signature policy: "
  msgstr "Politica de assinatura: "
  
@@@ -5513,15 -4387,12 +5532,15 @@@
  msgid "Critical preferred keyserver: "
  msgstr ""
  
 +#: g10/keylist.c:428
  msgid "Critical signature notation: "
- msgstr "Nota��o de assinatura cr�tica: "
+ msgstr "Notação de assinatura crítica: "
  
 +#: g10/keylist.c:430
  msgid "Signature notation: "
- msgstr "Nota��o de assinatura: "
+ msgstr "Notação de assinatura: "
  
 +#: g10/keylist.c:472
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d good signature\n"
@@@ -5534,10 -4404,9 +5553,10 @@@ msgstr[1] "%d assinaturas incorrectas\n
  #| msgid "1 signature not checked due to an error\n"
  msgid "%d signature not checked due to an error\n"
  msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 assinatura n�o verificada devido a um erro\n"
- msgstr[1] "1 assinatura n�o verificada devido a um erro\n"
+ msgstr[0] "1 assinatura não verificada devido a um erro\n"
+ msgstr[1] "1 assinatura não verificada devido a um erro\n"
  
 +#: g10/keylist.c:567
  #, c-format
  msgid "Warning: %lu key skipped due to its large size\n"
  msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@@ -5548,30 -4416,24 +5567,30 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "Porta-chaves"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
- msgstr "Impress�o da chave prim�ria:"
+ msgstr "Impressão da chave primária:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
- msgstr "      Impress�o da subchave:"
+ msgstr "      Impressão da subchave:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
- msgstr "Impress�o da chave prim�ria:"
+ msgstr "Impressão da chave primária:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
- msgstr "      Impress�o da subchave:"
+ msgstr "      Impressão da subchave:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  #, fuzzy
  msgid "      Key fingerprint ="
- msgstr "  Impress�o da chave ="
+ msgstr "  Impressão da chave ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr ""
  
@@@ -5607,142 -4464,113 +5626,142 @@@ msgstr[1] "1 assinatura incorrecta\n
  msgid "%s: keyring created\n"
  msgstr "%s: porta-chaves criado\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  #, fuzzy
  msgid "honor the preferred keyserver URL set on the key"
- msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
+ msgstr "a URL de política de assinatura dada é inválida\n"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  #, fuzzy
  msgid "disabled"
  msgstr "disable"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr ""
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, fuzzy, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
- msgstr "op��es de exporta��o inv�lidas\n"
+ msgstr "opções de exportação inválidas\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr ""
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
  msgstr[0] "a pedir a chave %08lX de %s\n"
  msgstr[1] "a pedir a chave %08lX de %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, fuzzy, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, fuzzy, c-format
  msgid "key \"%s\" not found on keyserver\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  #, fuzzy
  msgid "key not found on keyserver\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr ""
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, fuzzy, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "a pedir a chave %08lX de %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, fuzzy, c-format
  msgid "requesting key %s from %s\n"
  msgstr "a pedir a chave %08lX de %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  msgid "no keyserver known\n"
- msgstr "op��es de exporta��o inv�lidas\n"
+ msgstr "opções de exportação inválidas\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, fuzzy, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "ignorado `%s': %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, fuzzy, c-format
  msgid "sending key %s to %s\n"
  msgstr ""
  "\"\n"
  "assinado com a sua chave %08lX em %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  msgid "requesting key from '%s'\n"
  msgstr "a pedir a chave %08lX de %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, fuzzy, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
  
 +#: g10/mainproc.c:254
  #, c-format
  msgid "weird size for an encrypted session key (%d)\n"
- msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
+ msgstr "tamanho estranho para uma chave de sessão cifrada (%d)\n"
  
 +#: g10/mainproc.c:302
  #, fuzzy, c-format
  msgid "%s encrypted session key\n"
- msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
+ msgstr "tamanho estranho para uma chave de sessão cifrada (%d)\n"
  
 +#: g10/mainproc.c:312
  #, fuzzy, c-format
  msgid "passphrase generated with unknown digest algorithm %d\n"
  msgstr "cifrado com algoritmo desconhecido %d\n"
  
 +#: g10/mainproc.c:378
  #, fuzzy, c-format
  msgid "public key is %s\n"
- msgstr "a chave p�blica � %08lX\n"
+ msgstr "a chave pública é %08lX\n"
  
 +#: g10/mainproc.c:456
  msgid "public key encrypted data: good DEK\n"
- msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
+ msgstr "dados cifrados com chave pública: DEK válido\n"
  
 +#: g10/mainproc.c:489
  #, fuzzy, c-format
  msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
  msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
@@@ -5757,12 -4583,10 +5776,12 @@@ msgstr "                   ou \"
  msgid "encrypted with %s key, ID %s\n"
  msgstr "cifrado com chave %s, ID %08lX\n"
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
- msgstr "decifragem de chave p�blica falhou: %s\n"
+ msgstr "decifragem de chave pública falhou: %s\n"
  
 +#: g10/mainproc.c:530
  #, fuzzy, c-format
  msgid "encrypted with %lu passphrases\n"
  msgstr "Repita a frase secreta\n"
@@@ -5777,16 -4599,13 +5796,16 @@@ msgstr "Repita a frase secreta\n
  msgid "assuming %s encrypted data\n"
  msgstr "a assumir dados cifrados %s\n"
  
 +#: g10/mainproc.c:573
  #, c-format
  msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
- msgstr "Cifra IDEO n�o dispon�vel, a tentar utilizar %s em substitui��o\n"
+ msgstr "Cifra IDEO não disponível, a tentar utilizar %s em substituição\n"
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  msgid "WARNING: message was not integrity protected\n"
- msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
+ msgstr "AVISO: a mensagem não tinha a sua integridade protegida\n"
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
  msgstr "decifragem correcta\n"
  
@@@ -5814,165 -4628,132 +5833,165 @@@ msgstr "nome do ficheiro original='%.*s
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
- msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
+ msgstr "revocação solitária - utilize \"gpg --import\" para aplicar\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  #, fuzzy
  msgid "no signature found\n"
  msgstr "Assinatura correcta de \""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
  msgstr "Assinatura INCORRECTA de \""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Assinatura expirada de \""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
  msgstr "Assinatura correcta de \""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
- msgstr "verifica��o de assinatura suprimida\n"
+ msgstr "verificação de assinatura suprimida\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
- msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
+ msgstr "não consigo tratar estas assinaturas múltiplas\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, fuzzy, c-format
  msgid "Signature made %s\n"
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "                   ou \""
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                   ou \""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  #, fuzzy
  msgid "Key available at: "
- msgstr "Nenhuma ajuda dispon�vel"
+ msgstr "Nenhuma ajuda disponível"
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[incerto]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "                   ou \""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, fuzzy, c-format
  msgid "Signature expired %s\n"
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, fuzzy, c-format
  msgid "Signature expires %s\n"
  msgstr "Esta assinatura expirou em %s.\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "assinatura %s de: \"%s\"\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  #, fuzzy
  msgid "binary"
  msgstr "primary"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr ""
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  #, fuzzy
  msgid "unknown"
- msgstr "vers�o desconhecida"
+ msgstr "versão desconhecida"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
- msgstr "algoritmo de chave p�blica desconhecido"
+ msgstr "algoritmo de chave pública desconhecido"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
- msgstr "Imposs�vel verificar assinatura: %s\n"
+ msgstr "Impossível verificar assinatura: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
- msgstr "n�o � uma assinatura separada\n"
+ msgstr "não é uma assinatura separada\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
- "AVISO: v�rias assinaturas detectadas.  Apenas a primeira ser� verificada.\n"
+ "AVISO: várias assinaturas detectadas.  Apenas a primeira será verificada.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "assinatura de classe 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "formato de assinatura antigo (PGP2.x)\n"
  
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
  #, fuzzy, c-format
  msgid "fstat of '%s' failed in %s: %s\n"
- msgstr "imposs�vel abrir %s: %s\n"
+ msgstr "impossível abrir %s: %s\n"
  
 +#: g10/misc.c:170
  #, fuzzy, c-format
  msgid "fstat(%d) failed in %s: %s\n"
- msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
+ msgstr "base de dados de confiança: leitura falhou (n=%d): %s\n"
  
 +#: g10/misc.c:279
  #, fuzzy, c-format
  msgid "WARNING: using experimental public key algorithm %s\n"
- msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
+ msgstr "impossível manipular algoritmo de chave pública %d\n"
  
 +#: g10/misc.c:286
  #, fuzzy
  msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
  msgstr ""
- "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
- "destinat�rio\n"
+ "forçar o algoritmo de 'digest' %s (%d) viola as preferências do "
+ "destinatário\n"
  
 +#: g10/misc.c:300
  #, fuzzy, c-format
  msgid "WARNING: using experimental cipher algorithm %s\n"
- msgstr "algoritmo de criptografia n�o implementado"
+ msgstr "algoritmo de criptografia não implementado"
  
 +#: g10/misc.c:319
  #, fuzzy, c-format
  msgid "WARNING: using experimental digest algorithm %s\n"
  msgstr "assinatura %s de: \"%s\"\n"
@@@ -5981,10 -4761,9 +6000,10 @@@
  #, fuzzy, c-format
  msgid "WARNING: digest algorithm %s is deprecated\n"
  msgstr ""
- "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
- "destinat�rio\n"
+ "forçar o algoritmo de 'digest' %s (%d) viola as preferências do "
+ "destinatário\n"
  
 +#: g10/misc.c:353
  #, fuzzy, c-format
  msgid "Note: signatures using the %s algorithm are rejected\n"
  msgstr "assinatura %s de: \"%s\"\n"
@@@ -6003,68 -4779,55 +6022,68 @@@ msgstr "armadura: %s\n
  msgid "(further info: "
  msgstr ""
  
 +#: g10/misc.c:1056
  #, c-format
  msgid "%s:%d: deprecated option \"%s\"\n"
- msgstr "%s:%d: op��o depreciada \"%s\"\n"
+ msgstr "%s:%d: opção depreciada \"%s\"\n"
  
 +#: g10/misc.c:1060
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated option\n"
- msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+ msgstr "AVISO: \"%s\" é uma opção depreciada\n"
  
 +#: g10/misc.c:1062
  #, c-format
  msgid "please use \"%s%s\" instead\n"
  msgstr "por favor utilize \"%s%s\" em vez dela\n"
  
 +#: g10/misc.c:1069
  #, fuzzy, c-format
  msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
- msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+ msgstr "AVISO: \"%s\" é uma opção depreciada\n"
  
 +#: g10/misc.c:1079
  #, fuzzy, c-format
  msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
- msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+ msgstr "AVISO: \"%s\" é uma opção depreciada\n"
  
 +#: g10/misc.c:1083
  #, fuzzy, c-format
  msgid ""
  "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
- msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+ msgstr "AVISO: \"%s\" é uma opção depreciada\n"
  
 +#: g10/misc.c:1147
  #, fuzzy
  msgid "Uncompressed"
- msgstr "n�o processado"
+ msgstr "não processado"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: g10/misc.c:1172
  #, fuzzy
  msgid "uncompressed|none"
- msgstr "n�o processado"
+ msgstr "não processado"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
- msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
+ msgstr "esta mensagem poderá não ser utilizável pelo %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  msgid "ambiguous option '%s'\n"
- msgstr "a ler op��es de `%s'\n"
+ msgstr "a ler opções de `%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  msgid "unknown option '%s'\n"
- msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
+ msgstr "destinatário por omissão desconhecido `%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "classe de assinatura desconhecida"
@@@ -6073,9 -4835,8 +6092,9 @@@
  #, fuzzy, c-format
  #| msgid "File `%s' exists. "
  msgid "File '%s' exists. "
- msgstr "Arquivo `%s' j� existe. "
+ msgstr "Arquivo `%s' já existe. "
  
 +#: g10/openfile.c:88
  #, fuzzy
  msgid "Overwrite? (y/N) "
  msgstr "Escrever por cima (s/N)? "
@@@ -6103,29 -4859,24 +6122,29 @@@ msgstr "a assumir dados assinados em `%
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new configuration file '%s' created\n"
- msgstr "criado um novo ficheiro de configura��o `%s'\n"
+ msgstr "criado um novo ficheiro de configuração `%s'\n"
  
 +#: g10/openfile.c:498
  #, fuzzy, c-format
  #| msgid "WARNING: options in `%s' are not yet active during this run\n"
  msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
+ msgstr "AVISO: opções em `%s' ainda não estão activas nesta execução\n"
  
 +#: g10/parse-packet.c:257
  #, c-format
  msgid "can't handle public key algorithm %d\n"
- msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
+ msgstr "impossível manipular algoritmo de chave pública %d\n"
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
  msgstr ""
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
- msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
+ msgstr "subpacote do tipo %d tem bit crítico ligado\n"
  
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
  msgstr "problema com o agente: o agente returnou 0x%lx\n"
@@@ -6163,17 -4907,14 +6182,17 @@@ msgstr "Por favor digite a frase secret
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr "Por favor digite a frase secreta \n"
  
 +#: g10/passphrase.c:513
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
- msgstr "Voc� quer realmente remover as chaves selecionadas? "
+ msgstr "Você quer realmente remover as chaves selecionadas? "
  
 +#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
- msgstr "Voc� quer realmente remover as chaves selecionadas? "
+ msgstr "Você quer realmente remover as chaves selecionadas? "
  
 +#: g10/passphrase.c:525
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6196,63 -4935,50 +6215,63 @@@ msgstr "
  msgid "Enter JPEG filename for photo ID: "
  msgstr ""
  
 +#: g10/photoid.c:120
  #, fuzzy, c-format
  msgid "unable to open JPEG file '%s': %s\n"
- msgstr "imposs�vel abrir %s: %s\n"
+ msgstr "impossível abrir %s: %s\n"
  
 +#: g10/photoid.c:131
  #, c-format
  msgid "This JPEG is really large (%d bytes) !\n"
  msgstr ""
  
 +#: g10/photoid.c:133
  #, fuzzy
  msgid "Are you sure you want to use it? (y/N) "
- msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
+ msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
  
 +#: g10/photoid.c:149
  #, fuzzy, c-format
  msgid "'%s' is not a JPEG file\n"
- msgstr "%s: n�o � um base de dados de confian�a\n"
+ msgstr "%s: não é um base de dados de confiança\n"
  
 +#: g10/photoid.c:168
  #, fuzzy
  msgid "Is this photo correct (y/N/q)? "
- msgstr "Est� correto (s/n)? "
+ msgstr "Está correto (s/n)? "
  
 +#: g10/photoid.c:380
  #, fuzzy
  msgid "unable to display photo ID!\n"
- msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
+ msgstr "não foi possível alterar o exec-path para %s\n"
  
 +#: g10/pkclist.c:72 g10/revoke.c:757
  msgid "No reason specified"
  msgstr "Nenhum motivo especificado"
  
 +#: g10/pkclist.c:74 g10/revoke.c:759
  msgid "Key is superseded"
- msgstr "A chave foi substitu�da"
+ msgstr "A chave foi substituída"
  
 +#: g10/pkclist.c:76 g10/revoke.c:758
  msgid "Key has been compromised"
  msgstr "A chave foi comprometida"
  
 +#: g10/pkclist.c:78 g10/revoke.c:760
  msgid "Key is no longer used"
- msgstr "A chave j� n�o � utilizada"
+ msgstr "A chave já não é utilizada"
  
 +#: g10/pkclist.c:80 g10/revoke.c:761
  msgid "User ID is no longer valid"
- msgstr "O identificador do utilizador j� n�o � v�lido"
+ msgstr "O identificador do utilizador já não é válido"
  
 +#: g10/pkclist.c:84
  msgid "reason for revocation: "
- msgstr "motivo da revoca��o: "
+ msgstr "motivo da revocação: "
  
 +#: g10/pkclist.c:100
  msgid "revocation comment: "
- msgstr "coment�rio da revoca��o: "
+ msgstr "comentário da revocação: "
  
  #. TRANSLATORS: These are the allowed answers in lower and
  #. uppercase.  Below you will find the matching strings which
@@@ -6272,10 -4996,9 +6291,10 @@@ msgstr "iImMqQsS
  #, fuzzy
  msgid "No trust value assigned to:\n"
  msgstr ""
- "Nenhum valor de confian�a designado para:\n"
+ "Nenhum valor de confiança designado para:\n"
  "%4u%c/%08lX %s \""
  
 +#: g10/pkclist.c:257
  #, fuzzy, c-format
  msgid "  aka \"%s\"\n"
  msgstr "                   ou \""
@@@ -6286,17 -5008,14 +6305,17 @@@ msgid "
  "How much do you trust that this key actually belongs to the named user?\n"
  msgstr "Esta chave provavelmente pertence ao dono\n"
  
 +#: g10/pkclist.c:282
  #, fuzzy, c-format
  msgid "  %d = I don't know or won't say\n"
- msgstr " %d = N�o sei\n"
+ msgstr " %d = Não sei\n"
  
 +#: g10/pkclist.c:284
  #, fuzzy, c-format
  msgid "  %d = I do NOT trust\n"
- msgstr " %d = Eu N�O confio\n"
+ msgstr " %d = Eu NÃO confio\n"
  
 +#: g10/pkclist.c:290
  #, fuzzy, c-format
  msgid "  %d = I trust ultimately\n"
  msgstr " %d = Confio de forma total\n"
@@@ -6323,11 -5038,9 +6342,11 @@@ msgid "
  "\n"
  msgstr ""
  
 +#: g10/pkclist.c:310 g10/revoke.c:786
  msgid "Your decision? "
- msgstr "Decis�o? "
+ msgstr "Decisão? "
  
 +#: g10/pkclist.c:331
  #, fuzzy
  msgid "Do you really want to set this key to ultimate trust? (y/N) "
  msgstr "Tem a certeza que quer confiar totalmente nesta chave?"
@@@ -6340,15 -5051,13 +6359,15 @@@ msgstr "Certificados que levam a uma ch
  #, fuzzy, c-format
  msgid "%s: There is no assurance this key belongs to the named user\n"
  msgstr ""
- "%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
+ "%08lx: Não há indicação de que a assinatura pertence realmente ao dono.\n"
  
 +#: g10/pkclist.c:439
  #, fuzzy, c-format
  msgid "%s: There is limited assurance this key belongs to the named user\n"
  msgstr ""
- "%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
+ "%08lx: Não há indicação de que a assinatura pertence realmente ao dono.\n"
  
 +#: g10/pkclist.c:445
  #, fuzzy
  msgid "This key probably belongs to the named user\n"
  msgstr "Esta chave provavelmente pertence ao dono\n"
@@@ -6357,146 -5065,132 +6376,163 @@@
  msgid "This key belongs to us\n"
  msgstr "Esta chave pertence-nos\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "NÃO se tem certeza de que esta chave pertence ao seu dono.\n"
+ "Se você *realmente* sabe o que está a fazer, pode responder\n"
+ "sim à próxima pergunta\n"
+ "\n"
+ 
++#: g10/pkclist.c:489
  #, fuzzy
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
  "you may answer the next question with yes.\n"
  msgstr ""
- "N�O se tem certeza de que esta chave pertence ao seu dono.\n"
- "Se voc� *realmente* sabe o que est� a fazer, pode responder\n"
- "sim � pr�xima pergunta\n"
+ "NÃO se tem certeza de que esta chave pertence ao seu dono.\n"
+ "Se você *realmente* sabe o que está a fazer, pode responder\n"
+ "sim à próxima pergunta\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  #, fuzzy
  msgid "Use this key anyway? (y/N) "
  msgstr "Usar esta chave de qualquer modo? "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
- msgstr "AVISO: A utilizar uma chave que n�o � de confian�a!\n"
+ msgstr "AVISO: A utilizar uma chave que não é de confiança!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  #, fuzzy
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
- "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
+ "AVISO: a chave %08lX pode estar revocada: chave de revocação %08lX não "
  "presente.\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  #, fuzzy
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  #, fuzzy
  msgid "         This could mean that the signature is forged.\n"
- msgstr "         Isto pode significar que a assinatura � falsificada.\n"
+ msgstr "         Isto pode significar que a assinatura é falsificada.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Nota: Esta chave foi desactivada.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Nota: Esta chave expirou!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
- msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
+ msgstr "AVISO: Esta chave não está certificada com uma assinatura confiável!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
- msgstr "         N�o h� indica��o de que a assinatura pertence ao dono.\n"
+ msgstr "         Não há indicação de que a assinatura pertence ao dono.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
- msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
+ msgstr "AVISO: Nós NÃO confiamos nesta chave!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
- msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
+ msgstr "         A assinatura é provavelmente uma FALSIFICAÇÃO.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
- "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
- "       confi�veis!\n"
+ "AVISO: Esta chave não está certificada com assinaturas suficientemente\n"
+ "       confiáveis!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
- msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
+ msgstr "         Não se tem certeza de que a assinatura pertence ao dono.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: ignorado: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
- msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
+ msgstr "%s: ignorado: a chave pública está desactivada\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
- msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
+ msgstr "%s: ignorado: a chave pública já está presente\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
- msgstr "imposs�vel ligar a `%s': %s\n"
+ msgstr "impossível ligar a `%s': %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
- msgstr "N�o especificou um identificador de utilizador. (pode usar \"-r\")\n"
+ msgstr "Não especificou um identificador de utilizador. (pode usar \"-r\")\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr ""
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6504,46 -5198,36 +6540,46 @@@ msgstr "
  "\n"
  "Insira o identificador do utilizador. Termine com uma linha vazia: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Identificador de utilizador inexistente.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
- msgstr "ignorado: chave p�blica j� colocada como destinat�rio por omiss�o\n"
+ msgstr "ignorado: chave pública já colocada como destinatário por omissão\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
- msgstr "A chave p�blica est� desativada.\n"
+ msgstr "A chave pública está desativada.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
- msgstr "ignorado: a chave p�blica j� est� presente\n"
+ msgstr "ignorado: a chave pública já está presente\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
- msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
+ msgstr "destinatário por omissão desconhecido `%s'\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
- msgstr "nenhum endere�o v�lido\n"
+ msgstr "nenhum endereço válido\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "chave %08lX: sem ID de utilizador\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "chave %08lX: sem ID de utilizador\n"
  
 +#: g10/plaintext.c:84
  msgid "data not saved; use option \"--output\" to save it\n"
- msgstr "dados n�o gravados; use a op��o \"--output\" para grav�-los\n"
+ msgstr "dados não gravados; use a opção \"--output\" para gravá-los\n"
  
 +#: g10/plaintext.c:598
  msgid "Detached signature.\n"
  msgstr "Assinatura separada.\n"
  
@@@ -6555,45 -5237,36 +6591,45 @@@ msgstr "Por favor digite o nome do fich
  msgid "reading stdin ...\n"
  msgstr "lendo do \"stdin\" ...\n"
  
 +#: g10/plaintext.c:688
  msgid "no signed data\n"
- msgstr "n�o h� dados assinados\n"
+ msgstr "não há dados assinados\n"
  
 +#: g10/plaintext.c:706
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
- msgstr "imposs�vel abrir dados assinados `%s'\n"
+ msgstr "impossível abrir dados assinados `%s'\n"
  
 +#: g10/plaintext.c:741
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
- msgstr "imposs�vel abrir dados assinados `%s'\n"
+ msgstr "impossível abrir dados assinados `%s'\n"
  
 +#: g10/pubkey-enc.c:116
  #, fuzzy, c-format
  msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr "destinat�rio an�nimo; a tentar chave secreta %08lX ...\n"
+ msgstr "destinatário anónimo; a tentar chave secreta %08lX ...\n"
  
 +#: g10/pubkey-enc.c:123
  msgid "okay, we are the anonymous recipient.\n"
- msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
+ msgstr "certo, nós somos o destinatário anónimo.\n"
  
 +#: g10/pubkey-enc.c:282
  msgid "old encoding of the DEK is not supported\n"
- msgstr "codifica��o antiga do DEK n�o suportada\n"
+ msgstr "codificação antiga do DEK não suportada\n"
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
- msgstr "algoritmo de cifra %d%s � desconhecido ou foi desactivado\n"
+ msgstr "algoritmo de cifra %d%s é desconhecido ou foi desactivado\n"
  
 +#: g10/pubkey-enc.c:352
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
- msgstr "NOTA: algoritmo de cifragem %d n�o encontrado nas prefer�ncias\n"
+ msgstr "NOTA: algoritmo de cifragem %d não encontrado nas preferências\n"
  
 +#: g10/pubkey-enc.c:377
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
  msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@@ -6604,13 -5276,10 +6640,13 @@@
  msgid "Note: key has been revoked"
  msgstr "NOTA: a chave foi revogada"
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, fuzzy, c-format
  msgid "build_packet failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
 +#: g10/revoke.c:144
  #, fuzzy, c-format
  msgid "key %s has no user IDs\n"
  msgstr "chave %08lX: sem ID de utilizador\n"
@@@ -6627,38 -5293,31 +6663,38 @@@ msgstr "
  #, fuzzy
  #| msgid "Secret key is available.\n"
  msgid "Secret key is not available.\n"
- msgstr "Chave secreta dispon�vel.\n"
+ msgstr "Chave secreta disponível.\n"
  
 +#: g10/revoke.c:327
  #, fuzzy
  msgid "Create a designated revocation certificate for this key? (y/N) "
- msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
+ msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
  
 +#: g10/revoke.c:336 g10/revoke.c:727
  msgid "ASCII armored output forced.\n"
  msgstr ""
  
 +#: g10/revoke.c:352 g10/revoke.c:479
  #, fuzzy, c-format
  msgid "make_keysig_packet failed: %s\n"
- msgstr "actualiza��o da chave secreta falhou: %s\n"
+ msgstr "actualização da chave secreta falhou: %s\n"
  
 +#: g10/revoke.c:415
  #, fuzzy
  msgid "Revocation certificate created.\n"
- msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+ msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
 +#: g10/revoke.c:421
  #, c-format
  msgid "no revocation keys found for \"%s\"\n"
  msgstr ""
  
 +#: g10/revoke.c:551
  #, fuzzy
  msgid "This is a revocation certificate for the OpenPGP key:"
- msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
+ msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
  
 +#: g10/revoke.c:567
  msgid ""
  "A revocation certificate is a kind of \"kill switch\" to publicly\n"
  "declare that a key shall not anymore be used.  It is not possible\n"
@@@ -6681,15 -5338,13 +6717,15 @@@ msgid "
  "before importing and publishing this revocation certificate."
  msgstr ""
  
 +#: g10/revoke.c:590
  #, fuzzy, c-format
  msgid "revocation certificate stored as '%s.rev'\n"
- msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+ msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
 +#: g10/revoke.c:634
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
@@@ -6705,12 -5358,10 +6741,12 @@@ msgstr "
  msgid "error searching the keyring: %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
  
 +#: g10/revoke.c:711
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
- msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
+ msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
  
 +#: g10/revoke.c:735
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6721,12 -5372,10 +6757,12 @@@
  "your machine might store the data and make it available to others!\n"
  msgstr ""
  
 +#: g10/revoke.c:769
  #, fuzzy
  msgid "Please select the reason for the revocation:\n"
- msgstr "motivo da revoca��o: "
+ msgstr "motivo da revocação: "
  
 +#: g10/revoke.c:779
  msgid "Cancel"
  msgstr ""
  
@@@ -6742,12 -5389,10 +6778,12 @@@ msgstr "
  "\n"
  "Insira o identificador do utilizador. Termine com uma linha vazia: "
  
 +#: g10/revoke.c:850
  #, fuzzy, c-format
  msgid "Reason for revocation: %s\n"
- msgstr "motivo da revoca��o: "
+ msgstr "motivo da revocação: "
  
 +#: g10/revoke.c:852
  msgid "(No description given)\n"
  msgstr ""
  
@@@ -6764,10 -5406,9 +6800,10 @@@ msgstr "chave fraca criada - tentando n
  #, c-format
  msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
  msgstr ""
- "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
+ "impossível evitar chave fraca para criptografia simétrica;\n"
  "tentei %d vezes!\n"
  
 +#: g10/seskey.c:306
  #, c-format
  msgid "%s key %s uses an unsafe (%zu bit) hash\n"
  msgstr ""
@@@ -6777,40 -5417,33 +6813,40 @@@
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "AVISO: conflito no 'digest' de assinatura da mensagem\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr ""
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, fuzzy, c-format
  msgid "please see %s for more information\n"
- msgstr " i = mostrar mais informa��es\n"
+ msgstr " i = mostrar mais informações\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
- msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
+ msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
- msgstr[0] "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
- msgstr[1] "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
+ msgstr[0] "a chave pública %08lX é %lu segundo mais nova que a assinatura\n"
+ msgstr[1] "a chave pública %08lX é %lu segundo mais nova que a assinatura\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
- msgstr[0] "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
- msgstr[1] "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
+ msgstr[0] "a chave pública %08lX é %lu segundo mais nova que a assinatura\n"
+ msgstr[1] "a chave pública %08lX é %lu segundo mais nova que a assinatura\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6818,75 -5451,65 +6854,75 @@@ msgid_plural "
  "key %s was created %lu seconds in the future (time warp or clock problem)\n"
  msgstr[0] ""
  "a chave foi criada %lu segundo no futuro\n"
- "(viagem no tempo ou problema no rel�gio)\n"
+ "(viagem no tempo ou problema no relógio)\n"
  msgstr[1] ""
  "a chave foi criada %lu segundo no futuro\n"
- "(viagem no tempo ou problema no rel�gio)\n"
+ "(viagem no tempo ou problema no relógio)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu days in the future (time warp or clock problem)\n"
  msgstr[0] ""
  "a chave foi criada %lu segundo no futuro\n"
- "(viagem no tempo ou problema no rel�gio)\n"
+ "(viagem no tempo ou problema no relógio)\n"
  msgstr[1] ""
  "a chave foi criada %lu segundo no futuro\n"
- "(viagem no tempo ou problema no rel�gio)\n"
+ "(viagem no tempo ou problema no relógio)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "NOTA: a chave foi revogada"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, fuzzy, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
- "assumindo assinatura incorrecta na chave %08lX devido a um bit cr�tico "
+ "assumindo assinatura incorrecta na chave %08lX devido a um bit crítico "
  "desconhecido\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
- msgstr "chave %08lX: sem subchave para o pacote revoca��o de subchave\n"
+ msgstr "chave %08lX: sem subchave para o pacote revocação de subchave\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
- msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
+ msgstr "chave %08lX: sem subchave para ligação de chaves\n"
  
 +#: g10/sign.c:88
  #, c-format
  msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
  msgstr ""
- "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).  A "
- "utilizar n�o expandida.\n"
+ "AVISO: impossível expandir-%% a url de política (demasiado grande).  A "
+ "utilizar não expandida.\n"
  
 +#: g10/sign.c:114
  #, fuzzy, c-format
  msgid ""
  "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
  msgstr ""
- "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
- "A utilizar n�o expandida.\n"
+ "AVISO: impossível expandir-%% a url de política (demasiado grande).\n"
+ "A utilizar não expandida.\n"
  
 +#: g10/sign.c:137
  #, fuzzy, c-format
  msgid ""
  "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
  "unexpanded.\n"
  msgstr ""
- "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
- "A utilizar n�o expandida.\n"
+ "AVISO: impossível expandir-%% a url de política (demasiado grande).\n"
+ "A utilizar não expandida.\n"
  
 +#: g10/sign.c:329
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "assinatura %s de: \"%s\"\n"
@@@ -6896,45 -5518,37 +6932,45 @@@
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
- "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
- "destinat�rio\n"
+ "forçar o algoritmo de 'digest' %s (%d) viola as preferências do "
+ "destinatário\n"
  
 +#: g10/sign.c:1009
  msgid "signing:"
  msgstr "a assinar:"
  
 +#: g10/sign.c:1286
  #, c-format
  msgid "%s encryption will be used\n"
- msgstr "ser� utilizada a cifragem %s\n"
+ msgstr "será utilizada a cifragem %s\n"
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
  msgstr ""
- "a chave n�o est� marcada insegura - imposs�vel us�-la com o RNG falso!\n"
+ "a chave não está marcada insegura - impossível usá-la com o RNG falso!\n"
  
 +#: g10/skclist.c:187
  #, fuzzy, c-format
  msgid "skipped \"%s\": duplicated\n"
  msgstr "ignorado `%s': duplicada\n"
  
 +#: g10/skclist.c:206
  msgid "skipped: secret key already present\n"
- msgstr "ignorado: a chave secreta j� est� presente\n"
+ msgstr "ignorado: a chave secreta já está presente\n"
  
 +#: g10/skclist.c:225
  #, fuzzy
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr ""
- "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
+ "ignorado `%s': esta é uma chave ElGamal gerada pelo PGP que não é segura "
  "para assinaturas!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
- msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
+ msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n"
  
 +#: g10/tdbdump.c:105
  #, c-format
  msgid ""
  "# List of assigned trustvalues, created %s\n"
@@@ -6955,148 -5566,118 +6991,148 @@@ msgstr "frase secreta demasiado longa\n
  msgid "colon missing"
  msgstr ""
  
 +#: g10/tdbdump.c:176
  #, fuzzy
  msgid "invalid fingerprint"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: g10/tdbdump.c:181
  #, fuzzy
  msgid "ownertrust value missing"
- msgstr "importar os valores de confian�a"
+ msgstr "importar os valores de confiança"
  
 +#: g10/tdbdump.c:217
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
- msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
+ msgstr "%s: erro ao escrever registo de diretório: %s\n"
  
 +#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
  msgstr "armadura: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
- msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
+ msgstr "base de dados de confiança: sincronização falhou: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  msgid "can't create lock for '%s'\n"
- msgstr "imposs�vel criar `%s': %s\n"
+ msgstr "impossível criar `%s': %s\n"
  
 +#: g10/tdbio.c:146
  #, fuzzy, c-format
  msgid "can't lock '%s'\n"
- msgstr "imposs�vel abrir `%s'\n"
+ msgstr "impossível abrir `%s'\n"
  
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
  #, c-format
  msgid "trustdb rec %lu: lseek failed: %s\n"
- msgstr "base de dados de confian�a rec %lu: lseek falhou: %s\n"
+ msgstr "base de dados de confiança rec %lu: lseek falhou: %s\n"
  
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
  #, c-format
  msgid "trustdb rec %lu: write failed (n=%d): %s\n"
- msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
+ msgstr "base de dados de confiança rec %lu: escrita falhou (n=%d): %s\n"
  
 +#: g10/tdbio.c:352
  msgid "trustdb transaction too large\n"
- msgstr "transa��o de base de dados de confian�a muito grande\n"
+ msgstr "transação de base de dados de confiança muito grande\n"
  
 +#: g10/tdbio.c:682
  #, c-format
  msgid "%s: directory does not exist!\n"
  msgstr "%s: diretoria inexistente!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
- msgstr "imposs�vel fechar `%s': %s\n"
+ msgstr "impossível fechar `%s': %s\n"
  
 +#: g10/tdbio.c:724
  #, c-format
  msgid "%s: failed to create version record: %s"
- msgstr "%s: falha ao criar registo de vers�o: %s"
+ msgstr "%s: falha ao criar registo de versão: %s"
  
 +#: g10/tdbio.c:729
  #, c-format
  msgid "%s: invalid trustdb created\n"
- msgstr "%s: base de dados de confian�a inv�lida criada\n"
+ msgstr "%s: base de dados de confiança inválida criada\n"
  
 +#: g10/tdbio.c:732
  #, c-format
  msgid "%s: trustdb created\n"
- msgstr "%s: base de dados de confian�a criada\n"
+ msgstr "%s: base de dados de confiança criada\n"
  
 +#: g10/tdbio.c:788
  #, fuzzy
  #| msgid "NOTE: trustdb not writable\n"
  msgid "Note: trustdb not writable\n"
- msgstr "NOTA: n�o � poss�vel escrever na trustdb\n"
+ msgstr "NOTA: não é possível escrever na trustdb\n"
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
- msgstr "%s: base de dados de confian�a inv�lida\n"
+ msgstr "%s: base de dados de confiança inválida\n"
  
 +#: g10/tdbio.c:834
  #, c-format
  msgid "%s: failed to create hashtable: %s\n"
- msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
+ msgstr "%s: falha ao criar tabela de dispersão: %s\n"
  
 +#: g10/tdbio.c:842
  #, c-format
  msgid "%s: error updating version record: %s\n"
- msgstr "%s: erro a actualizar registo de vers�o: %s\n"
+ msgstr "%s: erro a actualizar registo de versão: %s\n"
  
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
  #, c-format
  msgid "%s: error reading version record: %s\n"
- msgstr "%s: erro ao ler registo de vers�o: %s\n"
+ msgstr "%s: erro ao ler registo de versão: %s\n"
  
 +#: g10/tdbio.c:938
  #, c-format
  msgid "%s: error writing version record: %s\n"
- msgstr "%s: erro ao escrever registo de vers�o: %s\n"
+ msgstr "%s: erro ao escrever registo de versão: %s\n"
  
 +#: g10/tdbio.c:1461
  #, c-format
  msgid "trustdb: lseek failed: %s\n"
- msgstr "base de dados de confian�a: lseek falhou: %s\n"
+ msgstr "base de dados de confiança: lseek falhou: %s\n"
  
 +#: g10/tdbio.c:1472
  #, c-format
  msgid "trustdb: read failed (n=%d): %s\n"
- msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
+ msgstr "base de dados de confiança: leitura falhou (n=%d): %s\n"
  
 +#: g10/tdbio.c:1497
  #, c-format
  msgid "%s: not a trustdb file\n"
- msgstr "%s: n�o � um base de dados de confian�a\n"
+ msgstr "%s: não é um base de dados de confiança\n"
  
 +#: g10/tdbio.c:1522
  #, c-format
  msgid "%s: version record with recnum %lu\n"
- msgstr "%s: registo de vers�o com recnum %lu\n"
+ msgstr "%s: registo de versão com recnum %lu\n"
  
 +#: g10/tdbio.c:1528
  #, c-format
  msgid "%s: invalid file version %d\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: g10/tdbio.c:1748
  #, c-format
  msgid "%s: error reading free record: %s\n"
  msgstr "%s: erro ao ler registo livre: %s\n"
  
 +#: g10/tdbio.c:1757
  #, c-format
  msgid "%s: error writing dir record: %s\n"
- msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
+ msgstr "%s: erro ao escrever registo de diretório: %s\n"
  
 +#: g10/tdbio.c:1768
  #, c-format
  msgid "%s: failed to zero a record: %s\n"
  msgstr "%s: falha ao zerar um registo: %s\n"
@@@ -7106,280 -5686,258 +7142,315 @@@
  msgid "%s: failed to append a record: %s\n"
  msgstr "%s: falha ao anexar um registo: %s\n"
  
 +#: g10/tdbio.c:1865
  #, fuzzy
  msgid "Error: The trustdb is corrupted.\n"
- msgstr "%s: base de dados de confian�a criada\n"
+ msgstr "%s: base de dados de confiança criada\n"
  
 +#: g10/textfilter.c:146
  #, c-format
  msgid "can't handle text lines longer than %d characters\n"
- msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
+ msgstr "impossível manipular linhas de texto maiores que %d caracteres\n"
  
 +#: g10/textfilter.c:241
  #, c-format
  msgid "input line longer than %d characters\n"
  msgstr "linha de entrada maior que %d caracteres\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Algoritmos suportados:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
- msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
+ msgstr "%s: erro ao escrever registo de diretório: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr ""
+ 
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "lista chave e identificadores de utilizadores"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
- msgstr "Pol�tica: "
+ msgstr "Política: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "listar as chaves"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
  msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1746
+ #, c-format
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "erro na escrita do porta-chaves `%s': %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "%d assinaturas removidas.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+ msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld messages"
+ msgstr "Repita a frase secreta\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+ msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7393,137 -5951,120 +7464,149 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "erro ao escrever no porta-chaves público `%s': %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
- msgstr "`%s' n�o � um identificador longo de chave v�lido\n"
+ msgstr "`%s' não é um identificador longo de chave válido\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, fuzzy, c-format
  msgid "key %s: accepted as trusted key\n"
- msgstr "chave %08lX: aceite como chave de confian�a\n"
+ msgstr "chave %08lX: aceite como chave de confiança\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, fuzzy, c-format
  msgid "key %s occurs more than once in the trustdb\n"
- msgstr "chave %08lX ocrreu mais do que uma vez na base de dados de confian�a\n"
+ msgstr "chave %08lX ocrreu mais do que uma vez na base de dados de confiança\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, fuzzy, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr ""
- "chave %08lX: nenhuma chave p�blica para chave de confian�a - ignorada\n"
+ "chave %08lX: nenhuma chave pública para chave de confiança - ignorada\n"
  "\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, fuzzy, c-format
  msgid "key %s marked as ultimately trusted\n"
- msgstr "chave marcada como de confian�a absoluta\n"
+ msgstr "chave marcada como de confiança absoluta\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
- msgstr "registo de confian�a %lu, tipo req %d: falha na leitura: %s\n"
+ msgstr "registo de confiança %lu, tipo req %d: falha na leitura: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
- msgstr "registo de confian�a %lu n�o � do tipo pedido %d\n"
+ msgstr "registo de confiança %lu não é do tipo pedido %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
- msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
+ msgstr "não é necessária uma verificação da base de dados de confiança\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
- msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
+ msgstr "proxima verificação da base de dados de confiança a %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
- msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
+ msgstr "não é necessária uma verificação da base de dados de confiança\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
- msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
+ msgstr "não é necessária uma verificação da base de dados de confiança\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
- msgstr "chave p�blica %08lX n�o encontrada: %s\n"
+ msgstr "chave pública %08lX não encontrada: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr ""
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
- msgstr "a verificar a base de dados de confian�a\n"
+ msgstr "a verificar a base de dados de confiança\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
- msgstr[0] "%lu chaves processadas at� agora\n"
- msgstr[1] "%lu chaves processadas at� agora\n"
+ msgstr[0] "%lu chaves processadas até agora\n"
+ msgstr[1] "%lu chaves processadas até agora\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  #, fuzzy
  msgid "no ultimately trusted keys found\n"
  msgstr ""
- "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
+ "chave pública da chave absolutamente de confiança %08lX não encontrada\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr ""
- "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
+ "chave pública da chave absolutamente de confiança %08lX não encontrada\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
- msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
+ msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n"
  
 +#: g10/trust.c:105
  msgid "undefined"
  msgstr ""
  
@@@ -7565,12 -6099,10 +7648,12 @@@ msgstr "revkey
  msgid "[ expired]"
  msgstr "expire"
  
 +#: g10/trust.c:156
  #, fuzzy
  msgid "[ unknown]"
- msgstr "vers�o desconhecida"
+ msgstr "versão desconhecida"
  
 +#: g10/trust.c:158
  msgid "[  undef ]"
  msgstr ""
  
@@@ -7596,21 -6123,18 +7679,21 @@@ msgid "
  "Please remember that the signature file (.sig or .asc)\n"
  "should be the first file given on the command line.\n"
  msgstr ""
- "a assinatura n�o pode ser verificada.\n"
- "N�o se esque�a que o ficheiro com a assinatura (.sig ou .asc)\n"
+ "a assinatura não pode ser verificada.\n"
+ "Não se esqueça que o ficheiro com a assinatura (.sig ou .asc)\n"
  "deve ser o primeiro a ser dado na linha de comando.\n"
  
 +#: g10/verify.c:204
  #, c-format
  msgid "input line %u too long or missing LF\n"
  msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
  
 +#: g10/verify.c:253
  #, fuzzy, c-format
  msgid "can't open fd %d: %s\n"
- msgstr "imposs�vel abrir `%s': %s\n"
+ msgstr "impossível abrir `%s': %s\n"
  
 +#: kbx/kbxutil.c:92
  msgid "set debugging flags"
  msgstr ""
  
@@@ -7618,155 -6141,123 +7701,157 @@@
  msgid "enable full debugging"
  msgstr ""
  
 +#: kbx/kbxutil.c:117
  #, fuzzy
  msgid "Usage: kbxutil [options] [files] (-h for help)"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
 +#: kbx/kbxutil.c:120
  #, fuzzy
  msgid ""
  "Syntax: kbxutil [options] [files]\n"
  "List, export, import Keybox data\n"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "muda a frase secreta"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
  msgstr "muda a frase secreta"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
- msgstr "motivo da revoca��o: "
+ msgstr "motivo da revocação: "
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
- msgstr "motivo da revoca��o: "
+ msgstr "motivo da revocação: "
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
- msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+ msgstr "falha ao inicializar a base de dados de confiança: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, fuzzy, c-format
- msgid "reading public key failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "remove keys from the public keyring"
+ msgid "response does not contain the EC public key\n"
+ msgstr "remover chaves do porta-chaves público"
+ 
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1551
+ #, fuzzy, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
- msgstr "A gera��o de chaves falhou: %s\n"
+ msgstr "A geração de chaves falhou: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7776,26 -6267,21 +7861,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
- msgstr "motivo da revoca��o: "
+ msgstr "motivo da revocação: "
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7803,122 -6289,97 +7888,122 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "muda a frase secreta"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  #, fuzzy
  msgid "error reading application data\n"
  msgstr "erro na leitura do bloco de chave: %s\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  #, fuzzy
  msgid "error reading fingerprint DO\n"
  msgstr "%s: erro ao ler registo livre: %s\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  #, fuzzy
  msgid "key already exists\n"
- msgstr "%s' j� comprimido\n"
+ msgstr "%s' já comprimido\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  #, fuzzy
  msgid "generating new key\n"
  msgstr "gerar um novo par de chaves"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
  msgstr "gerar um novo par de chaves"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
- msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+ msgstr "falha ao inicializar a base de dados de confiança: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
- msgstr "URI n�o suportado"
+ msgstr "URI não suportado"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  #, fuzzy
  msgid "generating key failed\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
- msgstr[0] "A gera��o de chaves falhou: %s\n"
- msgstr[1] "A gera��o de chaves falhou: %s\n"
+ msgstr[0] "A geração de chaves falhou: %s\n"
+ msgstr[1] "A geração de chaves falhou: %s\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "assinatura %s de: \"%s\"\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
- msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
+ msgstr "nenhum dado OpenPGP válido encontrado.\n"
  
 +#: scd/app-dinsig.c:299
  #, fuzzy
  msgid "||Please enter your PIN at the reader's pinpad"
  msgstr "muda a frase secreta"
@@@ -7934,30 -6393,24 +8019,30 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
  #, fuzzy
  msgid "|FILE|write a log to FILE"
- msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+ msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
 +#: scd/scdaemon.c:134
  msgid "|N|connect to reader at port N"
  msgstr ""
  
 +#: scd/scdaemon.c:136
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
- msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
+ msgstr "|NOME|usar NOME como destinatário por omissão"
  
 +#: scd/scdaemon.c:138
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
- msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
+ msgstr "|NOME|usar NOME como destinatário por omissão"
  
 +#: scd/scdaemon.c:141
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "nunca usar o terminal"
@@@ -7979,61 -6428,49 +8064,61 @@@ msgstr "comandos em conflito\n
  msgid "use variable length input for pinpad"
  msgstr ""
  
 +#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
 +#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
 +#: sm/base64.c:327
  #, fuzzy, c-format
  msgid "invalid radix64 character %02x skipped\n"
- msgstr "caracter radix64 inv�lido %02x ignorado\n"
+ msgstr "caracter radix64 inválido %02x ignorado\n"
  
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
- msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
+ msgstr "o gpg-agent não está disponível nesta sessão\n"
  
 +#: sm/certchain.c:194
  #, c-format
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  #, fuzzy
  msgid "shell"
  msgstr "help"
  
 +#: sm/certchain.c:256 dirmngr/validate.c:107
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
- msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
+ msgstr "a versão %d do protocolo gpg-agent não é suportada\n"
  
 +#: sm/certchain.c:295 dirmngr/validate.c:205
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8041,12 -6477,10 +8126,12 @@@
  msgid "critical marked policy without configured policies"
  msgstr ""
  
 +#: sm/certchain.c:343
  #, fuzzy, c-format
  msgid "failed to open '%s': %s\n"
- msgstr "imposs�vel abrir `%s': %s\n"
+ msgstr "impossível abrir `%s': %s\n"
  
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
  msgstr "a escrever chave privada para `%s'\n"
@@@ -8056,209 -6489,162 +8141,209 @@@
  msgid "certificate policy not allowed"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
- msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+ msgstr "falha ao inicializar a base de dados de confiança: %s\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
  msgstr "NOTA: a chave foi revogada"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
- msgstr "verifica��o da assinatura criada falhou: %s\n"
+ msgstr "verificação da assinatura criada falhou: %s\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
  msgstr "a escrever chave privada para `%s'\n"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
  msgstr "Esta chave expirou!"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
  msgstr "Esta chave expirou!"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
  msgstr "Esta chave expirou!"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
  msgstr "Esta chave expirou!"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
  msgstr "        novas assinaturas: %lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
- msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+ msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
  msgstr "certificado incorrecto"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
- msgstr "mostra impress�o digital"
+ msgstr "mostra impressão digital"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
- msgstr "gerar um certificado de revoga��o"
+ msgstr "gerar um certificado de revogação"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr ""
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
- msgstr "verifica��o da assinatura criada falhou: %s\n"
+ msgstr "verificação da assinatura criada falhou: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "verificar uma assinatura"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
- msgstr "prefer�ncia %c%lu duplicada\n"
+ msgstr "preferência %c%lu duplicada\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
- msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+ msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
  msgstr "certificado incorrecto"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8272,17 -6656,14 +8357,17 @@@ msgstr "
  msgid "(this is the MD2 algorithm)\n"
  msgstr ""
  
 +#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:705
  #, fuzzy
  msgid "none"
- msgstr "n�o"
+ msgstr "não"
  
 +#: sm/certdump.c:552 sm/certdump.c:617
  #, fuzzy
  msgid "[Error - invalid encoding]"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: sm/certdump.c:560
  msgid "[Error - out of core]"
  msgstr ""
  
@@@ -8290,12 -6670,10 +8375,12 @@@
  msgid "[Error - No name]"
  msgstr ""
  
 +#: sm/certdump.c:623
  #, fuzzy
  msgid "[Error - invalid DN]"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: sm/certdump.c:833
  #, fuzzy, c-format
  msgid ""
  "Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -8343,12 -6713,10 +8428,12 @@@ msgstr "
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
 +#: sm/certreqgen.c:464
  #, fuzzy, c-format
  msgid "line %d: invalid algorithm\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: sm/certreqgen.c:478
  #, c-format
  msgid "line %d: invalid key length %u (valid are %d to %d)\n"
  msgstr ""
@@@ -8358,27 -6725,22 +8443,27 @@@
  msgid "line %d: no subject name given\n"
  msgstr ""
  
 +#: sm/certreqgen.c:505
  #, fuzzy, c-format
  msgid "line %d: invalid subject name label '%.*s'\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: sm/certreqgen.c:508
  #, fuzzy, c-format
  msgid "line %d: invalid subject name '%s' at pos %d\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: sm/certreqgen.c:525
  #, fuzzy, c-format
  msgid "line %d: not a valid email address\n"
- msgstr "Endere�o eletr�nico inv�lido\n"
+ msgstr "Endereço eletrónico inválido\n"
  
 +#: sm/certreqgen.c:544
  #, fuzzy, c-format
  msgid "line %d: invalid serial number\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: sm/certreqgen.c:560
  #, c-format
  msgid "line %d: invalid issuer name label '%.*s'\n"
  msgstr ""
@@@ -8388,37 -6749,30 +8473,37 @@@
  msgid "line %d: invalid issuer name '%s' at pos %d\n"
  msgstr ""
  
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
  #, fuzzy, c-format
  msgid "line %d: invalid date given\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: sm/certreqgen.c:599
  #, fuzzy, c-format
  msgid "line %d: error getting signing key by keygrip '%s': %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
  
 +#: sm/certreqgen.c:618
  #, fuzzy, c-format
  msgid "line %d: invalid hash algorithm given\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: sm/certreqgen.c:633
  #, fuzzy, c-format
  msgid "line %d: invalid authority-key-id\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: sm/certreqgen.c:648
  #, fuzzy, c-format
  msgid "line %d: invalid subject-key-id\n"
- msgstr "chave %08lX: liga��o de subchave inv�lida\n"
+ msgstr "chave %08lX: ligação de subchave inválida\n"
  
 +#: sm/certreqgen.c:686
  #, fuzzy, c-format
  msgid "line %d: invalid extension syntax\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: sm/certreqgen.c:699
  #, fuzzy, c-format
  msgid "line %d: error reading key '%s' from card: %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
@@@ -8428,12 -6781,10 +8513,12 @@@
  msgid "line %d: error getting key by keygrip '%s': %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
  
 +#: sm/certreqgen.c:729
  #, fuzzy, c-format
  msgid "line %d: key generation failed: %s <%s>\n"
- msgstr "A gera��o de chaves falhou: %s\n"
+ msgstr "A geração de chaves falhou: %s\n"
  
 +#: sm/certreqgen.c:1324
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8459,12 -6806,10 +8544,12 @@@ msgstr "
  msgid "error reading the card: %s\n"
  msgstr "%s: erro ao ler registo livre: %s\n"
  
 +#: sm/certreqgen-ui.c:237
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: sm/certreqgen-ui.c:249
  #, fuzzy
  msgid "Available keys:\n"
  msgstr "desactiva uma chave"
@@@ -8497,31 -6836,26 +8582,31 @@@ msgstr "
  msgid "No subject name given\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:315
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
  #. TRANSLATORS: The 22 in the second string is the
  #. length of the first string up to the "%s".  Please
  #. adjust it do the length of your translation.  The
  #. second string is merely passed to atoi so you can
  #. drop everything after the number.
 +#: sm/certreqgen-ui.c:324
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: sm/certreqgen-ui.c:326
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:338
  #, fuzzy
  msgid "Enter email addresses"
- msgstr "Endere�o de correio eletr�nico: "
+ msgstr "Endereço de correio eletrónico: "
  
 +#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
@@@ -8544,12 -6875,10 +8629,12 @@@ msgstr "
  msgid "Enter URIs"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:355
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
- msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
+ msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
  
 +#: sm/certreqgen-ui.c:382
  msgid "These parameters are used:\n"
  msgstr ""
  
@@@ -8557,12 -6885,10 +8642,12 @@@
  msgid "Now creating self-signed certificate.  "
  msgstr ""
  
 +#: sm/certreqgen-ui.c:402
  #, fuzzy
  msgid "Now creating certificate request.  "
- msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+ msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
 +#: sm/certreqgen-ui.c:403
  msgid "This may take a while ...\n"
  msgstr ""
  
@@@ -8586,275 -6907,218 +8671,275 @@@ msgstr "
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
 +#: sm/delete.c:51 sm/delete.c:112
  #, fuzzy, c-format
  msgid "certificate '%s' not found: %s\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
  msgstr "erro na leitura do bloco de chave: %s\n"
  
 +#: sm/delete.c:143
  #, fuzzy, c-format
  msgid "duplicated certificate '%s' deleted\n"
- msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+ msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
 +#: sm/delete.c:145
  #, fuzzy, c-format
  msgid "certificate '%s' deleted\n"
- msgstr "prefer�ncia %c%lu duplicada\n"
+ msgstr "preferência %c%lu duplicada\n"
  
 +#: sm/delete.c:175
  #, fuzzy, c-format
  msgid "deleting certificate \"%s\" failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: sm/encrypt.c:328
  #, fuzzy
  msgid "no valid recipients given\n"
- msgstr "resposta do agente inv�lida\n"
+ msgstr "resposta do agente inválida\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
  msgstr "listar as chaves secretas"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
  msgstr "certificado incorrecto"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
  msgstr "certificado incorrecto"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
  msgstr "certificado incorrecto"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
- msgstr "criar sa�da com armadura ascii"
+ msgstr "criar saída com armadura ascii"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "nunca usar o terminal"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
- msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+ msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
- msgstr "modo n�o-interactivo: nunca perguntar"
+ msgstr "modo não-interactivo: nunca perguntar"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "assumir sim para a maioria das perguntas"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
- msgstr "assumir n�o para a maioria das perguntas"
+ msgstr "assumir não para a maioria das perguntas"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr ""
  "adicionar este porta-chaves\n"
- "� lista de porta-chaves"
+ "à lista de porta-chaves"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
- msgstr "|NOME|usar NOME como chave secreta por omiss�o"
+ msgstr "|NOME|usar NOME como chave secreta por omissão"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
- msgstr "|ENDERE�O|usar este servidor para buscar chaves"
+ msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NOME|usar algoritmo de criptografia NOME"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "Sintaxe: gpg [op��es] [ficheiros]\n"
+ "Sintaxe: gpg [opções] [ficheiros]\n"
  "assina, verifica, cifra ou decifra\n"
- "a opera��o por omiss�o depende dos dados de entrada\n"
+ "a operação por omissão depende dos dados de entrada\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
- msgstr "imposs�vel ligar a `%s': %s\n"
+ msgstr "impossível ligar a `%s': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
- msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
+ msgstr "destinatário por omissão desconhecido `%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr ""
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr " s = saltar esta chave\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, fuzzy
  msgid "could not parse keyserver\n"
- msgstr "n�o consegui processar a URI do servidor de chaves\n"
+ msgstr "não consegui processar a URI do servidor de chaves\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "a escrever para `%s'\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
- msgstr "imposs�vel fechar `%s': %s\n"
+ msgstr "impossível fechar `%s': %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
 +#: sm/import.c:127
  #, fuzzy, c-format
  msgid "total number processed: %lu\n"
- msgstr "N�mero total processado: %lu\n"
+ msgstr "Número total processado: %lu\n"
  
 +#: sm/import.c:246
  #, fuzzy
  msgid "error storing certificate\n"
- msgstr "gerar um certificado de revoga��o"
+ msgstr "gerar um certificado de revogação"
  
 +#: sm/import.c:254
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: sm/import.c:526 sm/import.c:558
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: sm/import.c:746 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
- msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+ msgstr "falha ao inicializar a base de dados de confiança: %s\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, fuzzy, c-format
  msgid "problem re-searching certificate: %s\n"
- msgstr "rev? problema ao verificar revoga��o: %s\n"
+ msgstr "rev? problema ao verificar revogação: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -8867,17 -7129,14 +8952,17 @@@ msgstr "
  msgid "GPG_TTY has not been set - using maybe bogus default\n"
  msgstr ""
  
 +#: sm/qualified.c:105
  #, fuzzy, c-format
  msgid "invalid formatted fingerprint in '%s', line %d\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: sm/qualified.c:123
  #, fuzzy, c-format
  msgid "invalid country code in '%s', line %d\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: sm/qualified.c:206
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
@@@ -8902,22 -7159,18 +8987,22 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
 +#: sm/sign.c:451
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
- msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
+ msgstr "algoritmo de protecção %d%s não é suportado\n"
  
 +#: sm/sign.c:465
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
 +#: sm/sign.c:517
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
- msgstr "verifica��o da assinatura criada falhou: %s\n"
+ msgstr "verificação da assinatura criada falhou: %s\n"
  
 +#: sm/verify.c:450
  #, fuzzy
  msgid "Signature made "
  msgstr "Esta assinatura expirou em %s.\n"
@@@ -8926,12 -7178,10 +9011,12 @@@
  msgid "[date not given]"
  msgstr ""
  
 +#: sm/verify.c:455
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: sm/verify.c:474
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
@@@ -8951,14 -7198,12 +9036,14 @@@ msgstr "                   ou \"
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
- "Isto ser� uma auto-assinatura.\n"
+ "Isto será uma auto-assinatura.\n"
  
 +#: dirmngr/certcache.c:106
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
- msgstr "verifica��o da assinatura criada falhou: %s\n"
+ msgstr "verificação da assinatura criada falhou: %s\n"
  
 +#: dirmngr/certcache.c:117
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
@@@ -8982,29 -7223,24 +9067,29 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
- msgstr "imposs�vel criar `%s': %s\n"
+ msgstr "impossível criar `%s': %s\n"
  
 +#: dirmngr/certcache.c:395
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
- msgstr "prefer�ncia %c%lu duplicada\n"
+ msgstr "preferência %c%lu duplicada\n"
  
 +#: dirmngr/certcache.c:399
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
- msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+ msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
 +#: dirmngr/certcache.c:401
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
- msgstr "prefer�ncia %c%lu duplicada\n"
+ msgstr "preferência %c%lu duplicada\n"
  
 +#: dirmngr/certcache.c:405
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
- msgstr "mostra impress�o digital"
+ msgstr "mostra impressão digital"
  
 +#: dirmngr/certcache.c:408
  msgid "   issuer ="
  msgstr ""
  
@@@ -9012,109 -7247,87 +9097,109 @@@
  msgid "  subject ="
  msgstr ""
  
 +#: dirmngr/certcache.c:413
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/certcache.c:489
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "certificado incorrecto"
  
 +#: dirmngr/certcache.c:491
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
- msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+ msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
 +#: dirmngr/certcache.c:508
  #, fuzzy
  msgid "certificate cached\n"
- msgstr "prefer�ncia %c%lu duplicada\n"
+ msgstr "preferência %c%lu duplicada\n"
  
 +#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/certcache.c:593
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
  #, fuzzy
  msgid "no issuer found in certificate\n"
- msgstr "gerar um certificado de revoga��o"
+ msgstr "gerar um certificado de revogação"
  
 +#: dirmngr/certcache.c:1325
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/crlcache.c:213
  #, fuzzy, c-format
  msgid "creating directory '%s'\n"
- msgstr "%s: imposs�vel criar directoria: %s\n"
+ msgstr "%s: impossível criar directoria: %s\n"
  
 +#: dirmngr/crlcache.c:217
  #, fuzzy, c-format
  msgid "error creating directory '%s': %s\n"
  msgstr "erro ao criar porta-chaves `%s': %s\n"
  
 +#: dirmngr/crlcache.c:245
  #, fuzzy, c-format
  msgid "ignoring database dir '%s'\n"
- msgstr "erro na �ltima linha\n"
+ msgstr "erro na última linha\n"
  
 +#: dirmngr/crlcache.c:254
  #, fuzzy, c-format
  msgid "error reading directory '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
 +#: dirmngr/crlcache.c:275
  #, fuzzy, c-format
  msgid "removing cache file '%s'\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: dirmngr/crlcache.c:284
  #, fuzzy, c-format
  #| msgid "enarmoring failed: %s\n"
  msgid "not removing file '%s'\n"
- msgstr "cria��o de armadura falhou: %s\n"
+ msgstr "criação de armadura falhou: %s\n"
  
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
 +#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
  #, fuzzy, c-format
  msgid "failed to open cache dir file '%s': %s\n"
- msgstr "imposs�vel abrir `%s': %s\n"
+ msgstr "impossível abrir `%s': %s\n"
  
 +#: dirmngr/crlcache.c:421
  #, fuzzy, c-format
  msgid "error creating new cache dir file '%s': %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/crlcache.c:428
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing new cache dir file '%s': %s\n"
@@@ -9129,14 -7340,12 +9214,14 @@@ msgstr "erro na leitura de `%s': %s\n
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new cache dir file '%s' created\n"
- msgstr "criado um novo ficheiro de configura��o `%s'\n"
+ msgstr "criado um novo ficheiro de configuração `%s'\n"
  
 +#: dirmngr/crlcache.c:445
  #, fuzzy, c-format
  msgid "failed to re-open cache dir file '%s': %s\n"
- msgstr "%s: imposs�vel criar directoria: %s\n"
+ msgstr "%s: impossível criar directoria: %s\n"
  
 +#: dirmngr/crlcache.c:473
  #, c-format
  msgid "first record of '%s' is not the version\n"
  msgstr ""
@@@ -9154,44 -7360,36 +9239,44 @@@ msgstr "
  msgid "extra field detected in crl record of '%s' line %u\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:623
  #, fuzzy, c-format
  msgid "invalid line detected in '%s' line %u\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: dirmngr/crlcache.c:632
  #, fuzzy, c-format
  msgid "duplicate entry detected in '%s' line %u\n"
- msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+ msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
 +#: dirmngr/crlcache.c:647
  #, c-format
  msgid "unsupported record type in '%s' line %u skipped\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:673
  #, fuzzy, c-format
  msgid "invalid issuer hash in '%s' line %u\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: dirmngr/crlcache.c:679
  #, fuzzy, c-format
  msgid "no issuer DN in '%s' line %u\n"
  msgstr "armadura: %s\n"
  
 +#: dirmngr/crlcache.c:686
  #, fuzzy, c-format
  msgid "invalid timestamp in '%s' line %u\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: dirmngr/crlcache.c:692
  #, fuzzy, c-format
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid "WARNING: invalid cache file hash in '%s' line %u\n"
  msgstr ""
- "AVISO: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
+ "AVISO: o ficheiro random_seed tem um tamanho inválido - não utilizado\n"
  
 +#: dirmngr/crlcache.c:698
  msgid "detected errors in cache dir file\n"
  msgstr ""
  
@@@ -9199,12 -7396,10 +9284,12 @@@
  msgid "please check the reason and manually delete that file\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
  #, fuzzy, c-format
  msgid "failed to create temporary cache dir file '%s': %s\n"
- msgstr "%s: imposs�vel criar directoria: %s\n"
+ msgstr "%s: impossível criar directoria: %s\n"
  
 +#: dirmngr/crlcache.c:937
  #, fuzzy, c-format
  msgid "error closing '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -9215,12 -7409,10 +9300,12 @@@
  msgid "error renaming '%s' to '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1003
  #, fuzzy, c-format
  msgid "can't hash '%s': %s\n"
- msgstr "imposs�vel fechar `%s': %s\n"
+ msgstr "impossível fechar `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1011
  #, fuzzy, c-format
  msgid "error setting up MD5 hash context: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
@@@ -9230,12 -7421,10 +9315,12 @@@
  msgid "error hashing '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1055
  #, fuzzy, c-format
  msgid "invalid formatted checksum for '%s'\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: dirmngr/crlcache.c:1108
  msgid "too many open cache files; can't open anymore\n"
  msgstr ""
  
@@@ -9262,18 -7446,15 +9347,18 @@@ msgstr "
  msgid "calling unlock_db_file on an unlocked file\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1231
  #, fuzzy, c-format
  msgid "failed to create a new cache object: %s\n"
- msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
+ msgstr "%s: falha ao criar tabela de dispersão: %s\n"
  
 +#: dirmngr/crlcache.c:1286
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "no CRL available for issuer id %s\n"
- msgstr "Nenhuma ajuda dispon�vel para `%s'"
+ msgstr "Nenhuma ajuda disponível para `%s'"
  
 +#: dirmngr/crlcache.c:1293
  #, c-format
  msgid "cached CRL for issuer id %s too old; update required\n"
  msgstr ""
@@@ -9319,18 -7492,15 +9404,18 @@@ msgstr "
  msgid "S/N %s is valid, it is not listed in the CRL\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1379
  #, fuzzy, c-format
  msgid "error getting data from cache file: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
- msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+ msgstr "algoritmo de dispersão inválido `%s'\n"
  
 +#: dirmngr/crlcache.c:1549
  #, c-format
  msgid "gcry_md_open for algorithm %d failed: %s\n"
  msgstr ""
@@@ -9339,27 -7508,22 +9424,27 @@@
  msgid "got an invalid S-expression from libksba\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
- msgstr "imposs�vel abrir %s: %s\n"
+ msgstr "impossível abrir %s: %s\n"
  
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: dirmngr/crlcache.c:1699
  #, fuzzy, c-format
  msgid "ksba_crl_parse failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
 +#: dirmngr/crlcache.c:1714
  #, fuzzy, c-format
  msgid "error getting update times of CRL: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/crlcache.c:1721
  #, c-format
  msgid "update times of this CRL: this=%s next=%s\n"
  msgstr ""
@@@ -9368,22 -7531,18 +9453,22 @@@
  msgid "nextUpdate not given; assuming a validity period of one day\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1745
  #, fuzzy, c-format
  msgid "error getting CRL item: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/crlcache.c:1760
  #, fuzzy, c-format
  msgid "error inserting item into temporary cache file: %s\n"
  msgstr "a escrever para `%s'\n"
  
 +#: dirmngr/crlcache.c:1787
  #, fuzzy, c-format
  msgid "no CRL issuer found in CRL: %s\n"
- msgstr "gerar um certificado de revoga��o"
+ msgstr "gerar um certificado de revogação"
  
 +#: dirmngr/crlcache.c:1802
  msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
  msgstr ""
  
@@@ -9391,55 -7549,45 +9476,55 @@@
  #, fuzzy, c-format
  #| msgid "signature verification suppressed\n"
  msgid "CRL signature verification failed: %s\n"
- msgstr "verifica��o de assinatura suprimida\n"
+ msgstr "verificação de assinatura suprimida\n"
  
 +#: dirmngr/crlcache.c:1858
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
- msgstr "verifica��o da assinatura criada falhou: %s\n"
+ msgstr "verificação da assinatura criada falhou: %s\n"
  
 +#: dirmngr/crlcache.c:2001
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: dirmngr/crlcache.c:2008
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
 +#: dirmngr/crlcache.c:2042
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
- msgstr "%s: imposs�vel criar directoria: %s\n"
+ msgstr "%s: impossível criar directoria: %s\n"
  
 +#: dirmngr/crlcache.c:2046
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
- msgstr "%s: imposs�vel criar directoria: %s\n"
+ msgstr "%s: impossível criar directoria: %s\n"
  
 +#: dirmngr/crlcache.c:2056
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/crlcache.c:2066
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
- msgstr "actualiza��o da chave secreta falhou: %s\n"
+ msgstr "actualização da chave secreta falhou: %s\n"
  
 +#: dirmngr/crlcache.c:2076
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "a escrever para `%s'\n"
  
 +#: dirmngr/crlcache.c:2083
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/crlcache.c:2108
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
@@@ -9459,17 -7604,14 +9544,17 @@@ msgstr "
  msgid "error reading CRL extensions: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
 +#: dirmngr/crlcache.c:2189
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/crlcache.c:2221
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
- msgstr "cria��o de armadura falhou: %s\n"
+ msgstr "criação de armadura falhou: %s\n"
  
 +#: dirmngr/crlcache.c:2235
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9504,19 -7640,16 +9589,19 @@@ msgstr "
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr ""
- "AVISO: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
+ "AVISO: o ficheiro random_seed tem um tamanho inválido - não utilizado\n"
  
 +#: dirmngr/crlcache.c:2333
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
  msgstr "%s: erro ao ler registo livre: %s\n"
  
 +#: dirmngr/crlcache.c:2344
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
- msgstr "rev? problema ao verificar revoga��o: %s\n"
+ msgstr "rev? problema ao verificar revogação: %s\n"
  
 +#: dirmngr/crlcache.c:2375
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -9525,22 -7657,18 +9610,22 @@@
  msgid "End CRL dump\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:2499
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
 +#: dirmngr/crlcache.c:2510
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
- msgstr "verifica��o da assinatura criada falhou: %s\n"
+ msgstr "verificação da assinatura criada falhou: %s\n"
  
 +#: dirmngr/crlcache.c:2570
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: dirmngr/crlfetch.c:74
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
@@@ -9559,19 -7682,16 +9644,19 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
- msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
+ msgstr "%s: erro ao escrever registo de diretório: %s\n"
  
 +#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
  #, fuzzy
  msgid "too many redirections\n"
- msgstr "demasiadas prefer�ncias `%c'\n"
+ msgstr "demasiadas preferências `%c'\n"
  
 +#: dirmngr/crlfetch.c:274
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "erro ao criar `%s': %s\n"
@@@ -9581,18 -7700,14 +9666,18 @@@
  msgid "error retrieving '%s': http status %u\n"
  msgstr "erro na leitura de `%s': %s\n"
  
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
 +#: dirmngr/crlfetch.c:386
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
 +#: dirmngr/dirmngr-client.c:71
  msgid "use OCSP instead of CRLs"
  msgstr ""
  
@@@ -9600,12 -7714,10 +9685,12 @@@
  msgid "check whether a dirmngr is running"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:73
  #, fuzzy
  msgid "add a certificate to the cache"
- msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+ msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
  
 +#: dirmngr/dirmngr-client.c:74
  #, fuzzy
  msgid "validate a certificate"
  msgstr "certificado incorrecto"
@@@ -9647,9 -7751,8 +9732,9 @@@ msgstr "Insira o ID de utilizador do re
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
 +#: dirmngr/dirmngr-client.c:173
  msgid ""
  "Syntax: dirmngr-client [options] [certfile|pattern]\n"
  "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9657,12 -7760,10 +9742,12 @@@
  "not valid and other error codes for general failures\n"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
  #, fuzzy, c-format
  msgid "error reading certificate from stdin: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/dirmngr-client.c:281
  #, fuzzy, c-format
  msgid "error reading certificate from '%s': %s\n"
  msgstr "erro na leitura de `%s': %s\n"
@@@ -9675,50 -7774,41 +9760,50 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to the dirmngr: %s\n"
- msgstr "imposs�vel ligar a `%s': %s\n"
+ msgstr "impossível ligar a `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:332
  #, fuzzy, c-format
  #| msgid "update failed: %s\n"
  msgid "lookup failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
 +#: dirmngr/dirmngr-client.c:347
  #, fuzzy, c-format
  msgid "loading CRL '%s' failed: %s\n"
- msgstr "cria��o de armadura falhou: %s\n"
+ msgstr "criação de armadura falhou: %s\n"
  
 +#: dirmngr/dirmngr-client.c:375
  msgid "a dirmngr daemon is up and running\n"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:397
  #, fuzzy, c-format
  msgid "validation of certificate failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
  #, fuzzy
  msgid "certificate is valid\n"
- msgstr "prefer�ncia %c%lu duplicada\n"
+ msgstr "preferência %c%lu duplicada\n"
  
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
  #, fuzzy
  msgid "certificate has been revoked\n"
  msgstr "NOTA: a chave foi revogada"
  
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
  #, fuzzy, c-format
  msgid "certificate check failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: dirmngr/dirmngr-client.c:428
  #, fuzzy, c-format
  #| msgid "can't stat `%s': %s\n"
  msgid "got status: '%s'\n"
- msgstr "imposs�vel 'stat' a `%s': %s\n"
+ msgstr "impossível 'stat' a `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:443
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing base64 encoding: %s\n"
@@@ -9740,112 -7827,88 +9825,116 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
- msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+ msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  msgid "run without asking a user"
  msgstr "Sair sem gravar? "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
- msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+ msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
- msgstr "n�o consegui processar a URI do servidor de chaves\n"
+ msgstr "não consegui processar a URI do servidor de chaves\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9856,93 -7919,74 +9945,93 @@@ msgid "
  "options)\n"
  msgstr ""
  "@\n"
- "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
+ "(Veja a página man para uma lista completa de comandos e opções)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
- msgstr "uso: gpg [op��es] "
+ msgstr "uso: gpg [opções] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
- msgstr "%s n�o � permitido com %s!\n"
+ msgstr "%s não é permitido com %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
- msgstr "cria��o de armadura falhou: %s\n"
+ msgstr "criação de armadura falhou: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
- msgstr "cria��o de armadura falhou: %s\n"
+ msgstr "criação de armadura falhou: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "frase secreta demasiado longa\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "armadura: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  msgid "shutdown forced\n"
- msgstr "n�o processado"
+ msgstr "não processado"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -9971,9 -8010,8 +10060,9 @@@ msgstr "
  #, fuzzy
  #| msgid "|NAME|use NAME as default recipient"
  msgid "|NAME|use user NAME for authentication"
- msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
+ msgstr "|NOME|usar NOME como destinatário por omissão"
  
 +#: dirmngr/dirmngr_ldap.c:145
  msgid "|PASS|use password PASS for authentication"
  msgstr ""
  
@@@ -9997,9 -8030,8 +10086,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
 +#: dirmngr/dirmngr_ldap.c:212
  msgid ""
  "Syntax: dirmngr_ldap [options] [URL]\n"
  "Internal LDAP helper for Dirmngr\n"
@@@ -10010,9 -8041,8 +10099,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "invalid import options\n"
  msgid "invalid port number %d\n"
- msgstr "op��es de importa��o inv�lidas\n"
+ msgstr "opções de importação inválidas\n"
  
 +#: dirmngr/dirmngr_ldap.c:413
  #, c-format
  msgid "scanning result for attribute '%s'\n"
  msgstr ""
@@@ -10029,12 -8055,10 +10118,12 @@@ msgstr "erro na escrita do porta-chave
  msgid "          available attribute '%s'\n"
  msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:475
  #, fuzzy, c-format
  msgid "attribute '%s' not found\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:482
  #, c-format
  msgid "found attribute '%s'\n"
  msgstr ""
@@@ -10065,9 -8084,8 +10154,9 @@@ msgstr "                   ou \"
  #, fuzzy, c-format
  #| msgid "          not imported: %lu\n"
  msgid "          port %d\n"
- msgstr "        n�o importadas: %lu\n"
+ msgstr "        não importadas: %lu\n"
  
 +#: dirmngr/dirmngr_ldap.c:600
  #, fuzzy, c-format
  msgid "            DN '%s'\n"
  msgstr "                   ou \""
@@@ -10096,41 -8109,29 +10185,35 @@@ msgstr "
  #, fuzzy
  #| msgid "WARNING: using insecure memory!\n"
  msgid "WARNING: using first attribute only\n"
- msgstr "AVISO: a utilizar mem�ria insegura!\n"
+ msgstr "AVISO: a utilizar memória insegura!\n"
  
 +#: dirmngr/dirmngr_ldap.c:636
  #, fuzzy, c-format
  msgid "LDAP init to '%s:%d' failed: %s\n"
- msgstr "cria��o de armadura falhou: %s\n"
+ msgstr "criação de armadura falhou: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:659
  #, fuzzy, c-format
  msgid "binding to '%s:%d' failed: %s\n"
- msgstr "cria��o de armadura falhou: %s\n"
+ msgstr "criação de armadura falhou: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:686
  #, fuzzy, c-format
  #| msgid "dearmoring failed: %s\n"
  msgid "searching '%s' failed: %s\n"
  msgstr "retirada de armadura falhou: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:718
  #, fuzzy, c-format
  msgid "'%s' is not an LDAP URL\n"
- msgstr "%s: n�o � um base de dados de confian�a\n"
+ msgstr "%s: não é um base de dados de confiança\n"
  
 +#: dirmngr/dirmngr_ldap.c:724
  #, c-format
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "erro ao criar porta-chaves `%s': %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
  msgstr "erro na escrita do porta-chaves `%s': %s\n"
@@@ -10140,12 -8140,10 +10223,12 @@@
  msgid "error reading log from ldap wrapper %d: %s\n"
  msgstr "erro na leitura de `%s': %s\n"
  
 +#: dirmngr/ldap-wrapper.c:304
  #, fuzzy, c-format
  msgid "npth_select failed: %s - waiting 1s\n"
- msgstr "actualiza��o da chave secreta falhou: %s\n"
+ msgstr "actualização da chave secreta falhou: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:343
  #, c-format
  msgid "ldap wrapper %d ready"
  msgstr ""
@@@ -10160,12 -8156,10 +10243,12 @@@ msgstr "
  msgid "ldap wrapper %d ready: exitcode=%d\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:364
  #, fuzzy, c-format
  msgid "waiting for ldap wrapper %d failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:376
  #, c-format
  msgid "ldap wrapper %d stalled - killing\n"
  msgstr ""
@@@ -10175,12 -8168,10 +10258,12 @@@
  msgid "error spawning ldap wrapper reaper thread: %s\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
  #, fuzzy, c-format
  msgid "reading from ldap wrapper %d failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: dirmngr/ldap.c:91
  #, c-format
  msgid "invalid char 0x%02x in host name - not added\n"
  msgstr ""
@@@ -10190,12 -8180,10 +10273,12 @@@
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "a procurar por \"%s\" no servidor HKP %s\n"
  
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: dirmngr/ldap.c:627
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
@@@ -10208,20 -8194,17 +10291,20 @@@ msgstr "
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
- msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+ msgstr "%s: versão de ficheiro inválida %d\n"
  
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
- msgstr "imposs�vel abrir %s: %s\n"
+ msgstr "impossível abrir %s: %s\n"
  
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
- msgstr "actualiza��o da chave secreta falhou: %s\n"
+ msgstr "actualização da chave secreta falhou: %s\n"
  
 +#: dirmngr/misc.c:518
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10235,12 -8216,10 +10318,12 @@@ msgstr "erro na leitura de `%s': %s\n
  msgid "response from server too large; limit is %d bytes\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:139
  #, fuzzy
  msgid "OCSP request not possible due to Tor mode\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
 +#: dirmngr/ocsp.c:145
  msgid "OCSP request not possible due to disabled HTTP\n"
  msgstr ""
  
@@@ -10279,12 -8251,10 +10362,12 @@@ msgstr "erro ao enviar para `%s': %s\n
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:293
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
- msgstr "verifica��o da assinatura criada falhou: %s\n"
+ msgstr "verificação da assinatura criada falhou: %s\n"
  
 +#: dirmngr/ocsp.c:328
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
@@@ -10292,46 -8261,37 +10375,46 @@@
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:464
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: dirmngr/ocsp.c:479
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/ocsp.c:514
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
- msgstr "chave `%s' n�o encontrada: %s\n"
+ msgstr "chave `%s' não encontrada: %s\n"
  
 +#: dirmngr/ocsp.c:563
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:570
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
- msgstr "gerar um certificado de revoga��o"
+ msgstr "gerar um certificado de revogação"
  
 +#: dirmngr/ocsp.c:580
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
- msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+ msgstr "falha ao inicializar a base de dados de confiança: %s\n"
  
 +#: dirmngr/ocsp.c:614
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
- msgstr "%s: imposs�vel aceder: %s\n"
+ msgstr "%s: impossível aceder: %s\n"
  
 +#: dirmngr/ocsp.c:621
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
@@@ -10339,9 -8298,8 +10422,9 @@@
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
- msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
+ msgstr "sem porta-chaves público por omissão: %s\n"
  
 +#: dirmngr/ocsp.c:634
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
@@@ -10356,12 -8312,10 +10439,12 @@@ msgstr "assinatura falhou: %s\n
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:676
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: dirmngr/ocsp.c:701
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
@@@ -10387,77 -8336,61 +10470,77 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "assinatura falhou: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "assinatura falhou: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "erro ao enviar para `%s': %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
- msgstr "imposs�vel criar `%s': %s\n"
+ msgstr "impossível criar `%s': %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
+ msgstr "%s: falha ao criar tabela de dispersão: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
- msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
+ msgstr "falha ao inicializar a base de dados de confiança: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10471,41 -8402,33 +10554,41 @@@ msgstr "
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
- msgstr "a verificar a base de dados de confian�a\n"
+ msgstr "a verificar a base de dados de confiança\n"
  
 +#: dirmngr/validate.c:245
  msgid "not checking CRL for"
  msgstr ""
  
 +#: dirmngr/validate.c:250
  #, fuzzy
  msgid "checking CRL for"
- msgstr "verifica��o da assinatura criada falhou: %s\n"
+ msgstr "verificação da assinatura criada falhou: %s\n"
  
 +#: dirmngr/validate.c:528
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
  msgstr "verificar uma assinatura"
  
 +#: dirmngr/validate.c:561
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
- msgstr "verifica��o da assinatura criada falhou: %s\n"
+ msgstr "verificação da assinatura criada falhou: %s\n"
  
 +#: dirmngr/validate.c:738
  #, fuzzy
  msgid "certificate chain is good\n"
- msgstr "prefer�ncia %c%lu duplicada\n"
+ msgstr "preferência %c%lu duplicada\n"
  
 +#: dirmngr/validate.c:968
  msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
+ msgstr "DSA necessita de utilização de uma algoritmo de dispersão de 160 bit\n"
  
 +#: dirmngr/validate.c:1116
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "sair"
@@@ -10538,21 -8454,17 +10621,21 @@@ msgstr "
  msgid "do not use extended connect mode"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:92
  #, fuzzy
  msgid "|FILE|run commands from FILE on startup"
- msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+ msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
  
 +#: tools/gpg-connect-agent.c:93
  msgid "run /subst on startup"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:205
  #, fuzzy
  msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
 +#: tools/gpg-connect-agent.c:208
  msgid ""
  "Syntax: @GPG at -connect-agent [options]\n"
  "Connect to a running agent and send commands\n"
@@@ -10569,12 -8478,10 +10652,12 @@@ msgstr "
  msgid "option \"%s\" ignored due to \"%s\"\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
  #, fuzzy, c-format
  msgid "receiving line failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: tools/gpg-connect-agent.c:1458
  #, fuzzy
  msgid "line too long - skipped\n"
  msgstr "frase secreta demasiado longa\n"
@@@ -10583,12 -8489,10 +10666,12 @@@
  msgid "line shortened due to embedded Nul character\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1837
  #, fuzzy, c-format
  msgid "unknown command '%s'\n"
- msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
+ msgstr "destinatário por omissão desconhecido `%s'\n"
  
 +#: tools/gpg-connect-agent.c:1855
  #, fuzzy, c-format
  msgid "sending line failed: %s\n"
  msgstr "assinatura falhou: %s\n"
@@@ -10654,20 -8541,16 +10737,20 @@@ msgstr "
  msgid "|N|expire the passphrase after N days"
  msgstr "|N|usar mode de frase secreta N"
  
 +#: tools/gpgconf-comp.c:583
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
- msgstr "erro na cria��o da frase secreta: %s\n"
+ msgstr "erro na criação da frase secreta: %s\n"
  
 +#: tools/gpgconf-comp.c:587
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
  msgid "|NAME|use NAME as default secret key"
- msgstr "|NOME|usar NOME como chave secreta por omiss�o"
+ msgstr "|NOME|usar NOME como chave secreta por omissão"
  
 +#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NOME|cifrar para NOME"
@@@ -10676,16 -8558,13 +10759,16 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
- msgstr "n�o consegui processar a URI do servidor de chaves\n"
+ msgstr "não consegui processar a URI do servidor de chaves\n"
  
 +#: tools/gpgconf-comp.c:735
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
@@@ -10716,148 -8589,121 +10799,156 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "erro na rede"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "frase secreta incorrecta"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
- msgstr "chave p�blica n�o encontrada"
+ msgstr "chave pública não encontrada"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
- msgstr "criado um novo ficheiro de configura��o `%s'\n"
+ msgstr "criado um novo ficheiro de configuração `%s'\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
- msgstr "criado um novo ficheiro de configura��o `%s'\n"
+ msgstr "criado um novo ficheiro de configuração `%s'\n"
+ 
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "actualizar a base de dados de confiança"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
- msgstr "usar como ficheiro de sa�da"
+ msgstr "usar como ficheiro de saída"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
- msgstr "chave p�blica n�o encontrada"
+ msgstr "chave pública não encontrada"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  #, fuzzy
  msgid "No argument allowed"
  msgstr "a escrever chave privada para `%s'\n"
@@@ -10899,39 -8738,32 +10990,39 @@@ msgstr "
  msgid "input file name (default stdin)"
  msgstr ""
  
 +#: tools/symcryptrun.c:209
  #, fuzzy
  msgid "Usage: symcryptrun [options] (-h for help)"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
 +#: tools/symcryptrun.c:212
  msgid ""
  "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
  "[options...] COMMAND [inputfile]\n"
  "Call a simple symmetric encryption tool\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:278
  #, fuzzy, c-format
  msgid "%s on %s aborted with status %i\n"
- msgstr "%s n�o � permitido com %s!\n"
+ msgstr "%s não é permitido com %s!\n"
  
 +#: tools/symcryptrun.c:285
  #, fuzzy, c-format
  msgid "%s on %s failed with status %i\n"
- msgstr "imposs�vel abrir %s: %s\n"
+ msgstr "impossível abrir %s: %s\n"
  
 +#: tools/symcryptrun.c:317
  #, fuzzy, c-format
  msgid "can't create temporary directory '%s': %s\n"
- msgstr "%s: imposs�vel criar directoria: %s\n"
+ msgstr "%s: impossível criar directoria: %s\n"
  
 +#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
  #, fuzzy, c-format
  msgid "could not open %s for writing: %s\n"
- msgstr "imposs�vel abrir %s: %s\n"
+ msgstr "impossível abrir %s: %s\n"
  
 +#: tools/symcryptrun.c:385
  #, fuzzy, c-format
  msgid "error writing to %s: %s\n"
  msgstr "erro na escrita do porta-chaves `%s': %s\n"
@@@ -10962,62 -8788,50 +11053,62 @@@ msgstr "
  msgid "cannot allocate args vector\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:531
  #, fuzzy, c-format
  msgid "could not create pipe: %s\n"
- msgstr "imposs�vel criar %s: %s\n"
+ msgstr "impossível criar %s: %s\n"
  
 +#: tools/symcryptrun.c:538
  #, fuzzy, c-format
  msgid "could not create pty: %s\n"
- msgstr "imposs�vel criar %s: %s\n"
+ msgstr "impossível criar %s: %s\n"
  
 +#: tools/symcryptrun.c:554
  #, c-format
  msgid "could not fork: %s\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:582
  #, fuzzy, c-format
  msgid "execv failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
 +#: tools/symcryptrun.c:611
  #, fuzzy, c-format
  msgid "select failed: %s\n"
- msgstr "remo��o do bloco de chave falhou: %s\n"
+ msgstr "remoção do bloco de chave falhou: %s\n"
  
 +#: tools/symcryptrun.c:628
  #, fuzzy, c-format
  msgid "read failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
 +#: tools/symcryptrun.c:680
  #, fuzzy, c-format
  msgid "pty read failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
 +#: tools/symcryptrun.c:732
  #, fuzzy, c-format
  msgid "waitpid failed: %s\n"
- msgstr "actualiza��o falhou: %s\n"
+ msgstr "actualização falhou: %s\n"
  
 +#: tools/symcryptrun.c:746
  #, c-format
  msgid "child aborted with status %i\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:801
  #, fuzzy, c-format
  msgid "cannot allocate infile string: %s\n"
- msgstr "imposs�vel criar `%s': %s\n"
+ msgstr "impossível criar `%s': %s\n"
  
 +#: tools/symcryptrun.c:814
  #, fuzzy, c-format
  msgid "cannot allocate outfile string: %s\n"
- msgstr "imposs�vel criar `%s': %s\n"
+ msgstr "impossível criar `%s': %s\n"
  
 +#: tools/symcryptrun.c:987
  #, c-format
  msgid "either %s or %s must be given\n"
  msgstr ""
@@@ -11026,17 -8839,14 +11117,17 @@@
  msgid "no class provided\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:1018
  #, fuzzy, c-format
  msgid "class %s is not supported\n"
- msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
+ msgstr "algoritmo de protecção %d%s não é suportado\n"
  
 +#: tools/gpg-check-pattern.c:144
  #, fuzzy
  msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
- msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
  
 +#: tools/gpg-check-pattern.c:147
  msgid ""
  "Syntax: gpg-check-pattern [options] patternfile\n"
  "Check a passphrase given on stdin against the patternfile\n"
diff --cc po/ro.po
index 2e3238e,ea68dc3..74f0da9
--- a/po/ro.po
+++ b/po/ro.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.4.2rc1\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2005-05-31 22:00-0500\n"
  "Last-Translator: Laurentiu Buzdugan <lbuz at rolix.org>\n"
  "Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
@@@ -19,10 -18,9 +19,10 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
- msgstr "am e�uat s� stochez amprenta: %s\n"
+ msgstr "am eşuat să stochez amprenta: %s\n"
  
  #. TRANSLATORS: These are labels for buttons etc used in
  #. Pinentries.  An underscore indicates that the next letter
@@@ -30,41 -28,32 +30,41 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to make your passphrase visible on the screen?"
- msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
+ msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -72,7 -61,6 +72,7 @@@ msgstr "frază-parolă invalidă
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  #, fuzzy
  msgid "Quality:"
  msgstr "validitate: %s"
@@@ -83,193 -71,138 +83,183 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr ""
- "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+ "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
- msgstr "fraz�-parol� incorect�"
+ msgstr "frază-parolă incorectă"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
- msgstr "linie prea lung�"
+ msgstr "linie prea lungă"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
- msgstr "fraz�-parol� prea lung�\n"
+ msgstr "frază-parolă prea lungă\n"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
- msgstr "Caracter invalid �n nume\n"
+ msgstr "Caracter invalid în nume\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
  msgstr "MPI incorect"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
- msgstr "fraz�-parol� incorect�"
+ msgstr "frază-parolă incorectă"
  
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
  #, fuzzy, c-format
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "algoritm rezumat %d nu este suportat\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "nu pot crea `%s': %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
  msgstr "nu pot deschide `%s': %s\n"
  
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
 +#: agent/command-ssh.c:2419
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
 +#: agent/command-ssh.c:2424
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
- msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
+ msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
  
 +#: agent/command-ssh.c:2444
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
- msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
+ msgstr "nu am găsit nici un inel de chei secret de scris: %s\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "citirea cheii publice a e�uat: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "eroare la scrierea inelului de chei `%s': %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr ""
- "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+ "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
- msgstr "schimb� fraza-parol�"
+ msgstr "schimbă fraza-parolă"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr ""
- "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+ "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
- msgstr "%s: am e�uat s� creez hashtable: %s\n"
+ msgstr "%s: am eşuat să creez hashtable: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  #, fuzzy
  msgid "Please insert the card with serial number"
  msgstr ""
- "V� rug�m scoate�i cardul curent �i introduca�i unul cu num�r de serie:\n"
+ "Vă rugăm scoateţi cardul curent şi introducaţi unul cu număr de serie:\n"
  "   %.*s\n"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  #, fuzzy
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
- "V� rug�m scoate�i cardul curent �i introduca�i unul cu num�r de serie:\n"
+ "Vă rugăm scoateţi cardul curent şi introducaţi unul cu număr de serie:\n"
  "   %.*s\n"
  
 +#: agent/divert-scd.c:204
  #, fuzzy
  msgid "Admin PIN"
  msgstr "|A|PIN Admin"
@@@ -289,61 -219,49 +279,61 @@@ msgstr "
  msgid "%s%%0A%%0AUse the reader's pinpad for input."
  msgstr ""
  
 +#: agent/divert-scd.c:291
  #, fuzzy
  msgid "Repeat this Reset Code"
- msgstr "Repeta�i acest PIN: "
+ msgstr "Repetaţi acest PIN: "
  
 +#: agent/divert-scd.c:293
  #, fuzzy
  msgid "Repeat this PUK"
- msgstr "Repeta�i acest PIN: "
+ msgstr "Repetaţi acest PIN: "
  
 +#: agent/divert-scd.c:294
  #, fuzzy
  msgid "Repeat this PIN"
- msgstr "Repeta�i acest PIN: "
+ msgstr "Repetaţi acest PIN: "
  
 +#: agent/divert-scd.c:299
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
- msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
+ msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
  
 +#: agent/divert-scd.c:301
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
- msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
+ msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
  
 +#: agent/divert-scd.c:302
  msgid "PIN not correctly repeated; try again"
- msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
+ msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
  
 +#: agent/divert-scd.c:314
  #, fuzzy, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
 +#: agent/genkey.c:110 sm/certreqgen-ui.c:394
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
 +#: agent/genkey.c:117
  #, fuzzy, c-format
  msgid "error writing to temporary file: %s\n"
- msgstr "%s: eroare scriere �nregistrare dir: %s\n"
+ msgstr "%s: eroare scriere înregistrare dir: %s\n"
  
 +#: agent/genkey.c:158 agent/genkey.c:164
  #, fuzzy
  msgid "Enter new passphrase"
- msgstr "Introduce�i fraza-parol�\n"
+ msgstr "Introduceţi fraza-parolă\n"
  
 +#: agent/genkey.c:172
  #, fuzzy
  msgid "Take this one anyway"
- msgstr "Folosi�i oricum aceast� cheie? (d/N) "
+ msgstr "Folosiţi oricum această cheie? (d/N) "
  
 +#: agent/genkey.c:202
  #, c-format
  msgid ""
  "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@@ -365,10 -280,9 +355,10 @@@ msgstr "
  #| msgid "Name must be at least 5 characters long\n"
  msgid "A passphrase should be at least %u character long."
  msgid_plural "A passphrase should be at least %u characters long."
- msgstr[0] "Numele trebuie s� fie de cel pu�in 5 caractere\n"
- msgstr[1] "Numele trebuie s� fie de cel pu�in 5 caractere\n"
+ msgstr[0] "Numele trebuie să fie de cel puţin 5 caractere\n"
+ msgstr[1] "Numele trebuie să fie de cel puţin 5 caractere\n"
  
 +#: agent/genkey.c:252
  #, c-format
  msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
  msgid_plural ""
@@@ -389,137 -300,108 +379,143 @@@ msgstr "
  #, fuzzy, c-format
  msgid "Please enter the passphrase to%0Aprotect your new key"
  msgstr ""
- "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
+ "Aveţi nevoie de o frază-parolă pentru a vă proteja cheia secretă.\n"
  "\n"
  
 +#: agent/genkey.c:606
  #, fuzzy
  msgid "Please enter the new passphrase"
- msgstr "schimb� fraza-parol�"
+ msgstr "schimbă fraza-parolă"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
  " "
  msgstr ""
  "@\n"
- "Op�iuni:\n"
+ "Opţiuni:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "Cheia este înlocuită"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "locvace"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
- msgstr "fii oarecum mai t�cut"
+ msgstr "fii oarecum mai tăcut"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
- msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+ msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
- msgstr "caut� pentru chei pe un server de chei"
+ msgstr "caută pentru chei pe un server de chei"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
- msgstr "actualizeaz� baza de date de �ncredere"
+ msgstr "actualizează baza de date de încredere"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|accept some commands via NAME"
- msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
+ msgstr "|NUME|setează charset-ul pentru terminal ca NUME"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
- msgstr "nu este suportat(�)"
+ msgstr "nu este suportat(ă)"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -528,180 -410,134 +524,180 @@@ msgstr "nu este suportat(ă)
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
- msgstr "Raporta�i bug-uri la <gnupg-bugs at gnu.org>.\n"
+ msgstr "Raportaţi bug-uri la <gnupg-bugs at gnu.org>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
- msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
+ msgstr "NOTĂ: nici un fişier opţiuni implicit `%s'\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
- msgstr "fi�ier op�iuni `%s': %s\n"
+ msgstr "fişier opţiuni `%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
- msgstr "citesc op�iuni din `%s'\n"
+ msgstr "citesc opţiuni din `%s'\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
- msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+ msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "nu pot crea `%s': %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, fuzzy
  msgid "a gpg-agent is already running - not starting a new one\n"
- msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
+ msgstr "gpg-agent nu este disponibil în această sesiune\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
- msgstr "eroare la ob�inere noului PIN: %s\n"
+ msgstr "eroare la obţinere noului PIN: %s\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
- msgstr "actualizarea a e�uat: %s\n"
+ msgstr "actualizarea a eşuat: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
- msgstr "scriu cheia secret� �n `%s'\n"
+ msgstr "scriu cheia secretă în `%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "nu pot crea directorul `%s': %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "director `%s' creat\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
- msgstr "fstat(%d) a e�uat �n %s: %s\n"
+ msgstr "fstat(%d) a eşuat în %s: %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "%s: nu pot crea director: %s\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
- msgstr "actualizarea secretului a e�uat: %s\n"
+ msgstr "actualizarea secretului a eşuat: %s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
- msgstr "%s: s�rit�: %s\n"
+ msgstr "%s: sărită: %s\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
- msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
+ msgstr "gpg-agent nu este disponibil în această sesiune\n"
  
 +#: agent/preset-passphrase.c:99
  #, fuzzy
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
 +#: agent/preset-passphrase.c:102
  msgid ""
  "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -709,24 -545,19 +705,24 @@@ msgstr "
  "@Comenzi:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
  " "
  msgstr ""
  "@\n"
- "Op�iuni:\n"
+ "Opţiuni:\n"
  " "
  
 +#: agent/protect-tool.c:154
  #, fuzzy
  msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
 +#: agent/protect-tool.c:156
  msgid ""
  "Syntax: gpg-protect-tool [options] [args]\n"
  "Secret key maintenance tool\n"
@@@ -736,15 -566,13 +732,15 @@@ msgstr "
  #, fuzzy
  msgid "Please enter the passphrase to unprotect the PKCS#12 object."
  msgstr ""
- "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+ "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
 +#: agent/protect-tool.c:698
  #, fuzzy
  msgid "Please enter the passphrase to protect the new PKCS#12 object."
  msgstr ""
- "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+ "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
 +#: agent/protect-tool.c:704
  msgid ""
  "Please enter the passphrase to protect the imported object within the GnuPG "
  "system."
@@@ -756,49 -583,40 +752,50 @@@ msgid "
  "Please enter the passphrase or the PIN\n"
  "needed to complete this operation."
  msgstr ""
- "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+ "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
  #, fuzzy
  msgid "cancelled\n"
- msgstr "anulat�"
+ msgstr "anulată"
  
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
  #, fuzzy, c-format
  msgid "error while asking for the passphrase: %s\n"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
- msgstr "eroare �n `%s': %s\n"
+ msgstr "eroare în `%s': %s\n"
  
 +#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
  #, fuzzy, c-format
  msgid "file '%s', line %d: %s\n"
- msgstr "fi�ier op�iuni `%s': %s\n"
+ msgstr "fişier opţiuni `%s': %s\n"
  
 +#: agent/trustlist.c:192 agent/trustlist.c:200
  #, fuzzy, c-format
  msgid "statement \"%s\" ignored in '%s', line %d\n"
- msgstr "eroare citire �n `%s': %s\n"
+ msgstr "eroare citire în `%s': %s\n"
  
 +#: agent/trustlist.c:206
  #, fuzzy, c-format
  msgid "system trustlist '%s' not available\n"
- msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
+ msgstr "părţi ale cheii secrete nu sunt disponibile\n"
  
 +#: agent/trustlist.c:250
  #, fuzzy, c-format
  msgid "bad fingerprint in '%s', line %d\n"
- msgstr "eroare citire �n `%s': %s\n"
+ msgstr "eroare citire în `%s': %s\n"
  
 +#: agent/trustlist.c:275 agent/trustlist.c:282
  #, fuzzy, c-format
  msgid "invalid keyflag in '%s', line %d\n"
- msgstr "Eroare: amprent� formatat� invalid.\n"
+ msgstr "Eroare: amprentă formatată invalid.\n"
  
 +#: agent/trustlist.c:316 common/helpfile.c:136
  #, fuzzy, c-format
  msgid "error reading '%s', line %d: %s\n"
  msgstr "eroare la citire `%s': %s\n"
@@@ -827,8 -642,6 +824,8 @@@ msgstr "
  msgid "Yes"
  msgstr "da"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -858,42 -668,35 +855,42 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
- msgstr "schimb� fraza-parol�"
+ msgstr "schimbă fraza-parolă"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
- msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
+ msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
- msgstr "activeaz� cheia"
+ msgstr "activează cheia"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -908,116 -709,99 +905,128 @@@ msgstr "
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
- msgstr "verificarea semn�turii create a e�uat: %s\n"
+ msgstr "verificarea semnăturii create a eşuat: %s\n"
  
 +#: agent/cvt-openpgp.c:338
  msgid "secret key parts are not available\n"
- msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
+ msgstr "părţi ale cheii secrete nu sunt disponibile\n"
  
 +#: agent/cvt-openpgp.c:344
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "public key algorithm %d (%s) is not supported\n"
- msgstr "algoritm de protec�ie %d%s nu este suportat\n"
+ msgstr "algoritm de protecţie %d%s nu este suportat\n"
  
 +#: agent/cvt-openpgp.c:448
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection algorithm %d (%s) is not supported\n"
- msgstr "algoritm de protec�ie %d%s nu este suportat\n"
+ msgstr "algoritm de protecţie %d%s nu este suportat\n"
  
 +#: agent/cvt-openpgp.c:455
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection hash algorithm %d (%s) is not supported\n"
- msgstr "algoritm de protec�ie %d%s nu este suportat\n"
+ msgstr "algoritm de protecţie %d%s nu este suportat\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "actualizarea a e�uat: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
  #, fuzzy, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "actualizarea a eşuat: %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
+ #, fuzzy, c-format
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
- msgstr "nu m� pot conecta la `%s': %s\n"
+ msgstr "nu mă pot conecta la `%s': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  #, fuzzy
  msgid "problem setting the gpg-agent options\n"
- msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
+ msgstr "problemă cu agentul: agentul returnează 0x%lx\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
- msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
+ msgstr "nu pot deactiva generarea fişierelor core: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
- msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
+ msgstr "AVERTISMENT: proprietate nesigură (unsafe) pentru extensia `%s'\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "actualizarea a eşuat: %s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ #| msgid "renaming `%s' to `%s' failed: %s\n"
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "da"
  
@@@ -1035,11 -816,9 +1044,11 @@@ msgid "nN
  msgstr "nN"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:86
  msgid "quit"
- msgstr "termin�"
+ msgstr "termină"
  
 +#: common/yesno.c:89
  msgid "qQ"
  msgstr "tT"
  
@@@ -1049,11 -827,9 +1058,11 @@@ msgid "okay|okay
  msgstr "OK|OK"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:125
  msgid "cancel|cancel"
- msgstr "renun��|renun��"
+ msgstr "renunţă|renunţă"
  
 +#: common/yesno.c:126
  msgid "oO"
  msgstr "oO"
  
@@@ -1071,7 -844,6 +1080,7 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "eroare la crearea inelului de chei `%s': %s\n"
@@@ -1081,47 -852,38 +1090,47 @@@
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
  msgstr ""
  
 +#: common/miscellaneous.c:146
  #, fuzzy, c-format
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
- msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+ msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
  
 +#: common/miscellaneous.c:554
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  #| msgid "can't do this in batch mode\n"
  msgid "connection to agent is in restricted mode\n"
- msgstr "nu pot face acest lucru �n modul batch\n"
+ msgstr "nu pot face acest lucru în modul batch\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1187,12 -936,10 +1196,12 @@@ msgstr "certificat incorect
  msgid "Data encryption succeeded"
  msgstr ""
  
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
  #, fuzzy
  msgid "Data available"
- msgstr "afi�eaz� toate datele disponibile"
+ msgstr "afişează toate datele disponibile"
  
 +#: common/audit.c:767
  #, fuzzy
  msgid "Session key created"
  msgstr "%s: inelul de chei creat\n"
@@@ -1202,8 -948,6 +1211,8 @@@
  msgid "algorithm: %s"
  msgstr "validitate: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1215,12 -958,10 +1224,12 @@@
  msgid "seems to be not encrypted"
  msgstr "necifrat"
  
 +#: common/audit.c:784 common/audit.c:933
  #, fuzzy
  msgid "Number of recipients"
- msgstr "Destinatari curen�i:\n"
+ msgstr "Destinatari curenţi:\n"
  
 +#: common/audit.c:792 common/audit.c:956
  #, c-format
  msgid "Recipient %d"
  msgstr ""
@@@ -1234,12 -973,10 +1243,12 @@@ msgstr "
  msgid "data hash algorithm: %s"
  msgstr "algoritm hash invalid `%s'\n"
  
 +#: common/audit.c:862
  #, fuzzy, c-format
  msgid "Signer %d"
- msgstr "Semn�tur� f�cut� %s\n"
+ msgstr "Semnătură făcută %s\n"
  
 +#: common/audit.c:866 common/audit.c:1065
  #, fuzzy, c-format
  msgid "attr hash algorithm: %s"
  msgstr "algoritm hash invalid `%s'\n"
@@@ -1248,57 -984,46 +1257,57 @@@
  msgid "Data decryption succeeded"
  msgstr ""
  
 +#: common/audit.c:910
  #, fuzzy
  msgid "Encryption algorithm supported"
- msgstr "algoritm de protec�ie %d%s nu este suportat\n"
+ msgstr "algoritm de protecţie %d%s nu este suportat\n"
  
 +#: common/audit.c:993
  #, fuzzy
  msgid "Data verification succeeded"
- msgstr "verificare semn�tur� eliminat�\n"
+ msgstr "verificare semnătură eliminată\n"
  
 +#: common/audit.c:1002
  #, fuzzy
  msgid "Signature available"
- msgstr "Semn�tur� f�cut� %s\n"
+ msgstr "Semnătură făcută %s\n"
  
 +#: common/audit.c:1024
  #, fuzzy
  msgid "Parsing data succeeded"
- msgstr "Semn�tur� bun� din \"%s\""
+ msgstr "Semnătură bună din \"%s\""
  
 +#: common/audit.c:1036
  #, fuzzy, c-format
  msgid "bad data hash algorithm: %s"
  msgstr "algoritm hash invalid `%s'\n"
  
 +#: common/audit.c:1051
  #, fuzzy, c-format
  msgid "Signature %d"
- msgstr "Semn�tur� f�cut� %s\n"
+ msgstr "Semnătură făcută %s\n"
  
 +#: common/audit.c:1079
  #, fuzzy
  msgid "Certificate chain valid"
- msgstr "Aceast� cheie a expirat!"
+ msgstr "Această cheie a expirat!"
  
 +#: common/audit.c:1090
  #, fuzzy
  msgid "Root certificate trustworthy"
  msgstr "certificat incorect"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
  msgstr "certificat incorect"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
- msgstr "Cheie disponibil� la: "
+ msgstr "Cheie disponibilă la: "
  
 +#: common/audit.c:1119
  #, fuzzy
  msgid "CRL/OCSP check of certificates"
  msgstr "certificat incorect"
@@@ -1312,12 -1035,10 +1321,12 @@@ msgstr "certificat incorect
  msgid "No audit log entries."
  msgstr ""
  
 +#: common/audit.c:1243
  #, fuzzy
  msgid "Unknown operation"
- msgstr "versiune necunoscut�"
+ msgstr "versiune necunoscută"
  
 +#: common/audit.c:1261
  msgid "Gpg-Agent usable"
  msgstr ""
  
@@@ -1335,27 -1053,22 +1344,27 @@@ msgstr "Nici un disponibil disponibil p
  msgid "ignoring garbage line"
  msgstr "eroare linia de trailer\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
- msgstr "[nesetat(�)]"
+ msgstr "[nesetat(ă)]"
  
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
  msgstr "Nu sunt permise comenzi administrare\n"
  
 +#: common/argparse.c:367
  #, fuzzy
  msgid "read error"
- msgstr "eroare citire fi�ier"
+ msgstr "eroare citire fişier"
  
 +#: common/argparse.c:369
  #, fuzzy
  msgid "keyword too long"
- msgstr "linie prea lung�"
+ msgstr "linie prea lungă"
  
 +#: common/argparse.c:371
  #, fuzzy
  msgid "missing argument"
  msgstr "argument invalid"
@@@ -1364,49 -1076,40 +1373,49 @@@
  #, fuzzy
  #| msgid "invalid armor"
  msgid "invalid argument"
- msgstr "armur� invalid�"
+ msgstr "armură invalidă"
  
 +#: common/argparse.c:375
  #, fuzzy
  msgid "invalid command"
- msgstr "Comand� numai-administrare\n"
+ msgstr "Comandă numai-administrare\n"
  
 +#: common/argparse.c:377
  #, fuzzy
  msgid "invalid alias definition"
- msgstr "op�iuni enumerare invalide\n"
+ msgstr "opţiuni enumerare invalide\n"
  
 +#: common/argparse.c:379
  #, fuzzy
  msgid "out of core"
- msgstr "nefor�at(�)"
+ msgstr "neforţat(ă)"
  
 +#: common/argparse.c:381
  #, fuzzy
  msgid "invalid option"
- msgstr "op�iuni enumerare invalide\n"
+ msgstr "opţiuni enumerare invalide\n"
  
 +#: common/argparse.c:389
  #, c-format
  msgid "missing argument for option \"%.50s\"\n"
  msgstr ""
  
 +#: common/argparse.c:391
  #, fuzzy, c-format
  msgid "invalid argument for option \"%.50s\"\n"
- msgstr "op�iuni enumerare invalide\n"
+ msgstr "opţiuni enumerare invalide\n"
  
 +#: common/argparse.c:393
  #, c-format
  msgid "option \"%.50s\" does not expect an argument\n"
  msgstr ""
  
 +#: common/argparse.c:395
  #, fuzzy, c-format
  msgid "invalid command \"%.50s\"\n"
- msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
+ msgstr "Comandă invalidă  (încercaţi \"ajutor\")\n"
  
 +#: common/argparse.c:397
  #, c-format
  msgid "option \"%.50s\" is ambiguous\n"
  msgstr ""
@@@ -1416,32 -1118,26 +1425,32 @@@
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
- msgstr "nefor�at(�)"
+ msgstr "neforţat(ă)"
  
 +#: common/argparse.c:403
  #, fuzzy, c-format
  msgid "invalid option \"%.50s\"\n"
- msgstr "op�iuni enumerare invalide\n"
+ msgstr "opţiuni enumerare invalide\n"
  
 +#: common/utf8conv.c:123
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' not available\n"
- msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
+ msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
  
 +#: common/utf8conv.c:131
  #, fuzzy, c-format
  msgid "iconv_open failed: %s\n"
- msgstr "nu pot deschide fi�ierul: %s\n"
+ msgstr "nu pot deschide fişierul: %s\n"
  
 +#: common/utf8conv.c:385 common/utf8conv.c:651
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' failed: %s\n"
- msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
+ msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
  
 +#: common/dotlock.c:707
  #, fuzzy, c-format
  msgid "failed to create temporary file '%s': %s\n"
  msgstr "nu pot crea directorul `%s': %s\n"
@@@ -1456,79 -1150,61 +1465,79 @@@ msgstr "eroare la scrierea inelului de 
  msgid "removing stale lockfile (created by %d)\n"
  msgstr ""
  
 +#: common/dotlock.c:1152
  #, fuzzy, c-format
  msgid "waiting for lock (held by %d%s) %s...\n"
- msgstr "scriu cheia secret� �n `%s'\n"
+ msgstr "scriu cheia secretă în `%s'\n"
  
 +#: common/dotlock.c:1153
  msgid "(deadlock?) "
  msgstr ""
  
 +#: common/dotlock.c:1192
  #, fuzzy, c-format
  msgid "lock '%s' not made: %s\n"
- msgstr "cheia public� %s nu a fost g�sit�: %s\n"
+ msgstr "cheia publică %s nu a fost găsită: %s\n"
  
 +#: common/dotlock.c:1219
  #, fuzzy, c-format
  msgid "waiting for lock %s...\n"
- msgstr "scriu cheia secret� �n `%s'\n"
+ msgstr "scriu cheia secretă în `%s'\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
  
 +#: g10/armor.c:424
  #, c-format
  msgid "armor: %s\n"
- msgstr "armur�: %s\n"
+ msgstr "armură: %s\n"
  
 +#: g10/armor.c:463
  msgid "invalid armor header: "
- msgstr "header armur� invalid: "
+ msgstr "header armură invalid: "
  
 +#: g10/armor.c:474
  msgid "armor header: "
- msgstr "header armur�: "
+ msgstr "header armură: "
  
 +#: g10/armor.c:487
  msgid "invalid clearsig header\n"
  msgstr "header clearsig invalid\n"
  
 +#: g10/armor.c:500
  #, fuzzy
  msgid "unknown armor header: "
- msgstr "header armur�: "
+ msgstr "header armură: "
  
 +#: g10/armor.c:553
  msgid "nested clear text signatures\n"
- msgstr "semn�turi text �n clar �ncuib�rite\n"
+ msgstr "semnături text în clar încuibărite\n"
  
 +#: g10/armor.c:688
  msgid "unexpected armor: "
- msgstr "armur� nea�teptat�: "
+ msgstr "armură neaşteptată: "
  
 +#: g10/armor.c:701
  msgid "invalid dash escaped line: "
- msgstr "linie cu liniu�� escape invalid�: "
+ msgstr "linie cu liniuţă escape invalidă: "
  
 +#: g10/armor.c:873 g10/armor.c:1490
  #, c-format
  msgid "invalid radix64 character %02X skipped\n"
- msgstr "caracter radix64 invalid %02X s�rit\n"
+ msgstr "caracter radix64 invalid %02X sărit\n"
  
 +#: g10/armor.c:916
  msgid "premature eof (no CRC)\n"
  msgstr "eof prematur (nici un CRC)\n"
  
 +#: g10/armor.c:950
  msgid "premature eof (in CRC)\n"
- msgstr "eof prematur (�n CRC)\n"
+ msgstr "eof prematur (în CRC)\n"
  
 +#: g10/armor.c:958
  msgid "malformed CRC\n"
  msgstr "CRC anormal\n"
  
@@@ -1537,141 -1212,110 +1546,140 @@@
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "eroare CRC; %06lX - %06lX\n"
  
 +#: g10/armor.c:982
  msgid "premature eof (in trailer)\n"
- msgstr "eof prematur (�n trailer)\n"
+ msgstr "eof prematur (în trailer)\n"
  
 +#: g10/armor.c:986
  msgid "error in trailer line\n"
  msgstr "eroare linia de trailer\n"
  
 +#: g10/armor.c:1303
  msgid "no valid OpenPGP data found.\n"
- msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
+ msgstr "nici o dată OpenPGP validă găsită.\n"
  
 +#: g10/armor.c:1308
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
- msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
+ msgstr "armură invalidă: linie mai lungă de %d caractere\n"
  
 +#: g10/armor.c:1312
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
- "caracter printabil �n ghilimele �n armur� - probabil a fost folosit un MTA "
+ "caracter printabil în ghilimele în armură - probabil a fost folosit un MTA "
  "cu bug-uri\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "ilizibil"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr ""
- "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
- "�i s� se termine cu un '='\n"
+ "un nume de notaţie trebuie să conţină numai caractere imprimabile sau spaţii "
+ "şi să se termine cu un '='\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
- msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
+ msgstr "un nume de notaţie utilizator trebuie să conţină caracterul '@'\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
- msgstr "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
+ msgstr "un nume de notaţie trebuie să nu conţină mai mult de un caracter '@'\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr ""
- "o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
+ "o valoare de notaţie trebuie să nu folosească nici un caracter de control\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  #| msgid "a notation name must not contain more than one '@' character\n"
  msgid "a notation name may not contain an '=' character\n"
- msgstr "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
+ msgstr "un nume de notaţie trebuie să nu conţină mai mult de un caracter '@'\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
  #| "with an '='\n"
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr ""
- "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
- "�i s� se termine cu un '='\n"
+ "un nume de notaţie trebuie să conţină numai caractere imprimabile sau spaţii "
+ "şi să se termine cu un '='\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
- msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
+ msgstr "AVERTISMENT: am găsit date de notare invalide\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr ""
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
- msgstr "Introduce�i fraza-parol�: "
+ msgstr "Introduceţi fraza-parolă: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "eroare la crearea inelului de chei `%s': %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: "
  msgid "WARNING: %s\n"
  msgstr "AVERTISMENT: "
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "cardul OpenPGP nu e disponibil: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "cardul OpenPGP nr. %s detectat\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
- msgstr "nu pot face acest lucru �n modul batch\n"
+ msgstr "nu pot face acest lucru în modul batch\n"
  
 +#: g10/card-util.c:107
  #, fuzzy
  msgid "This command is only available for version 2 cards\n"
- msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
+ msgstr "Această comandă nu este permisă în modul %s.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
- msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
+ msgstr "părţi ale cheii secrete nu sunt disponibile\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
- msgstr "Selec�ia d-voastr�? "
+ msgstr "Selecţia d-voastră? "
  
 +#: g10/card-util.c:279 g10/card-util.c:330
  msgid "[not set]"
- msgstr "[nesetat(�)]"
+ msgstr "[nesetat(ă)]"
  
 +#: g10/card-util.c:533
  msgid "male"
  msgstr "masculin"
  
@@@ -1679,188 -1322,143 +1687,188 @@@
  msgid "female"
  msgstr "feminin"
  
 +#: g10/card-util.c:534
  msgid "unspecified"
- msgstr "nespecificat(�)"
+ msgstr "nespecificat(ă)"
  
 +#: g10/card-util.c:561
  msgid "not forced"
- msgstr "nefor�at(�)"
+ msgstr "neforţat(ă)"
  
 +#: g10/card-util.c:561
  msgid "forced"
- msgstr "for�at(�)"
+ msgstr "forţat(ă)"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
- msgstr "Eroare: Deocamdat� sunt permise numai caractere ASCII.\n"
+ msgstr "Eroare: Deocamdată sunt permise numai caractere ASCII.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
- msgstr "Eroare: Spa�iile duble nu sunt permise.\n"
+ msgstr "Eroare: Spaţiile duble nu sunt permise.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "Numele de familie al proprietarului cardului: "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "Prenumele proprietarului cardului: "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
- msgstr "URL pentru a aduce cheia public�: "
+ msgstr "URL pentru a aduce cheia publică: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "eroare la scrierea inelului de chei `%s': %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "Date login (nume cont): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "Date DO personale: "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
- msgstr "Preferin�e limb�: "
+ msgstr "Preferinţe limbă: "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
- msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
+ msgstr "Eroare: lungime invalidă pentru şir preferinţe.\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
- msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
+ msgstr "Eroare: caractere invalide în şir preferinţe.\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
- msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
+ msgstr "Sex ((M)asculin, (F)eminin sau spaţiu): "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
- msgstr "Eroare: r�spuns invalid.\n"
+ msgstr "Eroare: răspuns invalid.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "Amprenta CA: "
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
- msgstr "Eroare: amprent� formatat� invalid.\n"
+ msgstr "Eroare: amprentă formatată invalid.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
- msgstr "opera�ia pe cheie nu e posibil�: %s\n"
+ msgstr "operaţia pe cheie nu e posibilă: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "nu este un card OpenPGP"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
- msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
+ msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
- msgstr "�nlocuiesc cheia existent�? (d/N) "
+ msgstr "Înlocuiesc cheia existentă? (d/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
- msgstr "Ce lungime de cheie dori�i? (%u) "
+ msgstr "Ce lungime de cheie doriţi? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
- msgstr "Ce lungime de cheie dori�i? (%u) "
+ msgstr "Ce lungime de cheie doriţi? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
- msgstr "Ce lungime de cheie dori�i? (%u) "
+ msgstr "Ce lungime de cheie doriţi? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
- msgstr "rotunjit� prin adaos la %u bi�i\n"
+ msgstr "rotunjită prin adaos la %u biţi\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
- msgstr "dimensiunile cheii %s trebuie s� fie �n intervalul %u-%u\n"
+ msgstr "dimensiunile cheii %s trebuie să fie în intervalul %u-%u\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
- msgstr "Creez copie de rezerv� a cheii de cifrare �n afara cardului? (d/N) "
+ msgstr "Creez copie de rezervă a cheii de cifrare în afara cardului? (d/N) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
- msgstr "cheia secret� deja stocat� pe un card\n"
+ msgstr "cheia secretă deja stocată pe un card\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
- msgstr "�nlocuiesc cheile existente? (d/N) "
+ msgstr "Înlocuiesc cheile existente? (d/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, fuzzy, c-format
  #| msgid ""
  #| "Please note that the factory settings of the PINs are\n"
@@@ -1871,171 -1469,127 +1879,171 @@@ msgid "
  "   PIN = '%s'     Admin PIN = '%s'\n"
  "You should change them using the command --change-pin\n"
  msgstr ""
- "V� rug�m s� observa�i c� set�rile din fabric� ale PIN-urilor sunt\n"
+ "Vă rugăm să observaţi că setările din fabrică ale PIN-urilor sunt\n"
  "   PIN = `%s'     PIN Admin = `%s'\n"
- "Ar trebui s� le schimba�i folosind comanda --change-pin\n"
+ "Ar trebui să le schimbaţi folosind comanda --change-pin\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
- msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
+ msgstr "Vă rugăm selectaţi tipul de cheie de generat:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "   (1) Cheie de semnare\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) Cheie de cifrare\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Cheie de autentificare\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
- msgstr "Selec�ie invalid�.\n"
+ msgstr "Selecţie invalidă.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
- msgstr "V� rug�m selecta�i unde s� fie stocat� cheia:\n"
+ msgstr "Vă rugăm selectaţi unde să fie stocată cheia:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
- msgstr "actualizarea a e�uat: %s\n"
+ msgstr "actualizarea a eşuat: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
- msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
+ msgstr "Această comandă nu este permisă în modul %s.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
- msgstr "cheia secret� deja stocat� pe un card\n"
+ msgstr "cheia secretă deja stocată pe un card\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  #| msgid "Sign it? (y/N) "
  msgid "Continue? (y/N) "
- msgstr "Dori�i s�-l semna�i? (d/N) "
+ msgstr "Doriţi să-l semnaţi? (d/N) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
- msgstr "ie�i din acest meniu"
+ msgstr "ieşi din acest meniu"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
- msgstr "arat� comenzi administrare"
+ msgstr "arată comenzi administrare"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
- msgstr "afi�eaz� acest mesaj"
+ msgstr "afişează acest mesaj"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
- msgstr "afi�eaz� toate datele disponibile"
+ msgstr "afişează toate datele disponibile"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
- msgstr "schimb� numele purt�torului cardului"
+ msgstr "schimbă numele purtătorului cardului"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
- msgstr "schimb� URL-ul de unde s� fie adus� cheia"
+ msgstr "schimbă URL-ul de unde să fie adusă cheia"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
- msgstr "adu cheia specificat� de URL-ul de pe card"
+ msgstr "adu cheia specificată de URL-ul de pe card"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
- msgstr "schimb� numele de login"
+ msgstr "schimbă numele de login"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
- msgstr "schimb� preferin�ele de limb�"
+ msgstr "schimbă preferinţele de limbă"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
- msgstr "schimb� sexul purt�torului cardului"
+ msgstr "schimbă sexul purtătorului cardului"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
- msgstr "schimb� o amprent� CA"
+ msgstr "schimbă o amprentă CA"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
- msgstr "comut� fanionul PIN de for�are a semn�turii"
+ msgstr "comută fanionul PIN de forţare a semnăturii"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
- msgstr "genereaz� noi chei"
+ msgstr "generează noi chei"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "meniu pentru a schimba sau debloca PIN-ul"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
- msgstr "verific� PIN-ul �i listeaz� toate datele"
+ msgstr "verifică PIN-ul şi listează toate datele"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
- msgstr "Comand� numai-administrare\n"
+ msgstr "Comandă numai-administrare\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "Sunt permise comenzi administrare\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "Nu sunt permise comenzi administrare\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
- msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
+ msgstr "Comandă invalidă  (încercaţi \"ajutor\")\n"
  
 +#: g10/decrypt.c:191 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
- msgstr "--output nu merge pentru aceast� comand�\n"
+ msgstr "--output nu merge pentru această comandă\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "nu pot deschide `%s'\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
- msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
+ msgstr "cheia \"%s\" nu a fost găsită: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "eroare la citire keyblock: %s\n"
@@@ -2044,30 -1597,24 +2052,30 @@@
  #, fuzzy, c-format
  #| msgid "key \"%s\" not found: %s\n"
  msgid "key \"%s\" not found\n"
- msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
+ msgstr "cheia \"%s\" nu a fost găsită: %s\n"
  
 +#: g10/delkey.c:129 g10/delkey.c:136
  msgid "(unless you specify the key by fingerprint)\n"
- msgstr "(dac� nu specifica�i cheia prin amprent�)\n"
+ msgstr "(dacă nu specificaţi cheia prin amprentă)\n"
  
 +#: g10/delkey.c:135
  msgid "can't do this in batch mode without \"--yes\"\n"
- msgstr "nu pot face acest lucru �n mod batch f�r� \"--yes\"\n"
+ msgstr "nu pot face acest lucru în mod batch fără \"--yes\"\n"
  
 +#: g10/delkey.c:148
  msgid "Delete this key from the keyring? (y/N) "
- msgstr "�terge aceast� cheie din inelul de chei? (d/N) "
+ msgstr "Şterge această cheie din inelul de chei? (d/N) "
  
 +#: g10/delkey.c:158
  msgid "This is a secret key! - really delete? (y/N) "
- msgstr "Aceasta este o cheie secret�! - chiar dori�i s� o �terge�i? (d/N) "
+ msgstr "Aceasta este o cheie secretă! - chiar doriţi să o ştergeţi? (d/N) "
  
 +#: g10/delkey.c:201
  #, fuzzy, c-format
  msgid "deleting secret %s failed: %s\n"
- msgstr "stergere keyblock a e�uat: %s\n"
+ msgstr "stergere keyblock a eşuat: %s\n"
  
 +#: g10/delkey.c:203
  msgid "key"
  msgstr "cheie"
  
@@@ -2077,36 -1623,29 +2085,36 @@@
  msgid "subkey"
  msgstr "Pubkey: "
  
 +#: g10/delkey.c:226
  #, c-format
  msgid "deleting keyblock failed: %s\n"
- msgstr "stergere keyblock a e�uat: %s\n"
+ msgstr "stergere keyblock a eşuat: %s\n"
  
 +#: g10/delkey.c:239
  msgid "ownertrust information cleared\n"
- msgstr "informa�ii �ncredere-proprietar cur��ate\n"
+ msgstr "informaţii încredere-proprietar curăţate\n"
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
- msgstr "exist� o cheie secret� pentru cheia public� \"%s\"!\n"
+ msgstr "există o cheie secretă pentru cheia publică \"%s\"!\n"
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
  msgstr ""
- "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
- "�nt�i.\n"
+ "folosiţi opţiunea \"--delete-secret-keys\" pentru a o şterge pe aceasta mai "
+ "întâi.\n"
  
 +#: g10/encrypt.c:232 g10/sign.c:1292
  #, c-format
  msgid "error creating passphrase: %s\n"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
 +#: g10/encrypt.c:239
  msgid "can't use a symmetric ESK packet due to the S2K mode\n"
- msgstr "nu pot crea un pachet ESK simetric datorit� modului S2K\n"
+ msgstr "nu pot crea un pachet ESK simetric datorită modului S2K\n"
  
 +#: g10/encrypt.c:253
  #, c-format
  msgid "using cipher %s\n"
  msgstr "folosesc cifrul %s\n"
@@@ -2121,9 -1658,8 +2129,9 @@@ msgstr "`%s' deja compresat\n
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
- msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
+ msgstr "AVERTISMENT: `%s' este un fişier gol\n"
  
 +#: g10/encrypt.c:557
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "reading from '%s'\n"
@@@ -2134,34 -1669,29 +2142,34 @@@ msgstr "citesc din `%s'\n
  msgid ""
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
  msgstr ""
- "AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
+ "AVERTISMENT: forţând cifrul simetric %s (%d) violaţi preferinţele "
  "destinatarului\n"
  
 +#: g10/encrypt.c:707 g10/sign.c:984
  #, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
  "preferences\n"
  msgstr ""
- "AVERTISMENT: for��nd algoritmul de compresie %s (%d) viola�i preferin�ele "
+ "AVERTISMENT: forţând algoritmul de compresie %s (%d) violaţi preferinţele "
  "destinatarului\n"
  
 +#: g10/encrypt.c:817
  #, c-format
  msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
- msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
+ msgstr "forţând cifrul simetric %s (%d) violaţi preferinţele destinatarului\n"
  
 +#: g10/encrypt.c:903
  #, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s cifrat pentru: \"%s\"\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
- msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
+ msgstr "nu puteţi folosi %s câtă vreme în modul %s\n"
  
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
  #, c-format
  msgid "%s encrypted data\n"
  msgstr "%s date cifrate\n"
@@@ -2175,30 -1703,25 +2183,30 @@@ msgstr "cifrat cu un algoritm necunoscu
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
- "AVERTISMENT: mesajul a fost cifrat cu o cheie slab� din cifrul simetric.\n"
+ "AVERTISMENT: mesajul a fost cifrat cu o cheie slabă din cifrul simetric.\n"
  
 +#: g10/decrypt-data.c:176
  msgid "problem handling encrypted packet\n"
- msgstr "problem� cu m�nuirea pachetului cifrat\n"
+ msgstr "problemă cu mânuirea pachetului cifrat\n"
  
 +#: g10/exec.c:60
  msgid "no remote program execution supported\n"
- msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
+ msgstr "nu este suportată execuţia nici unui program la distanţă\n"
  
 +#: g10/exec.c:319
  msgid ""
  "external program calls are disabled due to unsafe options file permissions\n"
  msgstr ""
- "chemarea programelor externe sunt deactivate datorit� op�iunilor nesigure "
- "pentru permisiunile fi�ierului\n"
+ "chemarea programelor externe sunt deactivate datorită opţiunilor nesigure "
+ "pentru permisiunile fişierului\n"
  
 +#: g10/exec.c:349
  msgid "this platform requires temporary files when calling external programs\n"
  msgstr ""
- "aceast� platform� necesit� fi�iere temporare c�nd sunt chemate programe "
+ "această platformă necesită fişiere temporare când sunt chemate programe "
  "externe\n"
  
 +#: g10/exec.c:427
  #, fuzzy, c-format
  #| msgid "unable to execute program `%s': %s\n"
  msgid "unable to execute program '%s': %s\n"
@@@ -2215,385 -1736,300 +2223,385 @@@ msgstr "nu pot executa shell-ul `%s': %
  msgid "system error while calling external program: %s\n"
  msgstr "eroare de sistem la chemarea programului extern: %s\n"
  
 +#: g10/exec.c:532 g10/exec.c:599
  msgid "unnatural exit of external program\n"
- msgstr "ie�ire nenatural� a programului extern\n"
+ msgstr "ieşire nenaturală a programului extern\n"
  
 +#: g10/exec.c:547
  msgid "unable to execute external program\n"
  msgstr "nu pot executa programul extern\n"
  
 +#: g10/exec.c:564
  #, c-format
  msgid "unable to read external program response: %s\n"
- msgstr "nu pot citi r�spunsul programului extern: %s\n"
+ msgstr "nu pot citi răspunsul programului extern: %s\n"
  
 +#: g10/exec.c:610 g10/exec.c:617
  #, fuzzy, c-format
  #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
  msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
- msgstr "AVERTISMENT: nu pot �terge fi�ierul temporar (%s) `%s': %s\n"
+ msgstr "AVERTISMENT: nu pot şterge fişierul temporar (%s) `%s': %s\n"
  
 +#: g10/exec.c:622
  #, fuzzy, c-format
  #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
- msgstr "AVERTISMENT: nu pot �terge directorul temporar `%s': %s\n"
+ msgstr "AVERTISMENT: nu pot şterge directorul temporar `%s': %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  #, fuzzy
  msgid "export signatures that are marked as local-only"
- msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
+ msgstr "Semnătura va fi marcată ca non-revocabilă.\n"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  #, fuzzy
  msgid "export revocation keys marked as \"sensitive\""
- msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
+ msgstr "nici o cheie de revocare găsită pentru \"%s\"\n"
  
- #: g10/export.c:108
++#: g10/export.c:112
  #, fuzzy
  msgid "remove unusable parts from key during export"
- msgstr "cheie secret� de nefolosit"
+ msgstr "cheie secretă de nefolosit"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
- msgstr "%s: s�rit�: %s\n"
+ msgstr "%s: sărită: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
- msgstr "scriu �n `%s'\n"
+ msgstr "scriu în `%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
- msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
+ msgstr "cheia %s: semnătură subcheie într-un loc greşit - sărită\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "exportul cheilor secrete nu este permis\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
- msgstr "cheia %s: cheie stil PGP 2.x - s�rit�\n"
+ msgstr "cheia %s: cheie stil PGP 2.x - sărită\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "AVERTISMENT: nimic exportat\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
  msgstr "eroare la creearea `%s': %s\n"
  
 +#: g10/getkey.c:257
  msgid "[User ID not found]"
- msgstr "[ID utilizator nu a fost g�sit]"
+ msgstr "[ID utilizator nu a fost găsit]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
- msgstr "op�iuni enumerare invalide\n"
+ msgstr "opţiuni enumerare invalide\n"
  
 +#: g10/getkey.c:516
  #, c-format
  msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
  msgstr ""
  
 +#: g10/getkey.c:546
  #, fuzzy, c-format
  msgid "error looking up: %s\n"
- msgstr "eroare �n `%s': %s\n"
+ msgstr "eroare în `%s': %s\n"
  
 +#: g10/getkey.c:636
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "eroare la crearea inelului de chei `%s': %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "eroare la creearea `%s': %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "eroare la creearea `%s': %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
  msgstr "Amprenta CA: "
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
- msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+ msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
- msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
+ msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
- msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
+ msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
- msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
+ msgstr "Cheia invalidă %s făcută validă de --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
- msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
+ msgstr "folosim subcheia %s în loc de cheia primară %s\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
- msgstr "|[fi�ier]|creaz� o semn�tur�"
+ msgstr "|[fişier]|crează o semnătură"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
- msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
+ msgstr "|[fişier]|crează o semnătură text în clar"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
- msgstr "creaz� o semn�tur� deta�at�"
+ msgstr "crează o semnătură detaşată"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
- msgstr "cifreaz� datele"
+ msgstr "cifrează datele"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
- msgstr "cifreaz� numai cu cifru simetric"
+ msgstr "cifrează numai cu cifru simetric"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
- msgstr "decripteaz� datele (implicit)"
+ msgstr "decriptează datele (implicit)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
- msgstr "verific� o semn�tur�"
+ msgstr "verifică o semnătură"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
- msgstr "enumer� chei"
+ msgstr "enumeră chei"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
- msgstr "enumer� chei �i semn�turi"
+ msgstr "enumeră chei şi semnături"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
- msgstr "enumer� �i verific� semn�turile cheii"
+ msgstr "enumeră şi verifică semnăturile cheii"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
- msgstr "enumer� chei �i amprente"
+ msgstr "enumeră chei şi amprente"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
- msgstr "enumer� chei secrete"
+ msgstr "enumeră chei secrete"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
- msgstr "genereaz� o nou� perechi de chei"
+ msgstr "generează o nouă perechi de chei"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
- msgstr "genereaz� o nou� perechi de chei"
+ msgstr "generează o nouă perechi de chei"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
- msgstr "genereaz� o nou� perechi de chei"
+ msgstr "generează o nouă perechi de chei"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
- msgstr "genereaz� o nou� perechi de chei"
+ msgstr "generează o nouă perechi de chei"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
- msgstr "genereaz� un certificat de revocare"
+ msgstr "generează un certificat de revocare"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
- msgstr "�terge chei de pe inelul de chei public"
+ msgstr "şterge chei de pe inelul de chei public"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
- msgstr "�terge chei de pe inelul de chei secret"
+ msgstr "şterge chei de pe inelul de chei secret"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
- msgstr "semneaz� o cheie"
+ msgstr "semnează o cheie"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
- msgstr "semneaz� o cheie local"
+ msgstr "semnează o cheie local"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
- msgstr "semneaz� o cheie"
+ msgstr "semnează o cheie"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
- msgstr "semneaz� o cheie local"
+ msgstr "semnează o cheie local"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
- msgstr "semneaz� sau editeaz� o cheie"
+ msgstr "semnează sau editează o cheie"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
- msgstr "schimb� fraza-parol�"
+ msgstr "schimbă fraza-parolă"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
- msgstr "export� chei"
+ msgstr "exportă chei"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
- msgstr "export� chei pentru un server de chei"
+ msgstr "exportă chei pentru un server de chei"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
- msgstr "import� chei de la un server de chei"
+ msgstr "importă chei de la un server de chei"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
- msgstr "caut� pentru chei pe un server de chei"
+ msgstr "caută pentru chei pe un server de chei"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
- msgstr "actualizeaz� toate cheile de la un server de chei"
+ msgstr "actualizează toate cheile de la un server de chei"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
- msgstr "import�/combin� chei"
+ msgstr "importă/combină chei"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
- msgstr "afi�eaz� starea cardului"
+ msgstr "afişează starea cardului"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
- msgstr "schimb� data de pe card"
+ msgstr "schimbă data de pe card"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
- msgstr "schimb� PIN-ul unui card"
+ msgstr "schimbă PIN-ul unui card"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
- msgstr "actualizeaz� baza de date de �ncredere"
+ msgstr "actualizează baza de date de încredere"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
- msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
+ msgstr "|algo [fişiere]|afişează rezumate mesaje"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
- msgstr "creaz� ie�ire �n armur� ascii"
+ msgstr "crează ieşire în armură ascii"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|NUME|cifrare pentru NUME"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
- msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
+ msgstr "foloseşte acest id-utilizator pentru a semna sau decripta"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
- msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
+ msgstr "|N|setează nivel de compresie N (0 deactivează)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
- msgstr "folose�te modul text canonic"
+ msgstr "foloseşte modul text canonic"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
- msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+ msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "nu face nici o schimbare"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
- msgstr "�ntreab� �nainte de a suprascrie"
+ msgstr "întreabă înainte de a suprascrie"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
- msgstr "folose�te comportament strict OpenPGP"
+ msgstr "foloseşte comportament strict OpenPGP"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
  msgstr ""
  "@\n"
- "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
+ "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2607,19 -2043,17 +2615,19 @@@ msgstr "
  "@\n"
  "Exemple:\n"
  "\n"
- " -se -r Dan [fi�ier]        semneaz� �i cifreaz� pentru utilizatorul Dan\n"
- " --clearsign [fi�ier]       creaz� o semn�tur� text �n clar\n"
- " --detach-sign [fi�ier]     creaz� o semn�tur� deta�at�\n"
- " --list-keys [nume]         arat� chei\n"
- " --fingerprint [nume]       arat� amprente\n"
+ " -se -r Dan [fişier]        semnează şi cifrează pentru utilizatorul Dan\n"
+ " --clearsign [fişier]       crează o semnătură text în clar\n"
+ " --detach-sign [fişier]     crează o semnătură detaşată\n"
+ " --list-keys [nume]         arată chei\n"
+ " --fingerprint [nume]       arată amprente\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2630,11 -2064,10 +2638,11 @@@ msgid "
  "Sign, check, encrypt or decrypt\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "Sintax�: gpg [op�iuni] [fi�iere]\n"
+ "Sintaxă: gpg [opţiuni] [fişiere]\n"
  "sign, check, encrypt sau decrypt\n"
- "opera�iunea implicit� depinde de datele de intrare\n"
+ "operaţiunea implicită depinde de datele de intrare\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2642,78 -2075,64 +2650,78 @@@ msgstr "
  "\n"
  "Algoritmuri suportate:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "Pubkey: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Cifru: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Compresie: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
- msgstr "folosire: gpg [op�iuni] "
+ msgstr "folosire: gpg [opţiuni] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
- msgstr "comenzi �n conflict\n"
+ msgstr "comenzi în conflict\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  #| msgid "no = sign found in group definition `%s'\n"
  msgid "no = sign found in group definition '%s'\n"
- msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
+ msgstr "nu am găsit nici un semn = în definiţia grupului `%s'\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr ""
- "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
+ "AVERTISMENT: proprietate nesigură (unsafe) pentru directorul home `%s'\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr ""
- "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
+ "AVERTISMENT: proprietate nesigură (unsafe) pentru fişier configurare `%s'\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on extension `%s'\n"
  msgid "WARNING: unsafe ownership on extension '%s'\n"
- msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
+ msgstr "AVERTISMENT: proprietate nesigură (unsafe) pentru extensia `%s'\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr ""
  "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr ""
- "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
+ "AVERTISMENT: permisiuni nesigure (unsafe) pentru fişier configurare `%s'\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on extension `%s'\n"
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2721,17 -2140,15 +2729,17 @@@ msgstr "
  "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
  "directorul home `%s'\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr ""
- "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
+ "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fişier "
  "configurare `%s'\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2739,7 -2156,6 +2747,7 @@@ msgstr "
  "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
  "extensia `%s'\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2747,7 -2163,6 +2755,7 @@@ msgstr "
  "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
  "directorul home `%s'\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2755,10 -2170,9 +2763,10 @@@
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
  msgstr ""
- "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
+ "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fişier "
  "configurare `%s'\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2766,545 -2180,432 +2774,550 @@@ msgstr "
  "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
  "extensia `%s'\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
  msgstr "articol configurare necunoscut `%s'\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  msgid "show key usage information during key listings"
- msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
+ msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  #, fuzzy
  msgid "show all notations during signature listings"
- msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
+ msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  #, fuzzy
  msgid "show the keyring name in key listings"
- msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
+ msgstr "arată căruia dintre inelele de chei îi aparţine o cheie enumerată"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  #, fuzzy
  msgid "show expiration dates during signature listings"
- msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
+ msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "deactiveaz� cheia"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
- msgstr "op�iune necunoscut� `%s'\n"
+ msgstr "opţiune necunoscută `%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "opţiuni enumerare invalide\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
- msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
+ msgstr "NOTĂ: fisier opţiuni implicite vechi `%s' ignorat\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
- msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
+ msgstr "NOTĂ: %s nu este pentru o folosire normală!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid signature expiration\n"
  msgid "'%s' is not a valid signature expiration\n"
- msgstr "`%s' nu este expirare de semn�tur� valid�\n"
+ msgstr "`%s' nu este expirare de semnătură validă\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
- msgstr "Nu este o adres� de email valid�\n"
+ msgstr "Nu este o adresă de email validă\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "algoritm hash invalid `%s'\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid character set\n"
  msgid "'%s' is not a valid character set\n"
  msgstr "`%s' nu este un set de carectere valid\n"
  
  #
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "nu am putut interpreta URL-ul serverului de chei\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
- msgstr "%s:%d: op�iuni server de chei invalide\n"
+ msgstr "%s:%d: opţiuni server de chei invalide\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
- msgstr "op�iuni server de chei invalide\n"
+ msgstr "opţiuni server de chei invalide\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
- msgstr "%s:%d: op�iuni import invalide\n"
+ msgstr "%s:%d: opţiuni import invalide\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
- msgstr "op�iuni import invalide\n"
+ msgstr "opţiuni import invalide\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
- msgstr "op�iuni enumerare invalide\n"
+ msgstr "opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
- msgstr "%s:%d: op�iuni export invalide\n"
+ msgstr "%s:%d: opţiuni export invalide\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
- msgstr "op�iuni export invalide\n"
+ msgstr "opţiuni export invalide\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
- msgstr "%s:%d: op�iuni enumerare invalide\n"
+ msgstr "%s:%d: opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
- msgstr "op�iuni enumerare invalide\n"
+ msgstr "opţiuni enumerare invalide\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  #, fuzzy
  msgid "show all notations during signature verification"
- msgstr "`%s' nu este expirare de semn�tur� valid�\n"
+ msgstr "`%s' nu este expirare de semnătură validă\n"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "show user ID validity during signature verification"
- msgstr "`%s' nu este expirare de semn�tur� valid�\n"
+ msgstr "`%s' nu este expirare de semnătură validă\n"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
- msgstr "`%s' nu este expirare de semn�tur� valid�\n"
+ msgstr "`%s' nu este expirare de semnătură validă\n"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
- msgstr "%s:%d: op�iuni verificare invalide\n"
+ msgstr "%s:%d: opţiuni verificare invalide\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
- msgstr "op�iuni verificare invalide\n"
+ msgstr "opţiuni verificare invalide\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
- msgstr "nu pot seta cale-execu�ie ca %s\n"
+ msgstr "nu pot seta cale-execuţie ca %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
- msgstr "%s:%d: op�iuni verificare invalide\n"
+ msgstr "%s:%d: opţiuni verificare invalide\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
- msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
+ msgstr "AVERTISMENT: programul ar putea crea un fişier core!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
- msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
+ msgstr "AVERTISMENT: %s înlocuieşte %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s nu este permis cu %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s nu are sens cu %s!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, 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"
+ msgstr "nu va rula cu memorie neprotejată (insecure) pentru că %s\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "algoritm cifrare selectat este invalid\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "algoritm rezumat selectat este invalid\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "algoritm compresie selectat este invalid\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "algoritm rezumat certificare selectat este invalid\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
- msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
+ msgstr "completes-needed trebuie să fie mai mare decât 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
- msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
+ msgstr "marginals-needed trebuie să fie mai mare decât 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  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"
+ msgstr "max-cert-depth trebuie să fie în intervalul de la 1 la 255\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  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"
+ msgstr "default-cert-level invalid; trebuie să fie 0, 1, 2 sau 3\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  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"
+ msgstr "min-cert-level invalid; trebuie să fie 0, 1, 2 sau 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
- msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
+ msgstr "NOTĂ: modul S2K simplu (0) este contraindicat cu insistenţă\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
- msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
+ msgstr "mod S2K invalid; trebuie să fie 0, 1 sau 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
- msgstr "preferin�e implicite invalide\n"
+ msgstr "preferinţe implicite invalide\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
- msgstr "preferin�e cifrare personale invalide\n"
+ msgstr "preferinţe cifrare personale invalide\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
- msgstr "preferin�e rezumat personale invalide\n"
+ msgstr "preferinţe rezumat personale invalide\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
- msgstr "preferin�e compresie personale invalide\n"
+ msgstr "preferinţe compresie personale invalide\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
- msgstr "%s nu merge �nc� cu %s!\n"
+ msgstr "%s nu merge încă cu %s!\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  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"
+ msgstr "nu puteţi folosi algoritmul de cifrare `%s' câtă vreme în modul %s\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  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"
+ msgstr "nu puteţi folosi algorimul de rezumat `%s' câtă vreme în modul %s\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  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"
+ msgstr "nu puteţi folosi algoritmul de compresie `%s' câtă vreme în modul %s\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
- msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
+ msgstr "am eşuat să iniţializez TrustDB:%s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  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"
+ "AVERTISMENT: destinatari (-r) furnizaţi fără a folosi cifrare cu cheie "
+ "publică\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
- msgstr "--store [nume_fi�ier]"
+ msgstr "--store [nume_fişier]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
- msgstr "--symmetric [nume_fi�ier]"
+ msgstr "--symmetric [nume_fişier]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  #| msgid "symmetric encryption of `%s' failed: %s\n"
  msgid "symmetric encryption of '%s' failed: %s\n"
- msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
+ msgstr "cifrarea simetrică a lui `%s' a eşuat: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
- msgstr "--encrypt [nume_fi�ier]"
+ msgstr "--encrypt [nume_fişier]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
- msgstr "--symmetric --encrypt [nume_fi�ier]"
+ msgstr "--symmetric --encrypt [nume_fişier]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
- msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
+ msgstr "nu puteţi folosi --symmetric --encrypt cu --s2k-mode 0\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, 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"
+ msgstr "nu puteţi folosi --symmetric --encrypt câtă vreme în modul %s\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
- msgstr "--sign [nume_fi�ier]"
+ msgstr "--sign [nume_fişier]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [nume_fi�ier]"
+ msgstr "--sign --encrypt [nume_fişier]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
+ msgstr "--symmetric --sign --encrypt [nume_fişier]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  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"
+ msgstr "nu puteţi folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, 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"
+ msgstr "nu puteţi folosi --symmetric --sign --encrypt câtă vreme în modul %s\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [nume_fi�ier]"
+ msgstr "--sign --symmetric [nume_fişier]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
- msgstr "--clearsign [nume_fi�ier]"
+ msgstr "--clearsign [nume_fişier]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
- msgstr "--decrypt [nume_fi�ier]"
+ msgstr "--decrypt [nume_fişier]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key id-utilizator"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key id-utilizator"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key id-utilizator [comenzi]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
  msgstr "--sign-key id-utilizator"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
- msgstr "trimitere server de chei e�uat�: %s\n"
+ msgstr "trimitere server de chei eşuată: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
- msgstr "recep�ie server de chei e�uat�: %s\n"
+ msgstr "recepţie server de chei eşuată: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
- msgstr "export cheie e�uat: %s\n"
+ msgstr "export cheie eşuat: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
- msgstr "export cheie e�uat: %s\n"
+ msgstr "export cheie eşuat: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
- msgstr "c�utare server de chei e�uat�: %s\n"
+ msgstr "căutare server de chei eşuată: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
- msgstr "actualizare server de chei e�uat�: %s\n"
+ msgstr "actualizare server de chei eşuată: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
- msgstr "eliminarea armurii a e�uat: %s\n"
+ msgstr "eliminarea armurii a eşuat: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
- msgstr "punerea armurii a e�uat: %s\n"
+ msgstr "punerea armurii a eşuat: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "algoritm hash invalid `%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
- msgstr "[nume_fi�ier]"
+ msgstr "[nume_fişier]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
- msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
+ msgstr "Daţi-i drumul şi scrieţi mesajul ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "URL-ul politicii de certificare furnizat este invalid\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
- msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
+ msgstr "URL-ul politicii de semnături furnizat este invalid\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "ia cheile de pe acest inel de chei"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
- msgstr "d� numai un avertisment la conflicte de timestamp"
+ msgstr "dă numai un avertisment la conflicte de timestamp"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
- msgstr "|FD|scrie informa�ii de stare �n acest FD"
+ msgstr "|FD|scrie informaţii de stare în acest FD"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
- msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpgv [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
  msgstr ""
- "Sintax�: gpg [op�iuni] [fi�iere]\n"
- "Verific� semn�turi folosind cheile cunoscute ca fiind de �ncredere\n"
+ "Sintaxă: gpg [opţiuni] [fişiere]\n"
+ "Verifică semnături folosind cheile cunoscute ca fiind de încredere\n"
  
 +#: g10/helptext.c:72
  msgid "No help available"
  msgstr "Nici un ajutor disponibil"
  
@@@ -3314,336 -2614,270 +3327,336 @@@
  msgid "No help available for '%s'"
  msgstr "Nici un disponibil disponibil pentru `%s'"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
- msgstr "actualizeaz� baza de date de �ncredere"
+ msgstr "actualizează baza de date de încredere"
  
- #: g10/import.c:147
++#: g10/import.c:160
  #, fuzzy
  msgid "do not update the trustdb after import"
- msgstr "actualizeaz� baza de date de �ncredere"
+ msgstr "actualizează baza de date de încredere"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
- msgstr "afi�eaz� amprenta cheii"
+ msgstr "afişează amprenta cheii"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  #, fuzzy
  msgid "remove unusable parts from key after import"
- msgstr "cheie secret� de nefolosit"
+ msgstr "cheie secretă de nefolosit"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
- msgstr "bloc de tip %d s�rit\n"
+ msgstr "bloc de tip %d sărit\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
- msgstr "%lu chei procesate p�n� acum\n"
+ msgstr "%lu chei procesate până acum\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
- msgstr "Num�r total procesate: %lu\n"
+ msgstr "Număr total procesate: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
- msgstr "      chei noi s�rite: %lu\n"
+ msgstr "      chei noi sărite: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
- msgstr "      chei noi s�rite: %lu\n"
+ msgstr "      chei noi sărite: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
- msgstr "  f�r� ID-uri utilizator: %lu\n"
+ msgstr "  fără ID-uri utilizator: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "               importate: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "             neschimbate: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "   noi ID-uri utilizator: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "             noi subchei: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
- msgstr "           noi semn�turi: %lu\n"
+ msgstr "           noi semnături: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
- msgstr "    noi revoc�ri de chei: %lu\n"
+ msgstr "    noi revocări de chei: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "     chei secrete citite: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  chei secrete importate: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "chei secrete neschimbate: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "            ne importate: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
- msgstr "semn�turi create p�n� acum: %lu\n"
+ msgstr "semnături create până acum: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "     chei secrete citite: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, fuzzy, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
- msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
+ msgstr "AVERTISMENT: cheia %s conţine preferinţe pentru indisponibil\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
- msgstr "         \"%s\": preferin�� pentru algoritm de cifrare %s\n"
+ msgstr "         \"%s\": preferinţă pentru algoritm de cifrare %s\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
- msgstr "         \"%s\": preferin�� pentru algoritm rezumat %s\n"
+ msgstr "         \"%s\": preferinţă pentru algoritm rezumat %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
- msgstr "         \"%s\": preferin�� pentru algoritm compresie %s\n"
+ msgstr "         \"%s\": preferinţă pentru algoritm compresie %s\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
- "este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
+ "este puternic sugerat să vă actualizaţi preferinţele şi re-distribuiţi\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
- "aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
+ "această cheie pentru a avita probleme potenţiale de ne-potrivire de "
  "algoritm\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
- msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
+ msgstr "vă puteţi actualiza preferinţele cu: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "cheia %s: nici un ID utilizator\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
- msgstr "s�rit� \"%s\": %s\n"
+ msgstr "sărită \"%s\": %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
- msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
+ msgstr "cheia %s: subcheia HPK coruptă a fost reparată\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "cheia %s: nici un ID utilizator valid\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
- msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
+ msgstr "aceasta poate fi cauzată de o auto-semnătură ce lipseşte\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
- msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
+ msgstr "cheia %s: cheia publică nu a fost găsită: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
- msgstr "cheia %s: cheie nou� - s�rit�\n"
+ msgstr "cheia %s: cheie nouă - sărită\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
- msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
+ msgstr "n-am găsit nici un inel de chei ce poate fi scris: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "eroare la scrierea inelului de chei `%s': %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
- msgstr "cheia %s: cheia public� \"%s\" importat�\n"
+ msgstr "cheia %s: cheia publică \"%s\" importată\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
- msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
+ msgstr "cheia %s: nu se potriveşte cu copia noastră\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
- msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
+ msgstr "cheia %s: nu pot găsi keyblock-ul original: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
- msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
+ msgstr "cheia %s: \"%s\" 1 nouă semnătură\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
- msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
+ msgstr "cheia %s: \"%s\" %d noi semnături\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
- msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
+ msgstr "cheia %s: \"%s\" 1 nouă subcheie\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "cheia %s: \"%s\" %d noi subchei\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
- msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
+ msgstr "cheia %s: \"%s\" %d noi semnături\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
- msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
+ msgstr "cheia %s: \"%s\" %d noi semnături\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
- msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
+ msgstr "cheia %s: \"%s\" nu a fost schimbată\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
- msgstr "cheia %s: cheie secret� importat�\n"
+ msgstr "cheia %s: cheie secretă importată\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
- msgstr "s�rit�: cheia secret� deja prezent�\n"
+ msgstr "sărită: cheia secretă deja prezentă\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
- msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+ msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "importul de chei secrete nu este permis\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
- msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
+ msgstr "cheia %s: cheie secretă cu cifru invalid %d - sărită\n"
  
  #. TRANSLATORS: For smartcard, each private key on
  #. host has a reference (stub) to a smartcard and
@@@ -3655,669 -2889,539 +3668,675 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
- "cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
+ "cheia %s: nici o cheie publică - nu pot aplica certificatul de revocare\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
- msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
+ msgstr "cheia %s: nici un ID utilizator pentru semnătură\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
- "cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
+ "cheia %s: algoritm cu cheie publică nesuportat pentru ID-ul utilizator \"%s"
  "\"\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
- msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
+ msgstr "cheia %s: auto-semnătură invalidă pentru ID-ul utilizator \"%s\"\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
- msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
+ msgstr "cheia %s: algoritm cu cheie publică nesuportat\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
- msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
+ msgstr "cheia %s: am adăugat semnătura de cheie directă\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
- msgstr "cheia %s: legare subcheie invalid�\n"
+ msgstr "cheia %s: legare subcheie invalidă\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
- msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
+ msgstr "cheia %s: am şters multiple legături de subchei\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
- msgstr "cheia %s: revocare de subcheie invalid�\n"
+ msgstr "cheia %s: revocare de subcheie invalidă\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
- msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
+ msgstr "cheia %s: am şters multiple revocări de subcheie\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
- msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
+ msgstr "cheia %s: am sărit ID-ul utilizator \"%s\"\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
- msgstr "cheia %s: am s�rit subcheia\n"
+ msgstr "cheia %s: am sărit subcheia\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
- msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
+ msgstr "cheia %s: semnătura nu poate fi exportată (clasa 0x%02X) - sărită\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
- msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
+ msgstr "cheia %s: certificat de revocare într-un loc greşit - sărit\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
- msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
+ msgstr "cheia %s: certificat de revocare invalid: %s - sărit\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
- msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
+ msgstr "cheia %s: semnătură subcheie într-un loc greşit - sărită\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
- msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
+ msgstr "cheia %s: clasă de semnătură neaşteptată (0x%02X) - sărită\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
- msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
+ msgstr "AVERTISMENT: cheia %s poate fi revocată: aduc revocarea cheii %s\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
- "AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
- "prezent�.\n"
+ "AVERTISMENT: cheia %s poate fi revocată: cheia de revocare %s nu este "
+ "prezentă.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
- msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
+ msgstr "cheia %s: am adăugat certificatul de revocare \"%s\"\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
- msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
+ msgstr "cheia %s: am adăugat semnătura de cheie directă\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "eroare la crearea inelului de chei `%s': %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
  msgstr "eroare la crearea inelului de chei `%s': %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
  msgstr "inelul de chei `%s' creat\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
  msgstr "inelul de chei `%s' creat\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  #| msgid "keyblock resource `%s': %s\n"
  msgid "keyblock resource '%s': %s\n"
- msgstr "resurs� keyblock `%s': %s\n"
+ msgstr "resursă keyblock `%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
- msgstr "eroare �n `%s': %s\n"
+ msgstr "eroare în `%s': %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
- msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
+ msgstr "am eşuat să reconstruiesc cache-ul inelului de chei: %s\n"
  
 +#: g10/keyedit.c:264
  msgid "[revocation]"
  msgstr "[revocare]"
  
 +#: g10/keyedit.c:264
  msgid "[self-signature]"
- msgstr "[auto-semn�tur�]"
+ msgstr "[auto-semnătură]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "eroare la crearea inelului de chei `%s': %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
+ msgstr "cheia %s: algoritm cu cheie publică nesuportat\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "semn�tur� %s, algoritm rezumat %s\n"
+ msgstr "semnătură %s, algoritm rezumat %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  #| msgid "revoke signatures"
  msgid " (reordered signatures follow)"
- msgstr "revoc� semn�turi"
+ msgstr "revocă semnături"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
- msgstr "s�rit� \"%s\": %s\n"
+ msgstr "sărită \"%s\": %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "ID utilizator \"%s\" a fost revocat."
  msgstr[1] "ID utilizator \"%s\" a fost revocat."
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
- msgstr[1] "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
+ msgstr[0] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
+ msgstr[1] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
- msgstr[0] "%d semn�turi incorecte\n"
- msgstr[1] "%d semn�turi incorecte\n"
+ msgstr[0] "%d semnături incorecte\n"
+ msgstr[1] "%d semnături incorecte\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
- msgstr[0] "Semn�tur� bun� din \"%s\""
- msgstr[1] "Semn�tur� bun� din \"%s\""
+ msgstr[0] "Semnătură bună din \"%s\""
+ msgstr[1] "Semnătură bună din \"%s\""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
  "(by looking at passports, checking fingerprints from different sources, "
  "etc.)\n"
  msgstr ""
- "V� rug�m decide�i c�t de mult� �ncredere ave�i �n acest utilizator\n"
- "pentru a verifica cheile altor utilizatori (folosind pa�apoarte,\n"
- "verific�nd amprentele din diferite surse, etc.)\n"
+ "Vă rugăm decideţi cât de multă încredere aveţi în acest utilizator\n"
+ "pentru a verifica cheile altor utilizatori (folosind paşapoarte,\n"
+ "verificând amprentele din diferite surse, etc.)\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
- msgstr "  %d = Am o �ncredere marginal�\n"
+ msgstr "  %d = Am o încredere marginală\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
- msgstr "  %d = Am toat� �ncrederea\n"
+ msgstr "  %d = Am toată încrederea\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
- "V� rug�m s� introduce�i ad�ncimea acestei semn�turi de �ncredere.\n"
- "O ad�ncime mai mare de 1 permite ca cheia pe care o semna�i s� fac�\n"
- "semn�turi de �ncredere �n numele d-voastr�.\n"
+ "Vă rugăm să introduceţi adâncimea acestei semnături de încredere.\n"
+ "O adâncime mai mare de 1 permite ca cheia pe care o semnaţi să facă\n"
+ "semnături de încredere în numele d-voastră.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
- "V� rug�m s� introduce�i domeniul de restric�ionare al acestei semn�turi, sau "
- "ap�sa�i enter pentru niciunul.\n"
+ "Vă rugăm să introduceţi domeniul de restricţionare al acestei semnături, sau "
+ "apăsaţi enter pentru niciunul.\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "ID utilizator \"%s\" a fost revocat."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
- msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
+ msgstr "Sunteţi sigur(ă) că doriţi să ştergeţi permanent \"%s\"? (d/N)"
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  Nu pot semna.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "ID utilizator \"%s\" este expirat."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "ID-ul utilizator \"%s\" poate fi semnat.  "
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
- msgstr "Dori�i s�-l semna�i? (d/N) "
+ msgstr "Doriţi să-l semnaţi? (d/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
  "is a PGP 2.x-style signature.\n"
  msgstr ""
- "Auto-semn�tura pe \"%s\"\n"
- "este o semn�tur� stil PGP 2.x.\n"
+ "Auto-semnătura pe \"%s\"\n"
+ "este o semnătură stil PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
- msgstr "Dori�i s� o promova�i la o auto-semn�tur� OpenPGP? (d/N) "
+ msgstr "Doriţi să o promovaţi la o auto-semnătură OpenPGP? (d/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "has expired.\n"
  msgstr ""
- "Semn�tura d-voastr� curent� pe \"%s\"\n"
+ "Semnătura d-voastră curentă pe \"%s\"\n"
  "a expirat.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
- "Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
+ "Doriţi să creaţi o nouă semnătură pentru a o înlocui pe cea expirată? (d/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "is a local signature.\n"
  msgstr ""
- "Semn�tura d-voastr� curent� pe \"%s\"\n"
- "semn�tur� local�.\n"
+ "Semnătura d-voastră curentă pe \"%s\"\n"
+ "semnătură locală.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
- msgstr "Dori�i s� o promova�i la o semn�tur� total exportabil�? (d/N) "
+ msgstr "Doriţi să o promovaţi la o semnătură total exportabilă? (d/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
- msgstr "\"%s\" a fost deja semnat� local de cheia %s\n"
+ msgstr "\"%s\" a fost deja semnată local de cheia %s\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
- msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
+ msgstr "\"%s\" a fost deja semnată de cheia %s\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
- msgstr "Dori�i s� o semna�i oricum din nou? (d/N) "
+ msgstr "Doriţi să o semnaţi oricum din nou? (d/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Nimic de semnat cu cheia %s\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
- msgstr "Aceast� cheie a expirat!"
+ msgstr "Această cheie a expirat!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
- msgstr "Aceast� cheie va expira pe %s.\n"
+ msgstr "Această cheie va expira pe %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
- msgstr "Dori�i ca semn�tura d-voastr� s� expire �n acela�i timp? (D/n) "
+ msgstr "Doriţi ca semnătura d-voastră să expire în acelaşi timp? (D/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
  "to the person named above?  If you don't know what to answer, enter \"0\".\n"
  msgstr ""
- "C�t de atent a�i verificat c� cheia pe care sunte�i pe cale a o semna "
- "apar�ine\n"
- "�ntr-adev�r persoanei numite deasupra?  Dac� nu �ti�i ce s� r�spunde�i,\n"
- "introduce�i \"0\".\n"
+ "Cât de atent aţi verificat că cheia pe care sunteţi pe cale a o semna "
+ "aparţine\n"
+ "într-adevăr persoanei numite deasupra?  Dacă nu ştiţi ce să răspundeţi,\n"
+ "introduceţi \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
- msgstr "   (0) Nu voi r�spunde.%s\n"
+ msgstr "   (0) Nu voi răspunde.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Nu am verificat deloc.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
- msgstr "   (2) Am f�cut ceva verific�ri superficiale.%s\n"
+ msgstr "   (2) Am făcut ceva verificări superficiale.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
- msgstr "   (3) Am f�cut verific�ri foarte atente.%s\n"
+ msgstr "   (3) Am făcut verificări foarte atente.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
- msgstr "Selec�ia dvs.? (introduce�i `?' pentru informa�ii suplimentare): "
+ msgstr "Selecţia dvs.? (introduceţi `?' pentru informaţii suplimentare): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr ""
- "Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
- "aceast� cheie cu cheia d-voastr� \"%s\" (%s)\n"
+ "Sunteţi într-adevăr sigur(ă) că doriţi să semnaţi\n"
+ "această cheie cu cheia d-voastră \"%s\" (%s)\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
- msgstr "Aceasta va fi o auto-semn�tur�.\n"
+ msgstr "Aceasta va fi o auto-semnătură.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
- msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
+ msgstr "AVERTISMENT: semnătura nu va fi marcată ca non-exportabilă.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
- msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
+ msgstr "AVERTISMENT: semnătura nu va fi marcată ca non-revocabilă.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
- msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
+ msgstr "Semnătura va fi marcată ca non-exportabilă.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
- msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
+ msgstr "Semnătura va fi marcată ca non-revocabilă.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
- msgstr "Nu am verificat aceast� cheie deloc.\n"
+ msgstr "Nu am verificat această cheie deloc.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
- msgstr "Am verificat aceast� cheie superficial.\n"
+ msgstr "Am verificat această cheie superficial.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
- msgstr "Am verificat aceast� cheie foarte atent.\n"
+ msgstr "Am verificat această cheie foarte atent.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
- msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
+ msgstr "Doriţi cu adevărat să semnaţi? (d/N) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
- msgstr "semnarea a e�uat: %s\n"
+ msgstr "semnarea a eşuat: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
- "Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
- "parol� de schimbat.\n"
+ "Cheia are numai articole de cheie sau talon (stub) pe card - nici o frază "
+ "parolă de schimbat.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
- msgstr "salveaz� �i termin�"
+ msgstr "salvează şi termină"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
- msgstr "afi�eaz� amprenta cheii"
+ msgstr "afişează amprenta cheii"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
- msgstr "Notare semn�tur�: "
+ msgstr "Notare semnătură: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
- msgstr "enumer� chei �i ID-uri utilizator"
+ msgstr "enumeră chei şi ID-uri utilizator"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
- msgstr "selecteaz� ID utilizator N"
+ msgstr "selectează ID utilizator N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
- msgstr "selecteaz� subcheia N"
+ msgstr "selectează subcheia N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
- msgstr "verific� semn�turi"
+ msgstr "verifică semnături"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
- "semneaz� ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
+ "semnează ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
  "relevante]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
- msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
+ msgstr "semnează ID-urile utilizatorilor selectaţi local"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
- msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� de �ncredere"
+ msgstr "semnează ID-urile utilizatorilor selectaţi cu o semnătură de încredere"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
- msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� irevocabil�"
+ msgstr "semnează ID-urile utilizatorilor selectaţi cu o semnătură irevocabilă"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
- msgstr "adaug� un ID utilizator"
+ msgstr "adaugă un ID utilizator"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
- msgstr "adaug� o poz� ID"
+ msgstr "adaugă o poză ID"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
- msgstr "�terge ID-urile utilizator selectate"
+ msgstr "şterge ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
- msgstr "adaug� o subcheie"
+ msgstr "adaugă o subcheie"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
- msgstr "adaug� o cheie la un smartcard"
+ msgstr "adaugă o cheie la un smartcard"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
- msgstr "mut� o cheie pe un smartcard"
+ msgstr "mută o cheie pe un smartcard"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
- msgstr "mut� o cheie de rezerv� pe un smartcard"
+ msgstr "mută o cheie de rezervă pe un smartcard"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
- msgstr "�terge subcheile selectate"
+ msgstr "şterge subcheile selectate"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
- msgstr "adaug� o cheie de revocare"
+ msgstr "adaugă o cheie de revocare"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
- msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
+ msgstr "şterge semnăturile de pe ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
- msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
+ msgstr "schimbă data de expirare pentru cheia sau subcheile selectate"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
- msgstr "marcheaz� ID-ul utilizator selectat ca primar"
+ msgstr "marchează ID-ul utilizator selectat ca primar"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
- msgstr "enumer� preferin�ele (expert)"
+ msgstr "enumeră preferinţele (expert)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
- msgstr "afi�eaz� preferin�ele (detaliat)"
+ msgstr "afişează preferinţele (detaliat)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
- msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
+ msgstr "setează lista de preferinţe pentru ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
- "seteaz� URL-ul serverului de chei preferat pentru ID-urile utilizator "
+ "setează URL-ul serverului de chei preferat pentru ID-urile utilizator "
  "selectate"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  #, fuzzy
  msgid "set a notation for the selected user IDs"
- msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
+ msgstr "setează lista de preferinţe pentru ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
- msgstr "schimb� fraza-parol�"
+ msgstr "schimbă fraza-parolă"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
- msgstr "schimb� �ncrederea pentru proprietar"
+ msgstr "schimbă încrederea pentru proprietar"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
- msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
+ msgstr "revocă semnăturile pentru ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
- msgstr "revoc� ID-urile utilizator selectate"
+ msgstr "revocă ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
- msgstr "revoc� cheia sau subcheile selectate"
+ msgstr "revocă cheia sau subcheile selectate"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
- msgstr "activeaz� cheia"
+ msgstr "activează cheia"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
- msgstr "deactiveaz� cheia"
+ msgstr "deactivează cheia"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
- msgstr "arat� pozele pentru ID-urile utilizator selectate"
+ msgstr "arată pozele pentru ID-urile utilizator selectate"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
- msgstr "Cheia secret� este disponibil�.\n"
+ msgstr "Cheia secretă este disponibilă.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
- msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
+ msgstr "Aveţi nevoie de cheia secretă pentru a face aceasta.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4331,433 -3435,343 +4350,434 @@@ msgid "
  "  a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
- "* Comanda `sign' (semneaz�) poate fi prefixat� cu un `l' pentru semn�turi\n"
- "  locale (lsign), un `t' pentru semn�turi de �ncredere (tsign), un `nr'\n"
- "  pentru semn�turi irevocabile (nrsign), sau orice combina�ie a acestora\n"
+ "* Comanda `sign' (semnează) poate fi prefixată cu un `l' pentru semnături\n"
+ "  locale (lsign), un `t' pentru semnături de încredere (tsign), un `nr'\n"
+ "  pentru semnături irevocabile (nrsign), sau orice combinaţie a acestora\n"
  "  (ltsign, tnrsign, etc.).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
- msgstr "Cheia este revocat�."
+ msgstr "Cheia este revocată."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
- msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
+ msgstr "Semnaţi într-adevăr toate ID-urile utilizator? (d/N) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
- msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
+ msgstr "Semnaţi într-adevăr toate ID-urile utilizator? (d/N) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
- msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
+ msgstr "Sugestie: Selectaţi ID-ul utilizator de semnat\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
- msgstr "Tip de semn�tur� necunoscut `%s'\n"
+ msgstr "Tip de semnătură necunoscut `%s'\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
- msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
+ msgstr "Această comandă nu este permisă în modul %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
- msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
+ msgstr "Trebuie mai întâi să selectaţi cel puţin un ID utilizator.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
- msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
+ msgstr "Nu puteţi şterge ultimul ID utilizator!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
- msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? (d/N) "
+ msgstr "Ştergeţi într-adevăr toate ID-urile utilizator selectate? (d/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
- msgstr "�terge�i �ntr-adev�r acest ID utilizator? (d/N) "
+ msgstr "Ştergeţi într-adevăr acest ID utilizator? (d/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
- msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
+ msgstr "Mutaţi într-adevăr cheia primară? (d/N) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
- msgstr "Trebuie s� selecta�i exact o cheie.\n"
+ msgstr "Trebuie să selectaţi exact o cheie.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
- msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
+ msgstr "Comanda aşteaptă un nume de fişier ca argument\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "Nu pot deschide `%s': %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
- msgstr "Eroare citind cheia de rezerv� de pe `%s': %s\n"
+ msgstr "Eroare citind cheia de rezervă de pe `%s': %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
- msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
+ msgstr "Trebuie să selectaţi cel puţin o cheie.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
- msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
+ msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
- msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? (d/N) "
+ msgstr "Doriţi într-adevăr să ştergeţi această cheie? (d/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr ""
- "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
+ "Doriţi într-adevăr să revocaţi toate ID-urile utilizator selectate? (d/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
- msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? (d/N) "
+ msgstr "Doriţi într-adevăr să revocaţi acest ID utilizator? (d/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
- msgstr "Dori�i �ntr-adev�r s� revoca�i toat� cheia? (d/N) "
+ msgstr "Doriţi într-adevăr să revocaţi toată cheia? (d/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgstr "Dori�i �ntr-adev�r s� revoca�i subcheile selectate? (d/N) "
+ msgstr "Doriţi într-adevăr să revocaţi subcheile selectate? (d/N) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
- msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� subcheie? (d/N) "
+ msgstr "Doriţi într-adevăr să revocaţi această subcheie? (d/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
- "�ncrederea proprietar nu poate fi setat� c�nd este folosit� o baz� de date "
- "de �ncredere furnizat� de utilizator\n"
+ "Încrederea proprietar nu poate fi setată când este folosită o bază de date "
+ "de încredere furnizată de utilizator\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
- msgstr "Seteaz� lista de preferin�e ca:\n"
+ msgstr "Setează lista de preferinţe ca:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
- "Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
+ "Doriţi într-adevăr să actualizaţi preferinţele pentru ID-urile utilizator "
  "selectate? (d/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
- msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
+ msgstr "Doriţi într-adevăr să actualizaţi preferinţele? (d/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
- msgstr "Salva�i schimb�rile?  (d/N) "
+ msgstr "Salvaţi schimbările?  (d/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
- msgstr "Termina�i f�r� a salva?  (d/N) "
+ msgstr "Terminaţi fără a salva?  (d/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
- msgstr "actualizarea a e�uat: %s\n"
+ msgstr "actualizarea a eşuat: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  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"
+ msgstr "Cheia nu a fost schimbată aşa că nici o actualizare a fost necesară.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
- msgstr "Generarea cheii a e�uat: %s\n"
+ msgstr "Generarea cheii a eşuat: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
- msgstr "amprent� invalid�"
+ msgstr "amprentă invalidă"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
- msgstr "am e�uat s� stochez amprenta: %s\n"
+ msgstr "am eşuat să stochez amprenta: %s\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
- msgstr "valoare invalid�\n"
+ msgstr "valoare invalidă\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
- msgstr "Nu exist� acest ID utilizator.\n"
+ msgstr "Nu există acest ID utilizator.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "Nothing to sign with key %s\n"
  msgid "Nothing to sign.\n"
  msgstr "Nimic de semnat cu cheia %s\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Rezumat: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
- msgstr "Capabilit��i: "
+ msgstr "Capabilităţi: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "Server de chei no-modify"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Server de chei preferat: "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  #, fuzzy
  msgid "Notations: "
- msgstr "Nota�ie:"
+ msgstr "Notaţie:"
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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"
+ msgstr "Nu există nici o preferinţă pentru un ID utilizator stil PGP 2.x.\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
- msgstr "Aceast� cheie a fost revocat� pe %s de %s cheia %s\n"
+ msgstr "Această cheie a fost revocată pe %s de %s cheia %s\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, c-format
  msgid "This key may be revoked by %s key %s"
- msgstr "Aceast� cheie poate fi revocat� de %s cheia %s"
+ msgstr "Această cheie poate fi revocată de %s cheia %s"
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr " (senzitiv)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
- msgstr "creat�: %s"
+ msgstr "creată: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
- msgstr "revocat�: %s"
+ msgstr "revocată: %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
- msgstr "expirat�: %s"
+ msgstr "expirată: %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
- msgstr "expir�: %s"
+ msgstr "expiră: %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "folosire: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "nr-card: "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
- msgstr "�ncredere: %s"
+ msgstr "încredere: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "validitate: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
- msgstr "Aceast� cheie a fost deactivat�"
+ msgstr "Această cheie a fost deactivată"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  msgstr ""
- "V� rug�m observa�i c� validitatea cheii ar�tate nu este �n mod necesar\n"
- "corect� dac� nu reporni�i programul.\n"
+ "Vă rugăm observaţi că validitatea cheii arătate nu este în mod necesar\n"
+ "corectă dacă nu reporniţi programul.\n"
  
  #
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
- msgstr "revocat�"
+ msgstr "revocată"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
- msgstr "expirat�"
+ msgstr "expirată"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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 ""
  "AVERTISMENT: nici un ID utilizator nu a fost marcat ca primar.\n"
- "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
- "              s� devin� ID-ul utilizator primar presupus.\n"
+ "              Această comandă poate cauza ca un alt ID utilizator\n"
+ "              să devină ID-ul utilizator primar presupus.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
- msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
+ msgstr "Nu puteţi schimba data de expirare a unei chei v3\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  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 ""
- "AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
- "         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
+ "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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  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) "
+ msgstr "Sunteţi încă sigur(ă) că doriţi să o adăugaţi? (d/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  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"
+ msgstr "Nu puteţi adăuga o poză ID la o cheie stil PGP2.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
- msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
+ msgstr "Ştergeţi această semnătură bună? (d/N/t)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
- msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
+ msgstr "Ştergeţi această semnătură invalidă? (d/N/t)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
- msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
+ msgstr "Ştergeţi această semnătură necunoscută? (d/N/t)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
- msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
+ msgstr "Ştergeţi într-adevăr această auto-semnătură? (d/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
- msgstr[0] "Am �ters %d semn�turi.\n"
- msgstr[1] "Am �ters %d semn�turi.\n"
+ msgstr[0] "Am şters %d semnături.\n"
+ msgstr[1] "Am şters %d semnături.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
- msgstr "Nu am �ters nimic.\n"
+ msgstr "Nu am şters nimic.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
- msgstr "invalid(�)"
+ msgstr "invalid(ă)"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "ID utilizator \"%s\" a fost revocat."
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
  msgstr[0] "ID utilizator \"%s\" a fost revocat."
  msgstr[1] "ID utilizator \"%s\" a fost revocat."
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  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 ""
- "AVERTISMENT: Aceasta este o cheie stil PGP 2.x.  Ad�ugarea unui revocator\n"
- "             desemnat poate face ca unele versiuni de PGP s� resping� "
+ "AVERTISMENT: Aceasta este o cheie stil PGP 2.x.  Adăugarea unui revocator\n"
+ "             desemnat poate face ca unele versiuni de PGP să respingă "
  "cheia.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  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"
+ msgstr "Nu puteţi adăuga un revocator desemnat la o cheie stil PGP 2.x.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
- msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
+ msgstr "Introduceţi ID-ul utilizator al revocatorului desemnat: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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:4642
++#: g10/keyedit.c:4658
  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"
+ msgstr "nu puteţi desemna o cheie ca propriul său revocator desemnat\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
- msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
+ msgstr "această cheie a fost deja desemnată ca un revocator\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  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"
+ "anulată!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  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 "
+ "Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
  "desemnat? (d/N) "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4765,241 -3779,190 +4785,241 @@@ msgid "
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
  msgstr ""
- "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
+ "Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
  "desemnat? (d/N) "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Schimb timpul de expirare pentru o subcheie.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
- msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
+ msgstr "Schimb timpul de expirare pentru cheia primară.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  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"
+ msgstr "Nu puteţi schimba data de expirare a unei chei v3\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr ""
- "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
+ "AVERTISMENT: subcheia de semnare %s nu este certificată reciproc (cross-"
  "certified)\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
- msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
+ msgstr "Vă rugăm selectaţi exact un ID utilizator.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, 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"
+ msgstr "auto-semnătură v3 sărită pentru ID-ul utilizator \"%s\"\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
- msgstr "Introduce�i URL-ul serverului de chei preferat: "
+ msgstr "Introduceţi URL-ul serverului de chei preferat: "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  msgid "Are you sure you want to replace it? (y/N) "
- msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
+ msgstr "Sunteţi sigur(ă) că doriţi să o folosiţi? (d/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
- msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
+ msgstr "Sunteţi sigur(ă) că doriţi să o folosiţi? (d/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  #, fuzzy
  msgid "Enter the notation: "
- msgstr "Notare semn�tur�: "
+ msgstr "Notare semnătură: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  #, fuzzy
  msgid "Proceed? (y/N) "
  msgstr "Suprascriu? (d/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Nici un ID utilizator cu indicele %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Nici un ID utilizator cu hash-ul %s\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Nici o subcheie cu indicele %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Nici o subcheie cu indicele %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID utilizator: \"%s\"\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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"
+ msgstr "semnată de cheia d-voastră %s la %s%s%s\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
- msgstr " (non-exportabil�)"
+ msgstr " (non-exportabilă)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
- msgstr "Aceast� semn�tur� a expirat pe %s.\n"
+ msgstr "Această semnătură a expirat pe %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  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) "
+ msgstr "Sunteţi încă sigur(ă) că doriţi să o revocaţi? (d/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
- msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
+ msgstr "Creaţi un certificat de revocare pentru această semnătură? (d/N) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr ""
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, 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"
+ msgstr "Aţi semnat aceste ID-uri utilizator pe cheia %s:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
- msgstr " (non-revocabil�)"
+ msgstr " (non-revocabilă)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
- msgstr "revocat� de cheia d-voastr� %s pe %s\n"
+ msgstr "revocată de cheia d-voastră %s pe %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
- msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
+ msgstr "Sunteţi pe cale să revocaţi aceste semnături:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
- msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
+ msgstr "Doriţi într-adevăr să creaţi certificatele de revocare? (d/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
- msgstr "nici o cheie secret�\n"
+ msgstr "nici o cheie secretă\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, fuzzy, c-format
  #| msgid "revoke a user ID"
  msgid "tried to revoke a non-user ID: %s\n"
- msgstr "revoc� un ID utilizator"
+ msgstr "revocă un ID utilizator"
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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"
+ "AVERTISMENT: o semnătură ID utilizator este datată %d secunde în viitor\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
- msgstr "Cheia %s este deja revocat�.\n"
+ msgstr "Cheia %s este deja revocată.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
- msgstr "Subcheia %s este deja revocat�.\n"
+ msgstr "Subcheia %s este deja revocată.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, 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"
+ msgstr "Afişez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
- msgstr "preferin�a `%s' duplicat�\n"
+ msgstr "preferinţa `%s' duplicată\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
- msgstr "prea multe preferin�e de cifrare\n"
+ msgstr "prea multe preferinţe de cifrare\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
- msgstr "prea multe preferin�e de rezumat\n"
+ msgstr "prea multe preferinţe de rezumat\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
- msgstr "prea multe preferin�e de compresie\n"
+ msgstr "prea multe preferinţe de compresie\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
- msgstr "articol invalid `%s' �n �irul de preferin�e\n"
+ msgstr "articol invalid `%s' în şirul de preferinţe\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
- msgstr "scriu semn�tur� direct�\n"
+ msgstr "scriu semnătură directă\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
- msgstr "scriu auto semn�tur�\n"
+ msgstr "scriu auto semnătură\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
- msgstr "scriu semn�tur� legat� de cheie\n"
+ msgstr "scriu semnătură legată de cheie\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
- msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
+ msgstr "lungime cheie invalidă; folosesc %u biţi\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
- msgstr "lungime cheie rotunjit� la %u bi�i\n"
+ msgstr "lungime cheie rotunjită la %u biţi\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
- msgstr "Semneaz�"
+ msgstr "Semnează"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
- msgstr "Cifreaz�"
+ msgstr "Cifrează"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
- msgstr "Autentific�"
+ msgstr "Autentifică"
  
  #. TRANSLATORS: Please use only plain ASCII characters for the
  #. translation.  If this is not possible use single digits.  The
@@@ -5011,158 -3974,127 +5031,158 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "SsCcAaTt"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
- msgstr "Ac�iuni posibile pentru o cheie %s: "
+ msgstr "Acţiuni posibile pentru o cheie %s: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
- msgstr "Ac�iuni permise curent: "
+ msgstr "Acţiuni permise curent: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
- msgstr "   (%c) Comut� capabilitatea de semnare\n"
+ msgstr "   (%c) Comută capabilitatea de semnare\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
- msgstr "   (%c) Comut� capabilitatea de cifrare\n"
+ msgstr "   (%c) Comută capabilitatea de cifrare\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
- msgstr "   (%c) Comut� capabilitatea de autentificare\n"
+ msgstr "   (%c) Comută capabilitatea de autentificare\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Terminat\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
- msgstr "Selecta�i ce fel de cheie dori�i:\n"
+ msgstr "Selectaţi ce fel de cheie doriţi:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
- msgstr "   (%d) DSA �i Elgamal (implicit)\n"
+ msgstr "   (%d) DSA şi Elgamal (implicit)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
- msgstr "   (%d) DSA �i Elgamal (implicit)\n"
+ msgstr "   (%d) DSA şi Elgamal (implicit)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (numai semnare)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (numai semnare)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (numai cifrare)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (numai cifrare)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
- msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
+ msgstr "   (%d) DSA (setează singur capabilităţile)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (seteaz� singur capabilit��ile)\n"
+ msgstr "   (%d) RSA (setează singur capabilităţile)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
- msgstr "   (%d) DSA �i Elgamal (implicit)\n"
+ msgstr "   (%d) DSA şi Elgamal (implicit)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (numai semnare)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
- msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
+ msgstr "   (%d) DSA (setează singur capabilităţile)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (numai cifrare)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (2) Cheie de cifrare\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
- msgstr "Notare semn�tur�: "
+ msgstr "Notare semnătură: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "Nici o subcheie cu indicele %d\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
- msgstr "rotunjit� prin adaos la %u bi�i\n"
+ msgstr "rotunjită prin adaos la %u biţi\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
- msgstr "cheile %s pot avea lungimea �ntre %u �i %u bi�i.\n"
+ msgstr "cheile %s pot avea lungimea între %u şi %u biţi.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
- msgstr "Ce lungime de cheie dori�i? (%u) "
+ msgstr "Ce lungime de cheie doriţi? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
- msgstr "Ce lungime de cheie dori�i? (%u) "
+ msgstr "Ce lungime de cheie doriţi? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
- msgstr "Lungimea cheii necesar� este %u bi�i\n"
+ msgstr "Lungimea cheii necesară este %u biţi\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
- msgstr "Selecta�i ce fel de cheie dori�i:\n"
+ msgstr "Selectaţi ce fel de cheie doriţi:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5171,14 -4103,13 +5191,14 @@@
  "      <n>m = key expires in n months\n"
  "      <n>y = key expires in n years\n"
  msgstr ""
- "Specifica�i c�t de mult timp dori�i s� fie valid� cheia.\n"
- "         0 = cheia nu expir�\n"
- "      <n>  = cheia expir� �n n zile\n"
- "      <n>w = cheia expir� �n n s�pt�m�ni\n"
- "      <n>m = cheia expir� �n n luni\n"
- "      <n>y = cheia expir� �n n ani\n"
+ "Specificaţi cât de mult timp doriţi să fie validă cheia.\n"
+ "         0 = cheia nu expiră\n"
+ "      <n>  = cheia expiră în n zile\n"
+ "      <n>w = cheia expiră în n săptămâni\n"
+ "      <n>m = cheia expiră în n luni\n"
+ "      <n>y = cheia expiră în n ani\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5187,57 -4118,47 +5207,57 @@@
  "      <n>m = signature expires in n months\n"
  "      <n>y = signature expires in n years\n"
  msgstr ""
- "Specifica�i c�t de mult timp dori�i s� fie valid� semn�tura.\n"
- "         0 = semn�tura nu expir�\n"
- "      <n>  = semn�tura expir� �n n zile\n"
- "      <n>w = semn�tura expir� �n n s�pt�m�ni\n"
- "      <n>m = semn�tura expir� �n n luni\n"
- "      <n>y = semn�tura expir� �n n ani\n"
+ "Specificaţi cât de mult timp doriţi să fie validă semnătura.\n"
+ "         0 = semnătura nu expiră\n"
+ "      <n>  = semnătura expiră în n zile\n"
+ "      <n>w = semnătura expiră în n săptămâni\n"
+ "      <n>m = semnătura expiră în n luni\n"
+ "      <n>y = semnătura expiră în n ani\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
- msgstr "Cheia este valid� pentru? (0) "
+ msgstr "Cheia este validă pentru? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
- msgstr "Semn�tura este valid� pentru? (%s) "
+ msgstr "Semnătura este validă pentru? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
- msgstr "valoare invalid�\n"
+ msgstr "valoare invalidă\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
- msgstr "Cheia nu expir� deloc\n"
+ msgstr "Cheia nu expiră deloc\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
- msgstr "Semn�tura nu expir� deloc\n"
+ msgstr "Semnătura nu expiră deloc\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
- msgstr "Cheia expir� pe %s\n"
+ msgstr "Cheia expiră pe %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
- msgstr "Semn�tura expir� pe %s\n"
+ msgstr "Semnătura expiră pe %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
- "Sistemul d-voastr� nu poate afi�a date dup� 2038.\n"
- "Totu�i, acestea vor fi corect m�nuite p�n� �n 2106.\n"
+ "Sistemul d-voastră nu poate afişa date după 2038.\n"
+ "Totuşi, acestea vor fi corect mânuite până în 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "Este aceasta corect? (d/N) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5248,7 -4169,6 +5268,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5258,57 -4178,46 +5278,57 @@@
  "\n"
  msgstr ""
  "\n"
- "Ave�i nevoie de un ID utilizator pentru a identifica cheia; software-ul\n"
- "construie�te ID-ul utilizator din Numele Real, Comentariul �i Adresa de "
+ "Aveţi nevoie de un ID utilizator pentru a identifica cheia; software-ul\n"
+ "construieşte ID-ul utilizator din Numele Real, Comentariul şi Adresa de "
  "Email\n"
- "�n aceast� form�:\n"
- "    \"Popa Ioan (popic�) <popa.ioan at compania.ro>\"\n"
+ "în această formă:\n"
+ "    \"Popa Ioan (popică) <popa.ioan at compania.ro>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Nume real: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
- msgstr "Caracter invalid �n nume\n"
+ msgstr "Caracter invalid în nume\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
- msgstr "Numele nu poate �ncepe cu o cifr�\n"
+ msgstr "Numele nu poate începe cu o cifră\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
- msgstr "Numele trebuie s� fie de cel pu�in 5 caractere\n"
+ msgstr "Numele trebuie să fie de cel puţin 5 caractere\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
- msgstr "Adres� de email: "
+ msgstr "Adresă de email: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
- msgstr "Nu este o adres� de email valid�\n"
+ msgstr "Nu este o adresă de email validă\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Comentariu: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
- msgstr "Caracter invalid �n comentariu\n"
+ msgstr "Caracter invalid în comentariu\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
- msgstr "Folosi�i setul de caractere `%s'\n"
+ msgstr "Folosiţi setul de caractere `%s'\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5319,9 -4228,8 +5339,9 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
- msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
+ msgstr "Vă rugăm nu puneţi adresa de email în numele real sau comentariu\n"
  
  #. TRANSLATORS: These are the allowed answers in
  #. lower and uppercase.  Below you will find the matching
@@@ -5334,53 -4242,43 +5354,53 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoTt"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
- msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
+ msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (T)Termină? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
- msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
+ msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termină? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
- msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
+ msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (T)Termină? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
- msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
+ msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termină? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
- msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
+ msgstr "Vă rugăm corectaţi mai întâi eroarea\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
  "disks) during the prime generation; this gives the random number\n"
  "generator a better chance to gain enough entropy.\n"
  msgstr ""
- "Trebuie s� gener�m o gr�mad� de octe�i aleatori. Este o idee bun� s� face�i\n"
- "altceva (tasta�i la tastatur�, mi�ca�i mausul, utiliza�i discurile)\n"
- "�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
- "numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
+ "Trebuie să generăm o grămadă de octeţi aleatori. Este o idee bună să faceţi\n"
+ "altceva (tastaţi la tastatură, mişcaţi mausul, utilizaţi discurile)\n"
+ "în timpul generării numerelor prime; aceasta dă o şansă generatorului de\n"
+ "numere aleatoare o şansă mai bună de a aduna destulă entropie.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
- msgstr "Generarea cheii a e�uat: %s\n"
+ msgstr "Generarea cheii a eşuat: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5388,155 -4286,127 +5408,155 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
- msgstr "cheia exist� deja\n"
+ msgstr "cheia există deja\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "Create anyway? (y/N) "
- msgstr "Crea�i oricum? "
+ msgstr "Creaţi oricum? "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  #| msgid "Create anyway? "
  msgid "creating anyway\n"
- msgstr "Crea�i oricum? "
+ msgstr "Creaţi oricum? "
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
- msgstr "Generarea cheii a fost anulat�.\n"
+ msgstr "Generarea cheii a fost anulată.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
- msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
+ msgstr "nu pot crea fişier de rezervă `%s': %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
- msgstr "NOT�: copia de siguran�a a cheii cardului salvat� la `%s'\n"
+ msgstr "NOTĂ: copia de siguranţa a cheii cardului salvată la `%s'\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
- msgstr "scriu cheia public� �n `%s'\n"
+ msgstr "scriu cheia publică în `%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
- msgstr "nu am g�sit nici un inel de chei public de scris: %s\n"
+ msgstr "nu am găsit nici un inel de chei public de scris: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
- msgstr "cheile secret� �i public� au fost create �i semnate.\n"
+ msgstr "cheile secretă şi publică au fost create şi semnate.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
  msgstr ""
- "De notat c� aceast� cheie nu poate fi folosit� pentru cifrare.  Poate "
- "dori�i\n"
- "s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
+ "De notat că această cheie nu poate fi folosită pentru cifrare.  Poate "
+ "doriţi\n"
+ "să folosiţi comanda \"--edit-key\" pentru a genera o subcheie secundară\n"
  "pentru acest scop.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr ""
- "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
+ "cheia a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
  "ceasul)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr ""
- "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
+ "cheia a fost creată %lu secunde în viitor (warp în timp sau probleme cu "
  "ceasul)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
- msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
+ msgstr "NOTĂ: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
- msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
+ msgstr "Părţile secrete ale cheii primare nu sunt disponibile.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
- msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
+ msgstr "Părţi secrete ale cheii primare sunt stacate pe card.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
- msgstr "Crea�i �ntr-adev�r? (d/N) "
+ msgstr "Creaţi într-adevăr? (d/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
- msgstr "niciodat� "
+ msgstr "niciodată "
  
 +#: g10/keylist.c:331
  msgid "Critical signature policy: "
- msgstr "Politic� de semn�turi critic�: "
+ msgstr "Politică de semnături critică: "
  
 +#: g10/keylist.c:333
  msgid "Signature policy: "
- msgstr "Politic� de semn�turi: "
+ msgstr "Politică de semnături: "
  
 +#: g10/keylist.c:375
  msgid "Critical preferred keyserver: "
  msgstr "Server de chei preferat critic: "
  
 +#: g10/keylist.c:428
  msgid "Critical signature notation: "
- msgstr "Notare semn�tur� critic�: "
+ msgstr "Notare semnătură critică: "
  
 +#: g10/keylist.c:430
  msgid "Signature notation: "
- msgstr "Notare semn�tur�: "
+ msgstr "Notare semnătură: "
  
 +#: g10/keylist.c:472
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d good signature\n"
  msgid_plural "%d good signatures\n"
- msgstr[0] "%d semn�turi incorecte\n"
- msgstr[1] "%d semn�turi incorecte\n"
+ msgstr[0] "%d semnături incorecte\n"
+ msgstr[1] "%d semnături incorecte\n"
  
 +#: g10/keylist.c:485
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to an error\n"
  msgid "%d signature not checked due to an error\n"
  msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
- msgstr[1] "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
+ msgstr[0] "1 semnătură nu a fost verificată din cauza unei erori\n"
+ msgstr[1] "1 semnătură nu a fost verificată din cauza unei erori\n"
  
 +#: g10/keylist.c:567
  #, c-format
  msgid "Warning: %lu key skipped due to its large size\n"
  msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@@ -5547,29 -4416,23 +5567,29 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "Inel de chei"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
- msgstr "Amprent� cheie primar�:"
+ msgstr "Amprentă cheie primară:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
- msgstr "     Amprent� subcheie:"
+ msgstr "     Amprentă subcheie:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
- msgstr " Amprent� cheie primar�:"
+ msgstr " Amprentă cheie primară:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
- msgstr "      Amprent� subcheie:"
+ msgstr "      Amprentă subcheie:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
- msgstr "      Amprent� cheie ="
+ msgstr "      Amprentă cheie ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr "      Card nr. serie ="
  
@@@ -5577,17 -4439,15 +5597,17 @@@
  #, fuzzy, c-format
  #| msgid "caching keyring `%s'\n"
  msgid "caching keyring '%s'\n"
- msgstr "pun �n cache inelul de chei `%s'\n"
+ msgstr "pun în cache inelul de chei `%s'\n"
  
 +#: g10/keyring.c:1572
  #, fuzzy, c-format
  #| msgid "%lu keys cached so far (%lu signatures)\n"
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
- msgstr[0] "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
- msgstr[1] "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
+ msgstr[0] "%lu chei puse în cache până acum (%lu semnături)\n"
+ msgstr[1] "%lu chei puse în cache până acum (%lu semnături)\n"
  
 +#: g10/keyring.c:1588
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
@@@ -5599,62 -4458,49 +5619,62 @@@ msgstr[1] "
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
- msgstr[0] "1 semn�tur� incorect�\n"
- msgstr[1] "1 semn�tur� incorect�\n"
+ msgstr[0] "1 semnătură incorectă\n"
+ msgstr[1] "1 semnătură incorectă\n"
  
 +#: g10/keyring.c:1665
  #, c-format
  msgid "%s: keyring created\n"
  msgstr "%s: inelul de chei creat\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  #, fuzzy
  msgid "honor the preferred keyserver URL set on the key"
- msgstr "Introduce�i URL-ul serverului de chei preferat: "
+ msgstr "Introduceţi URL-ul serverului de chei preferat: "
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
- msgstr "deactivat(�)"
+ msgstr "deactivat(ă)"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
- msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
+ msgstr "Introduceţi număr/numere, N)ext (următor), sau Q)uit (termină) > "
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
- msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
+ msgstr "\"%s\" nu este un ID de cheie: sărit\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  #| msgid "refreshing %d keys from %s\n"
  msgid "refreshing %d key from %s\n"
@@@ -5662,91 -4508,73 +5682,91 @@@ msgid_plural "refreshing %d keys from %
  msgstr[0] "reactualizez %d chei de la %s\n"
  msgstr[1] "reactualizez %d chei de la %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
- msgstr "cheia \"%s\" nu a fost g�sit� pe serverul de chei\n"
+ msgstr "cheia \"%s\" nu a fost găsită pe serverul de chei\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
- msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
+ msgstr "cheia nu a fost găsită pe serverul de chei\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
- msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
+ msgstr "nici un server de chei cunoscut (folosiţi opţiunea --keyserver)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "cer cheia %s de la serverul %s %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "cer cheia %s de la %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  #| msgid "no keyserver action!\n"
  msgid "no keyserver known\n"
- msgstr "nici o ac�iune pentru serverul de chei!\n"
+ msgstr "nici o acţiune pentru serverul de chei!\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
- msgstr "s�rit� \"%s\": %s\n"
+ msgstr "sărită \"%s\": %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "trimit cheia %s lui %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  #| msgid "requesting key %s from %s\n"
  msgid "requesting key from '%s'\n"
  msgstr "cer cheia %s de la %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, fuzzy, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
  
 +#: g10/mainproc.c:254
  #, c-format
  msgid "weird size for an encrypted session key (%d)\n"
- msgstr "dimensiune ciudat� pentru o cheie de sesiune cifrat� (%d)\n"
+ msgstr "dimensiune ciudată pentru o cheie de sesiune cifrată (%d)\n"
  
 +#: g10/mainproc.c:302
  #, c-format
  msgid "%s encrypted session key\n"
- msgstr "%s cheie de sesiune cifrat�\n"
+ msgstr "%s cheie de sesiune cifrată\n"
  
 +#: g10/mainproc.c:312
  #, c-format
  msgid "passphrase generated with unknown digest algorithm %d\n"
- msgstr "fraza-parol� generat� cu un algoritm rezumat necunoscut %d\n"
+ msgstr "fraza-parolă generată cu un algoritm rezumat necunoscut %d\n"
  
 +#: g10/mainproc.c:378
  #, c-format
  msgid "public key is %s\n"
- msgstr "cheia public� este %s\n"
+ msgstr "cheia publică este %s\n"
  
 +#: g10/mainproc.c:456
  msgid "public key encrypted data: good DEK\n"
- msgstr "date cigrate cu cheie public�: DEK bun\n"
+ msgstr "date cigrate cu cheie publică: DEK bun\n"
  
 +#: g10/mainproc.c:489
  #, c-format
  msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
- msgstr "cifrat cu cheia %u-bit %s, ID %s, creat� %s\n"
+ msgstr "cifrat cu cheia %u-bit %s, ID %s, creată %s\n"
  
 +#: g10/mainproc.c:493 g10/pkclist.c:228
  #, c-format
  msgid "      \"%s\"\n"
  msgstr "      \"%s\"\n"
@@@ -5756,35 -4583,28 +5776,35 @@@
  msgid "encrypted with %s key, ID %s\n"
  msgstr "cifrat cu cheia %s, ID %s\n"
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
- msgstr "decriptarea cu cheie public� a e�uat: %s\n"
+ msgstr "decriptarea cu cheie publică a eşuat: %s\n"
  
 +#: g10/mainproc.c:530
  #, c-format
  msgid "encrypted with %lu passphrases\n"
- msgstr "cifrat� cu %lu fraze-parol�\n"
+ msgstr "cifrată cu %lu fraze-parolă\n"
  
 +#: g10/mainproc.c:532
  msgid "encrypted with 1 passphrase\n"
- msgstr "cifrat� cu 1 fraz�-parol�\n"
+ msgstr "cifrată cu 1 frază-parolă\n"
  
 +#: g10/mainproc.c:566 g10/mainproc.c:587
  #, c-format
  msgid "assuming %s encrypted data\n"
  msgstr "presupunem date cifrate %s\n"
  
 +#: g10/mainproc.c:573
  #, c-format
  msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
- msgstr "cifru IDEA indisponibil, vom �ncerca s� folosim %s �n loc\n"
+ msgstr "cifru IDEA indisponibil, vom încerca să folosim %s în loc\n"
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  msgid "WARNING: message was not integrity protected\n"
- msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
+ msgstr "AVERTISMENT: mesajul nu a avut integritatea protejată\n"
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
  msgstr "decriptare OK\n"
  
@@@ -5792,173 -4611,138 +5812,173 @@@
  msgid "WARNING: encrypted message has been manipulated!\n"
  msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
  
 +#: g10/mainproc.c:653
  #, c-format
  msgid "decryption failed: %s\n"
- msgstr "decriptarea a e�uat: %s\n"
+ msgstr "decriptarea a eşuat: %s\n"
  
 +#: g10/mainproc.c:676
  #, fuzzy
  #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
  msgid "Note: sender requested \"for-your-eyes-only\"\n"
- msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
+ msgstr "NOTĂ: expeditorul a cerut \"doar-pentru-ochii-d-voastră\"\n"
  
 +#: g10/mainproc.c:678
  #, c-format
  msgid "original file name='%.*s'\n"
- msgstr "nume fi�ier original='%.*s'\n"
+ msgstr "nume fişier original='%.*s'\n"
  
 +#: g10/mainproc.c:748
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
- msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
+ msgstr "revocare standalone - folosiţi \"gpg --import\" pentru a aplica\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  #, fuzzy
  msgid "no signature found\n"
- msgstr "Semn�tur� bun� din \"%s\""
+ msgstr "Semnătură bună din \"%s\""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
- msgstr "Semn�tur� INCORECT� din \"%s\""
+ msgstr "Semnătură INCORECTĂ din \"%s\""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
- msgstr "Semn�tur� expirat� din \"%s\""
+ msgstr "Semnătură expirată din \"%s\""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
- msgstr "Semn�tur� bun� din \"%s\""
+ msgstr "Semnătură bună din \"%s\""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
- msgstr "verificare semn�tur� eliminat�\n"
+ msgstr "verificare semnătură eliminată\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
- msgstr "nu pot m�nui aceste semn�turi multiple\n"
+ msgstr "nu pot mânui aceste semnături multiple\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
- msgstr "Semn�tur� f�cut� %s\n"
+ msgstr "Semnătură făcută %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               folosind cheia %s %s\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
- msgstr "Semn�tur� f�cut� %s folosind cheia %s cu ID %s\n"
+ msgstr "Semnătură făcută %s folosind cheia %s cu ID %s\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                aka \"%s\""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
- msgstr "Cheie disponibil� la: "
+ msgstr "Cheie disponibilă la: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[nesigur]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                aka \"%s\""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
- msgstr "Semn�tur� expirat� %s\n"
+ msgstr "Semnătură expirată %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
- msgstr "Semn�tura expir� %s\n"
+ msgstr "Semnătura expiră %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
- msgstr "semn�tur� %s, algoritm rezumat %s\n"
+ msgstr "semnătură %s, algoritm rezumat %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binar"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "modtext"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "necunoscut"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "algoritm pubkey necunoscut"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
- msgstr "Nu pot verifica semn�tura: %s\n"
+ msgstr "Nu pot verifica semnătura: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
- msgstr "nu o semn�tur� deta�at�\n"
+ msgstr "nu o semnătură detaşată\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
- "AVERTISMENT: am detectat multiple semn�turi.  Numai prima va fi verificat�.\n"
+ "AVERTISMENT: am detectat multiple semnături.  Numai prima va fi verificată.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
- msgstr "semn�tur� de sine st�t�toare (standalone) de clas� 0x%02x\n"
+ msgstr "semnătură de sine stătătoare (standalone) de clasă 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
- msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
+ msgstr "semnătură de stil vechi (PGP 2.x)\n"
  
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
  #, fuzzy, c-format
  #| msgid "fstat of `%s' failed in %s: %s\n"
  msgid "fstat of '%s' failed in %s: %s\n"
- msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
+ msgstr "fstat pentru `%s' a eşuat în %s: %s\n"
  
 +#: g10/misc.c:170
  #, c-format
  msgid "fstat(%d) failed in %s: %s\n"
- msgstr "fstat(%d) a e�uat �n %s: %s\n"
+ msgstr "fstat(%d) a eşuat în %s: %s\n"
  
 +#: g10/misc.c:279
  #, c-format
  msgid "WARNING: using experimental public key algorithm %s\n"
- msgstr "AVERTISMENT: folosesc algoritmul cu cheie public� experimental %s\n"
+ msgstr "AVERTISMENT: folosesc algoritmul cu cheie publică experimental %s\n"
  
 +#: g10/misc.c:286
  #, fuzzy
  msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
  msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
@@@ -5982,56 -4762,46 +6002,56 @@@ msgstr "AVERTISMENT: algoritmul rezuma
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "Note: signatures using the %s algorithm are rejected\n"
- msgstr "semn�tur� %s, algoritm rezumat %s\n"
+ msgstr "semnătură %s, algoritm rezumat %s\n"
  
 +#: g10/misc.c:375
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "(reported error: %s)\n"
- msgstr "eroare citire �n `%s': %s\n"
+ msgstr "eroare citire în `%s': %s\n"
  
 +#: g10/misc.c:378
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "(reported error: %s <%s>)\n"
- msgstr "eroare citire �n `%s': %s\n"
+ msgstr "eroare citire în `%s': %s\n"
  
 +#: g10/misc.c:397
  msgid "(further info: "
  msgstr ""
  
 +#: g10/misc.c:1056
  #, c-format
  msgid "%s:%d: deprecated option \"%s\"\n"
- msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
+ msgstr "%s:%d: opţiune învechită \"%s\"\n"
  
 +#: g10/misc.c:1060
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated option\n"
- msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+ msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
  
 +#: g10/misc.c:1062
  #, c-format
  msgid "please use \"%s%s\" instead\n"
- msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
+ msgstr "vă rugăm folosiţi \"%s%s\" în loc\n"
  
 +#: g10/misc.c:1069
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
- msgstr "AVERTISMENT: \"%s\" este o comand� �nvechit� - nu o folosi�i\n"
+ msgstr "AVERTISMENT: \"%s\" este o comandă învechită - nu o folosiţi\n"
  
 +#: g10/misc.c:1079
  #, fuzzy, c-format
  msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
- msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+ msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
  
 +#: g10/misc.c:1083
  #, fuzzy, c-format
  msgid ""
  "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
- msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+ msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
  
 +#: g10/misc.c:1147
  msgid "Uncompressed"
  msgstr "Necompresat"
  
@@@ -6041,40 -4810,33 +6061,40 @@@
  msgid "uncompressed|none"
  msgstr "necompresat|niciunul"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
- msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
+ msgstr "acest mesaj s-ar putea să nu poată fi folosit de %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  #| msgid "ambiguous option `%s'\n"
  msgid "ambiguous option '%s'\n"
- msgstr "op�iune ambigu� `%s'\n"
+ msgstr "opţiune ambiguă `%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown option '%s'\n"
- msgstr "op�iune necunoscut� `%s'\n"
+ msgstr "opţiune necunoscută `%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "unknown weak digest '%s'\n"
- msgstr "Tip de semn�tur� necunoscut `%s'\n"
+ msgstr "Tip de semnătură necunoscut `%s'\n"
  
 +#: g10/openfile.c:84
  #, fuzzy, c-format
  #| msgid "File `%s' exists. "
  msgid "File '%s' exists. "
- msgstr "Fi�ierul `%s' exist�. "
+ msgstr "Fişierul `%s' există. "
  
 +#: g10/openfile.c:88
  msgid "Overwrite? (y/N) "
  msgstr "Suprascriu? (d/N) "
  
@@@ -6083,11 -4844,9 +6103,11 @@@
  msgid "%s: unknown suffix\n"
  msgstr "%s: sufix necunoscut\n"
  
 +#: g10/openfile.c:147
  msgid "Enter new filename"
- msgstr "Introduce�i un nou nume-fi�ier"
+ msgstr "Introduceţi un nou nume-fişier"
  
 +#: g10/openfile.c:218
  msgid "writing to stdout\n"
  msgstr "scriu la stdout\n"
  
@@@ -6095,92 -4853,76 +6115,92 @@@
  #, fuzzy, c-format
  #| msgid "assuming signed data in `%s'\n"
  msgid "assuming signed data in '%s'\n"
- msgstr "presupun date semnate �n `%s'\n"
+ msgstr "presupun date semnate în `%s'\n"
  
 +#: g10/openfile.c:457
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new configuration file '%s' created\n"
- msgstr "fi�ier de configurare nou `%s' creat\n"
+ msgstr "fişier de configurare nou `%s' creat\n"
  
 +#: g10/openfile.c:498
  #, fuzzy, c-format
  #| msgid "WARNING: options in `%s' are not yet active during this run\n"
  msgid "WARNING: options in '%s' are not yet active during this run\n"
  msgstr ""
- "AVERTISMENT: op�iunile din %s nu sunt �nc� active �n timpul acestei rul�ri\n"
+ "AVERTISMENT: opţiunile din %s nu sunt încă active în timpul acestei rulări\n"
  
 +#: g10/parse-packet.c:257
  #, c-format
  msgid "can't handle public key algorithm %d\n"
- msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
+ msgstr "nu pot mânui algoritmul cu cheie publică %d\n"
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
  msgstr ""
- "AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
+ "AVERTISMENT: cheie de sesiune cifrată simetric potenţial nesigură "
  "(insecure)\n"
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
  msgstr "subpachetul de tip %d are bitul critic setat\n"
  
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
- msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
+ msgstr "problemă cu agentul: agentul returnează 0x%lx\n"
  
 +#: g10/passphrase.c:241
  msgid "Enter passphrase\n"
- msgstr "Introduce�i fraza-parol�\n"
+ msgstr "Introduceţi fraza-parolă\n"
  
 +#: g10/passphrase.c:252
  msgid "cancelled by user\n"
- msgstr "anulat� de utilizator\n"
+ msgstr "anulată de utilizator\n"
  
 +#: g10/passphrase.c:489
  #, c-format
  msgid " (main key ID %s)"
- msgstr " (ID cheie principal� %s)"
+ msgstr " (ID cheie principală %s)"
  
 +#: g10/passphrase.c:496
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
  msgstr ""
- "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+ "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
 +#: g10/passphrase.c:500
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
  msgstr ""
- "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+ "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
 +#: g10/passphrase.c:505
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
  msgstr ""
- "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+ "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
 +#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
  msgstr ""
- "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+ "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
  
 +#: g10/passphrase.c:513
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
- msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
+ msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
  
 +#: g10/passphrase.c:516
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
- msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
+ msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
  
 +#: g10/passphrase.c:525
  #, fuzzy, c-format
  #| msgid "%u-bit %s key, ID %s, created %s"
  msgid ""
@@@ -6189,9 -4931,8 +6209,9 @@@
  "%u-bit %s key, ID %s,\n"
  "created %s%s.\n"
  "%s"
- msgstr "cheia %u-bit %s, ID %s, creat� %s"
+ msgstr "cheia %u-bit %s, ID %s, creată %s"
  
 +#: g10/photoid.c:77
  msgid ""
  "\n"
  "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@@ -6200,63 -4941,51 +6220,63 @@@
  "Keeping the image close to 240x288 is a good size to use.\n"
  msgstr ""
  "\n"
- "Alege�i o imagine pentru a o folosi ca poz� ID.  Imaginea trebuie s� fie un\n"
- "fi�ier JPEG.  Aminti�i-v� c� imaginea este p�strat� �n cheia d-voastr� "
- "public�.\n"
- "Dac� folosi�i o imagine foarte larg�, cheia d-voastr� va deveni de asemenea\n"
- "foarte larg�!\n"
- "�ncerca�i s� folosi�i o imagine de aproximativ 240x288 pixeli.\n"
+ "Alegeţi o imagine pentru a o folosi ca poză ID.  Imaginea trebuie să fie un\n"
+ "fişier JPEG.  Amintiţi-vă că imaginea este păstrată în cheia d-voastră "
+ "publică.\n"
+ "Dacă folosiţi o imagine foarte largă, cheia d-voastră va deveni de asemenea\n"
+ "foarte largă!\n"
+ "Încercaţi să folosiţi o imagine de aproximativ 240x288 pixeli.\n"
  
 +#: g10/photoid.c:99
  msgid "Enter JPEG filename for photo ID: "
- msgstr "Introduce�i nume-fi�ier JPEG pentru poz� ID: "
+ msgstr "Introduceţi nume-fişier JPEG pentru poză ID: "
  
 +#: g10/photoid.c:120
  #, fuzzy, c-format
  #| msgid "unable to open JPEG file `%s': %s\n"
  msgid "unable to open JPEG file '%s': %s\n"
- msgstr "nu pot deschide fi�ierul JPEG `%s': %s\n"
+ msgstr "nu pot deschide fişierul JPEG `%s': %s\n"
  
 +#: g10/photoid.c:131
  #, c-format
  msgid "This JPEG is really large (%d bytes) !\n"
- msgstr "Acest JPEG este foarte mare (%d octe�i) !\n"
+ msgstr "Acest JPEG este foarte mare (%d octeţi) !\n"
  
 +#: g10/photoid.c:133
  msgid "Are you sure you want to use it? (y/N) "
- msgstr "Sunte�i sigur(�) c� dori�i s� �l folosi�i? (d/N) "
+ msgstr "Sunteţi sigur(ă) că doriţi să îl folosiţi? (d/N) "
  
 +#: g10/photoid.c:149
  #, fuzzy, c-format
  #| msgid "`%s' is not a JPEG file\n"
  msgid "'%s' is not a JPEG file\n"
- msgstr "`%s' nu este un fi�ier JPEG\n"
+ msgstr "`%s' nu este un fişier JPEG\n"
  
 +#: g10/photoid.c:168
  msgid "Is this photo correct (y/N/q)? "
- msgstr "Este aceast� poz� corect� (d/N/t)? "
+ msgstr "Este această poză corectă (d/N/t)? "
  
 +#: g10/photoid.c:380
  msgid "unable to display photo ID!\n"
- msgstr "nu pot afi�a poza ID!\n"
+ msgstr "nu pot afişa poza ID!\n"
  
 +#: g10/pkclist.c:72 g10/revoke.c:757
  msgid "No reason specified"
  msgstr "Nici un motiv specificat"
  
 +#: g10/pkclist.c:74 g10/revoke.c:759
  msgid "Key is superseded"
- msgstr "Cheia este �nlocuit�"
+ msgstr "Cheia este înlocuită"
  
 +#: g10/pkclist.c:76 g10/revoke.c:758
  msgid "Key has been compromised"
- msgstr "Cheia a fost compromis�"
+ msgstr "Cheia a fost compromisă"
  
 +#: g10/pkclist.c:78 g10/revoke.c:760
  msgid "Key is no longer used"
- msgstr "Cheia nu mai este folosit�"
+ msgstr "Cheia nu mai este folosită"
  
 +#: g10/pkclist.c:80 g10/revoke.c:761
  msgid "User ID is no longer valid"
  msgstr "ID utilizator nu mai este valid"
  
@@@ -6282,11 -5008,9 +6302,11 @@@ msgstr "comentariu revocare: 
  msgid "iImMqQsS"
  msgstr "iImMtTsS"
  
 +#: g10/pkclist.c:224
  msgid "No trust value assigned to:\n"
- msgstr "Nici o valoare de �ncredere atribuit� lui:\n"
+ msgstr "Nici o valoare de încredere atribuită lui:\n"
  
 +#: g10/pkclist.c:257
  #, c-format
  msgid "  aka \"%s\"\n"
  msgstr "  aka \"%s\"\n"
@@@ -6295,280 -5018,241 +6315,300 @@@
  msgid ""
  "How much do you trust that this key actually belongs to the named user?\n"
  msgstr ""
- "C�t de mult crede�i c� aceast� cheie apar�ine �ntr-adev�r utilizatorului "
+ "Cât de mult credeţi că această cheie aparţine într-adevăr utilizatorului "
  "numit?\n"
  
 +#: g10/pkclist.c:282
  #, c-format
  msgid "  %d = I don't know or won't say\n"
- msgstr "  %d = Nu �tiu sau nu vreau s� m� pronun�\n"
+ msgstr "  %d = Nu ştiu sau nu vreau să mă pronunţ\n"
  
 +#: g10/pkclist.c:284
  #, c-format
  msgid "  %d = I do NOT trust\n"
- msgstr "  %d = NU am �ncredere\n"
+ msgstr "  %d = NU am încredere\n"
  
 +#: g10/pkclist.c:290
  #, c-format
  msgid "  %d = I trust ultimately\n"
- msgstr "  %d = Am �ncredere suprem�\n"
+ msgstr "  %d = Am încredere supremă\n"
  
 +#: g10/pkclist.c:296
  msgid "  m = back to the main menu\n"
- msgstr "  m = �napoi la meniul principal\n"
+ msgstr "  m = înapoi la meniul principal\n"
  
 +#: g10/pkclist.c:299
  msgid "  s = skip this key\n"
- msgstr "  s = s�ri peste cheia asta\n"
+ msgstr "  s = sări peste cheia asta\n"
  
 +#: g10/pkclist.c:300
  msgid "  q = quit\n"
- msgstr "  t = termin�\n"
+ msgstr "  t = termină\n"
  
 +#: g10/pkclist.c:304
  #, c-format
  msgid ""
  "The minimum trust level for this key is: %s\n"
  "\n"
  msgstr ""
- "Nivelul minim de �ncredere pentru aceast� cheie este: %s\n"
+ "Nivelul minim de încredere pentru această cheie este: %s\n"
  "\n"
  
 +#: g10/pkclist.c:310 g10/revoke.c:786
  msgid "Your decision? "
- msgstr "Decizia d-voastr�? "
+ msgstr "Decizia d-voastră? "
  
 +#: g10/pkclist.c:331
  msgid "Do you really want to set this key to ultimate trust? (y/N) "
  msgstr ""
- "Dori�i �ntr-adev�r s� seta�i aceast� cheie cu �ncredere suprem�? (d/N) "
+ "Doriţi într-adevăr să setaţi această cheie cu încredere supremă? (d/N) "
  
 +#: g10/pkclist.c:345
  msgid "Certificates leading to an ultimately trusted key:\n"
- msgstr "Certificatele ce conduc la o cheie cu �ncredere suprem�:\n"
+ msgstr "Certificatele ce conduc la o cheie cu încredere supremă:\n"
  
 +#: g10/pkclist.c:434
  #, c-format
  msgid "%s: There is no assurance this key belongs to the named user\n"
  msgstr ""
- "%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
+ "%s: Nu există nici o indicaţie că această cheie aparţine într-adevăr "
  "utilizatorului numit\n"
  
 +#: g10/pkclist.c:439
  #, c-format
  msgid "%s: There is limited assurance this key belongs to the named user\n"
  msgstr ""
- "%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
+ "%s: Nu există nici o indicaţie că această cheie aparţine într-adevăr "
  "utilizatorului numit\n"
  
 +#: g10/pkclist.c:445
  msgid "This key probably belongs to the named user\n"
- msgstr "Aceast� cheie apar�ine probabil utilizatorului numit\n"
+ msgstr "Această cheie aparţine probabil utilizatorului numit\n"
  
 +#: g10/pkclist.c:450
  msgid "This key belongs to us\n"
- msgstr "Aceast� cheie ne apar�ine\n"
+ msgstr "Această cheie ne aparţine\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "NU este sigur că cheia aparţine persoanei numite în ID-ul\n"
+ "utilizator.  Dacă ştiţi *cu adevărat* ce faceţi, puteţi\n"
+ "răspunde cu da la următoarea întrebare.\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
  "you may answer the next question with yes.\n"
  msgstr ""
- "NU este sigur c� cheia apar�ine persoanei numite �n ID-ul\n"
- "utilizator.  Dac� �ti�i *cu adev�rat* ce face�i, pute�i\n"
- "r�spunde cu da la urm�toarea �ntrebare.\n"
+ "NU este sigur că cheia aparţine persoanei numite în ID-ul\n"
+ "utilizator.  Dacă ştiţi *cu adevărat* ce faceţi, puteţi\n"
+ "răspunde cu da la următoarea întrebare.\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
- msgstr "Folosi�i oricum aceast� cheie? (d/N) "
+ msgstr "Folosiţi oricum această cheie? (d/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
- msgstr "AVERTISMENT: Folosi�i o cheie f�r� �ncredere!\n"
+ msgstr "AVERTISMENT: Folosiţi o cheie fără încredere!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
- "AVERTISMENT: aceast� cheie poate fi revocat� (cheia de revocare nu este "
- "prezent�)\n"
+ "AVERTISMENT: această cheie poate fi revocată (cheia de revocare nu este "
+ "prezentă)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
- msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
+ msgstr "AVERTISMENT: Această cheie a fost revocată revocatorul desemnat!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
- msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
+ msgstr "AVERTISMENT: Această cheie a fost revocată de proprietarul ei!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
- msgstr "         Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
+ msgstr "         Aceasta ar putea însemna că semnătura e falsificată.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
- msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
+ msgstr "AVERTISMENT: Această cheie a fost revocată de proprietarul ei!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
- msgstr "Not�: Aceast� cheie a fost deactivat�.\n"
+ msgstr "Notă: Această cheie a fost deactivată.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
- msgstr "Not�: Aceast� cheie a expirat!\n"
+ msgstr "Notă: Această cheie a expirat!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr ""
- "AVERTISMENT: Aceast� cheie nu este certificat� de o semn�tur� de �ncredere!\n"
+ "AVERTISMENT: Această cheie nu este certificată de o semnătură de încredere!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
- "         Nu exist� nici o indica�ie c� semn�tura apar�ine proprietarului.\n"
+ "         Nu există nici o indicaţie că semnătura aparţine proprietarului.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
- msgstr "AVERTISMENT: Noi NU avem �ncredere �n aceast� cheie!\n"
+ msgstr "AVERTISMENT: Noi NU avem încredere în această cheie!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
- msgstr "         Semn�tura este probabil un FALS.\n"
+ msgstr "         Semnătura este probabil un FALS.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
- "AVERTISMENT: Aceast� cheie nu este certificat� cu suficiente semn�turi de "
- "�ncredere!\n"
+ "AVERTISMENT: Această cheie nu este certificată cu suficiente semnături de "
+ "încredere!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
- msgstr "         Nu este sigur c� semn�tura apar�ine proprietarului.\n"
+ msgstr "         Nu este sigur că semnătura aparţine proprietarului.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
- msgstr "%s: s�rit�: %s\n"
+ msgstr "%s: sărită: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
- msgstr "%s: s�rit�: cheia public� este deactivat�\n"
+ msgstr "%s: sărită: cheia publică este deactivată\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
- msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
+ msgstr "%s: sărită: cheia publică este deja prezentă\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
- msgstr "nu m� pot conecta la `%s': %s\n"
+ msgstr "nu mă pot conecta la `%s': %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "algoritm hash invalid `%s'\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "algoritm hash invalid `%s'\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
- msgstr "Nu a�i specificat un ID utilizator. (pute�i folosi \"-r\")\n"
+ msgstr "Nu aţi specificat un ID utilizator. (puteţi folosi \"-r\")\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
- msgstr "Destinatari curen�i:\n"
+ msgstr "Destinatari curenţi:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
  msgstr ""
  "\n"
- "Introduce�i ID-ul utilizator.  Termina�i cu o linie nou�: "
+ "Introduceţi ID-ul utilizator.  Terminaţi cu o linie nouă: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
- msgstr "Nu exist� acest ID utilizator.\n"
+ msgstr "Nu există acest ID utilizator.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
- msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
+ msgstr "sărită: cheia publică setată deja ca destinatar implicit\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
- msgstr "Cheia public� este deactivat�.\n"
+ msgstr "Cheia publică este deactivată.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
- msgstr "s�rit�: cheia public� setat� deja\n"
+ msgstr "sărită: cheia publică setată deja\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "destinatar implicit necunoscut \"%s\"\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "nici un destinatar valid\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "cheia %s nu are nici un ID utilizator\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "cheia %s nu are nici un ID utilizator\n"
  
 +#: g10/plaintext.c:84
  msgid "data not saved; use option \"--output\" to save it\n"
  msgstr ""
- "datele nu au fost salvate: folosi�i op�iunea \"--output\" pentru a le salva\n"
+ "datele nu au fost salvate: folosiţi opţiunea \"--output\" pentru a le salva\n"
  
 +#: g10/plaintext.c:598
  msgid "Detached signature.\n"
- msgstr "Semn�tur� deta�at�.\n"
+ msgstr "Semnătură detaşată.\n"
  
 +#: g10/plaintext.c:606
  msgid "Please enter name of data file: "
- msgstr "V� rug�m introduce�i numele fi�ierului de date: "
+ msgstr "Vă rugăm introduceţi numele fişierului de date: "
  
 +#: g10/plaintext.c:643
  msgid "reading stdin ...\n"
  msgstr "citesc stdin ...\n"
  
 +#: g10/plaintext.c:688
  msgid "no signed data\n"
- msgstr "nici o dat� semnat�\n"
+ msgstr "nici o dată semnată\n"
  
 +#: g10/plaintext.c:706
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
@@@ -6579,20 -5262,16 +6619,20 @@@ msgstr "nu pot deschide date semnate `%
  msgid "can't open signed data fd=%d: %s\n"
  msgstr "nu pot deschide date semnate `%s'\n"
  
 +#: g10/pubkey-enc.c:116
  #, c-format
  msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr "destinator anonim; �ncerc cheia secret� %s ...\n"
+ msgstr "destinator anonim; încerc cheia secretă %s ...\n"
  
 +#: g10/pubkey-enc.c:123
  msgid "okay, we are the anonymous recipient.\n"
  msgstr "OK, noi suntem destinatarul anonim.\n"
  
 +#: g10/pubkey-enc.c:282
  msgid "old encoding of the DEK is not supported\n"
- msgstr "vechea encodare a lui DEK nu este suportat�\n"
+ msgstr "vechea encodare a lui DEK nu este suportată\n"
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
  msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n"
@@@ -6601,28 -5279,23 +6641,28 @@@
  #, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
  msgstr ""
- "AVERTISMENT: algoritm cifrare %s nu a fost g�sit �n preferin�ele "
+ "AVERTISMENT: algoritm cifrare %s nu a fost găsit în preferinţele "
  "destinatarului\n"
  
 +#: g10/pubkey-enc.c:377
  #, fuzzy, c-format
  #| msgid "NOTE: secret key %s expired at %s\n"
  msgid "Note: secret key %s expired at %s\n"
- msgstr "NOT�: cheia secret� %s a expirat la %s\n"
+ msgstr "NOTĂ: cheia secretă %s a expirat la %s\n"
  
 +#: g10/pubkey-enc.c:384
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
- msgstr "NOT�: cheia a fost revocat�"
+ msgstr "NOTĂ: cheia a fost revocată"
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, c-format
  msgid "build_packet failed: %s\n"
- msgstr "build_packet a e�uat: %s\n"
+ msgstr "build_packet a eşuat: %s\n"
  
 +#: g10/revoke.c:144
  #, c-format
  msgid "key %s has no user IDs\n"
  msgstr "cheia %s nu are nici un ID utilizator\n"
@@@ -6631,45 -5303,36 +6671,45 @@@
  msgid "To be revoked by:\n"
  msgstr "Pentru a fi revocat de:\n"
  
 +#: g10/revoke.c:316
  msgid "(This is a sensitive revocation key)\n"
- msgstr "(Aceasta este o cheie de revocare senzitiv�)\n"
+ msgstr "(Aceasta este o cheie de revocare senzitivă)\n"
  
 +#: g10/revoke.c:322
  #, fuzzy
  #| msgid "Secret key is available.\n"
  msgid "Secret key is not available.\n"
- msgstr "Cheia secret� este disponibil�.\n"
+ msgstr "Cheia secretă este disponibilă.\n"
  
 +#: g10/revoke.c:327
  msgid "Create a designated revocation certificate for this key? (y/N) "
- msgstr "Crea�i un certificat de revocare desemnat pentru aceast� cheie? (d/N) "
+ msgstr "Creaţi un certificat de revocare desemnat pentru această cheie? (d/N) "
  
 +#: g10/revoke.c:336 g10/revoke.c:727
  msgid "ASCII armored output forced.\n"
- msgstr "Ie�ire �n armur� ASCII for�at�.\n"
+ msgstr "Ieşire în armură ASCII forţată.\n"
  
 +#: g10/revoke.c:352 g10/revoke.c:479
  #, c-format
  msgid "make_keysig_packet failed: %s\n"
- msgstr "make_keysig_packet a e�uat: %s\n"
+ msgstr "make_keysig_packet a eşuat: %s\n"
  
 +#: g10/revoke.c:415
  msgid "Revocation certificate created.\n"
  msgstr "Certificat de revocare creat.\n"
  
 +#: g10/revoke.c:421
  #, c-format
  msgid "no revocation keys found for \"%s\"\n"
- msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
+ msgstr "nici o cheie de revocare găsită pentru \"%s\"\n"
  
 +#: g10/revoke.c:551
  #, fuzzy
  #| msgid "Create a revocation certificate for this key? (y/N) "
  msgid "This is a revocation certificate for the OpenPGP key:"
- msgstr "Crea�i un certificat de revocare pentru aceast� cheie? (d/N) "
+ msgstr "Creaţi un certificat de revocare pentru această cheie? (d/N) "
  
 +#: g10/revoke.c:567
  msgid ""
  "A revocation certificate is a kind of \"kill switch\" to publicly\n"
  "declare that a key shall not anymore be used.  It is not possible\n"
@@@ -6718,11 -5375,9 +6758,11 @@@ msgstr "
  msgid "error searching the keyring: %s\n"
  msgstr "eroare la crearea inelului de chei `%s': %s\n"
  
 +#: g10/revoke.c:711
  msgid "Create a revocation certificate for this key? (y/N) "
- msgstr "Crea�i un certificat de revocare pentru aceast� cheie? (d/N) "
+ msgstr "Creaţi un certificat de revocare pentru această cheie? (d/N) "
  
 +#: g10/revoke.c:735
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6734,52 -5389,42 +6774,52 @@@
  msgstr ""
  "Certificat de revocare creat.\n"
  "\n"
- "V� rug�m muta�i-l pe un medium pe care �l pute�i ascunde; dac� cineva pune\n"
- "m�na pe acest certificat l-ar putea folosi s� v� fac� cheia inutilizabil�.\n"
- "Este indicat s� tip�ri�i acest certificat �i s�-l p�stra�i undeva sigur, �n\n"
- "caz c� mediumul este deteriorat.  Dar fi�i atent: sistemul de tip�rire al\n"
- "ma�inii d-voastr� ar putea p�stra datele �i s� le fac� accesibile altora!\n"
+ "Vă rugăm mutaţi-l pe un medium pe care îl puteţi ascunde; dacă cineva pune\n"
+ "mâna pe acest certificat l-ar putea folosi să vă facă cheia inutilizabilă.\n"
+ "Este indicat să tipăriţi acest certificat şi să-l păstraţi undeva sigur, în\n"
+ "caz că mediumul este deteriorat.  Dar fiţi atent: sistemul de tipărire al\n"
+ "maşinii d-voastră ar putea păstra datele şi să le facă accesibile altora!\n"
  
 +#: g10/revoke.c:769
  msgid "Please select the reason for the revocation:\n"
- msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
+ msgstr "Vă rugăm selectaţi motivul pentru revocare:\n"
  
 +#: g10/revoke.c:779
  msgid "Cancel"
- msgstr "Renun��"
+ msgstr "Renunţă"
  
 +#: g10/revoke.c:781
  #, c-format
  msgid "(Probably you want to select %d here)\n"
- msgstr "(Probabil dori�i s� selecta�i %d aici)\n"
+ msgstr "(Probabil doriţi să selectaţi %d aici)\n"
  
 +#: g10/revoke.c:822
  msgid "Enter an optional description; end it with an empty line:\n"
- msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
+ msgstr "Introduceţi o descriere opţională; terminaţi cu o linie goală:\n"
  
 +#: g10/revoke.c:850
  #, c-format
  msgid "Reason for revocation: %s\n"
  msgstr "Motiv pentru revocare: %s\n"
  
 +#: g10/revoke.c:852
  msgid "(No description given)\n"
- msgstr "(Nici o descriere dat�)\n"
+ msgstr "(Nici o descriere dată)\n"
  
 +#: g10/revoke.c:857
  msgid "Is this okay? (y/N) "
  msgstr "Este aceasta OK? (d/N) "
  
 +#: g10/seskey.c:62 sm/encrypt.c:123
  msgid "weak key created - retrying\n"
- msgstr "cheie slab� creat� - re�ncerc\n"
+ msgstr "cheie slabă creată - reîncerc\n"
  
 +#: g10/seskey.c:66
  #, c-format
  msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
- msgstr "nu pot evita cheie slab� pentru cifru simetric; am �ncercat %d ori!\n"
+ msgstr "nu pot evita cheie slabă pentru cifru simetric; am încercat %d ori!\n"
  
 +#: g10/seskey.c:306
  #, c-format
  msgid "%s key %s uses an unsafe (%zu bit) hash\n"
  msgstr ""
@@@ -6789,46 -5433,39 +6829,46 @@@
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
- msgstr "AVERTISMENT: conflict pentru rezumat semn�tur� �n mesaj\n"
+ msgstr "AVERTISMENT: conflict pentru rezumat semnătură în mesaj\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr ""
- "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
+ "AVERTISMENT: subcheia de semnare %s nu este certificată reciproc (cross-"
  "certified)\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, fuzzy, c-format
  msgid "please see %s for more information\n"
- msgstr " i = arat�-mi mai multe informa�ii\n"
+ msgstr " i = arată-mi mai multe informaţii\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
- "AVERTISMENT: subcheia de semnare %s are o certificare-reciproc� invalid� "
+ "AVERTISMENT: subcheia de semnare %s are o certificare-reciprocă invalidă "
  "(invalid cross-certification)\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
- msgstr[0] "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
- msgstr[1] "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
+ msgstr[0] "cheie publică %s este mai nouă cu %lu secundă decât semnătura\n"
+ msgstr[1] "cheie publică %s este mai nouă cu %lu secundă decât semnătura\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
- msgstr[0] "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
- msgstr[1] "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
+ msgstr[0] "cheie publică %s este mai nouă cu %lu secundă decât semnătura\n"
+ msgstr[1] "cheie publică %s este mai nouă cu %lu secundă decât semnătura\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6837,13 -5474,12 +6877,13 @@@ msgid "
  msgid_plural ""
  "key %s was created %lu seconds in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
+ "cheia %s a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
  "ceasul)\n"
  msgstr[1] ""
- "cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
+ "cheia %s a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
  "ceasul)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6851,41 -5487,35 +6891,41 @@@ msgid "key %s was created %lu day in th
  msgid_plural ""
  "key %s was created %lu days in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
+ "cheia %s a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
  "ceasul)\n"
  msgstr[1] ""
- "cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
+ "cheia %s a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
  "ceasul)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  #| msgid "NOTE: signature key %s expired %s\n"
  msgid "Note: signature key %s expired %s\n"
- msgstr "NOT�: cheia semn�turii %s a expirat %s\n"
+ msgstr "NOTĂ: cheia semnăturii %s a expirat %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
- msgstr "NOT�: cheia a fost revocat�"
+ msgstr "NOTĂ: cheia a fost revocată"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
- "presupun semn�tur� incorect� din cheia %s datorit� unui bit critic "
+ "presupun semnătură incorectă din cheia %s datorită unui bit critic "
  "necunoscut\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
- msgstr "cheia %s: nici o subcheie pentru semn�tura de revocare a subcheii\n"
+ msgstr "cheia %s: nici o subcheie pentru semnătura de revocare a subcheii\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
- msgstr "cheia %s: nici o subcheie pentru semn�tura legat� de subcheie\n"
+ msgstr "cheia %s: nici o subcheie pentru semnătura legată de subcheie\n"
  
 +#: g10/sign.c:88
  #, c-format
  msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
  msgstr ""
@@@ -6896,155 -5525,127 +6936,155 @@@
  msgid ""
  "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
  msgstr ""
- "AVERTISMENT: nu pot %%-expanda URL-ul de politici (prea mare).  �l folosesc "
+ "AVERTISMENT: nu pot %%-expanda URL-ul de politici (prea mare).  Îl folosesc "
  "neexpandat.\n"
  
 +#: g10/sign.c:137
  #, c-format
  msgid ""
  "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
  "unexpanded.\n"
  msgstr ""
- "AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare).  �l "
+ "AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare).  Îl "
  "folosesc neexpandat.\n"
  
 +#: g10/sign.c:329
  #, c-format
  msgid "%s/%s signature from: \"%s\"\n"
- msgstr "%s/%s semn�tur� de la: \"%s\"\n"
+ msgstr "%s/%s semnătură de la: \"%s\"\n"
  
 +#: g10/sign.c:878
  #, c-format
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
- "AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
+ "AVERTISMENT: forţarea algoritmului rezumat %s (%d) violează preferinţele "
  "destinatarului\n"
  
 +#: g10/sign.c:1009
  msgid "signing:"
  msgstr "semnare:"
  
 +#: g10/sign.c:1286
  #, c-format
  msgid "%s encryption will be used\n"
- msgstr "va fi folosit� cifrarea %s\n"
+ msgstr "va fi folosită cifrarea %s\n"
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
- msgstr "cheia nu este marcat� ca sigur� - nu o pot folosi cu GNA falsificat!\n"
+ msgstr "cheia nu este marcată ca sigură - nu o pot folosi cu GNA falsificat!\n"
  
 +#: g10/skclist.c:187
  #, c-format
  msgid "skipped \"%s\": duplicated\n"
- msgstr "s�rit� \"%s\": duplicat�\n"
+ msgstr "sărită \"%s\": duplicată\n"
  
 +#: g10/skclist.c:206
  msgid "skipped: secret key already present\n"
- msgstr "s�rit�: cheia secret� deja prezent�\n"
+ msgstr "sărită: cheia secretă deja prezentă\n"
  
 +#: g10/skclist.c:225
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr ""
- "aceasta este o cheie ElGamal generat� de PGP care nu e sigur� pentru "
- "semn�turi!"
+ "aceasta este o cheie ElGamal generată de PGP care nu e sigură pentru "
+ "semnături!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
- msgstr "�nregistrare �ncredere %lu, tip %d: scrierea a e�uat: %s\n"
+ msgstr "înregistrare încredere %lu, tip %d: scrierea a eşuat: %s\n"
  
 +#: g10/tdbdump.c:105
  #, c-format
  msgid ""
  "# List of assigned trustvalues, created %s\n"
  "# (Use \"gpg --import-ownertrust\" to restore them)\n"
  msgstr ""
- "# List� cu valori de �ncredere atribuite, creat� %s\n"
- "# (Folosi�i \"gpg --import-ownertrust\" pentru a le reface)\n"
+ "# Listă cu valori de încredere atribuite, creată %s\n"
+ "# (Folosiţi \"gpg --import-ownertrust\" pentru a le reface)\n"
  
 +#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
  #, fuzzy, c-format
  #| msgid "error in `%s': %s\n"
  msgid "error in '%s': %s\n"
- msgstr "eroare �n `%s': %s\n"
+ msgstr "eroare în `%s': %s\n"
  
 +#: g10/tdbdump.c:162
  msgid "line too long"
- msgstr "linie prea lung�"
+ msgstr "linie prea lungă"
  
 +#: g10/tdbdump.c:170
  msgid "colon missing"
- msgstr "caracter : lips�"
+ msgstr "caracter : lipsă"
  
 +#: g10/tdbdump.c:176
  msgid "invalid fingerprint"
- msgstr "amprent� invalid�"
+ msgstr "amprentă invalidă"
  
 +#: g10/tdbdump.c:181
  msgid "ownertrust value missing"
- msgstr "lipse�te valorea �ncrederii �n proprietari (ownertrust)"
+ msgstr "lipseşte valorea încrederii în proprietari (ownertrust)"
  
 +#: g10/tdbdump.c:217
  #, fuzzy, c-format
  #| msgid "error finding trust record in `%s': %s\n"
  msgid "error finding trust record in '%s': %s\n"
- msgstr "eroare g�sire �nregistrare �ncredere �n `%s': %s\n"
+ msgstr "eroare găsire înregistrare încredere în `%s': %s\n"
  
 +#: g10/tdbdump.c:221
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "read error in '%s': %s\n"
- msgstr "eroare citire �n `%s': %s\n"
+ msgstr "eroare citire în `%s': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
- msgstr "trustdb: sincronizarea a e�uat: %s\n"
+ msgstr "trustdb: sincronizarea a eşuat: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  #| msgid "can't create lock for `%s'\n"
  msgid "can't create lock for '%s'\n"
- msgstr "nu pot crea �ncuietoare (lock) pentru `%s'\n"
+ msgstr "nu pot crea încuietoare (lock) pentru `%s'\n"
  
 +#: g10/tdbio.c:146
  #, fuzzy, c-format
  #| msgid "can't lock `%s'\n"
  msgid "can't lock '%s'\n"
- msgstr "nu pot �ncuia (lock) `%s'\n"
+ msgstr "nu pot încuia (lock) `%s'\n"
  
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
  #, c-format
  msgid "trustdb rec %lu: lseek failed: %s\n"
- msgstr "trustdb rec %lu: lseek a e�uat: %s\n"
+ msgstr "trustdb rec %lu: lseek a eşuat: %s\n"
  
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
  #, c-format
  msgid "trustdb rec %lu: write failed (n=%d): %s\n"
- msgstr "trustdb rec %lu: scrierea a e�uat (n=%d): %s\n"
+ msgstr "trustdb rec %lu: scrierea a eşuat (n=%d): %s\n"
  
 +#: g10/tdbio.c:352
  msgid "trustdb transaction too large\n"
- msgstr "tranzac�ia trustdb prea mare\n"
+ msgstr "tranzacţia trustdb prea mare\n"
  
 +#: g10/tdbio.c:682
  #, c-format
  msgid "%s: directory does not exist!\n"
- msgstr "%s: directorul nu exist�!\n"
+ msgstr "%s: directorul nu există!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
  msgstr "nu pot accesa `%s': %s\n"
  
 +#: g10/tdbio.c:724
  #, c-format
  msgid "%s: failed to create version record: %s"
- msgstr "%s: am e�uat s� creez �nregistrare versiune: %s"
+ msgstr "%s: am eşuat să creez înregistrare versiune: %s"
  
 +#: g10/tdbio.c:729
  #, c-format
  msgid "%s: invalid trustdb created\n"
  msgstr "%s: a fost creat trustdb invalid\n"
@@@ -7058,354 -5657,318 +7098,390 @@@ msgstr "%s: a fost creat trustdb\n
  #, fuzzy
  #| msgid "NOTE: trustdb not writable\n"
  msgid "Note: trustdb not writable\n"
- msgstr "NOT�: nu poate fi scris �n trustdb\n"
+ msgstr "NOTĂ: nu poate fi scris în trustdb\n"
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
  msgstr "%s: trustdb invalid\n"
  
 +#: g10/tdbio.c:834
  #, c-format
  msgid "%s: failed to create hashtable: %s\n"
- msgstr "%s: am e�uat s� creez hashtable: %s\n"
+ msgstr "%s: am eşuat să creez hashtable: %s\n"
  
 +#: g10/tdbio.c:842
  #, c-format
  msgid "%s: error updating version record: %s\n"
- msgstr "%s: eroare actualizare �nregistrare versiune: %s\n"
+ msgstr "%s: eroare actualizare înregistrare versiune: %s\n"
  
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
  #, c-format
  msgid "%s: error reading version record: %s\n"
- msgstr "%s: eroare citire �nregistrare versiune: %s\n"
+ msgstr "%s: eroare citire înregistrare versiune: %s\n"
  
 +#: g10/tdbio.c:938
  #, c-format
  msgid "%s: error writing version record: %s\n"
- msgstr "%s: eroare scriere �nregistrare versiune: %s\n"
+ msgstr "%s: eroare scriere înregistrare versiune: %s\n"
  
 +#: g10/tdbio.c:1461
  #, c-format
  msgid "trustdb: lseek failed: %s\n"
- msgstr "trustdb: lseek a e�uat: %s\n"
+ msgstr "trustdb: lseek a eşuat: %s\n"
  
 +#: g10/tdbio.c:1472
  #, c-format
  msgid "trustdb: read failed (n=%d): %s\n"
- msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
+ msgstr "trustdb: citirea a eşuat (n=%d): %s\n"
  
 +#: g10/tdbio.c:1497
  #, c-format
  msgid "%s: not a trustdb file\n"
- msgstr "%s: nu e un fi�ier trustdb\n"
+ msgstr "%s: nu e un fişier trustdb\n"
  
 +#: g10/tdbio.c:1522
  #, c-format
  msgid "%s: version record with recnum %lu\n"
- msgstr "%s: �nregistrare versiune cu recnum %lu\n"
+ msgstr "%s: înregistrare versiune cu recnum %lu\n"
  
 +#: g10/tdbio.c:1528
  #, c-format
  msgid "%s: invalid file version %d\n"
- msgstr "%s: versiune fi�ier invalid� %d\n"
+ msgstr "%s: versiune fişier invalidă %d\n"
  
 +#: g10/tdbio.c:1748
  #, c-format
  msgid "%s: error reading free record: %s\n"
- msgstr "%s: eroare citire �nregistrare liber�: %s\n"
+ msgstr "%s: eroare citire înregistrare liberă: %s\n"
  
 +#: g10/tdbio.c:1757
  #, c-format
  msgid "%s: error writing dir record: %s\n"
- msgstr "%s: eroare scriere �nregistrare dir: %s\n"
+ msgstr "%s: eroare scriere înregistrare dir: %s\n"
  
 +#: g10/tdbio.c:1768
  #, c-format
  msgid "%s: failed to zero a record: %s\n"
- msgstr "%s: eroare setere la zero a �nregistr�rii: %s\n"
+ msgstr "%s: eroare setere la zero a înregistrării: %s\n"
  
 +#: g10/tdbio.c:1804
  #, c-format
  msgid "%s: failed to append a record: %s\n"
- msgstr "%s: ad�ugarea unei �nregistr�ri a e�uat: %s\n"
+ msgstr "%s: adăugarea unei înregistrări a eşuat: %s\n"
  
 +#: g10/tdbio.c:1865
  #, fuzzy
  msgid "Error: The trustdb is corrupted.\n"
  msgstr "%s: a fost creat trustdb\n"
  
 +#: g10/textfilter.c:146
  #, c-format
  msgid "can't handle text lines longer than %d characters\n"
- msgstr "nu pot m�nui linii de text mai lungi de %d caractere\n"
+ msgstr "nu pot mânui linii de text mai lungi de %d caractere\n"
  
 +#: g10/textfilter.c:241
  #, c-format
  msgid "input line longer than %d characters\n"
  msgstr "linii de intrare mai lungi de %d caractere\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "Algoritmuri suportate:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
- msgstr "%s: eroare scriere �nregistrare dir: %s\n"
+ msgstr "%s: eroare scriere înregistrare dir: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
- msgstr "eroare �n `%s': %s\n"
+ msgstr "eroare în `%s': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
+ msgstr ""
+ 
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
- msgstr "eroare la ob�inere noului PIN: %s\n"
+ msgstr "eroare la obţinere noului PIN: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "enumeră chei şi ID-uri utilizator"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Politica: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
- msgstr "eroare la ob�inere noului PIN: %s\n"
+ msgstr "eroare la obţinere noului PIN: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
- msgstr "enumer� chei"
+ msgstr "enumeră chei"
  
- #: g10/tofu.c:1342
++#: g10/tofu.c:1715
+ #, fuzzy, c-format
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
+ msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
+ 
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1351
- #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "|algo [fi�iere]|afi�eaz� rezumate mesaje"
- msgstr[1] "|algo [fi�iere]|afi�eaz� rezumate mesaje"
- 
- #: g10/tofu.c:1357
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "eroare la scrierea inelului de chei `%s': %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Am şters %d semnături.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
+ msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "cifrată cu %lu fraze-parolă\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
+ msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7419,157 -5982,136 +7495,169 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
- msgstr "`%s' nu este un ID-cheie de lungime valid�\n"
+ msgstr "`%s' nu este un ID-cheie de lungime validă\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
- msgstr "cheia %s: acceptat� ca cheie de �ncredere\n"
+ msgstr "cheia %s: acceptată ca cheie de încredere\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
- msgstr "cheia %s apare de mai multe ori �n trustdb\n"
+ msgstr "cheia %s apare de mai multe ori în trustdb\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
- msgstr "cheia %s: nici o cheie public� pentru cheia de �ncredere - s�rit�\n"
+ msgstr "cheia %s: nici o cheie publică pentru cheia de încredere - sărită\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
- msgstr "cheia %s marcat� ca av�nd �ncredere suprem�\n"
+ msgstr "cheia %s marcată ca având încredere supremă\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
- msgstr "�nregistrare �ncredere %lu, tip req %d: citirea a e�uat: %s\n"
+ msgstr "înregistrare încredere %lu, tip req %d: citirea a eşuat: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
- msgstr "�nregistrare �ncredere %lu nu este de tipul cerut %d\n"
+ msgstr "înregistrare încredere %lu nu este de tipul cerut %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
- "nu pot folosi model de �ncredere (%d) - presupun model de �ncredere %s\n"
+ "nu pot folosi model de încredere (%d) - presupun model de încredere %s\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
- msgstr "folosesc model de �ncredere %s\n"
+ msgstr "folosesc model de încredere %s\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "nu e nevoie de o verificare trustdb\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
- msgstr "urm�toarea verificare trustdb programat� pe %s\n"
+ msgstr "următoarea verificare trustdb programată pe %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  #| msgid "no need for a trustdb check with `%s' trust model\n"
  msgid "no need for a trustdb check with '%s' trust model\n"
- msgstr "nu e nevoie de o verificare trustdb cu modelul de �ncredere `%s'\n"
+ msgstr "nu e nevoie de o verificare trustdb cu modelul de încredere `%s'\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  #| msgid "no need for a trustdb update with `%s' trust model\n"
  msgid "no need for a trustdb update with '%s' trust model\n"
- msgstr "nu e nevoie de o actualizare trustdb cu modelul de �ncredere `%s'\n"
+ msgstr "nu e nevoie de o actualizare trustdb cu modelul de încredere `%s'\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
- msgstr "cheia public� %s nu a fost g�sit�: %s\n"
+ msgstr "cheia publică %s nu a fost găsită: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
- msgstr "v� rug�m face�i un --check-trustdb\n"
+ msgstr "vă rugăm faceţi un --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "verific trustdb\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
  msgid_plural "%d keys processed"
- msgstr[0] "%lu chei procesate p�n� acum\n"
- msgstr[1] "%lu chei procesate p�n� acum\n"
+ msgstr[0] "%lu chei procesate până acum\n"
+ msgstr[1] "%lu chei procesate până acum\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
- msgstr[0] "%d chei procesate (%d num�r�tori valide anulate)\n"
- msgstr[1] "%d chei procesate (%d num�r�tori valide anulate)\n"
+ msgstr[0] "%d chei procesate (%d numărători valide anulate)\n"
+ msgstr[1] "%d chei procesate (%d numărători valide anulate)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
- msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
+ msgstr "nu am găsit nici o cheie cu încredere supremă\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
- msgstr "cheia public� a cheii cu �ncredere suprem� %s nu a fost g�sit�\n"
+ msgstr "cheia publică a cheii cu încredere supremă %s nu a fost găsită\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
- "ad�nc: %d  valid: %3d  semnat: %3d  �ncredere: %d-, %dq, %dn, %dm, %df, %du\n"
+ "adânc: %d  valid: %3d  semnat: %3d  încredere: %d-, %dq, %dn, %dm, %df, %du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
- "nu pot actualiza �nregistrare versiunii trustdb: scrierea a e�uat: %s\n"
+ "nu pot actualiza înregistrare versiunii trustdb: scrierea a eşuat: %s\n"
  
 +#: g10/trust.c:105
  msgid "undefined"
- msgstr "nedefinit�"
+ msgstr "nedefinită"
  
 +#: g10/trust.c:106
  msgid "never"
- msgstr "niciodat�"
+ msgstr "niciodată"
  
 +#: g10/trust.c:107
  msgid "marginal"
  msgstr "marginal"
  
 +#: g10/trust.c:108
  msgid "full"
- msgstr "deplin�"
+ msgstr "deplină"
  
 +#: g10/trust.c:109
  msgid "ultimate"
- msgstr "suprem�"
+ msgstr "supremă"
  
  #. TRANSLATORS: these strings are similar to those in
  #. trust_value_to_string(), but are a fixed length.  This is needed to
@@@ -7583,21 -6124,17 +7671,21 @@@
  #, fuzzy
  #| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
  msgid "10 translator see trust.c:uid_trust_string_fixed"
- msgstr "10 traduc�tor vezi trustdb.c:uid_trust_string_fixed"
+ msgstr "10 traducător vezi trustdb.c:uid_trust_string_fixed"
  
 +#: g10/trust.c:149
  msgid "[ revoked]"
- msgstr "[revocat�]"
+ msgstr "[revocată]"
  
 +#: g10/trust.c:151 g10/trust.c:157
  msgid "[ expired]"
- msgstr "[expirat�] "
+ msgstr "[expirată] "
  
 +#: g10/trust.c:156
  msgid "[ unknown]"
- msgstr "[necunoscut�]"
+ msgstr "[necunoscută]"
  
 +#: g10/trust.c:158
  msgid "[  undef ]"
  msgstr "[  nedef ]"
  
@@@ -7605,36 -6141,30 +7693,36 @@@
  #, fuzzy
  #| msgid "never"
  msgid "[  never ]"
- msgstr "niciodat�"
+ msgstr "niciodată"
  
 +#: g10/trust.c:160
  msgid "[marginal]"
  msgstr "[marginal]"
  
 +#: g10/trust.c:161
  msgid "[  full  ]"
- msgstr "[ deplin�]"
+ msgstr "[ deplină]"
  
 +#: g10/trust.c:162
  msgid "[ultimate]"
- msgstr "[ suprem�]"
+ msgstr "[ supremă]"
  
 +#: g10/verify.c:117
  msgid ""
  "the signature could not be verified.\n"
  "Please remember that the signature file (.sig or .asc)\n"
  "should be the first file given on the command line.\n"
  msgstr ""
- "semn�tura nu a putut fi verificat�.\n"
- "V� rug�m aminti�i-v� c� fi�ierul de semn�tur� (.sig sau .asc)\n"
- "ar trebui s� fie primul dat �n linia de comand�.\n"
+ "semnătura nu a putut fi verificată.\n"
+ "Vă rugăm amintiţi-vă că fişierul de semnătură (.sig sau .asc)\n"
+ "ar trebui să fie primul dat în linia de comandă.\n"
  
 +#: g10/verify.c:204
  #, c-format
  msgid "input line %u too long or missing LF\n"
- msgstr "linia de intrare %u prea lung� sau lipse�te LF\n"
+ msgstr "linia de intrare %u prea lungă sau lipseşte LF\n"
  
 +#: g10/verify.c:253
  #, fuzzy, c-format
  msgid "can't open fd %d: %s\n"
  msgstr "nu pot deschide `%s': %s\n"
@@@ -7647,157 -6175,123 +7735,157 @@@ msgstr "
  msgid "enable full debugging"
  msgstr ""
  
 +#: kbx/kbxutil.c:117
  #, fuzzy
  msgid "Usage: kbxutil [options] [files] (-h for help)"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
 +#: kbx/kbxutil.c:120
  #, fuzzy
  msgid ""
  "Syntax: kbxutil [options] [files]\n"
  "List, export, import Keybox data\n"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
- msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
+ msgstr "modulus-ul RSA lipseşte sau nu are %d biţi\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, fuzzy, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
- msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
+ msgstr "exponentul public RSA lipseşte sau are mai mult de %d biţi\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "apelul PIN a returnat eroare: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
- msgstr "eroare la ob�inere noului PIN: %s\n"
+ msgstr "eroare la obţinere noului PIN: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
- msgstr "am e�uat s� stochez amprenta: %s\n"
+ msgstr "am eşuat să stochez amprenta: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
- msgstr "am e�uat s� stochez data cre�rii: %s\n"
- 
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "citirea cheii publice a e�uat: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "r�spunsul nu con�ine datele cheii publice\n"
+ msgstr "am eşuat să stochez data creării: %s\n"
  
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
- msgstr "r�spunsul nu con�ine modulul RSA\n"
+ msgstr "răspunsul nu conţine modulul RSA\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
- msgstr "r�spunsul nu con�ine exponentul public RSA\n"
+ msgstr "răspunsul nu conţine exponentul public RSA\n"
  
- #: scd/app-openpgp.c:1322
++#: scd/app-openpgp.c:1353
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
- msgid "response does not contain the EC public point\n"
- msgstr "r�spunsul nu con�ine exponentul public RSA\n"
+ msgid "response does not contain the EC public key\n"
+ msgstr "răspunsul nu conţine exponentul public RSA\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "răspunsul nu conţine datele cheii publice\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "citirea cheii publice a eşuat: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
- msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
+ msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimă este %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
- msgstr "verificarea CHV%d a e�uat: %s\n"
+ msgstr "verificarea CHV%d a eşuat: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
- msgstr "eroare la recuperarea st�rii CHV de pe card\n"
+ msgstr "eroare la recuperarea stării CHV de pe card\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
- msgstr "cardul este �ncuiat permanent!\n"
+ msgstr "cardul este încuiat permanent!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7810,149 -6304,119 +7898,149 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
- msgstr "accesul la comenzile de administrare nu este configurat�\n"
+ msgstr "accesul la comenzile de administrare nu este configurată\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, fuzzy, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
- msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
+ msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimă este %d\n"
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|PIN Admin Nou"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|PIN Nou"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
- msgstr "eroare la citirea datelor aplica�iei\n"
+ msgstr "eroare la citirea datelor aplicaţiei\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "eroare la citirea amprentei DO\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
- msgstr "cheia exist� deja\n"
+ msgstr "cheia există deja\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
- msgstr "cheia existent� va fi �nlocuit�\n"
+ msgstr "cheia existentă va fi înlocuită\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
- msgstr "generez o nou� cheie\n"
+ msgstr "generez o nouă cheie\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
- msgstr "generez o nou� cheie\n"
+ msgstr "generez o nouă cheie\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
- msgstr "timestamp-ul de creare lipse�te\n"
+ msgstr "timestamp-ul de creare lipseşte\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
- msgstr "prime-ul RSA %s lipse�te sau nu are %d bi�i\n"
+ msgstr "prime-ul RSA %s lipseşte sau nu are %d biţi\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
- msgstr "am e�uat s� stochez cheia: %s\n"
+ msgstr "am eşuat să stochez cheia: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "URI nesuportat"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
- msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
+ msgstr "vă rugăm aşteptaţi câtă vreme este creată noua cheie ...\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
- msgstr "generarea cheii a e�uat\n"
+ msgstr "generarea cheii a eşuat\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
- msgstr[0] "generarea cheii este complet� (%d secunde)\n"
- msgstr[1] "generarea cheii este complet� (%d secunde)\n"
+ msgstr[0] "generarea cheii este completă (%d secunde)\n"
+ msgstr[1] "generarea cheii este completă (%d secunde)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
- msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
+ msgstr "structură invalidă a cardului OpenPGP (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
- msgstr "semn�tur� %s, algoritm rezumat %s\n"
+ msgstr "semnătură %s, algoritm rezumat %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
- msgstr "semn�turi create p�n� acum: %lu\n"
+ msgstr "semnături create până acum: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
- "verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
+ "verificarea PIN-ului Admin este deocamdată interzisă prin această comandă\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
  
 +#: scd/app-dinsig.c:299
  #, fuzzy
  msgid "||Please enter your PIN at the reader's pinpad"
- msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
@@@ -7966,30 -6428,24 +8054,30 @@@ msgstr "|N|PIN Nou
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
  #, fuzzy
  msgid "|FILE|write a log to FILE"
- msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+ msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
 +#: scd/scdaemon.c:134
  msgid "|N|connect to reader at port N"
  msgstr ""
  
 +#: scd/scdaemon.c:136
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
- msgstr "|NUME|folose�te NUME ca destinatar implicit"
+ msgstr "|NUME|foloseşte NUME ca destinatar implicit"
  
 +#: scd/scdaemon.c:138
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
- msgstr "|NUME|folose�te NUME ca destinatar implicit"
+ msgstr "|NUME|foloseşte NUME ca destinatar implicit"
  
 +#: scd/scdaemon.c:141
  #, fuzzy
  msgid "do not use the internal CCID driver"
  msgstr "nu folosi deloc terminalul"
@@@ -8002,60 -6456,48 +8090,60 @@@ msgstr "
  msgid "do not use a reader's pinpad"
  msgstr ""
  
 +#: scd/scdaemon.c:155
  #, fuzzy
  msgid "deny the use of admin card commands"
- msgstr "arat� comenzi administrare"
+ msgstr "arată comenzi administrare"
  
 +#: scd/scdaemon.c:158
  msgid "use variable length input for pinpad"
  msgstr ""
  
 +#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
 +#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
 +#: sm/base64.c:327
  #, fuzzy, c-format
  msgid "invalid radix64 character %02x skipped\n"
- msgstr "caracter radix64 invalid %02X s�rit\n"
+ msgstr "caracter radix64 invalid %02X sărit\n"
  
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
- msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
+ msgstr "gpg-agent nu este disponibil în această sesiune\n"
  
 +#: sm/certchain.c:194
  #, c-format
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  #, fuzzy
  msgid "shell"
  msgstr "ajutor"
@@@ -8088,210 -6524,163 +8176,210 @@@ msgstr "exportul cheilor secrete nu est
  msgid "certificate policy not allowed"
  msgstr "exportul cheilor secrete nu este permis\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
- msgstr "citirea cheii publice a e�uat: %s\n"
+ msgstr "citirea cheii publice a eşuat: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
- msgstr "am e�uat s� stochez cheia: %s\n"
+ msgstr "am eşuat să stochez cheia: %s\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
- msgstr "NOT�: cheia a fost revocat�"
+ msgstr "NOTĂ: cheia a fost revocată"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
- msgstr "verificarea semn�turii create a e�uat: %s\n"
+ msgstr "verificarea semnăturii create a eşuat: %s\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
  msgstr "exportul cheilor secrete nu este permis\n"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
- msgstr "Aceast� cheie a expirat!"
+ msgstr "Această cheie a expirat!"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
- msgstr "Aceast� cheie a expirat!"
+ msgstr "Această cheie a expirat!"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
- msgstr "Aceast� cheie a expirat!"
+ msgstr "Această cheie a expirat!"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
- msgstr "Aceast� cheie a expirat!"
+ msgstr "Această cheie a expirat!"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
- msgstr "semn�turi create p�n� acum: %lu\n"
+ msgstr "semnături create până acum: %lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
  msgstr "Certificat de revocare creat.\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
  msgstr "certificat incorect"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  #, fuzzy
  msgid "  (     issuer valid from "
  msgstr "      Card nr. serie ="
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "Amprenta CA: "
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
- msgstr "genereaz� un certificat de revocare"
+ msgstr "generează un certificat de revocare"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr ""
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
- msgstr "verificarea semn�turii create a e�uat: %s\n"
+ msgstr "verificarea semnăturii create a eşuat: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
- msgstr "verific� o semn�tur�"
+ msgstr "verifică o semnătură"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
- msgstr "preferin�a `%s' duplicat�\n"
+ msgstr "preferinţa `%s' duplicată\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
  msgstr "Certificat de revocare creat.\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
  msgstr "certificat incorect"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8310,12 -6696,10 +8398,12 @@@ msgstr "
  msgid "none"
  msgstr "nu"
  
 +#: sm/certdump.c:552 sm/certdump.c:617
  #, fuzzy
  msgid "[Error - invalid encoding]"
- msgstr "Eroare: r�spuns invalid.\n"
+ msgstr "Eroare: răspuns invalid.\n"
  
 +#: sm/certdump.c:560
  msgid "[Error - out of core]"
  msgstr ""
  
@@@ -8323,12 -6706,10 +8411,12 @@@
  msgid "[Error - No name]"
  msgstr ""
  
 +#: sm/certdump.c:623
  #, fuzzy
  msgid "[Error - invalid DN]"
- msgstr "Eroare: r�spuns invalid.\n"
+ msgstr "Eroare: răspuns invalid.\n"
  
 +#: sm/certdump.c:833
  #, fuzzy, c-format
  msgid ""
  "Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -8337,21 -6718,18 +8425,21 @@@
  "S/N %s, ID 0x%08lX,\n"
  "created %s, expires %s.\n"
  msgstr ""
- "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pt. "
+ "Aveţi nevoie de o frază-parolă pentru a descuia cheia secretă pt. "
  "utilizator:\n"
  "\"%.*s\"\n"
- "cheia %u-bit %s, ID %s, creat� %s%s\n"
+ "cheia %u-bit %s, ID %s, creată %s%s\n"
  
 +#: sm/certlist.c:122 dirmngr/validate.c:1075
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
 +#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
- msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
+ msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
  
 +#: sm/certlist.c:142 dirmngr/validate.c:1095
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
@@@ -8400,12 -6768,10 +8488,12 @@@ msgstr "algoritm hash invalid `%s'\n
  msgid "line %d: invalid subject name '%s' at pos %d\n"
  msgstr "algoritm hash invalid `%s'\n"
  
 +#: sm/certreqgen.c:525
  #, fuzzy, c-format
  msgid "line %d: not a valid email address\n"
- msgstr "Nu este o adres� de email valid�\n"
+ msgstr "Nu este o adresă de email validă\n"
  
 +#: sm/certreqgen.c:544
  #, fuzzy, c-format
  msgid "line %d: invalid serial number\n"
  msgstr "algoritm hash invalid `%s'\n"
@@@ -8444,9 -6803,8 +8532,9 @@@ msgstr "algoritm hash invalid `%s'\n
  #, fuzzy, c-format
  #| msgid "key %s: invalid subkey binding\n"
  msgid "line %d: invalid subject-key-id\n"
- msgstr "cheia %s: legare subcheie invalid�\n"
+ msgstr "cheia %s: legare subcheie invalidă\n"
  
 +#: sm/certreqgen.c:686
  #, fuzzy, c-format
  msgid "line %d: invalid extension syntax\n"
  msgstr "algoritm hash invalid `%s'\n"
@@@ -8461,12 -6817,10 +8549,12 @@@ msgstr "eroare la crearea inelului de c
  msgid "line %d: error getting key by keygrip '%s': %s\n"
  msgstr "eroare la crearea inelului de chei `%s': %s\n"
  
 +#: sm/certreqgen.c:729
  #, fuzzy, c-format
  msgid "line %d: key generation failed: %s <%s>\n"
- msgstr "Generarea cheii a e�uat: %s\n"
+ msgstr "Generarea cheii a eşuat: %s\n"
  
 +#: sm/certreqgen.c:1324
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8487,32 -6838,26 +8575,32 @@@ msgstr "   (2) Cheie de cifrare\n
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
- msgstr "%s: eroare citire �nregistrare liber�: %s\n"
+ msgstr "%s: eroare citire înregistrare liberă: %s\n"
  
 +#: sm/certreqgen-ui.c:237
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
 +#: sm/certreqgen-ui.c:249
  #, fuzzy
  msgid "Available keys:\n"
- msgstr "deactiveaz� cheia"
+ msgstr "deactivează cheia"
  
 +#: sm/certreqgen-ui.c:280
  #, fuzzy, c-format
  msgid "Possible actions for a %s key:\n"
- msgstr "Ac�iuni posibile pentru o cheie %s: "
+ msgstr "Acţiuni posibile pentru o cheie %s: "
  
 +#: sm/certreqgen-ui.c:281
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
- msgstr "   (%d) RSA (semnare �i cifrare)\n"
+ msgstr "   (%d) RSA (semnare şi cifrare)\n"
  
 +#: sm/certreqgen-ui.c:282
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (numai semnare)\n"
@@@ -8526,12 -6869,10 +8614,12 @@@ msgstr "   (%d) RSA (numai cifrare)\n
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
 +#: sm/certreqgen-ui.c:311
  #, fuzzy
  msgid "No subject name given\n"
- msgstr "(Nici o descriere dat�)\n"
+ msgstr "(Nici o descriere dată)\n"
  
 +#: sm/certreqgen-ui.c:315
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
  msgstr "algoritm hash invalid `%s'\n"
@@@ -8550,40 -6889,33 +8638,40 @@@ msgstr "algoritm hash invalid `%s'\n
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:338
  #, fuzzy
  msgid "Enter email addresses"
- msgstr "Adres� de email: "
+ msgstr "Adresă de email: "
  
 +#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
- "Introduce�i ID-ul utilizator.  Termina�i cu o linie nou�: "
+ "Introduceţi ID-ul utilizator.  Terminaţi cu o linie nouă: "
  
 +#: sm/certreqgen-ui.c:343
  #, fuzzy
  msgid "Enter DNS names"
- msgstr "Introduce�i un nou nume-fi�ier"
+ msgstr "Introduceţi un nou nume-fişier"
  
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
- msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
+ msgstr "Introduceţi o descriere opţională; terminaţi cu o linie goală:\n"
  
 +#: sm/certreqgen-ui.c:348
  #, fuzzy
  msgid "Enter URIs"
- msgstr "Introduce�i PIN: "
+ msgstr "Introduceţi PIN: "
  
 +#: sm/certreqgen-ui.c:355
  #, fuzzy
  #| msgid "Create a designated revocation certificate for this key? (y/N) "
  msgid "Create self-signed certificate? (y/N) "
- msgstr "Crea�i un certificat de revocare desemnat pentru aceast� cheie? (d/N) "
+ msgstr "Creaţi un certificat de revocare desemnat pentru această cheie? (d/N) "
  
 +#: sm/certreqgen-ui.c:382
  msgid "These parameters are used:\n"
  msgstr ""
  
@@@ -8621,12 -6945,10 +8709,12 @@@ msgstr "
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
 +#: sm/delete.c:51 sm/delete.c:112
  #, fuzzy, c-format
  msgid "certificate '%s' not found: %s\n"
- msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+ msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
  msgstr "eroare la citire keyblock: %s\n"
@@@ -8636,260 -6957,206 +8724,260 @@@
  msgid "duplicated certificate '%s' deleted\n"
  msgstr "Certificat de revocare creat.\n"
  
 +#: sm/delete.c:145
  #, fuzzy, c-format
  msgid "certificate '%s' deleted\n"
- msgstr "preferin�a `%s' duplicat�\n"
+ msgstr "preferinţa `%s' duplicată\n"
  
 +#: sm/delete.c:175
  #, fuzzy, c-format
  msgid "deleting certificate \"%s\" failed: %s\n"
- msgstr "stergere keyblock a e�uat: %s\n"
+ msgstr "stergere keyblock a eşuat: %s\n"
  
 +#: sm/encrypt.c:328
  #, fuzzy
  msgid "no valid recipients given\n"
- msgstr "(Nici o descriere dat�)\n"
+ msgstr "(Nici o descriere dată)\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
- msgstr "enumer� chei secrete"
+ msgstr "enumeră chei secrete"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
  msgstr "certificat incorect"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
  msgstr "certificat incorect"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
  msgstr "certificat incorect"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  #, fuzzy
  msgid "register a smartcard"
- msgstr "adaug� o cheie la un smartcard"
+ msgstr "adaugă o cheie la un smartcard"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
- msgstr "creaz� ie�ire �n armur� ascii"
+ msgstr "crează ieşire în armură ascii"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "nu folosi deloc terminalul"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
- msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+ msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
- msgstr "modul batch: nu �ntreba niciodat�"
+ msgstr "modul batch: nu întreba niciodată"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
- msgstr "presupune da la cele mai multe �ntreb�ri"
+ msgstr "presupune da la cele mai multe întrebări"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
- msgstr "presupune nu la cele mai multe �ntreb�ri"
+ msgstr "presupune nu la cele mai multe întrebări"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
- msgstr "adaug� acest inel de chei la lista inelelor de chei"
+ msgstr "adaugă acest inel de chei la lista inelelor de chei"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
- msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
+ msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
- msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
+ msgstr "|HOST|foloseşte acest server de chei pentru a căuta chei"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
- msgstr "|NUME|folose�te algoritm cifrare NUME"
+ msgstr "|NUME|foloseşte algoritm cifrare NUME"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
- msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
+ msgstr "|NUME|foloseşte algoritm rezumat mesaj NUME"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "Sintax�: gpg [op�iuni] [fi�iere]\n"
+ "Sintaxă: gpg [opţiuni] [fişiere]\n"
  "sign, check, encrypt sau decrypt\n"
- "opera�iunea implicit� depinde de datele de intrare\n"
+ "operaţiunea implicită depinde de datele de intrare\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
- msgstr "nu m� pot conecta la `%s': %s\n"
+ msgstr "nu mă pot conecta la `%s': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
- msgstr "op�iune necunoscut� `%s'\n"
+ msgstr "opţiune necunoscută `%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
- msgstr "(Nici o descriere dat�)\n"
+ msgstr "(Nici o descriere dată)\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
- msgstr "  s = s�ri peste cheia asta\n"
+ msgstr "  s = sări peste cheia asta\n"
  
  #
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "nu am putut interpreta URL-ul serverului de chei\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "nu pot accesa `%s': %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
 +#: sm/import.c:127
  #, fuzzy, c-format
  msgid "total number processed: %lu\n"
- msgstr "Num�r total procesate: %lu\n"
+ msgstr "Număr total procesate: %lu\n"
  
 +#: sm/import.c:246
  #, fuzzy
  msgid "error storing certificate\n"
- msgstr "genereaz� un certificat de revocare"
+ msgstr "generează un certificat de revocare"
  
 +#: sm/import.c:254
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
- msgstr "eroare la ob�inere noului PIN: %s\n"
+ msgstr "eroare la obţinere noului PIN: %s\n"
  
 +#: sm/import.c:526 sm/import.c:558
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
 +#: sm/import.c:746 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
- msgstr "am e�uat s� stochez amprenta: %s\n"
+ msgstr "am eşuat să stochez amprenta: %s\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, fuzzy, c-format
  msgid "problem re-searching certificate: %s\n"
- msgstr "rev? probleme la verificare revoc�rii: %s\n"
+ msgstr "rev? probleme la verificare revocării: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
  msgstr "eroare la citire `%s': %s\n"
@@@ -8902,17 -7167,14 +8990,17 @@@ msgstr "
  msgid "GPG_TTY has not been set - using maybe bogus default\n"
  msgstr ""
  
 +#: sm/qualified.c:105
  #, fuzzy, c-format
  msgid "invalid formatted fingerprint in '%s', line %d\n"
- msgstr "Eroare: amprent� formatat� invalid.\n"
+ msgstr "Eroare: amprentă formatată invalid.\n"
  
 +#: sm/qualified.c:123
  #, fuzzy, c-format
  msgid "invalid country code in '%s', line %d\n"
- msgstr "Eroare: amprent� formatat� invalid.\n"
+ msgstr "Eroare: amprentă formatată invalid.\n"
  
 +#: sm/qualified.c:206
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
@@@ -8937,61 -7197,49 +9025,61 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
 +#: sm/sign.c:451
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
- msgstr "algoritm de protec�ie %d%s nu este suportat\n"
+ msgstr "algoritm de protecţie %d%s nu este suportat\n"
  
 +#: sm/sign.c:465
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
 +#: sm/sign.c:517
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
- msgstr "verificarea semn�turii create a e�uat: %s\n"
+ msgstr "verificarea semnăturii create a eşuat: %s\n"
  
 +#: sm/verify.c:450
  #, fuzzy
  msgid "Signature made "
- msgstr "Semn�tur� f�cut� %s\n"
+ msgstr "Semnătură făcută %s\n"
  
 +#: sm/verify.c:454
  msgid "[date not given]"
  msgstr ""
  
 +#: sm/verify.c:455
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
 +#: sm/verify.c:474
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
 +#: sm/verify.c:595
  #, fuzzy
  msgid "Good signature from"
- msgstr "Semn�tur� bun� din \"%s\""
+ msgstr "Semnătură bună din \"%s\""
  
 +#: sm/verify.c:596
  #, fuzzy
  msgid "                aka"
  msgstr "                aka \"%s\""
  
 +#: sm/verify.c:614
  #, fuzzy
  msgid "This is a qualified signature\n"
- msgstr "Aceasta va fi o auto-semn�tur�.\n"
+ msgstr "Aceasta va fi o auto-semnătură.\n"
  
 +#: dirmngr/certcache.c:106
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
- msgstr "verificarea semn�turii create a e�uat: %s\n"
+ msgstr "verificarea semnăturii create a eşuat: %s\n"
  
 +#: dirmngr/certcache.c:117
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
@@@ -9017,22 -7261,18 +9105,22 @@@ msgstr "
  msgid "can't parse certificate '%s': %s\n"
  msgstr "nu pot crea `%s': %s\n"
  
 +#: dirmngr/certcache.c:395
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
- msgstr "preferin�a `%s' duplicat�\n"
+ msgstr "preferinţa `%s' duplicată\n"
  
 +#: dirmngr/certcache.c:399
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
  msgstr "Certificat de revocare creat.\n"
  
 +#: dirmngr/certcache.c:401
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
- msgstr "preferin�a `%s' duplicat�\n"
+ msgstr "preferinţa `%s' duplicată\n"
  
 +#: dirmngr/certcache.c:405
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
  msgstr "Amprenta CA: "
@@@ -9045,64 -7283,51 +9133,64 @@@ msgstr "
  msgid "  subject ="
  msgstr ""
  
 +#: dirmngr/certcache.c:413
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
 +#: dirmngr/certcache.c:489
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
  msgstr "certificat incorect"
  
 +#: dirmngr/certcache.c:491
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
  msgstr "Certificat de revocare creat.\n"
  
 +#: dirmngr/certcache.c:508
  #, fuzzy
  msgid "certificate cached\n"
- msgstr "preferin�a `%s' duplicat�\n"
+ msgstr "preferinţa `%s' duplicată\n"
  
 +#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
 +#: dirmngr/certcache.c:593
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "invalid SHA1 fingerprint string '%s'\n"
- msgstr "amprent� invalid�"
+ msgstr "amprentă invalidă"
  
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
 +#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
 +#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
  #, fuzzy
  msgid "no issuer found in certificate\n"
- msgstr "genereaz� un certificat de revocare"
+ msgstr "generează un certificat de revocare"
  
 +#: dirmngr/certcache.c:1325
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
- msgstr "eroare la ob�inere noului PIN: %s\n"
+ msgstr "eroare la obţinere noului PIN: %s\n"
  
 +#: dirmngr/crlcache.c:213
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "creating directory '%s'\n"
@@@ -9123,50 -7345,41 +9211,50 @@@ msgstr "eroare linia de trailer\n
  msgid "error reading directory '%s': %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
 +#: dirmngr/crlcache.c:275
  #, fuzzy, c-format
  msgid "removing cache file '%s'\n"
- msgstr "citirea cheii publice a e�uat: %s\n"
+ msgstr "citirea cheii publice a eşuat: %s\n"
  
 +#: dirmngr/crlcache.c:284
  #, fuzzy, c-format
  #| msgid "enarmoring failed: %s\n"
  msgid "not removing file '%s'\n"
- msgstr "punerea armurii a e�uat: %s\n"
+ msgstr "punerea armurii a eşuat: %s\n"
  
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
- msgstr "eroare �n `%s': %s\n"
+ msgstr "eroare în `%s': %s\n"
  
 +#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
  #, fuzzy, c-format
  msgid "failed to open cache dir file '%s': %s\n"
  msgstr "Nu pot deschide `%s': %s\n"
  
 +#: dirmngr/crlcache.c:421
  #, fuzzy, c-format
  msgid "error creating new cache dir file '%s': %s\n"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
 +#: dirmngr/crlcache.c:428
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing new cache dir file '%s': %s\n"
  msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
  
 +#: dirmngr/crlcache.c:435
  #, fuzzy, c-format
  msgid "error closing new cache dir file '%s': %s\n"
- msgstr "eroare �n `%s': %s\n"
+ msgstr "eroare în `%s': %s\n"
  
 +#: dirmngr/crlcache.c:440
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new cache dir file '%s' created\n"
- msgstr "fi�ier de configurare nou `%s' creat\n"
+ msgstr "fişier de configurare nou `%s' creat\n"
  
 +#: dirmngr/crlcache.c:445
  #, fuzzy, c-format
  msgid "failed to re-open cache dir file '%s': %s\n"
  msgstr "nu pot crea directorul `%s': %s\n"
@@@ -9189,12 -7398,10 +9277,12 @@@ msgstr "
  msgid "extra field detected in crl record of '%s' line %u\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:623
  #, fuzzy, c-format
  msgid "invalid line detected in '%s' line %u\n"
- msgstr "Eroare: amprent� formatat� invalid.\n"
+ msgstr "Eroare: amprentă formatată invalid.\n"
  
 +#: dirmngr/crlcache.c:632
  #, fuzzy, c-format
  msgid "duplicate entry detected in '%s' line %u\n"
  msgstr "Certificat de revocare creat.\n"
@@@ -9204,30 -7410,25 +9292,30 @@@
  msgid "unsupported record type in '%s' line %u skipped\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:673
  #, fuzzy, c-format
  msgid "invalid issuer hash in '%s' line %u\n"
- msgstr "Eroare: amprent� formatat� invalid.\n"
+ msgstr "Eroare: amprentă formatată invalid.\n"
  
 +#: dirmngr/crlcache.c:679
  #, fuzzy, c-format
  msgid "no issuer DN in '%s' line %u\n"
- msgstr "eroare citire �n `%s': %s\n"
+ msgstr "eroare citire în `%s': %s\n"
  
 +#: dirmngr/crlcache.c:686
  #, fuzzy, c-format
  msgid "invalid timestamp in '%s' line %u\n"
- msgstr "Eroare: amprent� formatat� invalid.\n"
+ msgstr "Eroare: amprentă formatată invalid.\n"
  
 +#: dirmngr/crlcache.c:692
  #, fuzzy, c-format
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid "WARNING: invalid cache file hash in '%s' line %u\n"
  msgstr ""
- "AVERTISMENT: dimensiune invalid� pentru fi�ierul random_seed - nu va fi "
- "folosit�\n"
+ "AVERTISMENT: dimensiune invalidă pentru fişierul random_seed - nu va fi "
+ "folosită\n"
  
 +#: dirmngr/crlcache.c:698
  msgid "detected errors in cache dir file\n"
  msgstr ""
  
@@@ -9240,12 -7439,10 +9328,12 @@@ msgstr "
  msgid "failed to create temporary cache dir file '%s': %s\n"
  msgstr "nu pot crea directorul `%s': %s\n"
  
 +#: dirmngr/crlcache.c:937
  #, fuzzy, c-format
  msgid "error closing '%s': %s\n"
- msgstr "eroare �n `%s': %s\n"
+ msgstr "eroare în `%s': %s\n"
  
 +#: dirmngr/crlcache.c:949
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error renaming '%s' to '%s': %s\n"
@@@ -9266,28 -7460,23 +9354,28 @@@ msgstr "eroare trimitere la `%s': %s\n
  #, fuzzy, c-format
  #| msgid "error in `%s': %s\n"
  msgid "error hashing '%s': %s\n"
- msgstr "eroare �n `%s': %s\n"
+ msgstr "eroare în `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1055
  #, fuzzy, c-format
  msgid "invalid formatted checksum for '%s'\n"
- msgstr "Eroare: amprent� formatat� invalid.\n"
+ msgstr "Eroare: amprentă formatată invalid.\n"
  
 +#: dirmngr/crlcache.c:1108
  msgid "too many open cache files; can't open anymore\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1126
  #, fuzzy, c-format
  msgid "opening cache file '%s'\n"
- msgstr "semnarea a e�uat: %s\n"
+ msgstr "semnarea a eşuat: %s\n"
  
 +#: dirmngr/crlcache.c:1145
  #, fuzzy, c-format
  msgid "error opening cache file '%s': %s\n"
- msgstr "eroare �n `%s': %s\n"
+ msgstr "eroare în `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1154
  #, c-format
  msgid "error initializing cache file '%s' for reading: %s\n"
  msgstr ""
@@@ -9300,12 -7487,10 +9388,12 @@@ msgstr "
  msgid "calling unlock_db_file on an unlocked file\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1231
  #, fuzzy, c-format
  msgid "failed to create a new cache object: %s\n"
- msgstr "%s: am e�uat s� creez hashtable: %s\n"
+ msgstr "%s: am eşuat să creez hashtable: %s\n"
  
 +#: dirmngr/crlcache.c:1286
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "no CRL available for issuer id %s\n"
@@@ -9346,9 -7524,8 +9434,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "problem reading cache record for S/N %s: %s\n"
- msgstr "Eroare citind cheia de rezerv� de pe `%s': %s\n"
+ msgstr "Eroare citind cheia de rezervă de pe `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1360
  #, c-format
  msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
  msgstr ""
@@@ -9358,12 -7534,10 +9446,12 @@@
  msgid "S/N %s is valid, it is not listed in the CRL\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1379
  #, fuzzy, c-format
  msgid "error getting data from cache file: %s\n"
- msgstr "eroare la ob�inere noului PIN: %s\n"
+ msgstr "eroare la obţinere noului PIN: %s\n"
  
 +#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
@@@ -9378,30 -7550,25 +9466,30 @@@ msgstr "
  #, fuzzy
  #| msgid "invalid response from agent\n"
  msgid "got an invalid S-expression from libksba\n"
- msgstr "r�spuns invalid de la agent\n"
+ msgstr "răspuns invalid de la agent\n"
  
 +#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
- msgstr "nu pot deschide fi�ierul: %s\n"
+ msgstr "nu pot deschide fişierul: %s\n"
  
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
- msgstr "citirea cheii publice a e�uat: %s\n"
+ msgstr "citirea cheii publice a eşuat: %s\n"
  
 +#: dirmngr/crlcache.c:1699
  #, fuzzy, c-format
  #| msgid "build_packet failed: %s\n"
  msgid "ksba_crl_parse failed: %s\n"
- msgstr "build_packet a e�uat: %s\n"
+ msgstr "build_packet a eşuat: %s\n"
  
 +#: dirmngr/crlcache.c:1714
  #, fuzzy, c-format
  msgid "error getting update times of CRL: %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
 +#: dirmngr/crlcache.c:1721
  #, c-format
  msgid "update times of this CRL: this=%s next=%s\n"
  msgstr ""
@@@ -9414,19 -7579,16 +9502,19 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error getting CRL item: %s\n"
- msgstr "eroare la ob�inere noului PIN: %s\n"
+ msgstr "eroare la obţinere noului PIN: %s\n"
  
 +#: dirmngr/crlcache.c:1760
  #, fuzzy, c-format
  msgid "error inserting item into temporary cache file: %s\n"
- msgstr "%s: eroare scriere �nregistrare dir: %s\n"
+ msgstr "%s: eroare scriere înregistrare dir: %s\n"
  
 +#: dirmngr/crlcache.c:1787
  #, fuzzy, c-format
  msgid "no CRL issuer found in CRL: %s\n"
- msgstr "genereaz� un certificat de revocare"
+ msgstr "generează un certificat de revocare"
  
 +#: dirmngr/crlcache.c:1802
  msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
  msgstr ""
  
@@@ -9434,24 -7595,20 +9522,24 @@@
  #, fuzzy, c-format
  #| msgid "signature verification suppressed\n"
  msgid "CRL signature verification failed: %s\n"
- msgstr "verificare semn�tur� eliminat�\n"
+ msgstr "verificare semnătură eliminată\n"
  
 +#: dirmngr/crlcache.c:1858
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
- msgstr "verificarea semn�turii create a e�uat: %s\n"
+ msgstr "verificarea semnăturii create a eşuat: %s\n"
  
 +#: dirmngr/crlcache.c:2001
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
- msgstr "stergere keyblock a e�uat: %s\n"
+ msgstr "stergere keyblock a eşuat: %s\n"
  
 +#: dirmngr/crlcache.c:2008
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
- msgstr "actualizarea a e�uat: %s\n"
+ msgstr "actualizarea a eşuat: %s\n"
  
 +#: dirmngr/crlcache.c:2042
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
  msgstr "nu pot crea directorul `%s': %s\n"
@@@ -9461,28 -7617,23 +9549,28 @@@
  msgid "problem removing stale temporary cache file '%s': %s\n"
  msgstr "nu pot crea directorul `%s': %s\n"
  
 +#: dirmngr/crlcache.c:2056
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
 +#: dirmngr/crlcache.c:2066
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
- msgstr "actualizarea secretului a e�uat: %s\n"
+ msgstr "actualizarea secretului a eşuat: %s\n"
  
 +#: dirmngr/crlcache.c:2076
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
- msgstr "%s: eroare scriere �nregistrare dir: %s\n"
+ msgstr "%s: eroare scriere înregistrare dir: %s\n"
  
 +#: dirmngr/crlcache.c:2083
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
 +#: dirmngr/crlcache.c:2108
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
@@@ -9502,18 -7650,15 +9590,18 @@@ msgstr "
  msgid "error reading CRL extensions: %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
 +#: dirmngr/crlcache.c:2189
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
 +#: dirmngr/crlcache.c:2221
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "problem renaming '%s' to '%s': %s\n"
- msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
+ msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
  
 +#: dirmngr/crlcache.c:2235
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9548,20 -7687,17 +9636,20 @@@ msgstr "
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
  msgstr ""
- "AVERTISMENT: dimensiune invalid� pentru fi�ierul random_seed - nu va fi "
- "folosit�\n"
+ "AVERTISMENT: dimensiune invalidă pentru fişierul random_seed - nu va fi "
+ "folosită\n"
  
 +#: dirmngr/crlcache.c:2333
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
- msgstr "%s: eroare citire �nregistrare liber�: %s\n"
+ msgstr "%s: eroare citire înregistrare liberă: %s\n"
  
 +#: dirmngr/crlcache.c:2344
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
- msgstr "rev? probleme la verificare revoc�rii: %s\n"
+ msgstr "rev? probleme la verificare revocării: %s\n"
  
 +#: dirmngr/crlcache.c:2375
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
  msgstr "eroare la citire `%s': %s\n"
@@@ -9570,22 -7705,18 +9658,22 @@@
  msgid "End CRL dump\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:2499
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
- msgstr "actualizarea a e�uat: %s\n"
+ msgstr "actualizarea a eşuat: %s\n"
  
 +#: dirmngr/crlcache.c:2510
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
- msgstr "verificarea semn�turii create a e�uat: %s\n"
+ msgstr "verificarea semnăturii create a eşuat: %s\n"
  
 +#: dirmngr/crlcache.c:2570
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
- msgstr "citirea cheii publice a e�uat: %s\n"
+ msgstr "citirea cheii publice a eşuat: %s\n"
  
 +#: dirmngr/crlfetch.c:74
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
@@@ -9604,9 -7730,8 +9692,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
- msgstr "%s: eroare scriere �nregistrare dir: %s\n"
+ msgstr "%s: eroare scriere înregistrare dir: %s\n"
  
 +#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
@@@ -9615,9 -7739,8 +9703,9 @@@
  #, fuzzy
  #| msgid "too many cipher preferences\n"
  msgid "too many redirections\n"
- msgstr "prea multe preferin�e de cifrare\n"
+ msgstr "prea multe preferinţe de cifrare\n"
  
 +#: dirmngr/crlfetch.c:274
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
  msgstr "eroare la creearea `%s': %s\n"
@@@ -9627,18 -7749,14 +9715,18 @@@
  msgid "error retrieving '%s': http status %u\n"
  msgstr "eroare la citire `%s': %s\n"
  
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
- msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+ msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
  
 +#: dirmngr/crlfetch.c:386
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
- msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+ msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
  
 +#: dirmngr/dirmngr-client.c:71
  msgid "use OCSP instead of CRLs"
  msgstr ""
  
@@@ -9687,15 -7795,13 +9775,15 @@@ msgstr "certificat incorect
  #, fuzzy
  #| msgid "Enter the user ID of the designated revoker: "
  msgid "force the use of the default OCSP responder"
- msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
+ msgstr "Introduceţi ID-ul utilizator al revocatorului desemnat: "
  
 +#: dirmngr/dirmngr-client.c:169
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
 +#: dirmngr/dirmngr-client.c:173
  msgid ""
  "Syntax: dirmngr-client [options] [certfile|pattern]\n"
  "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9703,12 -7809,10 +9791,12 @@@
  "not valid and other error codes for general failures\n"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
  #, fuzzy, c-format
  msgid "error reading certificate from stdin: %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
 +#: dirmngr/dirmngr-client.c:281
  #, fuzzy, c-format
  msgid "error reading certificate from '%s': %s\n"
  msgstr "eroare la citire `%s': %s\n"
@@@ -9721,51 -7823,42 +9809,51 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to the dirmngr: %s\n"
- msgstr "nu m� pot conecta la `%s': %s\n"
+ msgstr "nu mă pot conecta la `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:332
  #, fuzzy, c-format
  #| msgid "update failed: %s\n"
  msgid "lookup failed: %s\n"
- msgstr "actualizarea a e�uat: %s\n"
+ msgstr "actualizarea a eşuat: %s\n"
  
 +#: dirmngr/dirmngr-client.c:347
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "loading CRL '%s' failed: %s\n"
- msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
+ msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
  
 +#: dirmngr/dirmngr-client.c:375
  msgid "a dirmngr daemon is up and running\n"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:397
  #, fuzzy, c-format
  msgid "validation of certificate failed: %s\n"
- msgstr "stergere keyblock a e�uat: %s\n"
+ msgstr "stergere keyblock a eşuat: %s\n"
  
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
  #, fuzzy
  msgid "certificate is valid\n"
- msgstr "preferin�a `%s' duplicat�\n"
+ msgstr "preferinţa `%s' duplicată\n"
  
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
  #, fuzzy
  msgid "certificate has been revoked\n"
- msgstr "NOT�: cheia a fost revocat�"
+ msgstr "NOTĂ: cheia a fost revocată"
  
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
  #, fuzzy, c-format
  msgid "certificate check failed: %s\n"
- msgstr "stergere keyblock a e�uat: %s\n"
+ msgstr "stergere keyblock a eşuat: %s\n"
  
 +#: dirmngr/dirmngr-client.c:428
  #, fuzzy, c-format
  #| msgid "can't stat `%s': %s\n"
  msgid "got status: '%s'\n"
- msgstr "nu pot ob�ine statistici `%s': %s\n"
+ msgstr "nu pot obţine statistici `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:443
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing base64 encoding: %s\n"
@@@ -9787,114 -7877,90 +9875,118 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
- msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+ msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
- msgstr "Termina�i f�r� a salva?  (d/N) "
+ msgstr "Terminaţi fără a salva?  (d/N) "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
- msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+ msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
  #
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "nu am putut interpreta URL-ul serverului de chei\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9905,97 -7971,78 +9997,97 @@@ msgid "
  "options)\n"
  msgstr ""
  "@\n"
- "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
+ "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
- msgstr "folosire: gpg [op�iuni] "
+ msgstr "folosire: gpg [opţiuni] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "%s nu este permis cu %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "fetching CRL from '%s' failed: %s\n"
- msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
+ msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
- msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
+ msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
- msgstr "linie prea lung�"
+ msgstr "linie prea lungă"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
- msgstr "amprent� invalid�"
+ msgstr "amprentă invalidă"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "%s:%u: read error: %s\n"
- msgstr "eroare citire �n `%s': %s\n"
+ msgstr "eroare citire în `%s': %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
- msgstr "nefor�at(�)"
+ msgstr "neforţat(ă)"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10012,9 -8056,8 +10104,9 @@@ msgstr "
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|connect to host NAME"
- msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
+ msgstr "|NUME|setează charset-ul pentru terminal ca NUME"
  
 +#: dirmngr/dirmngr_ldap.c:143
  msgid "|N|connect to port N"
  msgstr ""
  
@@@ -10022,9 -8064,8 +10114,9 @@@
  #, fuzzy
  #| msgid "|NAME|use NAME as default recipient"
  msgid "|NAME|use user NAME for authentication"
- msgstr "|NUME|folose�te NUME ca destinatar implicit"
+ msgstr "|NUME|foloseşte NUME ca destinatar implicit"
  
 +#: dirmngr/dirmngr_ldap.c:145
  msgid "|PASS|use password PASS for authentication"
  msgstr ""
  
@@@ -10048,9 -8084,8 +10140,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
 +#: dirmngr/dirmngr_ldap.c:212
  msgid ""
  "Syntax: dirmngr_ldap [options] [URL]\n"
  "Internal LDAP helper for Dirmngr\n"
@@@ -10061,9 -8095,8 +10153,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "invalid import options\n"
  msgid "invalid port number %d\n"
- msgstr "op�iuni import invalide\n"
+ msgstr "opţiuni import invalide\n"
  
 +#: dirmngr/dirmngr_ldap.c:413
  #, c-format
  msgid "scanning result for attribute '%s'\n"
  msgstr ""
@@@ -10080,12 -8109,10 +10172,12 @@@ msgstr "eroare la scrierea inelului de 
  msgid "          available attribute '%s'\n"
  msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:475
  #, fuzzy, c-format
  msgid "attribute '%s' not found\n"
- msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+ msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:482
  #, c-format
  msgid "found attribute '%s'\n"
  msgstr ""
@@@ -10100,9 -8125,8 +10192,9 @@@ msgstr "citesc din `%s'\n
  #, fuzzy, c-format
  #| msgid "          w/o user IDs: %lu\n"
  msgid "          user '%s'\n"
- msgstr "  f�r� ID-uri utilizator: %lu\n"
+ msgstr "  fără ID-uri utilizator: %lu\n"
  
 +#: dirmngr/dirmngr_ldap.c:595
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "          pass '%s'\n"
@@@ -10112,9 -8135,8 +10204,9 @@@ msgstr "                aka \"%s\"
  #, fuzzy, c-format
  #| msgid "          w/o user IDs: %lu\n"
  msgid "          host '%s'\n"
- msgstr "  f�r� ID-uri utilizator: %lu\n"
+ msgstr "  fără ID-uri utilizator: %lu\n"
  
 +#: dirmngr/dirmngr_ldap.c:598
  #, fuzzy, c-format
  #| msgid "          not imported: %lu\n"
  msgid "          port %d\n"
@@@ -10137,12 -8156,10 +10229,12 @@@ msgstr "
  msgid "          attr '%s'\n"
  msgstr "                aka \"%s\""
  
 +#: dirmngr/dirmngr_ldap.c:616
  #, fuzzy, c-format
  msgid "no host name in '%s'\n"
- msgstr "(Nici o descriere dat�)\n"
+ msgstr "(Nici o descriere dată)\n"
  
 +#: dirmngr/dirmngr_ldap.c:621
  #, c-format
  msgid "no attribute given for query '%s'\n"
  msgstr ""
@@@ -10151,44 -8167,32 +10243,38 @@@
  #, fuzzy
  #| msgid "WARNING: using insecure memory!\n"
  msgid "WARNING: using first attribute only\n"
- msgstr "AVERTISMENT: este folosit� memorie neprotejat� (insecure)!\n"
+ msgstr "AVERTISMENT: este folosită memorie neprotejată (insecure)!\n"
  
 +#: dirmngr/dirmngr_ldap.c:636
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "LDAP init to '%s:%d' failed: %s\n"
- msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
+ msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:659
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "binding to '%s:%d' failed: %s\n"
- msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
+ msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:686
  #, fuzzy, c-format
  #| msgid "dearmoring failed: %s\n"
  msgid "searching '%s' failed: %s\n"
- msgstr "eliminarea armurii a e�uat: %s\n"
+ msgstr "eliminarea armurii a eşuat: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:718
  #, fuzzy, c-format
  #| msgid "`%s' is not a JPEG file\n"
  msgid "'%s' is not an LDAP URL\n"
- msgstr "`%s' nu este un fi�ier JPEG\n"
+ msgstr "`%s' nu este un fişier JPEG\n"
  
 +#: dirmngr/dirmngr_ldap.c:724
  #, c-format
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "eroare la crearea inelului de chei `%s': %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
  msgstr "eroare la scrierea inelului de chei `%s': %s\n"
@@@ -10198,12 -8201,10 +10284,12 @@@
  msgid "error reading log from ldap wrapper %d: %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
 +#: dirmngr/ldap-wrapper.c:304
  #, fuzzy, c-format
  msgid "npth_select failed: %s - waiting 1s\n"
- msgstr "actualizarea secretului a e�uat: %s\n"
+ msgstr "actualizarea secretului a eşuat: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:343
  #, c-format
  msgid "ldap wrapper %d ready"
  msgstr ""
@@@ -10218,12 -8217,10 +10304,12 @@@ msgstr "
  msgid "ldap wrapper %d ready: exitcode=%d\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:364
  #, fuzzy, c-format
  msgid "waiting for ldap wrapper %d failed: %s\n"
- msgstr "actualizarea a e�uat: %s\n"
+ msgstr "actualizarea a eşuat: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:376
  #, c-format
  msgid "ldap wrapper %d stalled - killing\n"
  msgstr ""
@@@ -10237,9 -8232,8 +10323,9 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "reading public key failed: %s\n"
  msgid "reading from ldap wrapper %d failed: %s\n"
- msgstr "citirea cheii publice a e�uat: %s\n"
+ msgstr "citirea cheii publice a eşuat: %s\n"
  
 +#: dirmngr/ldap.c:91
  #, c-format
  msgid "invalid char 0x%02x in host name - not added\n"
  msgstr ""
@@@ -10250,12 -8243,10 +10336,12 @@@
  msgid "adding '%s:%d' to the ldap server list\n"
  msgstr "trimit cheia %s serverului %s %s\n"
  
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
- msgstr "stergere keyblock a e�uat: %s\n"
+ msgstr "stergere keyblock a eşuat: %s\n"
  
 +#: dirmngr/ldap.c:627
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
@@@ -10268,20 -8257,17 +10354,20 @@@ msgstr "
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
- msgstr "%s: versiune fi�ier invalid� %d\n"
+ msgstr "%s: versiune fişier invalidă %d\n"
  
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
- msgstr "nu pot deschide fi�ierul: %s\n"
+ msgstr "nu pot deschide fişierul: %s\n"
  
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
- msgstr "actualizarea secretului a e�uat: %s\n"
+ msgstr "actualizarea secretului a eşuat: %s\n"
  
 +#: dirmngr/misc.c:518
  msgid "bad URL encoding detected\n"
  msgstr ""
  
@@@ -10296,12 -8280,10 +10382,12 @@@ msgstr "eroare la citire `%s': %s\n
  msgid "response from server too large; limit is %d bytes\n"
  msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
  
 +#: dirmngr/ocsp.c:139
  #, fuzzy
  msgid "OCSP request not possible due to Tor mode\n"
- msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+ msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
  
 +#: dirmngr/ocsp.c:145
  msgid "OCSP request not possible due to disabled HTTP\n"
  msgstr ""
  
@@@ -10340,12 -8315,10 +10426,12 @@@ msgstr "eroare trimitere la `%s': %s\n
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:293
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
- msgstr "verificarea semn�turii create a e�uat: %s\n"
+ msgstr "verificarea semnăturii create a eşuat: %s\n"
  
 +#: dirmngr/ocsp.c:328
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
@@@ -10353,41 -8325,33 +10439,41 @@@
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:464
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
- msgstr "citirea cheii publice a e�uat: %s\n"
+ msgstr "citirea cheii publice a eşuat: %s\n"
  
 +#: dirmngr/ocsp.c:479
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error getting responder ID: %s\n"
- msgstr "eroare la ob�inere noului PIN: %s\n"
+ msgstr "eroare la obţinere noului PIN: %s\n"
  
 +#: dirmngr/ocsp.c:514
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
- msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
+ msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
  
 +#: dirmngr/ocsp.c:563
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:570
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
- msgstr "genereaz� un certificat de revocare"
+ msgstr "generează un certificat de revocare"
  
 +#: dirmngr/ocsp.c:580
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
- msgstr "am e�uat s� stochez cheia: %s\n"
+ msgstr "am eşuat să stochez cheia: %s\n"
  
 +#: dirmngr/ocsp.c:614
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
@@@ -10419,12 -8378,10 +10505,12 @@@ msgstr "folosesc cifrul %s\n
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:676
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
- msgstr "eroare la ob�inerea num�rului serial: %s\n"
+ msgstr "eroare la obţinerea numărului serial: %s\n"
  
 +#: dirmngr/ocsp.c:701
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
@@@ -10433,12 -8389,10 +10519,12 @@@
  msgid "good"
  msgstr ""
  
 +#: dirmngr/ocsp.c:708
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
- msgstr "NOT�: cheia a fost revocat�"
+ msgstr "NOTĂ: cheia a fost revocată"
  
 +#: dirmngr/ocsp.c:743
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
@@@ -10450,84 -8402,67 +10536,84 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
- msgstr "semnarea a e�uat: %s\n"
+ msgstr "semnarea a eşuat: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
- msgstr "semnarea a e�uat: %s\n"
+ msgstr "semnarea a eşuat: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
- msgstr "stergere keyblock a e�uat: %s\n"
+ msgstr "stergere keyblock a eşuat: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
- msgstr "stergere keyblock a e�uat: %s\n"
+ msgstr "stergere keyblock a eşuat: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
- msgstr "stergere keyblock a e�uat: %s\n"
+ msgstr "stergere keyblock a eşuat: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
- msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
+ msgstr "nu pot crea fişier de rezervă `%s': %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: am e�uat s� creez hashtable: %s\n"
+ msgstr "%s: am eşuat să creez hashtable: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
- msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
+ msgstr "am eşuat să iniţializez TrustDB:%s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  #| msgid "failed to store the creation date: %s\n"
  msgid "failed to the register commands with Assuan: %s\n"
- msgstr "am e�uat s� stochez data cre�rii: %s\n"
+ msgstr "am eşuat să stochez data creării: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
- msgstr "semnarea a e�uat: %s\n"
+ msgstr "semnarea a eşuat: %s\n"
  
 +#: dirmngr/validate.c:201
  msgid "accepting root CA not marked as a CA"
  msgstr ""
  
@@@ -10541,40 -8474,32 +10627,40 @@@ msgstr "verific trustdb\n
  msgid "not checking CRL for"
  msgstr ""
  
 +#: dirmngr/validate.c:250
  #, fuzzy
  msgid "checking CRL for"
- msgstr "verificarea semn�turii create a e�uat: %s\n"
+ msgstr "verificarea semnăturii create a eşuat: %s\n"
  
 +#: dirmngr/validate.c:528
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
- msgstr "verific� o semn�tur�"
+ msgstr "verifică o semnătură"
  
 +#: dirmngr/validate.c:561
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
- msgstr "verificarea semn�turii create a e�uat: %s\n"
+ msgstr "verificarea semnăturii create a eşuat: %s\n"
  
 +#: dirmngr/validate.c:738
  #, fuzzy
  msgid "certificate chain is good\n"
- msgstr "preferin�a `%s' duplicat�\n"
+ msgstr "preferinţa `%s' duplicată\n"
  
 +#: dirmngr/validate.c:968
  msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA necesit� folosirea unui algoritm cu hash de 160 bi�i\n"
+ msgstr "DSA necesită folosirea unui algoritm cu hash de 160 biţi\n"
  
 +#: dirmngr/validate.c:1116
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
- msgstr "termin�"
+ msgstr "termină"
  
 +#: tools/gpg-connect-agent.c:79
  msgid "print data out hex encoded"
  msgstr ""
  
@@@ -10602,21 -8521,17 +10688,21 @@@ msgstr "
  msgid "do not use extended connect mode"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:92
  #, fuzzy
  msgid "|FILE|run commands from FILE on startup"
- msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+ msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
  
 +#: tools/gpg-connect-agent.c:93
  msgid "run /subst on startup"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:205
  #, fuzzy
  msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
 +#: tools/gpg-connect-agent.c:208
  msgid ""
  "Syntax: @GPG at -connect-agent [options]\n"
  "Connect to a running agent and send commands\n"
@@@ -10633,31 -8545,25 +10719,31 @@@ msgstr "
  msgid "option \"%s\" ignored due to \"%s\"\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
  #, fuzzy, c-format
  msgid "receiving line failed: %s\n"
- msgstr "citirea cheii publice a e�uat: %s\n"
+ msgstr "citirea cheii publice a eşuat: %s\n"
  
 +#: tools/gpg-connect-agent.c:1458
  #, fuzzy
  msgid "line too long - skipped\n"
- msgstr "linie prea lung�"
+ msgstr "linie prea lungă"
  
 +#: tools/gpg-connect-agent.c:1462
  msgid "line shortened due to embedded Nul character\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1837
  #, fuzzy, c-format
  msgid "unknown command '%s'\n"
- msgstr "op�iune necunoscut� `%s'\n"
+ msgstr "opţiune necunoscută `%s'\n"
  
 +#: tools/gpg-connect-agent.c:1855
  #, fuzzy, c-format
  msgid "sending line failed: %s\n"
- msgstr "semnarea a e�uat: %s\n"
+ msgstr "semnarea a eşuat: %s\n"
  
 +#: tools/gpg-connect-agent.c:2251
  #, fuzzy, c-format
  msgid "error sending standard options: %s\n"
  msgstr "eroare trimitere la `%s': %s\n"
@@@ -10713,25 -8604,20 +10799,25 @@@ msgstr "
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:579
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
- msgstr "|N|folose�te modul fraz�-parol� N"
+ msgstr "|N|foloseşte modul frază-parolă N"
  
 +#: tools/gpgconf-comp.c:583
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
- msgstr "eroare la crearea frazei-parol�: %s\n"
+ msgstr "eroare la crearea frazei-parolă: %s\n"
  
 +#: tools/gpgconf-comp.c:587
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
  msgid "|NAME|use NAME as default secret key"
- msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
+ msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
  
 +#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
  msgstr "|NUME|cifrare pentru NUME"
@@@ -10740,12 -8625,10 +10826,12 @@@
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
  #
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "nu am putut interpreta URL-ul serverului de chei\n"
@@@ -10762,12 -8642,10 +10848,12 @@@ msgstr "
  msgid "disable all access to the dirmngr"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:790
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
- msgstr "|NUME|folose�te algoritm cifrare NUME pentru fraza-parol�"
+ msgstr "|NUME|foloseşte algoritm cifrare NUME pentru fraza-parolă"
  
 +#: tools/gpgconf-comp.c:820
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
@@@ -10779,148 -8655,121 +10865,156 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "eroare reţea"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
- msgstr "fraz�-parol� incorect�"
+ msgid "Passphrase Entry"
+ msgstr "frază-parolă incorectă"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
- msgstr "cheia public� nu a fost g�sit�"
+ msgstr "cheia publică nu a fost găsită"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
  msgstr "articol configurare necunoscut `%s'\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
  msgstr "articol configurare necunoscut `%s'\n"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "actualizează baza de date de încredere"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
- msgstr "folose�te ca fi�ier ie�ire"
+ msgstr "foloseşte ca fişier ieşire"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
- msgstr "cheia public� nu a fost g�sit�"
+ msgstr "cheia publică nu a fost găsită"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  #, fuzzy
  msgid "No argument allowed"
  msgstr "Nu sunt permise comenzi administrare\n"
@@@ -10949,12 -8794,10 +11043,12 @@@ msgstr "decriptare OK\n
  msgid "tool class (confucius)"
  msgstr ""
  
 +#: tools/symcryptrun.c:162
  #, fuzzy
  msgid "program filename"
- msgstr "--store [nume_fi�ier]"
+ msgstr "--store [nume_fişier]"
  
 +#: tools/symcryptrun.c:164
  msgid "secret key file (required)"
  msgstr ""
  
@@@ -10962,12 -8804,10 +11056,12 @@@
  msgid "input file name (default stdin)"
  msgstr ""
  
 +#: tools/symcryptrun.c:209
  #, fuzzy
  msgid "Usage: symcryptrun [options] (-h for help)"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
 +#: tools/symcryptrun.c:212
  msgid ""
  "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
  "[options...] COMMAND [inputfile]\n"
@@@ -10979,12 -8818,10 +11073,12 @@@ msgstr "
  msgid "%s on %s aborted with status %i\n"
  msgstr "%s nu este permis cu %s!\n"
  
 +#: 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"
+ msgstr "fstat pentru `%s' a eşuat în %s: %s\n"
  
 +#: tools/symcryptrun.c:317
  #, fuzzy, c-format
  msgid "can't create temporary directory '%s': %s\n"
  msgstr "nu pot crea directorul `%s': %s\n"
@@@ -11004,17 -8838,14 +11098,17 @@@ msgstr "eroare la scrierea inelului de 
  msgid "error reading from %s: %s\n"
  msgstr "eroare la citire `%s': %s\n"
  
 +#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
  #, fuzzy, c-format
  msgid "error closing %s: %s\n"
- msgstr "eroare �n `%s': %s\n"
+ msgstr "eroare în `%s': %s\n"
  
 +#: tools/symcryptrun.c:490
  #, fuzzy
  msgid "no --program option provided\n"
- msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
+ msgstr "nu este suportată execuţia nici unui program la distanţă\n"
  
 +#: tools/symcryptrun.c:496
  msgid "only --decrypt and --encrypt are supported\n"
  msgstr ""
  
@@@ -11041,47 -8867,38 +11135,47 @@@ msgstr "nu pot crea `%s': %s\n
  msgid "could not fork: %s\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:582
  #, fuzzy, c-format
  msgid "execv failed: %s\n"
- msgstr "actualizarea a e�uat: %s\n"
+ msgstr "actualizarea a eşuat: %s\n"
  
 +#: tools/symcryptrun.c:611
  #, fuzzy, c-format
  msgid "select failed: %s\n"
- msgstr "stergere keyblock a e�uat: %s\n"
+ msgstr "stergere keyblock a eşuat: %s\n"
  
 +#: tools/symcryptrun.c:628
  #, fuzzy, c-format
  msgid "read failed: %s\n"
- msgstr "actualizarea a e�uat: %s\n"
+ msgstr "actualizarea a eşuat: %s\n"
  
 +#: tools/symcryptrun.c:680
  #, fuzzy, c-format
  msgid "pty read failed: %s\n"
- msgstr "actualizarea a e�uat: %s\n"
+ msgstr "actualizarea a eşuat: %s\n"
  
 +#: tools/symcryptrun.c:732
  #, fuzzy, c-format
  msgid "waitpid failed: %s\n"
- msgstr "actualizarea a e�uat: %s\n"
+ msgstr "actualizarea a eşuat: %s\n"
  
 +#: tools/symcryptrun.c:746
  #, c-format
  msgid "child aborted with status %i\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:801
  #, fuzzy, c-format
  msgid "cannot allocate infile string: %s\n"
- msgstr "nu pot deschide fi�ierul: %s\n"
+ msgstr "nu pot deschide fişierul: %s\n"
  
 +#: tools/symcryptrun.c:814
  #, fuzzy, c-format
  msgid "cannot allocate outfile string: %s\n"
- msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
+ msgstr "nu pot crea fişier de rezervă `%s': %s\n"
  
 +#: tools/symcryptrun.c:987
  #, c-format
  msgid "either %s or %s must be given\n"
  msgstr ""
@@@ -11095,12 -8910,10 +11189,12 @@@ msgstr "
  msgid "class %s is not supported\n"
  msgstr "algoritm rezumat %d nu este suportat\n"
  
 +#: tools/gpg-check-pattern.c:144
  #, fuzzy
  msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
- msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
  
 +#: tools/gpg-check-pattern.c:147
  msgid ""
  "Syntax: gpg-check-pattern [options] patternfile\n"
  "Check a passphrase given on stdin against the patternfile\n"
diff --cc po/ru.po
index 098e315,53bb489..3eea346
--- a/po/ru.po
+++ b/po/ru.po
@@@ -11,8 -11,7 +11,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: GnuPG 2.1.0\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
- "PO-Revision-Date: 2016-07-17 17:17+0000\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
+ "PO-Revision-Date: 2016-11-18 15:44+0100\n"
  "Last-Translator: Ineiev <ineiev at gnu.org>\n"
  "Language-Team: Russian <gnupg-ru at gnupg.org>\n"
  "Language: ru\n"
@@@ -22,7 -21,6 +22,7 @@@
  "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:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "сбой при блокировке для ввода пароля: %s\n"
@@@ -33,45 -31,35 +33,45 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|Отмена (_C)"
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|Да (_Y)"
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|Нет (_N)"
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|PIN:"
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|Сохранить в диспетчере паролей (_S)"
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Вы действительно хотите, чтобы фраза-пароль была видна на экране?"
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr "|pinentry-tt|Показывать фразу-пароль"
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  msgid "|pinentry-tt|Hide passphrase"
  msgstr "|pinentry-tt|Скрывать фразу-пароль"
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr "Стойкость:"
  
@@@ -81,72 -69,56 +81,72 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Стойкость введенного выше текста. Проконсультируйтесь у администратора о "
  "критериях оценки стойкости."
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr "Введите PIN, чтобы сделать секретный ключ доступным в этом сеансе"
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr ""
  "Введите фразу-пароль, чтобы сделать секретный ключ доступным в этом сеансе"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr "PIN:"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Фраза-пароль:"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "не подходит - попробуйте еще раз"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (попытка %d из %d)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr "Повторите:"
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
  msgstr "Слишком длинный PIN"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
  msgstr "Слишком длинная фраза-пароль"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
  msgstr "Недопустимый символ в PIN"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr "Слишком короткий PIN"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "Неверный PIN"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
  msgstr "Неверная фраза-пароль"
  
@@@ -155,24 -126,10 +155,24 @@@
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "ключи ssh длиннее %d бит не поддерживаются\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "не могу создать '%s': %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "не могу открыть '%s': %s\n"
@@@ -197,17 -150,6 +197,7 @@@ msgstr "на карте нет осно
  msgid "no suitable card key found: %s\n"
  msgstr "на карте не найдено подходящего ключа: %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "сбой при затенении ключа: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "ошибка записи ключа: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -216,24 -158,19 +206,24 @@@ msgstr "
  "Процесс ssh запросил доступ к ключу%%0A  %s%%0A  (%s)%%0AВы хотите это "
  "позволить?"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr "Позволить"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr "Отказать"
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Введите фразу-пароль для ключа ssh%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Повторите фразу-пароль:"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -242,16 -179,13 +232,16 @@@ msgstr "
  "Введите фразу-пароль для защиты полученного секретного ключа%%0A   %s%%0A   "
  "%s%%0Aвнутри хранилища ключей агента gpg"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "сбой создания потока из сокета: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr "Вставьте карту с серийным номером"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "Удалите текущую карту и вставьте карту с серийным номером"
  
@@@ -383,8 -293,6 +373,8 @@@ msgstr "Введите фразу-па�
  msgid "Please enter the new passphrase"
  msgstr "Введите новую фразу-пароль"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -392,129 -300,94 +382,133 @@@ msgstr "
  "@Параметры:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "запуск в режиме демона (фоновый режим)"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "запуск в режиме сервера (нефоновый режим)"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ msgid "run in supervised mode"
+ msgstr "запуск в подконтрольном режиме"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "подробно"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "сократить подробности"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr "вывод команд в стиле sh"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr "вывод команд в стиле csh"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FILE|взять параметры из файла FILE"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "не отсоединяться от консоли"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr "не захватывать клавиатуру и мышь"
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
  msgstr "использовать файл журнала для сервера"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr "|PGM|использовать программу PGM для ввода паролей"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr "|PGM|использовать программу PGM как демон криптографических карт"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
  msgstr "не использовать демон криптографических карт"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NAME|принимать некоторые команды по NAME"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr "игнорировать запросы смены терминала"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr "игнорировать запросы смены дисплея XWindow"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr "|N|сбрасывать запомненный PIN через N секунд"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr "не использовать запомненный PIN при подписывании"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  msgid "disallow the use of an external password cache"
  msgstr "не позволять пользоваться внешней памятью паролей"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "не позволять клиентам помечать ключи как \"доверенные\""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
  msgstr "разрешить предустанавливать фразу-пароль"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  "не позволять вызывающей программе замещать собой программу ввода пароля"
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr "разрешить ввод фразы-пароля через Emacs"
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  msgid "enable ssh support"
  msgstr "включить поддержку ssh"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
  msgstr "включить поддержку putty"
  
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Об ошибках в программе сообщайте по адресу <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Вызов: @GPG_AGENT@ [параметры] (-h для подсказки)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -522,135 -395,100 +516,135 @@@ msgstr "
  "Синтаксис: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
  "Управление секретными ключами для @GNUPG@\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "запрошен недопустимый уровень отладки '%s'\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "файл параметров '%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "чтение параметров из '%s'\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "Замечание: '%s' не считается параметром\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "не могу создать сокет: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "слишком длинное имя сокета '%s'\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
  msgstr "ошибка получения разового кода для сокета\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "ошибка связывания сокета с '%s': %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "не удалось задать права доступа для '%s': %s\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "сбой listen(): %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "слушаем сокет '%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "не могу создать каталог '%s': %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "создан каталог '%s'\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "сбой stat() для '%s': %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "невозможно использовать '%s' как домашний каталог\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "ошибка чтения разового кода из файлового дескриптора %d: %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "обработчик 0x%lx для файлового дескриптора %d запущен\n"
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "обработчик 0x%lx для файлового дескриптора %d завершился\n"
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr "обработчик ssh 0x%lx для файлового дескриптора %d запущен\n"
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "обработчик ssh 0x%lx для файлового дескриптора %d завершился\n"
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "сбой npth_pselect: %s - жду 1 секунду\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s остановлен\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "в этом сеансе агент gpg не работает\n"
  
@@@ -667,8 -503,6 +661,8 @@@ msgstr "
  "Синтаксис: gpg-preset-passphrase [параметры] КОД_КЛЮЧА\n"
  "Работа с буфером паролей\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -676,9 -510,6 +670,9 @@@ msgstr "
  "@Команды:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -732,7 -555,6 +726,8 @@@ msgstr "отменено\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "ошибка запроса ввода фразы-пароля: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "ошибка открытия '%s': %s\n"
@@@ -792,8 -605,6 +787,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Да"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "Нет"
  
@@@ -824,13 -632,11 +819,13 @@@ msgstr "Подтверждаю
  msgid "Wrong"
  msgstr "Неверно"
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  "Замечание: Фразу-пароль никогда не меняли.%0AПожалуйста, смените ее сейчас."
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@@ -838,26 -644,21 +833,26 @@@
  msgstr ""
  "Фраза-пароль не менялась%%0Aс %.4s-%.2s-%.2s. Пожалуйста, смените ее сейчас."
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
  msgstr "Сменить фразу-пароль"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr "Сменю позже"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
  msgstr "Вы действительно хотите удалить ключ с кодом%%0A  %s%%0A  %%C%%0A?"
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  msgid "Delete key"
  msgstr "Удалить ключ"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -874,12 -673,10 +869,12 @@@ msgstr "DSA требует длины �
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "%s ключ использует небезопасный (%u бит) хеш\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "%zu-битный хеш недопустим для %u-битного ключа %s\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "сбой проверки созданной подписи: %s\n"
@@@ -903,82 -696,72 +898,95 @@@ msgstr "алгоритм защиты %
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "хеш-функция защиты %d (%s) не поддерживается\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "ошибка при создании канала конвейера: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "ошибка при создании потока для канала конвейера: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "ошибка при дублировании процесса: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
  #, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "сбой при ожидании завершения процесса: %s\n"
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "сбой при ожидании завершения процесса %d: %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "ошибка выполнения '%s': возможно, не установлен\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "ошибка выполнения '%s': статус завершения %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, c-format
  msgid "error running '%s': terminated\n"
  msgstr "ошибка выполнения '%s': прервано\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
  #, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "ошибка получения кода возврата процесса %d: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "сбой при ожидании завершения процесса: %s\n"
  
- #: common/exechelp-w32ce.c:767
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "сбой при ожидании завершения процесса %d: %s\n"
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "ошибка получения кода возврата процесса %d: %s\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, c-format
  msgid "can't connect to '%s': %s\n"
  msgstr "не могу подключиться к '%s': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "проблема задания параметров агента gpg\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "не могу отключить создание файла образа памяти: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Внимание: небезопасный владелец %s \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Внимание: небезопасные права доступа %s \"%s\"\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ #| msgid "waiting for the agent to come up ... (%ds)\n"
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "ожидаю подключения агента ... (%iс)\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ #| msgid "error renaming '%s' to '%s': %s\n"
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "ошибка переименования '%s' в '%s': %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "да|yes"
  
@@@ -1032,7 -804,6 +1040,7 @@@ msgstr "выход за предел б
  msgid "out of core while allocating %lu bytes"
  msgstr "выход за границы при размещении %lu байтов"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "ошибка выделения достаточной памяти: %s\n"
@@@ -1052,35 -820,28 +1060,35 @@@ msgstr "Внимание: параме�
  msgid "unknown debug flag '%s' ignored\n"
  msgstr "неизвестный отладочный флаг '%s' игнорируется\n"
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr "агент gpg не работает - запускаем '%s'\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr "ожидаю подключения агента ... (%iс)\n"
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr "соединение с агентом установлено\n"
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  msgid "connection to agent is in restricted mode\n"
  msgstr "соединение с агентом в ограниченном режиме\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr "Dirmngr не выполняется - запуск '%s'\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr "ожидаю подключения dirmngr ... (%iс)\n"
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr "соединение с dirmngr установлено\n"
  
@@@ -1151,8 -896,6 +1159,8 @@@ msgstr "Сеансовый ключ с�
  msgid "algorithm: %s"
  msgstr "алгоритм: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "алгоритм (не поддерживается): %s"
@@@ -1227,11 -954,9 +1235,11 @@@ msgstr "Цепочка сертифик
  msgid "Root certificate trustworthy"
  msgstr "Корневой сертификат достоверен"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "для сертификата не найден список отозванных сертификатов"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
  msgstr "доступный список отозванных сертификатов слишком стар"
  
@@@ -1268,7 -985,6 +1276,7 @@@ msgstr "Нет справки для '%
  msgid "ignoring garbage line"
  msgstr "игнорируем дефектную строку"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[отсутствует]"
  
@@@ -1338,7 -1039,6 +1346,7 @@@ msgstr "параметр \"%.50s\" не
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "команда \"%.50s\" неоднозначна\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
  msgstr "нехватка выделенной памяти\n"
  
@@@ -1396,8 -1085,6 +1404,8 @@@ msgstr "блокировка '%s' не 
  msgid "waiting for lock %s...\n"
  msgstr "ожидаю снятия блокировки %s...\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "слишком старая версия %s (нужно %s, есть %s)\n"
@@@ -1481,12 -1150,10 +1489,12 @@@ msgstr "
  "символ quoted printable в текстовом формате - испорчено почтовой "
  "программой?\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, c-format
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "[ не для чтения человеком (%zu байт: %s%s) ]"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1494,67 -1161,51 +1502,66 @@@ msgstr "
  "имя замечания должно содержать только печатные символы или пробелы и "
  "заканчиваться знаком '='\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "имя замечания должно содержать символ '@'\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "имя замечания не должно содержать более одного символа '@'\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "в тексте замечания не должно быть управляющих символов\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  msgid "a notation name may not contain an '=' character\n"
  msgstr "имя примечания не должно содержать символа '='\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr "имя замечания должно содержать только печатные символы или пробелы\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "Внимание: найдена недопустимая форма записи замечания\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr "сбой при трансляции запроса %s клиенту\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Введите фразу-пароль:"
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, c-format
  msgid "error getting version from '%s': %s\n"
  msgstr "ошибка получения версии из '%s': %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr "сервер '%s' старше нас (%s < %s)"
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, c-format
  msgid "WARNING: %s\n"
  msgstr "Внимание: %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "Карта OpenPGP недоступна: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "Обнаружена карта OpenPGP номер %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "в пакетном режиме это действие невозможно\n"
  
@@@ -1562,14 -1212,9 +1569,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Эта команда доступна только для карт версии 2.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
  msgstr "Код сброса (больше) не доступен\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Ваш выбор? "
  
@@@ -1597,120 -1236,90 +1604,120 @@@ msgstr "не принудительны
  msgid "forced"
  msgstr "принудительный"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr "Ошибка: Допустим только простой текст ASCII.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "Ошибка: Нельзя использовать символ \"<\".\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "Ошибка: Двойные пробелы недопустимы.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "Фамилия владельца карты: "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "Имя владельца карты: "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr "Ошибка: Слишком длинное полное имя (предел - %d символов).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "URL для получения открытого ключа: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Ошибка: Слишком длинный URL (предел - %d символов).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "ошибка чтения '%s': %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "ошибка записи '%s': %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "Учетная запись (имя): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  "Ошибка: Слишком длинные данные учетной записи (предел - %d символов).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "Секретные данные DO:"
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr "Ошибка: Слишком много секретных данных DO (предел - %d символов).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "Предпочтительный язык: "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
  msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
  msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "Пол ((M) мужской, (F) женский или пробел): "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
  msgstr "Ошибка: недопустимый ответ.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "отпечаток удостоверяющего центра: "
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "Ошибка: недопустимый формат отпечатка.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "операция с ключом невозможна: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "это не карта OpenPGP"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "ошибка при считывании информации ключа: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr "Заменить существующий ключ? (y/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
@@@ -1720,55 -1329,43 +1727,55 @@@ msgstr "
  "           Если создать ключ не удастся, сверьтесь с документацией\n"
  "           на карту и выясните, какие размеры допустимы.\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Какой Вам нужен размер ключа для подписей? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "Какой Вам нужен размер ключа для шифрования? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Какой Вам нужен размер ключа для аутентификации? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "округлен до %u бит\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "размер ключей %s должен быть в пределах %u-%u\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr "Теперь карта будет перенастроена на генерацию ключа длиной %u бит\n"
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "ошибка изменения размера ключа %d до %u бит: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr "Сделать вне карты архивную копию ключа шифрования? (Y/n) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  msgid "Note: keys are already stored on the card!\n"
  msgstr "Замечание: ключи уже хранятся на карте!\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr "Заменить существующие ключи? (y/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1779,138 -1376,103 +1786,138 @@@ msgstr "
  "   PIN = '%s'    Админ. PIN = '%s'\n"
  "Вам следует изменить их командой --change-pin\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "Выберите тип создаваемого ключа:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "   (1) Ключ подписи\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) Ключ шифрования\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Ключ аутентификации\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Неправильный выбор.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "Выберите, где хранить ключ:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "сбой записи ключа на карту: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  msgid "This command is not supported by this card\n"
  msgstr "Данная команда этой картой не поддерживается.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "Замечание: эта команда сотрет с карты все ключи!\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  msgid "Continue? (y/N) "
  msgstr "Продолжить? (y/N) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr "Подтвердите сброс к заводским установкам (введите \"yes\") "
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "выйти из этого меню"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
  msgstr "показать административные команды"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "показать данную справку"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "вывести все доступные данные"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "изменить имя владельца карты"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "изменить URL получения ключа"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "запросить ключ по заданному картой URL"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "изменить имя учетной записи"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "изменить языковые предпочтения"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "изменить пол владельца карты"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "сменить отпечаток удостоверяющего центра"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr "переключить признак 'подпись требует PIN'"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "создать новые ключи"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "меню изменения или разблокировки PIN"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "проверить PIN и показать все данные"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr "разблокировать PIN с помощью кода сброса"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr "уничтожить все ключи и данные"
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr "gpg/card> "
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "Команды администрирования\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "Команды администрирования разрешены\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "Команды администрирования не разрешены\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Недопустимая команда (список команд: \"help\")\n"
  
@@@ -1918,22 -1479,14 +1925,22 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output для данной команды не работает\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "не могу открыть '%s'\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "ключ \"%s\" не найден: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "ошибка чтения блока ключей: %s\n"
@@@ -2046,7 -1577,6 +2053,7 @@@ msgstr "
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s зашифровано для: \"%s\"\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "нельзя использовать %s в режиме %s\n"
@@@ -2125,56 -1640,42 +2132,56 @@@ msgstr "Внимание: не мог�
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "Внимание: не могу удалить временный каталог '%s': %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
  msgstr "экспортировать подписи, помеченные как 'только локальные'"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr "экспортировать атрибутные ID пользователя (обычно фотоидентификаторы)"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "экспортировать ключи отзыва, помеченные как 'особо важные'"
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "удалить при экспорте непригодные части ключа"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "при экспорте удалить из ключа как можно больше"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  msgid " - skipped"
  msgstr " - пропущено"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "сохраняю в '%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "ключ %s: материал ключа на карте - пропущен\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "экспорт секретных ключей не разрешен\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "ключ %s: ключ типа PGP 2.x - пропущен\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "Внимание: нечего экспортировать\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "ошибка создания '%s': %s\n"
@@@ -2183,8 -1683,6 +2190,8 @@@
  msgid "[User ID not found]"
  msgstr "[ID пользователя не найден]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, c-format
  msgid "(check argument of option '%s')\n"
  msgstr "(проверьте аргумент параметра '%s')\n"
@@@ -2206,247 -1701,188 +2213,247 @@@ msgstr "ошибка поиска: %s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "Внимание: %s включено в таблицу ключей %d раз\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "автоматически получили '%s' через %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "ошибка получения '%s' через %s: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "Нет отпечатка"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "секретный ключ \"%s\" не найден: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, c-format
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "Внимание: '%s' не используется в качестве основного ключа: %s\n"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, c-format
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr ""
  "\"%s\" используется в качестве основного секретного ключа для подписи\n"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr "все значения, переданные в '%s', игнорируются\n"
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
  "Параметр --allow-non-selfsigned-uid сделал недостоверный ключ %s "
  "достоверным\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "использую подключ %s вместо первичного ключа %s\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "создать подпись"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
  msgstr "создать текстовую подпись"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "создать отделенную подпись"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "зашифровать данные"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "шифрование только симметричным шифром"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "расшифровать данные (по умолчанию)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "проверить подпись"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "вывести список ключей"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "вывести список ключей и подписей"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "вывести и проверить подписи ключей"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "вывести список ключей и их отпечатков"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "вывести список секретных ключей"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "создать новую пару ключей"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  msgid "quickly generate a new key pair"
  msgstr "быстро создать новую пару ключей"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  msgid "quickly add a new user-id"
  msgstr "быстро добавить новый ID пользователя"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  msgid "quickly revoke a user-id"
  msgstr "быстро отозвать ID пользователя"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr "создание полноценной пары ключей"
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "создать сертификат отзыва"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "удалить ключи из таблицы открытых ключей"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "удалить ключи из таблицы секретных ключей"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  msgid "quickly sign a key"
  msgstr "быстро подписать ключ"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  msgid "quickly sign a key locally"
  msgstr "быстро подписать ключ локально"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "подписать ключ"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "подписать ключ локально"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "подписать или редактировать ключ"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
  msgstr "сменить фразу-пароль"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "экспортировать ключи"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "экспортировать ключи на сервер ключей"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "импортировать ключи с сервера ключей"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "искать ключи на сервере ключей"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "обновить все ключи с сервера ключей"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "импортировать/объединить ключи"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "показать состояние карты"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "изменить данные на карте"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "сменить PIN карты"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "обновить таблицу доверия"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
  msgstr "вывести хеши сообщений"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "запуск в режиме сервера"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr "|VALUE|установить правила TOFU для ключа"
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "вывод в текстовом формате"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|USER-ID|зашифровать для пользователя USER-ID"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|USER-ID|использовать ключ USER-ID для подписи и расшифровки"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|установить уровень сжатия N (0 - без сжатия)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "использовать канонический текстовый режим"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|выводить данные в файл FILE"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "не делать никаких изменений"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "спросить перед перезаписью"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr "строго следовать стандарту OpenPGP"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2454,7 -1890,6 +2461,7 @@@ msgstr "
  "@\n"
  "(Полный список команд и параметров см. на странице man)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2474,11 -1909,9 +2481,11 @@@ msgstr "
  " --list-keys [имена]        показать ключи\n"
  " --fingerprint [имена]      показать отпечатки\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Вызов: @GPG@ [параметры] [файлы] (-h для подсказки)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2488,7 -1921,6 +2495,7 @@@ msgstr "
  "Подписи и их проверка, шифрование и расшифровка\n"
  "Действие по умолчанию зависит от входных данных\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2496,94 -1928,76 +2503,94 @@@ msgstr "
  "\n"
  "Поддерживаются следующие алгоритмы:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "С открытым ключом: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Симметричные шифры: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Хеш-функции: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Алгоритмы сжатия: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "вызов: %s [параметры] %s\n"
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "несовместимые команды\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "в определении группы '%s' отсутствует знак =\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "Внимание: небезопасный владелец домашнего каталога '%s'\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "Внимание: небезопасный владелец файла настроек '%s'\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "Внимание: небезопасный владелец файла модуля расширения '%s'\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "Внимание: небезопасные права доступа к домашнему каталогу '%s'\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "Внимание: небезопасные права доступа к файлу настроек '%s'\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "Внимание: небезопасные права доступа к файлу модуля расширения '%s'\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr ""
  "Внимание: небезопасный владелец каталога, содержащего домашний каталог '%s'\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr ""
  "Внимание: небезопасный владелец каталога, содержащего файл настроек '%s'\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr ""
  "Внимание: небезопасный владелец каталога,\n"
  "          содержащего модуль расширения '%s'\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr ""
  "Внимание: небезопасные права доступа к каталогу,\n"
  "          содержащему домашний каталог '%s'\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2591,518 -2005,405 +2598,523 @@@ msgstr "
  "ВНИМАНИЕ: небезопасные права доступа к каталогу,\n"
  "          содержащему файл настроек '%s'\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr ""
  "Внимание: небезопасные права доступа к каталогу,\n"
  "          содержащему файл модуля расширения '%s'\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "неизвестный элемент в файле настроек '%s'\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "показать в списке ключей фотоидентификаторы"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  msgid "show key usage information during key listings"
  msgstr "показать в списке ключей сведения о назначении ключа"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr "показать в списке подписей URL правил"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "показать в списке подписей все замечания"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr "показать в списке подписей замечания стандарта IETF"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr "показать в списке подписей пользовательские замечания"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "показать в списке подписей URL предпочтительных серверов ключей"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr "показать в списке ключей действительность ID пользователей"
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr "показать в списке ключей отозванные и просроченные ID пользователей"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr "показать в списке ключей отозванные и просроченные подключи"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "показать в списке ключей название таблицы ключей"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "показать в списке подписей сроки действия"
  
- #: g10/gpg.c:2011
- msgid "available TOFU policies:\n"
- msgstr "Доступные правила TOFU:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "недопустимые значения для параметра \"%s\"\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "неизвестные правила TOFU '%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr "(\"help\" выведет список вариантов)\n"
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "недопустимое значения для параметра \"%s\"\n"
+ 
++#: g10/gpg.c:2203
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "Замечание: старый основной файл параметров '%s' проигнорирован\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "Замечание: %s не предназначен для нормального применения!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "'%s' - не допустимый срок действия подписи\n"
  
- #: g10/gpg.c:2917
- #, fuzzy, c-format
- #| msgid "line %d: not a valid email address\n"
++#: g10/gpg.c:3012
+ #, c-format
  msgid "\"%s\" is not a proper mail address\n"
- msgstr "строка %d: нет допустимого адреса электронной почты\n"
+ msgstr "\"%s\" не является адресом электронной почты\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "недопустимый режим ввода пароля '%s'\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "'%s' - не допустимая таблица символов\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "не могу интерпретировать URL сервера ключей\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: недопустимые параметры сервера ключей\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "недопустимые параметры сервера ключей\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: недопустимые параметры импорта\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "недопустимые параметры импорта\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "недопустимый параметр фильтра: %s\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: недопустимые параметры экспорта\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "недопустимые параметры экспорта\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: недопустимые параметры списка\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "недопустимые параметры списка\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "показать при проверке подписи фотоидентификаторы"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr "показать при проверке подписи URL правил"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "показать при проверке подписей все замечания"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr "показать при проверке подписей замечания стандарта IETF"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr "показать при проверке подписей пользовательские замечания"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "показать при проверке подписей URL предпочтительных серверов ключей"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
  msgstr "показать при проверке подписей действительность ID пользователей"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  "показать при проверке подписей отозванные и просроченные ID пользователя"
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  msgid "show only the primary user ID in signature verification"
  msgstr "показать при проверке подписей только первичный ID пользователя"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "проверить подписи по данным PKA"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "поднять доверие подписей по действительным данным PKA"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: недопустимые параметры проверки\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "недопустимые параметры проверки\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "не могу определить путь запуска для %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: недопустимый список auto-key-locate\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr "недопустимый список auto-key-locate\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "Внимание: возможно создание файла образа памяти!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "Внимание: %s отменяет %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s с %s недопустимо!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s с %s не имеет смысла!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr "Внимание: работаем с фальшивым системным временем: "
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "не будет работать с небезопасной памятью из-за %s\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "выбран недопустимый алгоритм шифрования\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "выбрана недопустимая хеш-функция\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "выбран недопустимый алгоритм сжатия\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "выбрана недопустимая хеш-функция для сертификации\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed должен быть больше 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed должен быть больше 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  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:3590
++#: g10/gpg.c:3688
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "Замечание: простой режим S2K (0) строго противопоказан\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "недопустимые предпочтения по умолчанию\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "недопустимые личные предпочтения шифра\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "недопустимые личные предпочтения хеш-функции\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "недопустимые личные предпочтения алгоритмов сжатия\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s пока не работает совместно с %s!\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "шифрование '%s' в режиме %s использовать нельзя\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "хеш-функцию '%s' в режиме %s использовать нельзя\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "сжатие '%s' в режиме %s использовать нельзя\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "сбой инициализации таблицы доверия: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
  "ключом\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [файл]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [файл]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "сбой симметричного шифрования '%s': %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [файл]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [файл]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "--symmetric --encrypt нельзя использовать совместно с --s2k-mode 0\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "в режиме %s нельзя использовать --symmetric --encrypt\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [файл]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [файл]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [файл]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "в режиме %s нельзя использовать --symmetric --sign --encrypt\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [файл]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [файл]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [файл]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key <ID пользователя>"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key <ID пользователя>"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key <ID пользователя> [команды]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
  msgstr "--passwd <ID пользователя>"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "сбой при отправке на сервер ключей: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "сбой при получении с сервера ключей: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "сбой при экспорте ключа: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "сбой при экспорте в виде ключа ssh: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "сбой при поиске на сервере ключей: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "сбой при обновлении с сервера ключей: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "ошибка преобразования из текстового формата: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "ошибка преобразования в текстовый формат: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "недопустимая хеш-функция '%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "ошибка синтаксического анализа спецификации ключа '%s': %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr "'%s' не является идентификатором, отпечатком или кодом ключа\n"
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[файл]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Пишите сообщение ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "заданный URL правил сертификации неверен\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "заданный URL правил подписи неверен\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "заданный URL предпочтительного сервера ключей неверен\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FILE|взять ключи из файла таблицы ключей FILE"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "при несоответствии метки времени - только предупреждение"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|выводить информацию в файл с дескриптором FD"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr "|ALGO|отвергать подписи, сделанные по данному алгоритму"
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Вызов: gpgv [параметры] [файлы] (-h для подсказки)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3119,133 -2418,105 +3131,133 @@@ msgstr "Справки нет
  msgid "No help available for '%s'"
  msgstr "Нет справки для '%s'"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr "импортировать подписи, обозначенные как 'только локальные'"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr "устранить при импорте повреждения от сервера ключей pks"
  
- #: g10/import.c:144
++#: g10/import.c:157
  msgid "do not clear the ownertrust values during import"
  msgstr "не сбрасывать уровни доверия владельцам после импорта"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "не обновлять таблицу доверия после импорта"
  
- #: g10/import.c:150
++#: g10/import.c:163
  msgid "show key during import"
  msgstr "показывать ключ во время импорта"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr "обновлять только существующие ключи"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
  msgstr "удалить после импорта непригодные части ключа"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "удалить после импорта из ключа как можно больше"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr "применить фильтры импорта и немедленно экспортировать ключ"
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "пропущен блок типа %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "обработано %lu ключей\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Всего обработано: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "        пропущено ключей PGP-2: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "        пропущено новых ключей: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "           без ID пользователя: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                 импортировано: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                  неизмененных: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "         новых ID пользователя: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "               новых подключей: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "                новых подписей: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "          новых отзывов ключей: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "    прочитано секретных ключей: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "импортировано секретных ключей: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " неизмененных секретных ключей: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "             не импортировано: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "             очищено подписей: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "     очищено ID пользователей: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3254,189 -2525,151 +3266,189 @@@ msgstr "
  "Внимание: ключ %s содержит предпочтения для недоступных\n"
  "алгоритмов для следующих ID пользователей:\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": предпочитает шифр %s\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": предпочитает хеш-функцию %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": предпочитает алгоритм сжатия %s\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "крайне желательно, чтобы Вы обновили свои предпочтения и\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "распространили этот ключ во избежание возможных нестыковок алгоритмов\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "свои предпочтения можно обновить командой gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "ключ %s: нет ID пользователя\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, c-format
  msgid "key %s: %s\n"
  msgstr "ключ %s: %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr "исключен фильтром импорта"
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "ключ %s: повреждение подключа PKS исправлено\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "ключ %s: принят без самозаверенного ID пользователя \"%s\"\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "ключ %s: нет действительных ID пользователя\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "может быть, из-за отсутствия самоподписи\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "ключ %s: не найден открытый ключ: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "ключ %s: новый ключ - пропущен\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "нет доступной для записи таблицы ключей: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "ошибка записи таблицы ключей '%s': %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "ключ %s: импортирован открытый ключ \"%s\"\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "ключ %s: не совпадает с нашей копией\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "ключ %s: оригинальный блок ключей не читается: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "ключ %s: \"%s\" 1 новый ID пользователя\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "ключ %s: \"%s\" %d новых ID пользователя\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "ключ %s: \"%s\" 1 новая подпись\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "ключ %s: \"%s\" %d новых подписей\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "ключ %s: \"%s\" 1 новый подключ\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "ключ %s: \"%s\" %d новых подключей\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "ключ %s: \"%s\" %d подпись очищена\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "ключ %s: \"%s\" %d подписей очищено\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "ключ %s: \"%s\" %d ID пользователя очищен\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "ключ %s: \"%s\" %d ID пользователя очищено\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "ключ %s: \"%s\" не изменен\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "ключ %s: импортирован секретный ключ\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "ключ %s: секретный ключ уже имеется\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "ключ %s: ошибка отправки в агент: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "секретный ключ %s: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "импорт секретного ключа не допускается\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
@@@ -3451,174 -2684,140 +3463,174 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr "Для переноса '%s' выполните на каждой криптографической карте: %s\n"
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "ключ %s: недействительный сертификат отзыва: %s - отвергнут\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "ключ %s: сертификат отзыва \"%s\" импортирован\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "ключ %s: нет ID пользователя для подписи\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "ключ %s: алгоритм с открытым ключом у ID пользователя \"%s\" не "
  "поддерживается\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "ключ %s: неправильная самоподпись на ID пользователя \"%s\"\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "ключ %s: алгоритм с открытым ключом не поддерживается\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "ключ %s: недействительная прямая подпись ключа\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "ключ %s: нет подключа для связывания ключей\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "ключ %s: недопустимая связь подключей\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "ключ %s: удалено многократное связывание подключей\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "ключ %s: нет подключа для отзыва ключа\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "ключ %s: неверный отзыв подключа\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "ключ %s: удален многократный отзыв подключей\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "ключ %s: пропущен ID пользователя \"%s\"\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "ключ %s: пропущен подключ\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "ключ %s: неэкспортируемая подпись (класс 0x%02X) - пропущена\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "ключ %s: недействительный сертификат отзыва: %s - пропущен\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "ключ %s: неожиданный класс подписи (0x%02X) - пропущена\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "ключ %s: обнаружено дублирование ID пользователя - объединены\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "Внимание: ключ %s, возможно, отозван: запрашиваю ключ отзыва %s\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "Внимание: ключ %s, возможно, отозван: ключ отзыва %s отсутствует.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "ключ %s: добавлен сертификат отзыва \"%s\"\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "ключ %s: добавлена прямая подпись ключа\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "ошибка создания щита с ключами '%s': %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, c-format
  msgid "error creating keyring '%s': %s\n"
  msgstr "ошибка создания таблицы ключей '%s': %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, c-format
  msgid "keybox '%s' created\n"
  msgstr "создан щит с ключами '%s'\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, c-format
  msgid "keyring '%s' created\n"
  msgstr "создана таблица ключей '%s'\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "источник блока ключей '%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, c-format
  msgid "error opening key DB: %s\n"
  msgstr "ошибка открытия базы данных ключей: %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "сбой пересоставления буфера таблицы ключей: %s\n"
@@@ -3631,29 -2828,28 +3643,35 @@@ msgstr "[отзыв]
  msgid "[self-signature]"
  msgstr "[самоподпись]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "ошибка выделения памяти: %s\n"
+ 
++#: g10/keyedit.c:629
  #, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr ""
  "не удалось проверить подпись: алгоритм с открытым ключом %d не "
  "поддерживается: %s.\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "не удалось проверить подпись: хеш-функция %d не поддерживается: %s.\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  msgid " (reordered signatures follow)"
  msgstr "(порядок подписей изменен)"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, c-format
  msgid "key %s:\n"
  msgstr "ключ %s:\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
@@@ -3661,7 -2857,6 +3679,7 @@@ msgstr[0] "%d повторная под
  msgstr[1] "%d повторные подписи удалены\n"
  msgstr[2] "%d повторных подписей удалено\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, c-format
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
@@@ -3669,7 -2864,6 +3687,7 @@@ msgstr[0] "%d подпись не пр�
  msgstr[1] "%d подписи не проверены за отсутствием ключа\n"
  msgstr[2] "%d подписей не проверено за отсутствием ключа\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, c-format
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
@@@ -3677,7 -2871,6 +3695,7 @@@ msgstr[0] "%d плохая подпис
  msgstr[1] "%d плохих подписи\n"
  msgstr[2] "%d плохих подписей\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
@@@ -3685,7 -2878,6 +3703,7 @@@ msgstr[0] "Порядок %d подпи
  msgstr[1] "Порядок %d подписей изменен\n"
  msgstr[2] "Порядок %d подписей изменен\n"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3694,7 -2886,6 +3712,7 @@@ msgstr "
  "Внимание: обнаружены ошибки, проверялись только самоподписи; для проверки "
  "всех подписей выполните '%s'.\n"
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3705,17 -2896,14 +3723,17 @@@ msgstr "
  "достоверности ключей других пользователей (проверяет паспорт,\n"
  "сверяет отпечатки ключей из разных источников и т.п.)\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Доверяю ограниченно\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Полностью доверяю\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3725,52 -2913,40 +3743,52 @@@ msgstr "
  "позволяет ключу, который Вы подписываете, делать подписи доверия\n"
  "от Вашего имени.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Введите домен, ограничивающий использование данной подписи, или пустую "
  "строку, если нет ограничений.\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr "ID пользователя \"%s\" пропущен: это не текстовый ID.\n"
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "ID пользователя \"%s\" отозван."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Вы все равно хотите его подписать? (y/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  Не могу подписать.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Срок действия ID пользователя \"%s\" истек."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "ID пользователя \"%s\" не самозаверен."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "ID пользователя \"%s\" можно подписать."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
  msgstr "Подписать его? (y/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3779,11 -2955,9 +3797,11 @@@ msgstr "
  "Самоподпись у \"%s\" -\n"
  "это подпись типа PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Вы хотите преобразовать ее в самоподпись OpenPGP? (y/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3792,11 -2966,9 +3810,11 @@@ msgstr "
  "Ваша текущая подпись на \"%s\"\n"
  "просрочена.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3805,44 -2977,35 +3823,44 @@@ msgstr "
  "Ваша текущая подпись на \"%s\"\n"
  "является локальной.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Вы хотите преобразовать ее в полную экспортируемую подпись? (y/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" уже локально подписан ключом %s\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" уже подписан ключом %s\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Вы все равно хотите снова подписать его? (y/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Нечего подписывать ключом %s\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "Данный ключ просрочен!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Срок действия данного ключа истекает %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr ""
  "Вы хотите, чтобы Ваша подпись была действительна до того же времени? (Y/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3851,31 -3014,25 +3869,31 @@@ msgstr "
  "Насколько хорошо Вы проверили, что ключ действительно принадлежит\n"
  "указанному выше человеку? Если не знаете, что ответить, введите \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Не буду отвечать.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Никакой проверки не было.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Была частичная проверка.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Проверка была очень тщательной.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Ваш выбор? (введите '?' для получения информации): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3884,222 -3041,168 +3902,222 @@@ msgstr "
  "Вы уверены, что хотите подписать этот ключ\n"
  "своим ключом \"%s\" (%s)?\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
  msgstr "Это будет самоподпись.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "Внимание: подпись не будет помечена как неэкспортируемая.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "Внимание: подпись не будет помечена как неотзываемая.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Подпись будет помечена как неэкспортируемая.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Подпись будет помечена как неотзываемая.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "Этот ключ мной никак не проверялся.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "Мной проведена поверхностная проверка этого ключа.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "Этот ключ проверен мной очень тщательно.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
  msgstr "Действительно подписать? (y/N) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "подписать не удалось: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "В ключе только заготовка или элементы для карты -\n"
  "фразы-пароля для изменения нет.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "ключ %s: ошибка изменения фразы-пароля: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "сохранить и выйти"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "показать отпечаток ключа"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  msgid "show the keygrip"
  msgstr "показать код ключа"
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "вывести список ключей и ID пользователя"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "выбрать ID пользователя N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "выбрать подключ N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "проверка подписей"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "подписать выбранные ID пользователя [* описание команд см. ниже]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "локально подписать выбранные ID пользователя"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "подписать выбранные ID пользователя подписью доверия"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "подписать выбранные ID пользователя без возможности отзыва"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "добавить ID пользователя"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "добавить фотоидентификатор"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "удалить выбранные ID пользователя"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "добавить подключ"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "добавить ключ на криптографическую карту"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "переместить ключ на криптографическую карту"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "переместить архивный ключ на криптографическую карту"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "удалить выбранные подключи"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "добавить ключ отзыва"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "удалить подписи с выбранных ID пользователя"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "сменить срок действия ключа или выбранных подключей"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "пометить выбранный ID пользователя как первичный"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "список предпочтений (экспертам)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "список предпочтений (подробный)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "установить список предпочтений для выбранных ID пользователя"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
  "установить URL предпочтительного сервера ключей для выбранных ID пользователя"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
  msgstr "установить замечание для выбранных ID пользователя"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "сменить фразу-пароль"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "изменить уровень доверия владельцу"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "отозвать подписи у выбранных ID пользователя"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "отозвать выбранные ID пользователя"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "отозвать ключ или выбранные подключи"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "подключить ключ"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "отключить ключ"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "показать выбранные фотоидентификаторы"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "сжать непригодные ID пользователей и удалить непригодные подписи из ключа"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr "сжать непригодные ID пользователей и удалить все подписи из ключа"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "Секретный ключ доступен.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Для данного действия нужен секретный ключ.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4110,229 -3213,176 +4128,229 @@@ msgstr "
  "  't' (подписи доверия, tsign), 'nr' (неотзываемые, \n"
  "  nrsign) или любое их сочетание (ltsign, tnrsign и т.д.).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "Ключ отозван."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Действительно подписать все ID пользователя? (y/N) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Действительно подписать все текстовые ID пользователя? (y/N) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Подсказка: Выберите ID пользователей, которые нужно подписать\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "Неизвестный тип подписи '%s'\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Данная команда в режиме %s недопустима.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Вы должны выбрать хотя бы один ID пользователя.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr "(Команда '%s'.)\n"
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Вы не можете удалить последний ID пользователя!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Действительно удалить все выбранные ID пользователей? (y/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
  msgstr "Действительно удалить этот ID пользователя? (y/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
  msgstr "Действительно переместить первичный ключ? (y/N) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "Вы должны выбрать хотя бы один ключ.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "Команде нужен аргумент-имя файла\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "Не могу открыть '%s': %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Ошибка чтения архивного ключа из '%s': %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Вы должны выбрать хотя бы один ключ.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Вы действительно хотите удалить выбранные ключи? (y/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Вы действительно хотите удалить данный ключ? (y/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Действительно отозвать все выбранные ID пользователей? (y/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Действительно отозвать данный ID пользователя? (y/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Вы действительно хотите отозвать ключ целиком? (y/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Вы действительно хотите отозвать данный подключ? (y/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Нельзя присваивать степень доверия, когда таблица доверия указана "
  "пользователем\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "Установить предпочтения в:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Действительно обновить предпочтения для выбранных ID пользователей? (y/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
  msgstr "Действительно обновить предпочтения? (y/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
  msgstr "Сохранить изменения? (y/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
  msgstr "Выйти без сохранения? (y/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "сбой при обновлении: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "Ключ не изменялся - обновление не нужно.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, c-format
  msgid "User ID revocation failed: %s\n"
  msgstr "Сбой при отзыве идентификатора: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "\"%s\" - не отпечаток\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "\"%s\" - не первичный отпечаток\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, c-format
  msgid "Invalid user ID '%s': %s\n"
  msgstr "Недопустимый ID пользователя '%s': %s\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "No matching user IDs."
  msgstr "Нет подходящих ID пользователей."
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "Nothing to sign.\n"
  msgstr "Подписывать нечего.\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Хеш: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Характеристики: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "Не изменять на сервере"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Предпочтительный сервер ключей: "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "Замечания: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr "В ID пользователя типа PGP 2.x не может быть предпочтений.\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Следующий ключ был отозван %s пользователем %s ключом %s\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "Данный ключ может быть отозван пользователем %s ключом %s"
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(особо важный)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "     создан: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "    отозван: %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "просрочен с: %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "   годен до: %s"
@@@ -4340,30 -3390,24 +4358,30 @@@
  # perhaps this should be somewhere in help/man
  # (S - подпись, C - сертификация, E - шифрование, A - аутентификация)
  # too long for repeating messages.
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "назначение: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "номер карты: "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "доверие: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "достоверность: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Данный ключ отключен"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4371,18 -3415,13 +4389,19 @@@ msgstr "
  "Учтите, что показанная достоверность ключа может быть неверной,\n"
  "пока Вы не перезапустите программу.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "отозван"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "просрочен"
  
  # check it
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4391,15 -3430,12 +4410,15 @@@ msgstr "
  "          привести к тому, что первичным станет считаться другой\n"
  "          ID пользователя.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "Внимание: Срок действия Вашего подключа для шифрования истекает.\n"
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  msgid "You may want to change its expiration date too.\n"
  msgstr "Возможно, надо поменять также срок действия.\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4408,35 -3444,27 +4427,35 @@@ msgstr "
  "Внимание: Это ключ типа PGP2. Добавление фотоидентификатора может\n"
  "          в некоторых версиях PGP вызвать отбраковку ключа.\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Вы уверены, что хотите добавить это? (y/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "Нельзя добавить фотоидентификатор в ключ типа PGP2.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr "Такой ID пользователя на этом ключе уже есть!\n"
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Удалить данную действительную подпись? (y/N/q)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Удалить данную недействительную подпись? (y/N/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Удалить данную неизвестную подпись? (y/N/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Действительно удалить данную самоподпись? (y/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, c-format
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
@@@ -4444,20 -3472,16 +4463,20 @@@ msgstr[0] "Удалена %d подпи
  msgstr[1] "Удалены %d подписи.\n"
  msgstr[2] "Удалено %d подписей.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Ничего не удалено.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "недопустимый"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "ID пользователя \"%s\" сжат: %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
@@@ -4465,17 -3489,14 +4484,17 @@@ msgstr[0] "ID пользователя 
  msgstr[1] "ID пользователя \"%s\": %d подписи удалены\n"
  msgstr[2] "ID пользователя \"%s\": %d подписей удалено\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "ID пользователя \"%s\" уже минимизирован\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "ID пользователя \"%s\": уже очищен\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4484,36 -3505,28 +4503,36 @@@ msgstr "
  "Внимание: Это ключ типа PGP 2.x. Добавление особого отзывающего ключа\n"
  "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "Нельзя добавить особый отзывающий ключ в ключ типа PGP 2.x.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Укажите ID пользователя ключа, назначенного отзывающим: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr "нельзя назначить отзывающим ключ типа PGP 2.x\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "ключ не может быть назначен отзывающим самого себя\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
  msgstr "этот ключ уже назначен отзывающим\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr "Внимание: назначение ключа отзывающим невозможно отменить!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
@@@ -4521,229 -3534,178 +4540,229 @@@ msgstr "
  "Вы уверены, что хотите изменить срок действия сразу нескольких подключей? (y/"
  "N) "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Смена срока действия подключа.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Смена срока действия первичного ключа.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "Нельзя изменить срок действия ключа v3\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "подписывающий подключ %s уже перекрестно заверен\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr "подключ %s не для подписей, он не нуждается в перекрестном заверении\n"
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Выберите ровно один ID пользователя.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "пропуск самоподписи v3 на ID пользователя \"%s\"\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "Введите URL предпочтительного сервера ключей: "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Вы действительно хотите заменить его? (y/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Вы действительно хотите удалить его? (y/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "Введите замечание: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
  msgstr "Продолжить? (y/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Нет ID пользователя с индексом %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Нет ID пользователя с хешем %s\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Нет подключа с ID ключа '%s'.\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Нет подключа с индексом %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "ID пользователя: \"%s\"\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "подписано Вашим ключом %s %s%s%s\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (неэкспортируемая)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Срок действия подписи истек %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Вы уверены, что хотите отозвать? (y/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr "Вами не подписано.\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Вы подписали эти ID пользователей на ключе %s:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (неотзываемая)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "отозвано Вашим ключом %s %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Вы отзываете следующие подписи:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Действительно создать сертификат отзыва? (y/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "нет секретного ключа\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr "попытка отзыва непользовательского идентификатора: %s\n"
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "ID пользователя \"%s\" уже отозван\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr "Внимание: подпись ID пользователя датирована %d секундами в будущем\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Ключ %s уже отозван.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Подключ %s уже отозван.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Показ фотоидентификатора %s размера %ld для ключа %s (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "предпочтение '%s' дублируется\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "слишком много шифровых предпочтений\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "слишком много предпочтений для хеш-функций\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
  msgstr "слишком много предпочтений для методов сжатия\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "недопустимый элемент '%s' в строке предпочтений\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "запись прямой подписи\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "запись самоподписи\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "запись объединяющей подписи\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "неверный размер ключа; использую %u бит\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "размер ключа округлен вверх до %u бит\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "Внимание: некоторые реализации OpenPGP не могут обрабатывать ключи DSA с "
  "такой длиной хеша\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "Подписать"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "Заверить"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "Зашифровать"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "Аутентифицировать"
  
@@@ -4757,150 -3719,119 +4776,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "11223300"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Возможные действия для ключа %s: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "Допустимы действия: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Переключить возможность использования для подписи\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Переключить возможность использования для шифрования\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Переключить возможность использования для аутентификации\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Завершено\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Выберите тип ключа:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA и RSA (по умолчанию)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA и Elgamal\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (только для подписи)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (только для подписи)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (только для шифрования)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (только для шифрования)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (с требуемыми возможностями)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (с требуемыми возможностями)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC и ECC\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (только для подписи)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (с требуемыми возможностями)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (только для шифрования)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (%d) Имеющийся ключ\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Введите код ключа:"
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Недопустимый код ключа (ожидается 40 шестнадцатеричных цифр)\n"
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Нет ключа с таким кодом\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "округлен до %u бит\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "длина ключей %s может быть от %u до %u бит.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Какой размер подключа необходим? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Какой размер ключа Вам необходим? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Запрошенный размер ключа - %u бит\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Выберите эллиптическую кривую:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4916,7 -3847,6 +4935,7 @@@ msgstr "
  "      <n>m = срок действия ключа - n месяцев\n"
  "      <n>y = срок действия ключа - n лет\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4932,38 -3862,30 +4951,38 @@@ msgstr "
  "      <n>m = срок действия подписи - n месяцев\n"
  "      <n>y = срок действия подписи - n лет\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "Срок действия ключа? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Срок действия подписи? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "недопустимое значение\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "Срок действия ключа не ограничен\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "Срок действия подписи не ограничен\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Ключ действителен до %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Подпись действительна до %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -4971,11 -3893,9 +4990,11 @@@ msgstr "
  "Ваша система не может отображать даты после 2038 года.\n"
  "Однако даты до 2106 года будут обрабатываться верно.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "Все верно? (y/N) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4989,7 -3909,6 +5008,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5005,49 -3924,38 +5024,49 @@@ msgstr "
  "    \"Вася Пушкин (персонаж) <vp at test.ru>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Ваше полное имя: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Недопустимый символ в имени\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "Символы '%s' и '%s' в имени появляться не могут\n"
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "Имя не должно начинаться с цифры\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "Имя не должно быть короче 5 символов\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "Адрес электронной почты: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "Неправильный адрес электронной почты\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Примечание: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Недопустимый символ в примечании\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Используется таблица символов: '%s'.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5058,7 -3966,6 +5077,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Не вставляйте адрес электронной почты в имя пользователя или примечание\n"
@@@ -5074,31 -3981,24 +5093,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес или (Q)Выход? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Сменить (N)Имя, (C)Примечание, (E)Адрес или (O)Принять/(Q)Выход? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Сменить (N)Имя, (E)Адрес или (Q)Выход? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Сменить (N)Имя, (E)Адрес или (O)Принять/(Q)Выход? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Сначала исправьте ошибку\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5111,13 -4011,10 +5130,13 @@@ msgstr "
  "случайных чисел больше возможностей получить достаточное количество "
  "энтропии.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Сбой при создании ключа: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5128,63 -4025,50 +5147,63 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr "Продолжить? (Y/n) "
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Ключ для \"%s\" уже существует\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  msgid "Create anyway? (y/N) "
  msgstr "Все равно создать новый? (y/N) "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  msgid "creating anyway\n"
  msgstr "принудительное создание\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  "Замечание: \"%s %s\" вызывает полнофункциональный диалог создания ключа.\n"
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "Создание ключа прервано.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "не могу создать архивную копию, файл '%s': %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "Замечание: архивная копия ключа с карты сохранена в '%s'\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "сохранение открытого ключа в '%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "ошибка записи таблицы открытых ключей '%s': %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "открытый и секретный ключи созданы и подписаны.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5192,7 -4076,6 +5211,7 @@@ msgstr "
  "Учтите, что данный ключ не может использоваться для шифрования. Вы можете\n"
  "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5200,7 -4083,6 +5219,7 @@@ msgstr "
  "ключ создан на %lu секунду в будущем (петля во времени или проблемы с "
  "часами)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5208,23 -4090,18 +5227,23 @@@ msgstr "
  "ключ создан на %lu секунд в будущем (петля во времени или проблемы с "
  "часами)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "Замечание: создание подключей для ключей v3 не совместимо с OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Секретные части первичного ключа отсутствуют.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Секретные части первичного ключа хранятся на карте.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
  msgstr "Действительно создать? (y/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "никогда   "
  
@@@ -5276,29 -4144,23 +5295,29 @@@ msgstr[2] "Внимание: %lu клю
  msgid "Keyring"
  msgstr "Таблица ключей"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Отпечаток первичного ключа:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "      Отпечаток подключа:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr " Отпечаток первичного ключа:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "       Отпечаток подключа:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "      Отпечаток ключа ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr " серийный номер карты ="
  
@@@ -5336,53 -4193,41 +5355,53 @@@ msgstr[2] "(%lu подписей)\n
  msgid "%s: keyring created\n"
  msgstr "%s: таблица ключей создана\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr "переназначить настройки промежуточного сервера для dirmngr"
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr "включить в результаты поиска отозванные ключи"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr "искать по ID ключа, включая подключи"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr "переназначить настройки времени ожидания для dirmngr"
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr "автоматически получать ключи при проверке подписей"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "учитывать набор URL предпочтительных серверов ключей для этого ключа"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr "учитывать набор записей PKA при получении ключей"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "отключен"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr "Введите числа, N) Следующее или Q) Выход> "
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "недопустимый протокол сервера ключей (ожидается %d, получено %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "\"%s\" - не ID ключа: пропущен\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
@@@ -5390,54 -4235,43 +5409,54 @@@ msgstr[0] "обновление %d кл
  msgstr[1] "обновление %d ключей из %s\n"
  msgstr[2] "обновление %d ключей из %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "Внимание: невозможно обновить ключ %s с %s: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "ключ \"%s\" не найден на сервере ключей\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "ключ не найден на сервере ключей\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr "не заданы серверы ключей (используйте --keyserver)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "запрашиваю ключ %s с сервера %s %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "получение ключа %s с %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  msgid "no keyserver known\n"
  msgstr "ни один сервер ключей не известен\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "пропущено \"%s\": %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "отправка ключа %s на %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, c-format
  msgid "requesting key from '%s'\n"
  msgstr "запрос ключа из '%s'\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "Внимание: невозможно получить URI %s: %s\n"
@@@ -5535,128 -4349,100 +5554,127 @@@ msgstr "первоначальное и
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr "Внимание: наблюдается несколько текстов\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "отдельный сертификат отзыва: задействуется командой \"gpg --import\"\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "подпись не найдена\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "ПЛОХАЯ подпись пользователя \"%s\""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Просроченная подпись пользователя \"%s\""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Действительная подпись пользователя \"%s\""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "проверка подписи подавлена\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "не могу обработать эти неоднозначные данные подписи\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Подпись сделана %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               ключом %s с ID %s\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Подпись сделана %s ключом %s с ID %s\n"
  
- #: g10/mainproc.c:1755
- #, fuzzy, c-format
- #| msgid "                aka \"%s\""
++#: g10/mainproc.c:1772
+ #, c-format
  msgid "               issuer \"%s\"\n"
- msgstr "                или \"%s\""
+ msgstr "                издатель \"%s\"\n"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Ключ доступен на: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[сомнительно]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                или \"%s\""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Подпись просрочена %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Подпись действительна до %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "формат подписи: %s, хеш-функция %s%s%s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "двоичный"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "текстовый"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "неизвестно"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  msgid ", key algorithm "
  msgstr ", алгоритм ключа "
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr "Внимание: не отделенная подпись; файл '%s' НЕ был проверен!\n"
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Не могу проверить подпись: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "не отделенная подпись\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "Внимание: обнаружено несколько подписей. Проверена будет только первая.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "отдельная подпись класса 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "подпись старого типа (PGP 2.x)\n"
  
@@@ -5758,26 -4525,21 +5776,26 @@@ msgstr "Без сжатия
  msgid "uncompressed|none"
  msgstr "без сжатия|без|none"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "данное сообщение может быть непригодно для %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "неоднозначный параметр '%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, c-format
  msgid "unknown option '%s'\n"
  msgstr "неизвестный параметр '%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr "Открытый ключ ECDSA бывает в кодировке SEC, кратной 8 битам\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "неизвестный слабый хеш '%s'\n"
@@@ -6064,7 -4771,18 +6082,21 @@@ msgstr "Этот ключ, вероят
  msgid "This key belongs to us\n"
  msgstr "Данный ключ принадлежит нам\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "%s: Некачественный ключ! Он помечен как недоверенный!\n"
+ 
++#: g10/pkclist.c:484
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "Некачественный ключ! Он помечен как недоверенный! Если Вы ТОЧНО знаете,\n"
+ "что делаете, можете ответить на следующий вопрос утвердительно.\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6074,126 -4792,98 +6106,126 @@@ msgstr "
  "в ID пользователя. Если Вы ТОЧНО знаете, что делаете,\n"
  "можете ответить на следующий вопрос утвердительно.\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "Все равно использовать данный ключ? (y/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "Внимание: Использование недоверенного ключа!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr "Внимание: возможно, данный ключ отозван (ключ отзыва отсутствует)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "Внимание: Данный ключ отозван ключом, назначенным отзывающим!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "Внимание: Данный ключ отозван его владельцем!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
  msgstr "         Это может означать, что подпись подделана.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "Внимание: Данный подключ был отозван его владельцем!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Замечание: Данный ключ отключен.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr "Замечание: Проверенный адрес подписавшего - '%s'\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr "Замечание: Адрес подписавшего '%s' не соответствует данным DNS\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr "уровень доверия установлен в ПОЛНОСТЬЮ по действительным данным PKA\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr "уровень доверия установлен в НИКОГДА из-за непригодных данных PKA\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Замечание: Данный ключ просрочен!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr "Внимание: Данный ключ не заверен доверенной подписью!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr "          Нет указаний на то, что подпись принадлежит владельцу.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "Внимание: НЕТ ДОВЕРИЯ данному ключу!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "          Возможно, что подпись ПОДДЕЛАНА.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
  "Внимание: Этот ключ не заверен достаточным количеством доверенных подписей!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "          Нет уверенности в том, что подпись принадлежит владельцу.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: пропущено: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: пропущено: открытый ключ отключен\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: пропущено: открытый ключ уже существует\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, c-format
  msgid "can't encrypt to '%s'\n"
  msgstr "не могу зашифровать для '%s'\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "задан параметр '%s', но не заданы ключи по умолчанию\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "задан параметр '%s', но параметр '%s' не задан\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "Не задан ID пользователя (можно использовать \"-r\").\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "Текущие получатели:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6201,37 -4891,29 +6233,37 @@@ msgstr "
  "\n"
  "Введите ID пользователя. Завершите пустой строкой: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Нет такого ID пользователя.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "Открытый ключ отключен.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "пропущено: открытый ключ уже установлен\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "неизвестный получатель по умолчанию \"%s\"\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "нет пригодных адресов\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Замечание: у ключа %s нет функции %s\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Замечание: у ключа %s нет предпочтения для %s\n"
@@@ -6477,26 -5113,21 +6509,26 @@@ msgstr "ключ %s %s использу
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr "Ключ %s %s требует %zu-битного или более длинного хеша (хеш %s)\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "Внимание: конфликт хешей подписей в сообщении\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "Внимание: подписывающий подключ %s не был перекрестно заверен\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
  msgstr "за подробностями обращайтесь к %s\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr "Внимание: подписывающий подключ %s неправильно перекрестно заверен\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
@@@ -6504,7 -5135,6 +6536,7 @@@ msgstr[0] "открытый ключ %
  msgstr[1] "открытый ключ %s на %lu секунды новее подписи\n"
  msgstr[2] "открытый ключ %s на %lu секунд новее подписи\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
@@@ -6512,7 -5142,6 +6544,7 @@@ msgstr[0] "открытый ключ %
  msgstr[1] "открытый ключ %s на %lu дня новее подписи\n"
  msgstr[2] "открытый ключ %s на %lu дней новее подписи\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6528,7 -5157,6 +6560,7 @@@ msgstr[2] "
  "ключ %s создан на %lu секунд в будущем (петля во времени или проблемы с "
  "часами)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
@@@ -6543,28 -5171,23 +6575,28 @@@ msgstr[2] "
  "ключ %s создан на %lu дней в будущем (петля во времени или проблемы с "
  "часами)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "Замечание: срок действия подписавшего ключа %s истек %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "Замечание: ключ для подписей %s отозван\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
  "подпись ключа %s считается плохой из-за неизвестного критического бита\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr "ключ %s: нет подключа для отзывающей подписи подключа\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "ключ %s: нет подключа для подписи связи подключей\n"
@@@ -6635,7 -5247,6 +6667,7 @@@ msgid "this is a PGP generated Elgamal 
  msgstr ""
  "это ключ Elgamal, созданный PGP, он не обеспечивает безопасность подписи!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
@@@ -6680,12 -5283,10 +6712,12 @@@ msgstr "ошибка при поиск�
  msgid "read error in '%s': %s\n"
  msgstr "ошибка чтения в '%s': %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "таблица доверия: сбой синхронизации: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "невозможно создать блокировку для '%s'\n"
@@@ -6714,7 -5310,6 +6746,7 @@@ msgstr "слишком большая �
  msgid "%s: directory does not exist!\n"
  msgstr "%s: каталог не существует!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "нет доступа к '%s': %s\n"
@@@ -6823,95 -5396,79 +6855,99 @@@ msgstr "не могу обработа�
  msgid "input line longer than %d characters\n"
  msgstr "строка ввода длиннее %d символов\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "ошибка в начале операции с базой данных TOFU: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr "ошибка записи изменения в базе данных TOFU: %s\n"
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr "ошибка отката назад изменения в базе данных TOFU: %s\n"
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr "версия базы данных TOFU (не поддерживается): %s\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "ошибка чтения базы данных TOFU: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, c-format
  msgid "error determining TOFU database's version: %s\n"
  msgstr "ошибка определения версии базы данных TOFU: %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, c-format
  msgid "error initializing TOFU database: %s\n"
  msgstr "ошибка инициализации базы данных TOFU: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "ошибка открытия базы данных TOFU '%s': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "ошибка обновления базы данных TOFU: %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
- msgstr "Привязка %s неизвестна."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
+ msgstr "Адрес электронной почты \"%s\" используется с ключом %s впервые."
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr "Адрес электронной почты \"%s\" связан с %d ключами!"
+ 
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
- "Ключ с отпечатком %s противоречит этой привязке %s. Поскольку правило "
- "привязки было 'автоматически', оно изменилось на 'спрашивать'."
+ " Поскольку правило привязки было 'автоматически', оно изменилось на "
+ "'спрашивать'."
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
- "Укажите, считаете ли Вы привязку %s%sправомерной (ключ принадлежит "
- "заявленному владельцу) или поддельной (плохой)."
+ "Укажите, пожалуйста, следует ли связать этот адрес электронной почты с "
+ "ключом %s или вы думаете, что кто-то выдает себя за \"%s\"."
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "ошибка при сборе ID других пользователей: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr "Известные ID пользователя, связанные с этим ключом:\n"
++#: g10/tofu.c:1523
+ msgid "This key's user IDs:\n"
+ msgstr "Идентификаторы пользователя этого ключа:\n"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, c-format
  msgid "policy: %s"
  msgstr "правило: %s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "ошибка сбора статистики подписей: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -6919,59 -5476,57 +6955,67 @@@ msgstr[0] "Адрес электрон�
  msgstr[1] "Адрес электронной почты \"%s\" связан с %d ключами:\n"
  msgstr[2] "Адрес электронной почты \"%s\" связан с %d ключами:\n"
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr "Статистика ключей с адресом электронной почты \"%s\":\n"
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ", "
+ 
++#: g10/tofu.c:1693
  msgid "this key"
  msgstr "этот ключ"
  
- #: g10/tofu.c:1342
++#: g10/tofu.c:1715
  #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] "%ld сообщение подписано в будущем."
- msgstr[1] "%ld сообщения подписаны в будущем."
- msgstr[2] "%ld сообщений подписано в будущем."
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "Проверено %d сообщение"
+ msgstr[1] "Проверены %d сообщения"
+ msgstr[2] "Проверено %d сообщений"
  
- #: g10/tofu.c:1351
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "%ld сообщение подписано"
- msgstr[1] "%ld сообщения подписаны"
- msgstr[2] "%ld сообщений подписано"
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] "Зашифровано %d сообщение"
+ msgstr[1] "Зашифрованы %d сообщения"
+ msgstr[2] "Зашифровано %d сообщений"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
- msgstr[0] " за %ld прошедший день."
- msgstr[1] " за %ld прошедших дня."
- msgstr[2] " за %ld прошедших дней."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
+ msgstr[0] " за %d прошедший день."
+ msgstr[1] " за %d прошедших дня."
+ msgstr[2] " за %d прошедших дней."
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
- msgstr[0] " за %ld прошедшую неделю."
- msgstr[1] " за %ld прошедших недели."
- msgstr[2] " за %ld прошедших недель."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
+ msgstr[0] " за %d прошедший месяц."
+ msgstr[1] " за %d прошедших месяца."
+ msgstr[2] " за %d прошедших месяцев."
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
- msgstr[0] " за %ld прошедший месяц."
- msgstr[1] " за %ld прошедших месяца."
- msgstr[2] " за %ld прошедших месяцев."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
+ msgstr[0] " за %d прошедший год."
+ msgstr[1] " за %d прошедших дня."
+ msgstr[2] " за %d прошедших дней."
+ 
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr " в прошлом."
  
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  "Обычно с конкретным адресом электронной почты связан только один ключ. "
@@@ -6984,28 -5539,33 +7028,42 @@@
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr "gGaAuUrRbB"
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  "(G)Хороший, (A)Пока принять, (U)Неясно, (R)Пока отвергнуть, (B)Плохой? "
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr "Принимается исходное значение (неясно)."
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr "Обнаружено повреждение базы данных TOFU.\n"
+ 
++#: g10/tofu.c:1994
+ #, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "сброс базы данных ключей: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "ошибка установки уровня доверия привязки TOFU в %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "ошибка при смене правила TOFU: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
@@@ -7013,7 -5573,6 +7071,7 @@@ msgstr[0] "%d~год
  msgstr[1] "%d~года"
  msgstr[2] "%d~лет"
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
@@@ -7021,7 -5580,6 +7079,7 @@@ msgstr[0] "%d~месяц
  msgstr[1] "%d~месяца"
  msgstr[2] "%d~месяцев"
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
@@@ -7029,7 -5587,6 +7087,7 @@@ msgstr[0] "%d~день
  msgstr[1] "%d~дня"
  msgstr[2] "%d~дней"
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
@@@ -7037,7 -5594,6 +7095,7 @@@ msgstr[0] "%d~час
  msgstr[1] "%d~часа"
  msgstr[2] "%d~часов"
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
@@@ -7045,7 -5601,6 +7103,7 @@@ msgstr[0] "%d~минута
  msgstr[1] "%d~минуты"
  msgstr[2] "%d~минут"
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
@@@ -7053,64 -5608,55 +7111,65 @@@ msgstr[0] "%d~секунда
  msgstr[1] "%d~секунды"
  msgstr[2] "%d~секунд"
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
- msgstr "Сообщения, подписанные ключом %s, никогда не проверялись!\n"
+ msgid "%s: "
+ msgstr "%s: "
  
- #: g10/tofu.c:1976
++#: g10/tofu.c:2806
  #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
- "Не удалось собрать статистику подписей для \"%s\"\n"
- "(ключ %s)\n"
+ msgid "Verified %ld signatures"
+ msgstr "Проверено %ld подписей"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "Проверено %ld сообщений, подписанных \"%s\"."
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "Проверена %ld подпись за %s."
+ msgstr[1] "Проверены %ld прописи за %s."
+ msgstr[2] "Проверено %ld подписей за %s."
  
- #: g10/tofu.c:2007
++#: g10/tofu.c:2826
  #, c-format
- msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- "Проверено %ld сообщение, подписанное \"%s\"\n"
- " за %s."
- msgstr[1] ""
- "Проверены %ld сообщения, подписанные \"%s\"\n"
- " за %s."
- msgstr[2] ""
- "Проверено %ld сообщений, подписанных \"%s\"\n"
- " за %s."
+ msgid ", and encrypted %ld messages"
+ msgstr ", зашифровано %ld сообщений"
  
- #: g10/tofu.c:2018
++#: g10/tofu.c:2835
  #, c-format
- msgid "The most recent message was verified %s ago."
- msgstr "Последнее сообщение проверено %s назад."
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] ", зашифровано %ld сообщение за %s."
+ msgstr[1] ", зашифрованы %ld сообщения за %s."
+ msgstr[2] ", зашифровано %ld сообщений за %s."
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2880
+ msgid ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr ""
  "Внимание: мы до сих пор не видели ни одного сообщения, подписанного этим "
- "ключом!\n"
+ "ключом и этим идентификатором пользователя!\n"
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  "Внимание: мы до сих пор видели только одно сообщение, подписанное этим "
- "ключом!\n"
+ "ключом и этим идентификатором пользователя!\n"
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
+ msgstr ""
+ "Внимание: мы до сих пор не зашифровали этим ключом ни одного сообщения!\n"
+ 
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
+ msgstr ""
+ "Внимание: мы до сих пор зашифровали этим ключом только одно сообщение!\n"
+ 
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7140,98 -5686,90 +7199,113 @@@ msgstr[2] "
  "некачественный командой\n"
  "  %s\n"
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "ошибка при открытии базы данных TOFU: %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ "ВНИМАНИЕ: Шифрование для ключа %s, у которого нет неотозванных "
+ "идентификаторов пользователя.\n"
+ 
++#: g10/tofu.c:3515
+ #, c-format
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr ""
+ "ошибка установки правил для ключа %s с идентификатором пользователя \"%s\": "
+ "%s"
+ 
++#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
  msgstr "'%s' не является допустимым длинным ID ключа\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "ключ %s: принят как доверенный ключ\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "ключ %s встречается в таблице доверия более одного раза\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr "ключ %s: нет открытого ключа для доверенного ключа - пропущен\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "ключ %s помечен как абсолютно доверенный\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "запись о доверии %lu, тип запроса %d: сбой чтения: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "тип записи о доверии %lu отличается от запрошенного (%d)\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr "Можно попытаться пересоздать таблицу доверия командами:\n"
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr "Если это не выйдет, обратитесь к руководству пользователя\n"
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "не могу использовать неизвестную модель (%d) - использую модель доверия %s\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "использую модель доверия %s\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "проверка таблицы доверия не нужна\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "срок следующей проверки таблицы доверия %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "проверять таблицу доверия при модели доверия '%s' не нужно\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "обновлять таблицу доверия при модели доверия '%s' не нужно\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "открытый ключ %s не найден: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "выполните --check-trustdb, пожалуйста\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "проверка таблицы доверия\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
@@@ -7239,7 -5777,6 +7313,7 @@@ msgstr[0] "обработан %d клю
  msgstr[1] "обработаны %d ключа"
  msgstr[2] "обработано %d ключей"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
@@@ -7247,16 -5784,13 +7321,16 @@@ msgstr[0] " (сброшен %d счет
  msgstr[1] " (сброшены %d счетчика достоверности)\n"
  msgstr[2] " (сброшено %d счетчиков достоверности)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "абсолютно доверенных ключей не найдено\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "открытый ключ для абсолютно доверенного ключа %s не найден\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7264,7 -5798,6 +7338,7 @@@ msgstr "
  "глубина: %d  достоверных: %3d  подписанных: %3d  доверие: %d-, %dq, %dn, "
  "%dm, %df, %du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7374,52 -5886,39 +7448,52 @@@ msgstr "
  "Синтаксис: kbxutil [параметры] [файлы]\n"
  "Просмотр, экспорт, импорт данных щита с ключами\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "Модули RSA пропущены, или их размер не равен %d бит\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "отсутствует открытая экспонента RSA, или ее размер превышает %d бит\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "Функция обработки PIN возвратила ошибку: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr "пустой PIN до сих пор не изменен\n"
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "|A|Введите новый PIN для стандартных ключей."
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
  msgstr "|A|Введите PIN для стандартных ключей."
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|NP|Введите новый код разблокировки PIN (PUK) для стандартных ключей."
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|P|Введите код разблокировки PIN (PUK) для стандартных ключей."
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr "|N|Введите новый PIN ключа для создания квалифицированных подписей."
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr "||Введите PIN ключа для создания квалифицированных подписей."
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7427,7 -5926,6 +7501,7 @@@ msgstr "
  "|NP|Введите новый код разблокировки PIN (PUK) ключа для создания "
  "квалифицированных подписей."
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7435,83 -5933,65 +7509,83 @@@ msgstr "
  "|P|Введите код разблокировки PIN (PUK) ключа для создания квалифицированных "
  "подписей."
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "ошибка при получении нового PIN: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "сбой при сохранении отпечатка: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "сбой при сохранении даты создания: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "сбой при чтении открытого ключа: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "ответ не содержит данных открытого ключа\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr "в ответе отсутствует модуль RSA\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr "в ответе отсутствует открытая экспонента RSA\n"
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
- msgstr "в ответе отсутствует открытая точка эллиптической кривой\n"
++#: scd/app-openpgp.c:1353
+ msgid "response does not contain the EC public key\n"
+ msgstr "в ответе отсутствует открытый ключ эллиптической кривой\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "ответ не содержит данных открытого ключа\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "сбой при чтении открытого ключа: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "основной PIN применяется как %s\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "не удалось применить основной PIN как %s: %s - далее применяться\n"
  "как основной не будет\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Введите PIN%%0A[сделано подписей: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
  msgstr "||Введите PIN"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "сбой при проверке CHV%d: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "ошибка получения статуса CHV с карты\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr "карта окончательно заблокирована!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7525,24 -6005,19 +7599,24 @@@ msgstr[2] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Введите административный PIN%%0A[осталось попыток: %d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Введите административный PIN"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr "доступ к командам управления не настроен\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Введите код сброса для карты"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Код сброса слишком короток; минимальная длина %d\n"
@@@ -7550,77 -6025,59 +7624,77 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr "|RN|Новый код сброса"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Новый административный PIN"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|Новый PIN"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "|A|Введите административный PIN и новый административный PIN"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Введите PIN и новый PIN"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
  msgstr "ошибка чтения данных приложения\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "ошибка чтения отпечатка DO\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "ключ уже существует\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr "существующий ключ будет заменен\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "генерация нового ключа\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
  msgstr "запись нового ключа\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "пропущена метка времени создания\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "Простое число RSA %s пропущено или его размер не равен %d бит\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "сбой сохранения ключа: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  msgid "unsupported curve\n"
  msgstr "кривая не поддерживается\n"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
  msgstr "сбой при генерации ключа\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
@@@ -7628,31 -6085,25 +7702,31 @@@ msgstr[0] "создание ключа 
  msgstr[1] "создание ключа завершено (%d секунды)\n"
  msgstr[2] "создание ключа завершено (%d секунд)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "недопустимая структура карты OpenPGP (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr "отпечаток на карте не совпадает с запрошенным\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "карта не поддерживает хеш-функцию %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "создано подписей: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "проверка административного PIN в данный момент запрещена этой командой\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "нет доступа к %s - непригодная карта OpenPGP?\n"
@@@ -7672,7 -6120,6 +7746,7 @@@ msgstr "|N|Первоначальны�
  msgid "run in multi server mode (foreground)"
  msgstr "работать в многосерверном режиме (нефоновый режим)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LEVEL|установить уровень отладки, равный LEVEL"
  
@@@ -7724,17 -6160,14 +7798,17 @@@ msgstr "
  "Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
  "Демон криптографических карт для @GNUPG@\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  "используйте параметр '--daemon' для запуска приложения в фоновом режиме\n"
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "обработчик fd %d запущен\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "обработчик fd %d остановлен\n"
@@@ -7753,11 -6183,9 +7827,11 @@@ msgstr "в этом сеансе dirmng
  msgid "validation model requested by certificate: %s"
  msgstr "схема проверки, запрошенная сертификатом: %s"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr "цепь"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr "оболочка"
  
@@@ -7787,198 -6209,151 +7861,198 @@@ msgstr "Замечание: некри�
  msgid "certificate policy not allowed"
  msgstr "правила сертификата недопустимы"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr "внешний поиск издателя\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr "число соответствующих издателей: %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr "поиск издателя в буфере Dirmngr\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "число соответствующих сертификатов: %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "ключ не найден в буфере dirmngr: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "сбой при выделении памяти под указатель на базу данных\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
  msgstr "сертификат был отозван"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "статус сертификата неизвестен"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr "проверьте, что \"dirmngr\" установлен корректно\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
  msgstr "сбой проверки списка отозванных сертификатов: %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "сертификат с недействительной достоверностью: %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr "сертификат еще не достоверен"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
  msgstr "корневой сертификат еще не достоверен"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr "промежуточный сертификат еще не достоверен"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
  msgstr "сертификат просрочен"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
  msgstr "корневой сертификат просрочен"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
  msgstr "промежуточный сертификат просрочен"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr "сертификат не имеет требуемых атрибутов: %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
  msgstr "сертификат с недействительной достоверностью"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr "подпись создана вне времени действия сертификата"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr "сертификат создан вне времени действия издателя"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr "промежуточный сертификат создан вне времени действия издателя"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  (          подпись создана "
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "  (        сертификат создан "
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
  msgstr "  (сертификат действителен с "
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr "  (  издатель действителен с "
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "отпечаток=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr "корневой сертификат теперь помечен как доверенный\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr "в агенте gpg нельзя интерактивно сделать сертификат доверенным\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  "для данного сеанса запрещено интерактивно делать сертификат доверенным\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  "Внимание: время создания подписи неизвестно - предполагается текущий момент"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "в сертификате не найден издатель"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr "у самозаверенного сертификата ПЛОХАЯ подпись"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr "корневой сертификат не помечен как доверенный"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "сбой проверки списка доверия: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr "слишком длинная цепочка сертификатов\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "не найден издатель сертификата"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
  msgstr "сертификат имеет ПЛОХУЮ подпись"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  "найден еще один возможный сертификат удостоверяющего центра - повторная "
  "попытка"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "цепочка сертификатов длиннее допускаемой удостоверяющим центром (%d)"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "хороший сертификат\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
  msgstr "хороший промежуточный сертификат\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
  msgstr "хороший корневой сертификат\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr "переключение на цепную схему"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr "используется схема проверки: %s"
@@@ -8299,7 -6608,6 +8373,7 @@@ msgstr "(это не похоже на 
  msgid "certificate '%s' not found: %s\n"
  msgstr "сертификат '%s' не найден: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
  msgstr "ошибка блокировки щита с ключами: %s\n"
@@@ -8323,123 -6627,93 +8397,123 @@@ msgstr "сбой при удалени�
  msgid "no valid recipients given\n"
  msgstr "не заданы получатели\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
  msgstr "вывести список внешних ключей"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
  msgstr "вывести список цепочек сертификатов"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
  msgstr "импорт сертификатов"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
  msgstr "экспорт сертификатов"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "зарегистрировать криптографическую карту"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "передать команду dirmngr"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr "вызываем gpg-protect-tool"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
  msgstr "вывод в кодировке base64"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr "предполагаю, что входные данные в формате PEM"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr "предполагаю, что входные данные в формате base64"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr "предполагаю, что входные данные в двоичном формате"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr "не сверять со списком отозванных сертификатов"
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr "проверка достоверности с помощью OCSP"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr "|N|число включаемых сертификатов"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr "|FILE|взять информацию о правилах из файла FILE"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr "не проверять правила сертификата"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr "запросить недостающих издателей сертификатов"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "не использовать терминал совсем"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FILE|сохранять журнал аудита в файле FILE"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "пакетный режим: ничего не спрашивать"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "принять 'да' как ответ на большинство вопросов"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "принять 'нет' как ответ на большинство вопросов"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FILE|добавить таблицу ключей в список таблиц ключей"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|USER-ID|использовать USER-ID как основной секретный ключ"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|искать ключи на данном сервере ключей"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAME|использовать алгоритм шифрования NAME"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAME|использовать хеш-функцию NAME"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Вызов: @GPGSM@ [параметры] [файлы] (-h для подсказки)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8450,46 -6724,37 +8524,46 @@@ msgstr "
  "MIME\n"
  "Операция по умолчанию зависит от входных данных\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "Замечание: не могу зашифровать для '%s': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "неизвестная схема проверки '%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: не задано имя хоста\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: задан пароль, но не задан пользователь\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: пропускаю эту строку\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
  msgstr "не удалось определить сервер ключей\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "импорт общих сертификатов '%s'\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "невозможно подписать с помощью '%s': %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr "недопустимая команда (неявной команды нет)\n"
  
@@@ -8506,7 -6768,6 +8580,7 @@@ msgstr "ошибка сохранени
  msgid "basic certificate checks failed - not imported\n"
  msgstr "ошибка базовой проверки сертификата - не импортирован\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "ошибка получения сохраненных признаков: %s\n"
@@@ -8521,31 -6780,25 +8595,31 @@@ msgstr "ошибка импорта с�
  msgid "error reading input: %s\n"
  msgstr "ошибка чтения ввода: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
  msgstr "сбой получения отпечатка\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr "проблема поиска существующего сертификата: %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "ошибка при поиске базы данных ключей для записи: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
  msgstr "ошибка сохранения сертификата: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "проблема повторного поиска сертификата: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
  msgstr "ошибка сохранения признаков: %s\n"
@@@ -9442,114 -7518,92 +9516,120 @@@ msgstr "нужно абсолютно�
  msgid "looking up '%s'\n"
  msgstr "поиск '%s'\n"
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr "вывести содержание буфера списков отозванных сертификатов"
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|загрузить список отозванных сертификатов из файла FILE в буфер"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|получить список отозванных сертификатов из URL"
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr "выключить dirmngr"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr "записать буфер на диск"
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FILE|сохранять журнал режима сервера в файле FILE"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  msgid "run without asking a user"
  msgstr "работать, не спрашивая пользователя"
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr "принудительная загрузка устаревших списков отозванных сертификатов"
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr "разрешить посылку запросов OCSP"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ #, fuzzy
+ #| msgid "query the software version database"
+ msgid "allow online software version check"
+ msgstr "запросить базу данных версий программ"
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr "запретить использование HTTP"
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr "запретить использование LDAP"
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  "игнорировать точки распространения списков отозванных сертификатов по HTTP"
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  "игнорировать точки распространения списков отозванных сертификатов по LDAP"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "игнорировать URL служб OCSP из сертификата"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|перенаправлять все запросы HTTP на URL"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HOST|использовать хост HOST для поиска LDAP"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "не пользоваться запасными хостами с --ldap-proxy"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|взять список серверов LDAP из файла FILE"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  "добавлять новые серверы, обнаруженные в точках распространения списков "
  "отозванных сертификатов, в список серверов"
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|установить время ожидания LDAP N секунд"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|использовать ответчик OCSP по URL"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|ответ OCSP подписан сертификатом с отпечатком FPR"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|не возвращать более чем N результатов одного поиска"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  "|FILE|использовать сертификаты удостоверяющего центра из файла FILE для HKP "
  "по TLS"
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr "проводить весь сетевой обмен через Tor"
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9558,11 -7612,9 +9638,11 @@@ msgstr "
  "@\n"
  "(Полный список команд и параметров см. в руководстве \"info\")\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Вызов: @DIRMNGR@ [параметры] (-h для подсказки)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9570,77 -7622,60 +9650,77 @@@ msgstr "
  "Синтаксис: @DIRMNGR@ [параметры] [команда [аргументы]]\n"
  "Доступ к OCSP, серверам ключей, спискам отозванных сертификатов для @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "допустимые уровни отладки: %s\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, c-format
  msgid "usage: %s [options] "
  msgstr "вызов: %s [параметры] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  msgid "colons are not allowed in the socket name\n"
  msgstr "двоеточия в имени сокета недопустимы\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "сбой при получении списка отозванных сертификатов из '%s': %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "сбой обработки списка отозванных сертификатов из '%s': %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: слишком длинная строка - пропущена\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: обнаружен неверный отпечаток\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: ошибка чтения: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: мусор в конце строки игнорируется\n"
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr "получен SIGHUP - повторное чтение настроек и запись буферов на диск\n"
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "получен SIGUSR2 - действие не определено\n"
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "получен SIGTERM - завершение работы ...\n"
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "получен SIGTERM - осталось %d активных соединений\n"
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  msgid "shutdown forced\n"
  msgstr "принудительное выключение\n"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "получен SIGINT - немедленное завершение работы\n"
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "получен сигнал %d - действие не определено\n"
@@@ -9810,13 -7809,6 +9890,7 @@@ msgstr "'%s' - не URL LDAP\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr "'%s' - недопустимый URL LDAP\n"
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, c-format
- msgid "error allocating memory: %s\n"
- msgstr "ошибка выделения памяти: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, c-format
  msgid "error printing log line: %s\n"
  msgstr "ошибка вывода строки журнала: %s\n"
@@@ -10065,76 -8005,60 +10139,76 @@@ msgstr "ответчик OCSP возв�
  msgid "OCSP responder returned an too old status\n"
  msgstr "ответчик OCSP возвратил слишком старый статус\n"
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "сбой assuan_inquire(%s): %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr "нет сервера LDAP"
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr "в ID сертификата нет серийного номера"
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "сбой assuan_inquire: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "сбой fetch_cert_by_url: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "ошибка отправки данных: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "сбой start_cert_fetch: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "сбой fetch_next_cert: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "превышено max_replies %d\n"
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "сбой размещения контекста Assuan: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "сбой инициализации сервера: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "сбой регистрации команд с помощью Assuan: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "проблема с приемом Assuan: %s\n"
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "сбой обработки Assuan: %s\n"
@@@ -10179,7 -8094,6 +10253,7 @@@ msgstr "
  "сертификат не следовало использовать для подписывания списка отозванных "
  "сертификатов\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "менее подробно"
  
@@@ -10345,11 -8218,9 +10419,11 @@@ msgstr "|NAME|зашифровыват�
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|установить синонимы электронной почты"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr "Настройки серверов ключей"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|использовать север ключей по URL"
  
@@@ -10383,128 -8247,108 +10457,140 @@@ msgstr "Параметры, управ�
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Параметры, управляющие интерактивностью и принудительными действиями"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr "Параметры, управляющие применением Tor"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr "Настройки серверов HTTP"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr "использовать системные настройки промежуточного сервера HTTP"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr "Настройки серверов LDAP"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr "Список серверов LDAP"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr "Настройки OCSP"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ #, fuzzy
+ #| msgid "GPG for OpenPGP"
+ msgid "OpenPGP"
  msgstr "GPG для OpenPGP"
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
- msgstr "Агент GPG"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
+ msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ #, fuzzy
+ #| msgid "Smartcard Daemon"
+ msgid "Smartcards"
  msgstr "Демон криптографических карт"
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ #, fuzzy
+ #| msgid "GPG for S/MIME"
+ msgid "S/MIME"
  msgstr "GPG для S/MIME"
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr "Диспетчер ключей"
++#: tools/gpgconf-comp.c:1070
+ msgid "Network"
+ msgstr ""
  
- #: tools/gpgconf-comp.c:1068
- msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1071
+ #, fuzzy
+ #| msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "Ввод PIN и фраз-паролей"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  msgid "Component not suitable for launching"
  msgstr "Компонент не подходит для запуска"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Внешняя проверка компонента %s не прошла"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr "Обратите внимание, что спецификации групп игнорируются\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr "вывод списка всех компонентов"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr "проверить все программы"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|COMPONENT|вывод списка параметров"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|COMPONENT|изменить параметры"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|COMPONENT|проверить параметры"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr "применить глобальные значения по умолчанию"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "получить каталоги настроек для @GPGCONF@"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
  msgstr "указать глобальный файл настроек"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
  msgstr "проверить глобальный файл настроек"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ msgid "query the software version database"
+ msgstr "запросить базу данных версий программ"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr "перезагрузить все или заданный компонент"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr "запустить заданный компонент"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr "выключить заданный компонент"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "вывод в указанный файл"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr "задействовать изменения во время исполнения, если возможно"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Вызов: @GPGCONF@ [параметры] (-h для подсказки)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10512,15 -8356,12 +10598,15 @@@ msgstr "
  "Синтаксис: @GPGCONF@ [параметры]\n"
  "Управляет параметрами настроек инструментария @GNUPG@\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "Требуется однокомпонентный аргумент"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "Компонент не найден"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr "Аргументы не разрешены"
  
diff --cc po/sk.po
index 0d4925f,c44b6c3..5a65f2f
--- a/po/sk.po
+++ b/po/sk.po
@@@ -9,19 -9,17 +9,19 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.2.5\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2004-07-20 15:52+0200\n"
  "Last-Translator: Michal Majer <mmajer at econ.umb.sk>\n"
  "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
  "Language: sk\n"
  "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-2\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
- msgstr "nem�em inicializova� datab�zu d�very: %s\n"
+ msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
  #. TRANSLATORS: These are labels for buttons etc used in
  #. Pinentries.  An underscore indicates that the next letter
@@@ -29,40 -27,31 +29,40 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  msgid "Do you really want to make your passphrase visible on the screen?"
- msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
+ msgstr "Skutočne chcete zmazať vybrané kľúče? "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -70,7 -59,6 +70,7 @@@ msgstr "nesprávne heslo
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr ""
  
@@@ -80,180 -68,126 +80,170 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, 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"
+ msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
- msgstr "nespr�vne heslo"
+ msgstr "nesprávne heslo"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
- msgstr "riadok je pr�li� dlh�\n"
+ msgstr "riadok je príliš dlhý\n"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
- msgstr "heslo je pr�li� dlh�\n"
+ msgstr "heslo je príliš dlhé\n"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
- msgstr "Neplatn� znak ve mene\n"
+ msgstr "Neplatný znak ve mene\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
- msgstr "nespr�vne MPI"
+ msgstr "nesprávne MPI"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
- msgstr "nespr�vne heslo"
+ msgstr "nesprávne heslo"
  
 +#: agent/command-ssh.c:635 agent/command-ssh.c:730
  #, fuzzy, c-format
  msgid "ssh keys greater than %d bits are not supported\n"
- msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
+ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
- msgstr "nem�em vytvori� `%s': %s\n"
+ msgstr "nemôžem vytvoriť `%s': %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
- msgstr "nem�em otvori� `%s': %s\n"
+ msgstr "nemôžem otvoriť `%s': %s\n"
  
 +#: agent/command-ssh.c:2415 agent/command-ssh.c:2433
  #, fuzzy, c-format
  msgid "error getting serial number of card: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: agent/command-ssh.c:2419
  #, c-format
  msgid "detected card with S/N: %s\n"
  msgstr ""
  
 +#: agent/command-ssh.c:2424
  #, fuzzy, c-format
  msgid "no authentication key for ssh on card: %s\n"
- msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
+ msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
  
 +#: agent/command-ssh.c:2444
  #, fuzzy, c-format
  msgid "no suitable card key found: %s\n"
- msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
+ msgstr "nenájdený zapisovateľný súbor tajných kľúčov (secring): %s\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
- msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+ msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
- msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+ msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
- msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
+ msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -291,47 -218,38 +281,47 @@@ msgstr "Opakujte heslo: 
  msgid "Repeat this PIN"
  msgstr "Opakujte heslo: "
  
 +#: agent/divert-scd.c:299
  #, fuzzy
  msgid "Reset Code not correctly repeated; try again"
- msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
+ msgstr "heslo nie je zopakované správne; skúste to znovu"
  
 +#: agent/divert-scd.c:301
  #, fuzzy
  msgid "PUK not correctly repeated; try again"
- msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
+ msgstr "heslo nie je zopakované správne; skúste to znovu"
  
 +#: agent/divert-scd.c:302
  #, fuzzy
  msgid "PIN not correctly repeated; try again"
- msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
+ msgstr "heslo nie je zopakované správne; skúste to znovu"
  
 +#: agent/divert-scd.c:314
  #, c-format
  msgid "Please enter the PIN%s%s%s to unlock the card"
  msgstr ""
  
 +#: agent/genkey.c:110 sm/certreqgen-ui.c:394
  #, fuzzy, c-format
  msgid "error creating temporary file: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: agent/genkey.c:117
  #, fuzzy, c-format
  msgid "error writing to temporary file: %s\n"
  msgstr "zapisujem do '%s'\n"
  
 +#: agent/genkey.c:158 agent/genkey.c:164
  #, fuzzy
  msgid "Enter new passphrase"
- msgstr "Vlo�i� heslo\n"
+ msgstr "Vložiť heslo\n"
  
 +#: agent/genkey.c:172
  #, fuzzy
  msgid "Take this one anyway"
- msgstr "Pou�i� napriek tomu tento k���? "
+ msgstr "Použiť napriek tomu tento kľúč? "
  
 +#: agent/genkey.c:202
  #, c-format
  msgid ""
  "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@@ -353,10 -268,9 +343,10 @@@ msgstr "
  #| msgid "Name must be at least 5 characters long\n"
  msgid "A passphrase should be at least %u character long."
  msgid_plural "A passphrase should be at least %u characters long."
- msgstr[0] "Meno mus� by� dlh� aspo� 5 znakov\n"
- msgstr[1] "Meno mus� by� dlh� aspo� 5 znakov\n"
+ msgstr[0] "Meno musí byť dlhé aspoň 5 znakov\n"
+ msgstr[1] "Meno musí byť dlhé aspoň 5 znakov\n"
  
 +#: agent/genkey.c:252
  #, c-format
  msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
  msgid_plural ""
@@@ -377,137 -288,108 +367,143 @@@ msgstr "
  #, fuzzy, c-format
  msgid "Please enter the passphrase to%0Aprotect your new key"
  msgstr ""
- "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
+ "Na ochranu Vášho tajného kľúča musíte zadať heslo.\n"
  "\n"
  
 +#: agent/genkey.c:606
  #, fuzzy
  msgid "Please enter the new passphrase"
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
  " "
  msgstr ""
  "@\n"
- "Mo�nosti:\n"
+ "Možnosti:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "Kľúč je nahradený"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
- msgstr "s dodato�n�mi inform�ciami"
+ msgstr "s dodatočnými informáciami"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
- msgstr "by� o trochu tich��"
+ msgstr "byť o trochu tichší"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
- msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+ msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
- msgstr "vyh�ada� k���e na serveri k���ov"
+ msgstr "vyhľadať kľúče na serveri kľúčov"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
- msgstr "aktualizova� datab�zu d�very"
+ msgstr "aktualizovať databázu dôvery"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|accept some commands via NAME"
- msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
+ msgstr "|MENO|nastav znakovú sadu terminálu na MENO"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
- msgstr "nepodporovan�"
+ msgstr "nepodporované"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -516,222 -398,168 +512,222 @@@ msgstr "nepodporované
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
- "Chyby ozn�mte, pros�m, na adresu <gnupg-bugs at gnu.org>.\n"
+ "Chyby oznámte, prosím, na adresu <gnupg-bugs at gnu.org>.\n"
  "Pripomienky k prekladu <sk-i18n at lists.linux.sk>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
- msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
+ msgstr "POZNÁMKA: neexistuje implicitný súbor s možnosťami `%s'\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
- msgstr "s�bor s mo�nos�ami `%s': %s\n"
+ msgstr "súbor s možnosťami `%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
- msgstr "��tam mo�nosti z `%s'\n"
+ msgstr "čítam možnosti z `%s'\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
- msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+ msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
- msgstr "%s: nem�em vytvori�: %s\n"
+ msgstr "%s: nemôžem vytvoriť: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, fuzzy
  msgid "a gpg-agent is already running - not starting a new one\n"
- msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
+ msgstr "gpg-agent nie je v tomto sedení dostupný\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
- msgstr "chyba pri posielan� na `%s': %s\n"
+ msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
- msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
+ msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
- msgstr "aktualiz�cia zlyhala: %s\n"
+ msgstr "aktualizácia zlyhala: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
- msgstr "zapisujem tajn� k��� do `%s'\n"
+ msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
- msgstr "nem�em vytvori� adres�r `%s': %s\n"
+ msgstr "nemôžem vytvoriť adresár `%s': %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  msgid "directory '%s' created\n"
- msgstr "%s: adres�r vytvoren�\n"
+ msgstr "%s: adresár vytvorený\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
- msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
+ msgstr "databáza dôvery: procedúra read() (n=%d) zlyhala: %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
- msgstr "%s: nem�em vytvori� adres�r: %s\n"
+ msgstr "%s: nemôžem vytvoriť adresár: %s\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
- msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
+ msgstr "aktualizácia tajného kľúča zlyhala: %s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
- msgstr "%s: presko�en�: %s\n"
+ msgstr "%s: preskočené: %s\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
- msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
+ msgstr "gpg-agent nie je v tomto sedení dostupný\n"
  
 +#: agent/preset-passphrase.c:99
  #, fuzzy
  msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
 +#: agent/preset-passphrase.c:102
  msgid ""
  "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
  msgstr ""
- "@Pr�kazy:\n"
+ "@Príkazy:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
  " "
  msgstr ""
  "@\n"
- "Mo�nosti:\n"
+ "Možnosti:\n"
  " "
  
 +#: agent/protect-tool.c:154
  #, fuzzy
  msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
 +#: agent/protect-tool.c:156
  msgid ""
  "Syntax: gpg-protect-tool [options] [args]\n"
  "Secret key maintenance tool\n"
  msgstr ""
  
 +#: agent/protect-tool.c:693
  #, fuzzy
  msgid "Please enter the passphrase to unprotect the PKCS#12 object."
- msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+ msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
 +#: agent/protect-tool.c:698
  #, fuzzy
  msgid "Please enter the passphrase to protect the new PKCS#12 object."
- msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+ msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
 +#: agent/protect-tool.c:704
  msgid ""
  "Please enter the passphrase to protect the imported object within the GnuPG "
  "system."
@@@ -742,54 -569,44 +738,55 @@@ msgstr "
  msgid ""
  "Please enter the passphrase or the PIN\n"
  "needed to complete this operation."
- msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+ msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
 +#: agent/protect-tool.c:720 tools/symcryptrun.c:450
  #, fuzzy
  msgid "cancelled\n"
- msgstr "Zru�i�"
+ msgstr "Zrušiť"
  
 +#: agent/protect-tool.c:722 tools/symcryptrun.c:446
  #, fuzzy, c-format
  msgid "error while asking for the passphrase: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
  #, fuzzy, c-format
  msgid "file '%s', line %d: %s\n"
- msgstr "k��� `%s' nebol n�jden�: %s\n"
+ msgstr "kľúč `%s' nebol nájdený: %s\n"
  
 +#: agent/trustlist.c:192 agent/trustlist.c:200
  #, fuzzy, c-format
  msgid "statement \"%s\" ignored in '%s', line %d\n"
- msgstr "chyba pri ��tan�: %s\n"
+ msgstr "chyba pri čítaní: %s\n"
  
 +#: agent/trustlist.c:206
  #, fuzzy, c-format
  msgid "system trustlist '%s' not available\n"
- msgstr "tajn� �asti k���a nie s� dostupn�\n"
+ msgstr "tajné časti kľúča nie sú dostupné\n"
  
 +#: agent/trustlist.c:250
  #, fuzzy, c-format
  msgid "bad fingerprint in '%s', line %d\n"
- msgstr "chyba pri ��tan�: %s\n"
+ msgstr "chyba pri čítaní: %s\n"
  
 +#: agent/trustlist.c:275 agent/trustlist.c:282
  #, fuzzy, c-format
  msgid "invalid keyflag in '%s', line %d\n"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
 +#: agent/trustlist.c:316 common/helpfile.c:136
  #, fuzzy, c-format
  msgid "error reading '%s', line %d: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: agent/trustlist.c:434 agent/trustlist.c:503
  msgid "error reading list of trusted root certificates\n"
  msgstr ""
  
@@@ -813,8 -628,6 +810,8 @@@ msgstr "
  msgid "Yes"
  msgstr "ano"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -844,40 -654,33 +841,40 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
  "%%0A?"
- msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
+ msgstr "Skutočne chcete zmazať vybrané kľúče? "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  msgid "Delete key"
- msgstr "nastavi� k��� ako platn� (enable)"
+ msgstr "nastaviť kľúč ako platný (enable)"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -892,116 -693,98 +889,127 @@@ msgstr "
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr ""
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
- msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
 +#: agent/cvt-openpgp.c:338
  msgid "secret key parts are not available\n"
- msgstr "tajn� �asti k���a nie s� dostupn�\n"
+ msgstr "tajné časti kľúča nie sú dostupné\n"
  
 +#: agent/cvt-openpgp.c:344
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "public key algorithm %d (%s) is not supported\n"
- msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
+ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
  
 +#: agent/cvt-openpgp.c:448
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection algorithm %d (%s) is not supported\n"
- msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
+ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
  
 +#: agent/cvt-openpgp.c:455
  #, fuzzy, c-format
  #| msgid "protection algorithm %d%s is not supported\n"
  msgid "protection hash algorithm %d (%s) is not supported\n"
- msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
+ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "aktualiz�cia zlyhala: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
  #, fuzzy, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "aktualizácia zlyhala: %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
+ #, fuzzy, c-format
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
- msgstr "nem�em sa pripoji� k `%s': %s\n"
+ msgstr "nemôžem sa pripojiť k `%s': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  #, fuzzy
  msgid "problem setting the gpg-agent options\n"
- msgstr "probl�m s agentom: agent vracia 0x%lx\n"
+ msgstr "problém s agentom: agent vracia 0x%lx\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
- msgstr "nem�em vypn�� vytv�ranie core s�borov: %s\n"
+ msgstr "nemôžem vypnúť vytváranie core súborov: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
- msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
+ msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
- msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
+ msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
+ 
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "aktualizácia zlyhala: %s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "ano"
  
@@@ -1019,11 -799,9 +1027,11 @@@ msgid "nN
  msgstr "nN"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:86
  msgid "quit"
- msgstr "ukon�i�"
+ msgstr "ukončiť"
  
 +#: common/yesno.c:89
  msgid "qQ"
  msgstr "uUqQ"
  
@@@ -1056,56 -828,45 +1064,56 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
 +#: common/miscellaneous.c:143
  #, c-format
  msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
  msgstr ""
  
 +#: common/miscellaneous.c:146
  #, fuzzy, c-format
  msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
- msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+ msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
  
 +#: common/miscellaneous.c:554
  #, c-format
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  msgid "connection to agent is in restricted mode\n"
- msgstr "nemo�no previes� v d�vkovom m�de\n"
+ msgstr "nemožno previesť v dávkovom móde\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1123,83 -881,66 +1131,83 @@@ msgstr "
  msgid "|audit-log-result|Not supported"
  msgstr ""
  
 +#: common/audit.c:481
  #, fuzzy
  msgid "|audit-log-result|No certificate"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: common/audit.c:483
  #, fuzzy
  msgid "|audit-log-result|Not enabled"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: common/audit.c:485
  msgid "|audit-log-result|Error"
  msgstr ""
  
 +#: common/audit.c:487
  #, fuzzy
  msgid "|audit-log-result|Not used"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: common/audit.c:489
  #, fuzzy
  msgid "|audit-log-result|Okay"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: common/audit.c:491
  #, fuzzy
  msgid "|audit-log-result|Skipped"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: common/audit.c:493
  #, fuzzy
  msgid "|audit-log-result|Some"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: common/audit.c:726
  #, fuzzy
  msgid "Certificate chain available"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: common/audit.c:733
  #, fuzzy
  msgid "root certificate missing"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: common/audit.c:759
  msgid "Data encryption succeeded"
  msgstr ""
  
 +#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
  #, fuzzy
  msgid "Data available"
- msgstr "K��� k dispoz�cii na: "
+ msgstr "Kľúč k dispozícii na: "
  
 +#: common/audit.c:767
  #, fuzzy
  msgid "Session key created"
- msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
+ msgstr "%s: súbor kľúčov (keyring) vytvorený\n"
  
 +#: common/audit.c:772 common/audit.c:912 common/audit.c:919
  #, fuzzy, c-format
  msgid "algorithm: %s"
- msgstr "ASCII k�dovanie: %s\n"
+ msgstr "ASCII kódovanie: %s\n"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
  "\n"
- "Podporovan� algoritmy:\n"
+ "Podporované algoritmy:\n"
  
 +#: common/audit.c:778 common/audit.c:925
  #, fuzzy
  msgid "seems to be not encrypted"
- msgstr "neza�ifrovan�"
+ msgstr "nezašifrované"
  
 +#: common/audit.c:784 common/audit.c:933
  msgid "Number of recipients"
  msgstr ""
  
@@@ -1212,95 -951,76 +1220,95 @@@ msgstr "
  msgid "Data signing succeeded"
  msgstr ""
  
 +#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
  #, fuzzy, c-format
  msgid "data hash algorithm: %s"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: common/audit.c:862
  #, fuzzy, c-format
  msgid "Signer %d"
- msgstr "Platnos� podpisu vypr�ala %s\n"
+ msgstr "Platnosť podpisu vypršala %s\n"
  
 +#: common/audit.c:866 common/audit.c:1065
  #, fuzzy, c-format
  msgid "attr hash algorithm: %s"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: common/audit.c:901
  msgid "Data decryption succeeded"
  msgstr ""
  
 +#: common/audit.c:910
  #, fuzzy
  msgid "Encryption algorithm supported"
- msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
+ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
  
 +#: common/audit.c:993
  #, fuzzy
  msgid "Data verification succeeded"
- msgstr "verifik�cia podpisu potla�en�\n"
+ msgstr "verifikácia podpisu potlačená\n"
  
 +#: common/audit.c:1002
  #, fuzzy
  msgid "Signature available"
- msgstr "Platnos� podpisu vypr�ala %s\n"
+ msgstr "Platnosť podpisu vypršala %s\n"
  
 +#: common/audit.c:1024
  #, fuzzy
  msgid "Parsing data succeeded"
- msgstr "Dobr� podpis od \""
+ msgstr "Dobrý podpis od \""
  
 +#: common/audit.c:1036
  #, fuzzy, c-format
  msgid "bad data hash algorithm: %s"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: common/audit.c:1051
  #, fuzzy, c-format
  msgid "Signature %d"
- msgstr "Platnos� podpisu vypr�ala %s\n"
+ msgstr "Platnosť podpisu vypršala %s\n"
  
 +#: common/audit.c:1079
  #, fuzzy
  msgid "Certificate chain valid"
- msgstr "Platnos� k���a vypr�ala!"
+ msgstr "Platnosť kľúča vypršala!"
  
 +#: common/audit.c:1090
  #, fuzzy
  msgid "Root certificate trustworthy"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
- msgstr "K��� k dispoz�cii na: "
+ msgstr "Kľúč k dispozícii na: "
  
 +#: common/audit.c:1119
  #, fuzzy
  msgid "CRL/OCSP check of certificates"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: common/audit.c:1139
  #, fuzzy
  msgid "Included certificates"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: common/audit.c:1194
  msgid "No audit log entries."
  msgstr ""
  
 +#: common/audit.c:1243
  #, fuzzy
  msgid "Unknown operation"
- msgstr "nezn�ma verzia"
+ msgstr "neznáma verzia"
  
 +#: common/audit.c:1261
  msgid "Gpg-Agent usable"
  msgstr ""
  
@@@ -1308,88 -1027,71 +1316,88 @@@
  msgid "Dirmngr usable"
  msgstr ""
  
 +#: common/audit.c:1307
  #, fuzzy, c-format
  msgid "No help available for '%s'."
- msgstr "Pomoc nie je dostupn� pre '%s'"
+ msgstr "Pomoc nie je dostupná pre '%s'"
  
 +#: common/helpfile.c:90
  #, fuzzy
  msgid "ignoring garbage line"
- msgstr "chyba v p�ti�ke\n"
+ msgstr "chyba v pätičke\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
- msgstr "nezn�me"
+ msgstr "neznáme"
  
 +#: common/argparse.c:365
  #, fuzzy
  msgid "argument not expected"
- msgstr "zapisujem tajn� k��� do `%s'\n"
+ msgstr "zapisujem tajný kľúč do `%s'\n"
  
 +#: common/argparse.c:367
  #, fuzzy
  msgid "read error"
- msgstr "chyba pri ��tan� s�boru"
+ msgstr "chyba pri čítaní súboru"
  
 +#: common/argparse.c:369
  #, fuzzy
  msgid "keyword too long"
- msgstr "riadok je pr�li� dlh�\n"
+ msgstr "riadok je príliš dlhý\n"
  
 +#: common/argparse.c:371
  #, fuzzy
  msgid "missing argument"
- msgstr "neplatn� argument"
+ msgstr "neplatný argument"
  
 +#: common/argparse.c:373
  #, fuzzy
  #| msgid "invalid armor"
  msgid "invalid argument"
- msgstr "neplatn� sp�sob reprezent�cie v ASCII"
+ msgstr "neplatný spôsob reprezentácie v ASCII"
  
 +#: common/argparse.c:375
  #, fuzzy
  msgid "invalid command"
- msgstr "konfliktn� pr�kazy\n"
+ msgstr "konfliktné príkazy\n"
  
 +#: common/argparse.c:377
  #, fuzzy
  msgid "invalid alias definition"
- msgstr "neplatn� parameter pre import\n"
+ msgstr "neplatný parameter pre import\n"
  
 +#: common/argparse.c:379
  #, fuzzy
  msgid "out of core"
- msgstr "nespracovan�"
+ msgstr "nespracované"
  
 +#: common/argparse.c:381
  #, fuzzy
  msgid "invalid option"
- msgstr "neplatn� parameter pre import\n"
+ msgstr "neplatný parameter pre import\n"
  
 +#: common/argparse.c:389
  #, c-format
  msgid "missing argument for option \"%.50s\"\n"
  msgstr ""
  
 +#: common/argparse.c:391
  #, fuzzy, c-format
  msgid "invalid argument for option \"%.50s\"\n"
- msgstr "neplatn� parameter pre import\n"
+ msgstr "neplatný parameter pre import\n"
  
 +#: common/argparse.c:393
  #, c-format
  msgid "option \"%.50s\" does not expect an argument\n"
  msgstr ""
  
 +#: common/argparse.c:395
  #, fuzzy, c-format
  msgid "invalid command \"%.50s\"\n"
- msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
+ msgstr "Neplatný príkaz (skúste \"help\")\n"
  
 +#: common/argparse.c:397
  #, c-format
  msgid "option \"%.50s\" is ambiguous\n"
  msgstr ""
@@@ -1399,260 -1100,203 +1407,259 @@@
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
- msgstr "nespracovan�"
+ msgstr "nespracované"
  
 +#: common/argparse.c:403
  #, fuzzy, c-format
  msgid "invalid option \"%.50s\"\n"
- msgstr "neplatn� parameter pre import\n"
+ msgstr "neplatný parameter pre import\n"
  
 +#: common/utf8conv.c:123
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' not available\n"
- msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
+ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
 +#: common/utf8conv.c:131
  #, fuzzy, c-format
  msgid "iconv_open failed: %s\n"
- msgstr "nemo�no otvori� s�bor: %s\n"
+ msgstr "nemožno otvoriť súbor: %s\n"
  
 +#: common/utf8conv.c:385 common/utf8conv.c:651
  #, fuzzy, c-format
  msgid "conversion from '%s' to '%s' failed: %s\n"
- msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
+ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
 +#: common/dotlock.c:707
  #, fuzzy, c-format
  msgid "failed to create temporary file '%s': %s\n"
- msgstr "nem�em vytvori� adres�r `%s': %s\n"
+ msgstr "nemôžem vytvoriť adresár `%s': %s\n"
  
 +#: common/dotlock.c:771
  #, fuzzy, c-format
  msgid "error writing to '%s': %s\n"
- msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
+ msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
  
 +#: common/dotlock.c:1116
  #, c-format
  msgid "removing stale lockfile (created by %d)\n"
  msgstr ""
  
 +#: common/dotlock.c:1152
  #, fuzzy, c-format
  msgid "waiting for lock (held by %d%s) %s...\n"
- msgstr "zapisujem tajn� k��� do `%s'\n"
+ msgstr "zapisujem tajný kľúč do `%s'\n"
  
 +#: common/dotlock.c:1153
  msgid "(deadlock?) "
  msgstr ""
  
 +#: common/dotlock.c:1192
  #, fuzzy, c-format
  msgid "lock '%s' not made: %s\n"
- msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
+ msgstr "verejný kľúč %08lX nebol nájdený: %s\n"
  
 +#: common/dotlock.c:1219
  #, fuzzy, c-format
  msgid "waiting for lock %s...\n"
- msgstr "zapisujem tajn� k��� do `%s'\n"
+ msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
  
 +#: g10/armor.c:424
  #, c-format
  msgid "armor: %s\n"
- msgstr "ASCII k�dovanie: %s\n"
+ msgstr "ASCII kódovanie: %s\n"
  
 +#: g10/armor.c:463
  msgid "invalid armor header: "
- msgstr "neplatn� hlavi�ka ASCII k�dovania: "
+ msgstr "neplatná hlavička ASCII kódovania: "
  
 +#: g10/armor.c:474
  msgid "armor header: "
- msgstr "ASCII hlavi�ka: "
+ msgstr "ASCII hlavička: "
  
 +#: g10/armor.c:487
  msgid "invalid clearsig header\n"
- msgstr "neplatn� hlavi�ka podpisu v �itate�nom form�te\n"
+ msgstr "neplatná hlavička podpisu v čitateľnom formáte\n"
  
 +#: g10/armor.c:500
  #, fuzzy
  msgid "unknown armor header: "
- msgstr "ASCII hlavi�ka: "
+ msgstr "ASCII hlavička: "
  
 +#: g10/armor.c:553
  msgid "nested clear text signatures\n"
- msgstr "vnoren� podpisy v �itate�nom form�tu\n"
+ msgstr "vnorené podpisy v čitateľnom formátu\n"
  
 +#: g10/armor.c:688
  #, fuzzy
  msgid "unexpected armor: "
- msgstr "neo�ak�van� k�dovanie ASCII:"
+ msgstr "neočakávané kódovanie ASCII:"
  
 +#: g10/armor.c:701
  msgid "invalid dash escaped line: "
- msgstr "nespr�vne ozna�enie riadku m�nusmi: "
+ msgstr "nesprávne označenie riadku mínusmi: "
  
 +#: g10/armor.c:873 g10/armor.c:1490
  #, fuzzy, c-format
  msgid "invalid radix64 character %02X skipped\n"
- msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
+ msgstr "neplatný znak vo formáte radix64 %02x bol preskočený\n"
  
 +#: g10/armor.c:916
  msgid "premature eof (no CRC)\n"
- msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
+ msgstr "predčasný koniec súboru (žiadne CRC)\n"
  
 +#: g10/armor.c:950
  msgid "premature eof (in CRC)\n"
- msgstr "pred�asn� koniec s�boru (v CRC)\n"
+ msgstr "predčasný koniec súboru (v CRC)\n"
  
 +#: g10/armor.c:958
  msgid "malformed CRC\n"
- msgstr "nespr�vny form�t CRC\n"
+ msgstr "nesprávny formát CRC\n"
  
 +#: g10/armor.c:962 g10/armor.c:1527
  #, fuzzy, c-format
  msgid "CRC error; %06lX - %06lX\n"
  msgstr "Chyba CRC; %06lx - %06lx\n"
  
 +#: g10/armor.c:982
  #, fuzzy
  msgid "premature eof (in trailer)\n"
- msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
+ msgstr "predčasný koniec súboru (v pätičke)\n"
  
 +#: g10/armor.c:986
  msgid "error in trailer line\n"
- msgstr "chyba v p�ti�ke\n"
+ msgstr "chyba v pätičke\n"
  
 +#: g10/armor.c:1303
  msgid "no valid OpenPGP data found.\n"
- msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
+ msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
  
 +#: g10/armor.c:1308
  #, c-format
  msgid "invalid armor: line longer than %d characters\n"
- msgstr "neplatn� k�dovanie ASCII: riadok je dlh�� ako %d znakov\n"
+ msgstr "neplatné kódovanie ASCII: riadok je dlhší ako %d znakov\n"
  
 +#: g10/armor.c:1312
  msgid ""
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr ""
- "neplatn� znak (quoted-printable) v ASCII k�dovan� - pravdepodobne bol "
- "pou�it� nespr�vny MTA\n"
+ "neplatný znak (quoted-printable) v ASCII kódovaní - pravdepodobne bol "
+ "použitý nesprávny MTA\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
- msgstr "nie je v priamo �itate�nom form�te"
+ msgstr "nie je v priamo čitateľnom formáte"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr ""
- "meno m�e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
- "kon�i� s '='\n"
+ "meno môže obsahovať len písmená, číslice, bodky, podčiarníky alebo medzery a "
+ "končiť s '='\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
- msgstr "hodnota mus� obsahova� znak '@'\n"
+ msgstr "hodnota musí obsahovať znak '@'\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  #, fuzzy
  msgid "a notation name must not contain more than one '@' character\n"
- msgstr "hodnota mus� obsahova� znak '@'\n"
+ msgstr "hodnota musí obsahovať znak '@'\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
- msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
+ msgstr "hodnota nesmie obsahovať žiadne kontrolné znaky\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  msgid "a notation name may not contain an '=' character\n"
- msgstr "hodnota mus� obsahova� znak '@'\n"
+ msgstr "hodnota musí obsahovať znak '@'\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
  #| "with an '='\n"
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr ""
- "meno m�e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
- "kon�i� s '='\n"
+ "meno môže obsahovať len písmená, číslice, bodky, podčiarníky alebo medzery a "
+ "končiť s '='\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
- msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
+ msgstr "VAROVANIE: nájdený neplatný formát zápisu dátumu\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr ""
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
- msgstr "Vlo�te heslo: "
+ msgstr "Vložte heslo: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
- msgstr "VAROVANIE: %s prep�e %s\n"
+ msgstr "VAROVANIE: %s prepíše %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, fuzzy, c-format
  msgid "OpenPGP card not available: %s\n"
- msgstr "tajn� k��� nie je dostupn�"
+ msgstr "tajný kľúč nie je dostupný"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr ""
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  #, fuzzy
  msgid "can't do this in batch mode\n"
- msgstr "nemo�no previes� v d�vkovom m�de\n"
+ msgstr "nemožno previesť v dávkovom móde\n"
  
 +#: g10/card-util.c:107
  #, fuzzy
  msgid "This command is only available for version 2 cards\n"
- msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
+ msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
- msgstr "tajn� �asti k���a nie s� dostupn�\n"
+ msgstr "tajné časti kľúča nie sú dostupné\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
- msgstr "V� v�ber? "
+ msgstr "Váš výber? "
  
 +#: g10/card-util.c:279 g10/card-util.c:330
  msgid "[not set]"
  msgstr ""
  
@@@ -1666,198 -1308,153 +1673,198 @@@ msgstr "enable
  msgid "female"
  msgstr "enable"
  
 +#: g10/card-util.c:534
  #, fuzzy
  msgid "unspecified"
- msgstr "D�vod nebol �pecifikovan�"
+ msgstr "Dôvod nebol špecifikovaný"
  
 +#: g10/card-util.c:561
  #, fuzzy
  msgid "not forced"
- msgstr "nespracovan�"
+ msgstr "nespracované"
  
 +#: g10/card-util.c:561
  msgid "forced"
  msgstr ""
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr ""
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr ""
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr ""
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  #, fuzzy
  msgid "URL to retrieve public key: "
- msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
+ msgstr "žiadny zodpovedajúci verejný kľúč: %s\n"
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
- msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
+ msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr ""
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr ""
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  #, fuzzy
  msgid "Language preferences: "
- msgstr "aktualizova� predvo�by"
+ msgstr "aktualizovať predvoľby"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  #, fuzzy
  msgid "Error: invalid length of preference string.\n"
- msgstr "neplatn� znak v re�azci s predvo�bami\n"
+ msgstr "neplatný znak v reťazci s predvoľbami\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  #, fuzzy
  msgid "Error: invalid characters in preference string.\n"
- msgstr "neplatn� znak v re�azci s predvo�bami\n"
+ msgstr "neplatný znak v reťazci s predvoľbami\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr ""
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  #, fuzzy
  msgid "Error: invalid response.\n"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  #, fuzzy
  msgid "CA fingerprint: "
- msgstr "vyp�sa� fingerprint"
+ msgstr "vypísať fingerprint"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  #, fuzzy
  msgid "Error: invalid formatted fingerprint.\n"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, fuzzy, c-format
  msgid "key operation not possible: %s\n"
- msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+ msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  #, fuzzy
  msgid "not an OpenPGP card"
- msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
+ msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, fuzzy, c-format
  msgid "error getting current key info: %s\n"
- msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
+ msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
- msgstr "Ak� ve�kos� k���a si prajete? (1024) "
+ msgstr "Akú veľkosť kľúča si prajete? (1024) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
- msgstr "Ak� ve�kos� k���a si prajete? (1024) "
+ msgstr "Akú veľkosť kľúča si prajete? (1024) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
- msgstr "Ak� ve�kos� k���a si prajete? (1024) "
+ msgstr "Akú veľkosť kľúča si prajete? (1024) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
- msgstr "zaokr�hlen� na %u bitov\n"
+ msgstr "zaokrúhlené na %u bitov\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr ""
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
- msgstr "chyba pri posielan� na `%s': %s\n"
+ msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr ""
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
- msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
+ msgstr "preskočené: tajný kľúč je už v databáze\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr ""
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1865,213 -1462,162 +1872,213 @@@
  "You should change them using the command --change-pin\n"
  msgstr ""
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  #, fuzzy
  msgid "Please select the type of key to generate:\n"
- msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
+ msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  #, fuzzy
  msgid "   (1) Signature key\n"
- msgstr "Platnos� podpisu vypr�ala %s\n"
+ msgstr "Platnosť podpisu vypršala %s\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  #, fuzzy
  msgid "   (2) Encryption key\n"
- msgstr "   (%d) RSA (len na �ifrovanie)\n"
+ msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr ""
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
- msgstr "Neplatn� v�ber.\n"
+ msgstr "Neplatný výber.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  #, fuzzy
  msgid "Please select where to store the key:\n"
- msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
+ msgstr "Prosím výberte dôvod na revokáciu:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
- msgstr "aktualiz�cia zlyhala: %s\n"
+ msgstr "aktualizácia zlyhala: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
- msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
+ msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
- msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
+ msgstr "preskočené: tajný kľúč je už v databáze\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  msgid "Continue? (y/N) "
- msgstr "Skuto�ne podp�sa�? "
+ msgstr "Skutočne podpísať? "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
- msgstr "ukon�i� toto menu"
+ msgstr "ukončiť toto menu"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  #, fuzzy
  msgid "show admin commands"
- msgstr "konfliktn� pr�kazy\n"
+ msgstr "konfliktné príkazy\n"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
- msgstr "uk�za� t�to pomoc"
+ msgstr "ukázať túto pomoc"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  #, fuzzy
  msgid "list all available data"
- msgstr "K��� k dispoz�cii na: "
+ msgstr "Kľúč k dispozícii na: "
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr ""
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr ""
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr ""
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  #, fuzzy
  msgid "change the login name"
- msgstr "zmeni� dobu platnosti"
+ msgstr "zmeniť dobu platnosti"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  #, fuzzy
  msgid "change the language preferences"
- msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
+ msgstr "zmeniť dôveryhodnosť vlastníka kľúča"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr ""
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  #, fuzzy
  msgid "change a CA fingerprint"
- msgstr "vyp�sa� fingerprint"
+ msgstr "vypísať fingerprint"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr ""
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  #, fuzzy
  msgid "generate new keys"
- msgstr "vytvori� nov� p�r k���ov"
+ msgstr "vytvoriť nový pár kľúčov"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr ""
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr ""
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  #, fuzzy
  msgid "Admin-only command\n"
- msgstr "konfliktn� pr�kazy\n"
+ msgstr "konfliktné príkazy\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  #, fuzzy
  msgid "Admin commands are allowed\n"
- msgstr "konfliktn� pr�kazy\n"
+ msgstr "konfliktné príkazy\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  #, fuzzy
  msgid "Admin commands are not allowed\n"
- msgstr "zapisujem tajn� k��� do `%s'\n"
+ msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
- msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
+ msgstr "Neplatný príkaz (skúste \"help\")\n"
  
 +#: g10/decrypt.c:191 g10/encrypt.c:955
  msgid "--output doesn't work for this command\n"
- msgstr "--output pre tento pr�kaz nefunguje\n"
+ msgstr "--output pre tento príkaz nefunguje\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
- msgstr "nemo�no otvori� `%s'\n"
+ msgstr "nemožno otvoriť `%s'\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, fuzzy, c-format
  msgid "key \"%s\" not found: %s\n"
- msgstr "k��� `%s' nebol n�jden�: %s\n"
+ msgstr "kľúč `%s' nebol nájdený: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
- msgstr "chyba pri ��tan� bloku k���a: %s\n"
+ msgstr "chyba pri čítaní bloku kľúča: %s\n"
  
 +#: g10/delkey.c:118 g10/getkey.c:579
  #, fuzzy, c-format
  msgid "key \"%s\" not found\n"
- msgstr "k��� `%s' nebol n�jden�: %s\n"
+ msgstr "kľúč `%s' nebol nájdený: %s\n"
  
 +#: g10/delkey.c:129 g10/delkey.c:136
  msgid "(unless you specify the key by fingerprint)\n"
- msgstr "(pokia� neur��te k��� jeho fingerprintom)\n"
+ msgstr "(pokiaľ neurčíte kľúč jeho fingerprintom)\n"
  
 +#: g10/delkey.c:135
  #, fuzzy
  msgid "can't do this in batch mode without \"--yes\"\n"
- msgstr "bez parametra \"--yes\" to nemo�no v d�vkovom m�de previes�\n"
+ msgstr "bez parametra \"--yes\" to nemožno v dávkovom móde previesť\n"
  
 +#: g10/delkey.c:148
  #, fuzzy
  msgid "Delete this key from the keyring? (y/N) "
- msgstr "Zmaza� tento k��� zo s�boru k���ov? "
+ msgstr "Zmazať tento kľúč zo súboru kľúčov? "
  
 +#: g10/delkey.c:158
  #, fuzzy
  msgid "This is a secret key! - really delete? (y/N) "
- msgstr "Toto je tajn� k���! - skuto�ne zmaza�? "
+ msgstr "Toto je tajný kľúč! - skutočne zmazať? "
  
 +#: g10/delkey.c:201
  #, fuzzy, c-format
  msgid "deleting secret %s failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: g10/delkey.c:203
  msgid "key"
  msgstr "key"
  
@@@ -2079,532 -1624,422 +2086,532 @@@
  #, fuzzy
  #| msgid "Pubkey: "
  msgid "subkey"
- msgstr "Verejn� k���e: "
+ msgstr "Verejné kľúče: "
  
 +#: g10/delkey.c:226
  #, c-format
  msgid "deleting keyblock failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: g10/delkey.c:239
  msgid "ownertrust information cleared\n"
- msgstr "inform�cie o d�veryhodnosti vlastn�ka k���a vymazan�\n"
+ msgstr "informácie o dôveryhodnosti vlastníka kľúča vymazané\n"
  
 +#: g10/delkey.c:275
  #, c-format
  msgid "there is a secret key for public key \"%s\"!\n"
- msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
+ msgstr "existuje tajný kľúč pre tento verejný kľúč \"%s\"!\n"
  
 +#: g10/delkey.c:277
  msgid "use option \"--delete-secret-keys\" to delete it first.\n"
- msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
+ msgstr "aby ste ho zmazali, použite najprv prepínač \"--delete-secret-key\".\n"
  
 +#: g10/encrypt.c:232 g10/sign.c:1292
  #, c-format
  msgid "error creating passphrase: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: g10/encrypt.c:239
  msgid "can't use a symmetric ESK packet due to the S2K mode\n"
- msgstr "v m�de S2K nemo�no pou�i� symetrick� ESK paket\n"
+ msgstr "v móde S2K nemožno použiť symetrický ESK paket\n"
  
 +#: g10/encrypt.c:253
  #, c-format
  msgid "using cipher %s\n"
- msgstr "pou�it� �ifra %s\n"
+ msgstr "použitá šifra %s\n"
  
 +#: g10/encrypt.c:263 g10/encrypt.c:624
  #, fuzzy, c-format
  #| msgid "`%s' already compressed\n"
  msgid "'%s' already compressed\n"
- msgstr "`%s' je u� skomprimovan�\n"
+ msgstr "`%s' je už skomprimovaný\n"
  
 +#: g10/encrypt.c:320 g10/encrypt.c:660 g10/sign.c:608
  #, fuzzy, c-format
  #| msgid "WARNING: `%s' is an empty file\n"
  msgid "WARNING: '%s' is an empty file\n"
- msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
+ msgstr "VAROVANIE: súbor `%s' je prázdny\n"
  
 +#: g10/encrypt.c:557
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "reading from '%s'\n"
- msgstr "��tam z `%s'\n"
+ msgstr "čítam z `%s'\n"
  
 +#: g10/encrypt.c:605
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
- msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
+ msgstr "vyžiadaná symetrická šifra %s (%d) nevyhovuje predvoľbám príjemcu\n"
  
 +#: g10/encrypt.c:707 g10/sign.c:984
  #, fuzzy, c-format
  msgid ""
  "WARNING: forcing compression algorithm %s (%d) violates recipient "
  "preferences\n"
  msgstr ""
- "vy�iadan� kompresn� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
+ "vyžiadaný kompresný algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
  
 +#: g10/encrypt.c:817
  #, c-format
  msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
- msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
+ msgstr "vyžiadaná symetrická šifra %s (%d) nevyhovuje predvoľbám príjemcu\n"
  
 +#: g10/encrypt.c:903
  #, c-format
  msgid "%s/%s encrypted for: \"%s\"\n"
- msgstr "%s/%s za�ifrovan� pre: %s\n"
+ msgstr "%s/%s zašifrovaný pre: %s\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr ""
- "pou�itie %s nie je v m�de %s dovolen�\n"
+ "použitie %s nie je v móde %s dovolené\n"
  "\n"
  
 +#: g10/decrypt-data.c:93 g10/mainproc.c:304
  #, c-format
  msgid "%s encrypted data\n"
- msgstr "%s za�ifrovan� d�ta\n"
+ msgstr "%s zašifrované dáta\n"
  
 +#: g10/decrypt-data.c:96 g10/mainproc.c:308
  #, c-format
  msgid "encrypted with unknown algorithm %d\n"
- msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
+ msgstr "zašifrované neznámym algoritmom %d\n"
  
 +#: g10/decrypt-data.c:164 sm/decrypt.c:127
  msgid ""
  "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
  msgstr ""
- "VAROVANIE: spr�va bola za�ifrovan� slab�m k���om v symetrickej �ifre.\n"
+ "VAROVANIE: správa bola zašifrovaná slabým kľúčom v symetrickej šifre.\n"
  
 +#: g10/decrypt-data.c:176
  msgid "problem handling encrypted packet\n"
- msgstr "probl�m so za�ifrovan�m paketom\n"
+ msgstr "problém so zašifrovaným paketom\n"
  
 +#: g10/exec.c:60
  msgid "no remote program execution supported\n"
- msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
+ msgstr "žiadne vzialené vykonávanie programu nie je podporované\n"
  
 +#: g10/exec.c:319
  msgid ""
  "external program calls are disabled due to unsafe options file permissions\n"
  msgstr ""
- "volanie extern�ho programu zru�en� kv�li nebezpe�n�m pr�vam s�boru "
- "nastaven�\n"
+ "volanie externého programu zrušené kvôli nebezpečným právam súboru "
+ "nastavení\n"
  
 +#: g10/exec.c:349
  #, fuzzy
  msgid "this platform requires temporary files when calling external programs\n"
  msgstr ""
- "t�to platforma potrebuje do�asn� s�bory na spustenie extern�ho programu\n"
+ "táto platforma potrebuje dočasné súbory na spustenie externého programu\n"
  
 +#: g10/exec.c:427
  #, fuzzy, c-format
  msgid "unable to execute program '%s': %s\n"
- msgstr "nemo�no spusti� %s \"%s\": %s\n"
+ msgstr "nemožno spustiť %s \"%s\": %s\n"
  
 +#: g10/exec.c:430
  #, fuzzy, c-format
  msgid "unable to execute shell '%s': %s\n"
- msgstr "nemo�no spusti� %s \"%s\": %s\n"
+ msgstr "nemožno spustiť %s \"%s\": %s\n"
  
 +#: g10/exec.c:521
  #, c-format
  msgid "system error while calling external program: %s\n"
- msgstr "syst�mov� chyba pri volan� extern�ho programu: %s\n"
+ msgstr "systémová chyba pri volaní externého programu: %s\n"
  
 +#: g10/exec.c:532 g10/exec.c:599
  msgid "unnatural exit of external program\n"
- msgstr "nekorektn� ukon�enie extern�ho programu\n"
+ msgstr "nekorektné ukončenie externého programu\n"
  
 +#: g10/exec.c:547
  msgid "unable to execute external program\n"
- msgstr "nemo�no spusti� extern� program\n"
+ msgstr "nemožno spustiť externý program\n"
  
 +#: g10/exec.c:564
  #, c-format
  msgid "unable to read external program response: %s\n"
- msgstr "nemo�no c�ta� odozvu extern�ho programu: %s\n"
+ msgstr "nemožno cítať odozvu externého programu: %s\n"
  
 +#: g10/exec.c:610 g10/exec.c:617
  #, fuzzy, c-format
  #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
  msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
- msgstr "VAROVANIE: nem�em vymaza� do�asn� s�bor (%s) `%s': %s\n"
+ msgstr "VAROVANIE: nemôžem vymazať dočasný súbor (%s) `%s': %s\n"
  
 +#: g10/exec.c:622
  #, fuzzy, c-format
  #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
- msgstr "VAROVANIE: nem�em vymaza� do�asn� adres�r `%s': %s\n"
+ msgstr "VAROVANIE: nemôžem vymazať dočasný adresár `%s': %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  #, fuzzy
  msgid "export signatures that are marked as local-only"
  msgstr ""
  "\n"
- "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
+ "Podpis bude označený ako neodvolateľný (non-revocable).\n"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  
- #: g10/export.c:106
++#: g10/export.c:110
  #, fuzzy
  msgid "export revocation keys marked as \"sensitive\""
- msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
+ msgstr "žiadne revokačné kľúče pre `%s' nenájdené\n"
  
- #: g10/export.c:108
++#: g10/export.c:112
  #, fuzzy
  msgid "remove unusable parts from key during export"
- msgstr "nepou�ite�n� tajn� k���"
+ msgstr "nepoužiteľný tajný kľúč"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr ""
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
- msgstr "%s: presko�en�: %s\n"
+ msgstr "%s: preskočené: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "zapisujem do '%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, fuzzy, c-format
  msgid "key %s: key material on-card - skipped\n"
- msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
+ msgstr "kľúč %08lX: podpis subkľúča na zlom mieste - preskočené \n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  #, fuzzy
  msgid "exporting secret keys not allowed\n"
- msgstr "zapisujem tajn� k��� do `%s'\n"
+ msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, fuzzy, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
- msgstr "k��� %08lX: PGP 2.x k��� - presko�en�\n"
+ msgstr "kľúč %08lX: PGP 2.x kľúč - preskočené\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
- msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
+ msgstr "VAROVANIE: nič nebolo vyexportované\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
- msgstr "chyba pri vytv�ran� `%s': %s\n"
+ msgstr "chyba pri vytváraní `%s': %s\n"
  
 +#: g10/getkey.c:257
  #, fuzzy
  msgid "[User ID not found]"
  msgstr "[User id not found]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
- msgstr "neplatn� parameter pre import\n"
+ msgstr "neplatný parameter pre import\n"
  
 +#: g10/getkey.c:516
  #, c-format
  msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
  msgstr ""
  
 +#: g10/getkey.c:546
  #, fuzzy, c-format
  msgid "error looking up: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: g10/getkey.c:636
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "Warning: %s appears in the keyring %d times\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  msgid "automatically retrieved '%s' via %s\n"
- msgstr "chyba pri vytv�ran� `%s': %s\n"
+ msgstr "chyba pri vytváraní `%s': %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
- msgstr "chyba pri vytv�ran� `%s': %s\n"
+ msgstr "chyba pri vytváraní `%s': %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
- msgstr "vyp�sa� fingerprint"
+ msgstr "vypísať fingerprint"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found: %s\n"
- msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
+ msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
- msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
+ msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
- msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
+ msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
  # c-format
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, fuzzy, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
- "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
+ "Neplatný kľúč %08lX zmenený na platný pomocou --always-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, fuzzy, c-format
  msgid "using subkey %s instead of primary key %s\n"
- msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
+ msgstr "používam sekundárny kľúč %08lX namiesto primárneho kľúča %08lX\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
- msgstr "vytvori� podpis oddelen� od dokumentu"
+ msgstr "vytvoriť podpis oddelený od dokumentu"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
- msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
+ msgstr "|[súbor]|vytvoriť podpis v čitateľnom dokumente"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
- msgstr "vytvori� podpis oddelen� od dokumentu"
+ msgstr "vytvoriť podpis oddelený od dokumentu"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
- msgstr "�ifrova� d�ta"
+ msgstr "šifrovať dáta"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
- msgstr "�ifrovanie len so symetrickou �ifrou"
+ msgstr "šifrovanie len so symetrickou šifrou"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
- msgstr "de�ifrova� d�ta (implicitne)"
+ msgstr "dešifrovať dáta (implicitne)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
- msgstr "verifikova� podpis"
+ msgstr "verifikovať podpis"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
- msgstr "vyp�sa� zoznam k���ov"
+ msgstr "vypísať zoznam kľúčov"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
- msgstr "vyp�sa� zoznam k���ov a podpisov"
+ msgstr "vypísať zoznam kľúčov a podpisov"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  #, fuzzy
  msgid "list and check key signatures"
- msgstr "skontrolova� podpisy k���ov"
+ msgstr "skontrolovať podpisy kľúčov"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
- msgstr "vyp�sa� zoznam k���ov a fingerprintov"
+ msgstr "vypísať zoznam kľúčov a fingerprintov"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
- msgstr "vyp�sa� zoznam tajn�ch k���ov"
+ msgstr "vypísať zoznam tajných kľúčov"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
- msgstr "vytvori� nov� p�r k���ov"
+ msgstr "vytvoriť nový pár kľúčov"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
- msgstr "vytvori� nov� p�r k���ov"
+ msgstr "vytvoriť nový pár kľúčov"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
- msgstr "vytvori� nov� p�r k���ov"
+ msgstr "vytvoriť nový pár kľúčov"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
- msgstr "vytvori� nov� p�r k���ov"
+ msgstr "vytvoriť nový pár kľúčov"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
- msgstr "vytvori� revoka�n� certifik�t"
+ msgstr "vytvoriť revokačný certifikát"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
- msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
+ msgstr "odstrániť kľúč zo súboru verejných kľúčov"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
- msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
+ msgstr "odstrániť kľúč zo súboru tajných kľúčov"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
- msgstr "podp�sa� k���"
+ msgstr "podpísať kľúč"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
- msgstr "podp�sa� k��� lok�lne"
+ msgstr "podpísať kľúč lokálne"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
- msgstr "podp�sa� k���"
+ msgstr "podpísať kľúč"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
- msgstr "podp�sa� k��� lok�lne"
+ msgstr "podpísať kľúč lokálne"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
- msgstr "podp�sa� alebo modifikova� k���"
+ msgstr "podpísať alebo modifikovať kľúč"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
- msgstr "exportova� k���e"
+ msgstr "exportovať kľúče"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
- msgstr "exportova� k���e na server k���ov"
+ msgstr "exportovať kľúče na server kľúčov"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
- msgstr "importova� k���e zo servera k���ov"
+ msgstr "importovať kľúče zo servera kľúčov"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
- msgstr "vyh�ada� k���e na serveri k���ov"
+ msgstr "vyhľadať kľúče na serveri kľúčov"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
- msgstr "aktualizova� v�etky k���e zo servera k���ov"
+ msgstr "aktualizovať všetky kľúče zo servera kľúčov"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
- msgstr "importova�/zl��i� k���e"
+ msgstr "importovať/zlúčiť kľúče"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr ""
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr ""
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr ""
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
- msgstr "aktualizova� datab�zu d�very"
+ msgstr "aktualizovať databázu dôvery"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
- msgstr "|algo [s�bory]|vyp� hash"
+ msgstr "|algo [súbory]|vypíš hash"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
- msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
+ msgstr "vytvor výstup zakódovaný pomocou ASCII"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
- msgstr "|MENO|�ifrova� pre MENO"
+ msgstr "|MENO|šifrovať pre MENO"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, 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"
+ "použiť toto id užívateľa na podpísanie\n"
+ " alebo dešifrovanie"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr ""
- "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
- " komprim�cia)"
+ "|N|nastaviť úroveň komprimácie N (0 - žiadna\n"
+ " komprimácia)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
- msgstr "pou�i� k�nonick� textov� m�d"
+ msgstr "použiť kánonický textový mód"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
- msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+ msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
- msgstr "nevykona� �iadne zmeny"
+ msgstr "nevykonať žiadne zmeny"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
- msgstr "vy�iada� potvrdenie pred prep�san�m"
+ msgstr "vyžiadať potvrdenie pred prepísaním"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr ""
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
  msgstr ""
  "@\n"
- "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
- "mo�nost�)\n"
+ "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
+ "možností)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2616,21 -2051,19 +2623,21 @@@
  " --fingerprint [names]      show fingerprints\n"
  msgstr ""
  "@\n"
- "Pr�klady:\n"
+ "Príklady:\n"
  "\n"
- " -se -r Bob [s�bor]        podp�sa� a za�ifrova� pre u��vate�a Bob\n"
- " --clearsign [s�bor]       vytvori� podpis �itate�n�ho dokumentu\n"
- " --detach-sign [s�bor]     vytvori� podpis oddelen� od dokumentu\n"
- " --list-keys [men�]        vyp�sa� k���e\n"
- " --fingerprint [men�]      vyp�sa� fingerprinty\n"
+ " -se -r Bob [súbor]        podpísať a zašifrovať pre užívateľa Bob\n"
+ " --clearsign [súbor]       vytvoriť podpis čitateľného dokumentu\n"
+ " --detach-sign [súbor]     vytvoriť podpis oddelený od dokumentu\n"
+ " --list-keys [mená]        vypísať kľúče\n"
+ " --fingerprint [mená]      vypísať fingerprinty\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2641,990 -2074,790 +2648,995 @@@ msgid "
  "Sign, check, encrypt or decrypt\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "Syntax: gpg [mo�nosti] [s�bory]\n"
- "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
- "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
+ "Syntax: gpg [možnosti] [súbory]\n"
+ "podpísať, overiť, šifrovať alebo dešifrovať\n"
+ "implicitné operácie závisia od vstupných dát\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
  msgstr ""
  "\n"
- "Podporovan� algoritmy:\n"
+ "Podporované algoritmy:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
- msgstr "Verejn� k���e: "
+ msgstr "Verejné kľúče: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
- msgstr "�ifry: "
+ msgstr "Šifry: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Kompresia: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
- msgstr "pou�itie: gpg [mo�nosti] "
+ msgstr "použitie: gpg [možnosti] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
- msgstr "konfliktn� pr�kazy\n"
+ msgstr "konfliktné príkazy\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  msgid "no = sign found in group definition '%s'\n"
- msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
+ msgstr "no = podpis nájdený v definícii skupiny \"%s\"\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
- msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
+ msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
- msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
+ msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
- msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
+ msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, 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"
+ msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, 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"
+ msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, 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"
+ msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, 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"
+ msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpečne \"%s\"\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, 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"
+ msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpečne \"%s\"\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, 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"
+ msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpečne \"%s\"\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, 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"
+ "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpečne \"%s\"\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, 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"
+ "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpečne \"%s\"\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, 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"
+ "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpečne \"%s\"\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  msgid "unknown configuration item '%s'\n"
- msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
+ msgstr "neznáma položka konfigurácie \"%s\"\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr ""
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  msgid "show key usage information during key listings"
- msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
+ msgstr "V súbore tajných kľúčov chýba zodpovedajúci podpis\n"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  #, fuzzy
  msgid "show all notations during signature listings"
- msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
+ msgstr "V súbore tajných kľúčov chýba zodpovedajúci podpis\n"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr ""
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  #, fuzzy
  msgid "show preferred keyserver URLs during signature listings"
- msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
+ msgstr "zadané URL pre podpisovú politiku je neplatné\n"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr ""
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr ""
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  #, fuzzy
  msgid "show the keyring name in key listings"
- msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
+ msgstr "ukáž v ktorom súbore kľúčov je vypísaný kľúč"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  #, fuzzy
  msgid "show expiration dates during signature listings"
- msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
+ msgstr "V súbore tajných kľúčov chýba zodpovedajúci podpis\n"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "nastavi� k��� ako neplatn� (disable)"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  msgid "unknown TOFU policy '%s'\n"
- msgstr "nezn�my implicitn� adres�t `%s'\n"
+ msgstr "neznámy implicitný adresát `%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "neplatný parameter pre import\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
- msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
+ msgstr "POZNÁMKA: starý implicitný súbor s možnosťami `%s ignorovaný'\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
- msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
+ msgstr "POZNÁMKA: %s nie je pre normálne použitie!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  msgid "'%s' is not a valid signature expiration\n"
- msgstr "%s nie je platn� znakov� sada\n"
+ msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
- msgstr "Neplatn� e-mailov� adresa\n"
+ msgstr "Neplatná e-mailová adresa\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  msgid "'%s' is not a valid character set\n"
- msgstr "%s nie je platn� znakov� sada\n"
+ msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  #, fuzzy
  msgid "could not parse keyserver URL\n"
- msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
+ msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, fuzzy, c-format
  msgid "%s:%d: invalid keyserver options\n"
- msgstr "%s:%d: neplatn� parameter pre export\n"
+ msgstr "%s:%d: neplatný parameter pre export\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  #, fuzzy
  msgid "invalid keyserver options\n"
- msgstr "neplatn� parameter pre export\n"
+ msgstr "neplatný parameter pre export\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
- msgstr "%s:%d: neplatn� parameter pre import\n"
+ msgstr "%s:%d: neplatný parameter pre import\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
- msgstr "neplatn� parameter pre import\n"
+ msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  msgid "invalid filter option: %s\n"
- msgstr "neplatn� parameter pre import\n"
+ msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
- msgstr "%s:%d: neplatn� parameter pre export\n"
+ msgstr "%s:%d: neplatný parameter pre export\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
- msgstr "neplatn� parameter pre export\n"
+ msgstr "neplatný parameter pre export\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, fuzzy, c-format
  msgid "%s:%d: invalid list options\n"
- msgstr "%s:%d: neplatn� parameter pre import\n"
+ msgstr "%s:%d: neplatný parameter pre import\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  #, fuzzy
  msgid "invalid list options\n"
- msgstr "neplatn� parameter pre import\n"
+ msgstr "neplatný parameter pre import\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  #, fuzzy
  msgid "show all notations during signature verification"
- msgstr "%s nie je platn� znakov� sada\n"
+ msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr ""
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  #, fuzzy
  msgid "show preferred keyserver URLs during signature verification"
- msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
+ msgstr "zadané URL pre podpisovú politiku je neplatné\n"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  #, fuzzy
  msgid "show user ID validity during signature verification"
- msgstr "%s nie je platn� znakov� sada\n"
+ msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
- msgstr "%s nie je platn� znakov� sada\n"
+ msgstr "%s nie je platná znaková sada\n"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr ""
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr ""
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, fuzzy, c-format
  msgid "%s:%d: invalid verify options\n"
- msgstr "%s:%d: neplatn� parameter pre export\n"
+ msgstr "%s:%d: neplatný parameter pre export\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  #, fuzzy
  msgid "invalid verify options\n"
- msgstr "neplatn� parameter pre export\n"
+ msgstr "neplatný parameter pre export\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
- msgstr "nemo�no nastavi� exec-path na %s\n"
+ msgstr "nemožno nastaviť exec-path na %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, fuzzy, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
- msgstr "%s:%d: neplatn� parameter pre export\n"
+ msgstr "%s:%d: neplatný parameter pre export\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr ""
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
- msgstr "VAROVANIE: program m�e vytvori� s�bor core!\n"
+ msgstr "VAROVANIE: program môže vytvoriť súbor core!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
- msgstr "VAROVANIE: %s prep�e %s\n"
+ msgstr "VAROVANIE: %s prepíše %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
- msgstr "Nie je dovolen� pou��va� %s s %s!\n"
+ msgstr "Nie je dovolené používať %s s %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
- msgstr "%s ned�va s %s zmysel!\n"
+ msgstr "%s nedáva s %s zmysel!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, fuzzy, c-format
  msgid "will not run with insecure memory due to %s\n"
- msgstr "zapisujem tajn� k��� do `%s'\n"
+ msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
- msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
+ msgstr "vybraný šifrovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
- msgstr "vybran� hashovac� algoritmus je neplatn�\n"
+ msgstr "vybraný hashovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  #, fuzzy
  msgid "selected compression algorithm is invalid\n"
- msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
+ msgstr "vybraný šifrovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
- msgstr "vybran� hashovac� algoritmus je neplatn�\n"
+ msgstr "vybraný hashovací algoritmus je neplatný\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
- msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
+ msgstr "položka completes-needed musí byť väčšia ako 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
- msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
+ msgstr "položka marginals-needed musí byť väčšia ako 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  #, 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"
+ msgstr "položka max-cert-depth musí byť v rozmedzí od 1 do 255\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  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"
+ msgstr "neplatná implicitná úroveň certifikácie; musí byť 0, 1, 2 alebo 3\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  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"
+ msgstr "neplatná minimálna úroveň certifikácie; musí byť 0, 1, 2 alebo 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
- msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
+ msgstr "POZNÁMKA: jednoduchý mód S2K (0) je dôrazne nedoporučovaný\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
- msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
+ msgstr "neplatný mód S2K; musí byť 0, 1 alebo 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
- msgstr "neplatn� defaultn� predvo�by\n"
+ msgstr "neplatné defaultné predvoľby\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
- msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
+ msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
- msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
+ msgstr "neplatné užívateľské predvoľby pre hashovanie\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
- msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
+ msgstr "neplatné užívateľské predvoľby pre kompresiu\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
- msgstr "%s e�te nepracuje s %s\n"
+ msgstr "%s ešte nepracuje s %s\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, 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"
+ msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, 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"
+ msgstr "nemôžete použiť hashovací algoritmus \"%s\" v móde %s\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, 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"
+ msgstr "nemôžete použiť kompresný algoritmus \"%s\" v móde %s\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
- msgstr "nem�em inicializova� datab�zu d�very: %s\n"
+ msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  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"
+ "VAROVANIE: daný adresát (-r) bez použitia šifrovania s verejným kľúčom\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
- msgstr "--store [meno s�boru]"
+ msgstr "--store [meno súboru]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
- msgstr "--symmetric [meno s�boru]"
+ msgstr "--symmetric [meno súboru]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
- msgstr "de�ifrovanie zlyhalo: %s\n"
+ msgstr "dešifrovanie zlyhalo: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
- msgstr "--encrypt [meno s�boru]"
+ msgstr "--encrypt [meno súboru]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  #, fuzzy
  msgid "--symmetric --encrypt [filename]"
- msgstr "--sign --encrypt [meno s�boru]"
+ msgstr "--sign --encrypt [meno súboru]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, 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"
+ "použitie %s nie je v móde %s dovolené\n"
  "\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
- msgstr "--sign [meno s�boru]"
+ msgstr "--sign [meno súboru]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
- msgstr "--sign --encrypt [meno s�boru]"
+ msgstr "--sign --encrypt [meno súboru]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  #, fuzzy
  msgid "--symmetric --sign --encrypt [filename]"
- msgstr "--sign --encrypt [meno s�boru]"
+ msgstr "--sign --encrypt [meno súboru]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, 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"
+ "použitie %s nie je v móde %s dovolené\n"
  "\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
- msgstr "--sign --symmetric [meno s�boru]"
+ msgstr "--sign --symmetric [meno súboru]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
- msgstr "--clearsign [meno s�boru]"
+ msgstr "--clearsign [meno súboru]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
- msgstr "--decrypt [meno s�boru]"
+ msgstr "--decrypt [meno súboru]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
- msgstr "--sign-key id u��vate�a"
+ msgstr "--sign-key id užívateľa"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
- msgstr "--lsign-key id u��vate�a"
+ msgstr "--lsign-key id užívateľa"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
- msgstr "--edit-key id u��vate�a [pr�kazy]"
+ msgstr "--edit-key id užívateľa [príkazy]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
- msgstr "--sign-key id u��vate�a"
+ msgstr "--sign-key id užívateľa"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
- msgstr "nepodarilo posla� k��� na server: %s\n"
+ msgstr "nepodarilo poslať kľúč na server: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
- msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
+ msgstr "nepodarilo sa prijať kľúč zo servera: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
- msgstr "nepodaril sa export k���a: %s\n"
+ msgstr "nepodaril sa export kľúča: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
- msgstr "nepodaril sa export k���a: %s\n"
+ msgstr "nepodaril sa export kľúča: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
- msgstr "nepodarilo sa n�js� server: %s\n"
+ msgstr "nepodarilo sa nájsť server: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
- msgstr "aktualiz�cia servera zlyhala: %s\n"
+ msgstr "aktualizácia servera zlyhala: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
- msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
+ msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
- msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
+ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
- msgstr "[meno s�boru]"
+ msgstr "[meno súboru]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
- msgstr "Za�nite p�sa� svoju spr�vu ...\n"
+ msgstr "Začnite písať svoju správu ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
- msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
+ msgstr "zadané URL pre certifikačnú politiku je neplatné\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
- msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
+ msgstr "zadané URL pre podpisovú politiku je neplatné\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  #, fuzzy
  msgid "the given preferred keyserver URL is invalid\n"
- msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
+ msgstr "zadané URL pre podpisovú politiku je neplatné\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
- msgstr "Zmaza� tento k��� zo s�boru k���ov? "
+ msgstr "Zmazať tento kľúč zo súboru kľúčov? "
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
- msgstr "konflikt �asov�ho raz�tka"
+ msgstr "konflikt časového razítka"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
- msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
+ msgstr "|FD|zapísať informácie o stave do tohto FD"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
- msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpgv [možnosti] [súbory] (-h pre pomoc)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
  msgstr ""
- "Syntax: gpg [nastavenia] [s�bory]\n"
- "Skontroluje podpisy oproti zn�mym d�veryhodn�m k���om\n"
+ "Syntax: gpg [nastavenia] [súbory]\n"
+ "Skontroluje podpisy oproti známym dôveryhodným kľúčom\n"
  
 +#: g10/helptext.c:72
  msgid "No help available"
- msgstr "Pomoc nie je k dispoz�cii"
+ msgstr "Pomoc nie je k dispozícii"
  
 +#: g10/helptext.c:82
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "No help available for '%s'"
- msgstr "Pomoc nie je dostupn� pre '%s'"
+ msgstr "Pomoc nie je dostupná pre '%s'"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr ""
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr ""
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  msgid "do not clear the ownertrust values during import"
- msgstr "aktualizova� datab�zu d�very"
+ msgstr "aktualizovať databázu dôvery"
  
- #: g10/import.c:147
++#: g10/import.c:160
  #, fuzzy
  msgid "do not update the trustdb after import"
- msgstr "aktualizova� datab�zu d�very"
+ msgstr "aktualizovať databázu dôvery"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  msgid "show key during import"
- msgstr "vyp�sa� fingerprint"
+ msgstr "vypísať fingerprint"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr ""
  
- #: g10/import.c:156
++#: g10/import.c:169
  #, fuzzy
  msgid "remove unusable parts from key after import"
- msgstr "nepou�ite�n� tajn� k���"
+ msgstr "nepoužiteľný tajný kľúč"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr ""
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
- msgstr "blok typu %d bol presko�en�\n"
+ msgstr "blok typu %d bol preskočený\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, fuzzy, c-format
  msgid "%lu keys processed so far\n"
- msgstr "%lu k���e boli doteraz spracovan�\n"
+ msgstr "%lu kľúče boli doteraz spracované\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
- msgstr "Celkovo spracovan�ch k���ov: %lu\n"
+ msgstr "Celkovo spracovaných kľúčov: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
- msgstr "      presko�en� nov� k���e: %lu\n"
+ msgstr "      preskočené nové kľúče: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
- msgstr "      presko�en� nov� k���e: %lu\n"
+ msgstr "      preskočené nové kľúče: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
- msgstr "        bez identifik�torov: %lu\n"
+ msgstr "        bez identifikátorov: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
- msgstr "                importovan�: %lu"
+ msgstr "                importované: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                  bez zmien: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
- msgstr "         nov� id u��vate�ov: %lu\n"
+ msgstr "         nové id užívateľov: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
- msgstr "              nov� podk���e: %lu\n"
+ msgstr "              nové podkľúče: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
- msgstr "               nov� podpisy: %lu\n"
+ msgstr "               nové podpisy: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
- msgstr "      nov� revok�cie k���ov: %lu\n"
+ msgstr "      nové revokácie kľúčov: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
- msgstr "      pre��tan� tajn� k���e: %lu\n"
+ msgstr "      prečítané tajné kľúče: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
- msgstr "    importovan� tajn� k���e: %lu\n"
+ msgstr "    importované tajné kľúče: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
- msgstr "      tajn� k���e nezmenen�: %lu\n"
+ msgstr "      tajné kľúče nezmenené: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
- msgstr "           neimportovan�: %lu\n"
+ msgstr "           neimportované: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, fuzzy, c-format
  msgid "    signatures cleaned: %lu\n"
- msgstr "               nov� podpisy: %lu\n"
+ msgstr "               nové podpisy: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, fuzzy, c-format
  msgid "      user IDs cleaned: %lu\n"
- msgstr "      pre��tan� tajn� k���e: %lu\n"
+ msgstr "      prečítané tajné kľúče: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr ""
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, fuzzy, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
- msgstr "%s podpis, hashovac� algoritmus %s\n"
+ msgstr "%s podpis, hashovací algoritmus %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr ""
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, fuzzy, c-format
  msgid "key %s: no user ID\n"
- msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
+ msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  msgid "key %s: %s\n"
- msgstr "presko�en� `%s': %s\n"
+ msgstr "preskočený `%s': %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, fuzzy, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
- msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
+ msgstr "kľúč %08lX: HKP poškodenie podkľúča opravené\n"
  
  # c-format
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, fuzzy, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr ""
- "k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
+ "kľúč %08lX: prijaté id užívateľa '%s', ktorý nie je podpísaný ním samým\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, fuzzy, c-format
  msgid "key %s: no valid user IDs\n"
- msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
+ msgstr "kľúč %08lX: chýba platný identifikátor užívateľa\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
- msgstr "m�e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
+ msgstr "môže to byť spôsobené chýbajúcim podpisom kľúča ním samým\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, fuzzy, c-format
  msgid "key %s: public key not found: %s\n"
- msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
+ msgstr "kľúč %08lX: verejný kľúč nenájdený: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, fuzzy, c-format
  msgid "key %s: new key - skipped\n"
- msgstr "k��� %08lX: nov� k��� - presko�en�\n"
+ msgstr "kľúč %08lX: nový kľúč - preskočený\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
- msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
+ msgstr "nenájdený zapisovateľný súbor kľúčov (keyring): %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
- msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
+ msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, fuzzy, c-format
  msgid "key %s: public key \"%s\" imported\n"
- msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
+ msgstr "kľúč %08lX: verejný kľúč \"%s\" importovaný\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, fuzzy, c-format
  msgid "key %s: doesn't match our copy\n"
- msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
+ msgstr "kľúč %08lX: nezodpovedá našej kópii\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, fuzzy, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
- msgstr "k��� %08lX: nem�em n�js� origin�lny blok k���a: %s\n"
+ msgstr "kľúč %08lX: nemôžem nájsť originálny blok kľúča: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, fuzzy, c-format
  msgid "key %s: can't read original keyblock: %s\n"
- msgstr "k��� %08lX: nem�em ��ta� origin�lny blok k���a: %s\n"
+ msgstr "kľúč %08lX: nemôžem čítať originálny blok kľúča: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
- msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
+ msgstr "kľúč %08lX: \"%s\" 1 nový identifikátor užívateľa\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
- msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
+ msgstr "kľúč %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
- msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
+ msgstr "kľúč %08lX: \"%s\" 1 nový podpis\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
- msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
+ msgstr "kľúč %08lX: \"%s\" %d nových podpisov\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, fuzzy, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
- msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
+ msgstr "kľúč %08lX: \"%s\" 1 nový podkľúč\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
- msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
+ msgstr "kľúč %08lX: \"%s\" %d nových podkľúčov\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
- msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
+ msgstr "kľúč %08lX: \"%s\" %d nových podpisov\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
- msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
+ msgstr "kľúč %08lX: \"%s\" %d nových podpisov\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
- msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
+ msgstr "kľúč %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, fuzzy, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
- msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
+ msgstr "kľúč %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, fuzzy, c-format
  msgid "key %s: \"%s\" not changed\n"
- msgstr "k��� %08lX: \"%s\" bez zmeny\n"
+ msgstr "kľúč %08lX: \"%s\" bez zmeny\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, fuzzy, c-format
  msgid "key %s: secret key imported\n"
- msgstr "k��� %08lX: tajn� k��� importovan�\n"
+ msgstr "kľúč %08lX: tajný kľúč importovaný\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
- msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
+ msgstr "preskočené: tajný kľúč je už v databáze\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
- msgstr "chyba pri posielan� na `%s': %s\n"
+ msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  msgid "secret key %s: %s\n"
- msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
+ msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  #, fuzzy
  msgid "importing secret keys not allowed\n"
- msgstr "zapisujem tajn� k��� do `%s'\n"
+ msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, fuzzy, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
- msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
+ msgstr "kľúč %08lX: tajný kľúč bez verejného kľúča %d - preskočené\n"
  
  #. TRANSLATORS: For smartcard, each private key on
  #. host has a reference (stub) to a smartcard and
@@@ -3636,252 -2869,210 +3648,258 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, fuzzy, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
- "k��� %08lX: ch�ba verejn� k��� - nem�em aplikova� revoka�n� certifik�t\n"
+ "kľúč %08lX: chýba verejný kľúč - nemôžem aplikovať revokačný certifikát\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
- msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
+ msgstr "kľúč %08lX: neplatný revokačný certifikát: %s - zamietnuté\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
- msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
+ msgstr "kľúč %08lX: \"%s\" revokačný certifikát importovaný\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, fuzzy, c-format
  msgid "key %s: no user ID for signature\n"
- msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
+ msgstr "kľúč %08lX: neexistuje id užívateľa pre podpis\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
- "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
+ "kľúč %08lX: nepodporovaný algoritmus verejného kľúča u užívateľského id \"%s"
  "\"\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, fuzzy, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr ""
- "k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
+ "kľúč %08lX: neplatný podpis kľúča ním samým u užívateľského id \"%s\"\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, fuzzy, c-format
  msgid "key %s: unsupported public key algorithm\n"
- msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
+ msgstr "kľúč %08lX: nepodporovaný algoritmus verejného kľúča\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
- msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
+ msgstr "kľúč %08lX: podpis kľúča ním samým (direct key signature)\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, fuzzy, c-format
  msgid "key %s: no subkey for key binding\n"
- msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
+ msgstr "kľúč %08lX: neexistuje podkľúč pre viazanie kľúčov\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, fuzzy, c-format
  msgid "key %s: invalid subkey binding\n"
- msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
+ msgstr "kľúč %08lX: neplatná väzba podkľúča\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey binding\n"
- msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
+ msgstr "kľúč %08lX: zmazaná viacnásobná väzba podkľúča\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, fuzzy, c-format
  msgid "key %s: no subkey for key revocation\n"
- msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
+ msgstr "kľúč %08lX: neexistuje podkľúč na revokáciu kľúča\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, fuzzy, c-format
  msgid "key %s: invalid subkey revocation\n"
- msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
+ msgstr "kľúč %08lX: neplatný revokačný podkľúč\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, fuzzy, c-format
  msgid "key %s: removed multiple subkey revocation\n"
- msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
+ msgstr "kľúč %08lX: zmazaná viacnásobná revokácia podkľúča\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, fuzzy, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
- msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
+ msgstr "kľúč %08lX: identifikátor užívateľa preskočený '"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, fuzzy, c-format
  msgid "key %s: skipped subkey\n"
- msgstr "k��� %08lX: podk��� presko�en�\n"
+ msgstr "kľúč %08lX: podkľúč preskočený\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, fuzzy, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
- msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
+ msgstr "kľúč %08lX: podpis nie je exportovateľný (trieda %02x) - preskočené\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, fuzzy, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
- msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
+ msgstr "kľúč %08lX: revokačný certifikát na zlom mieste - preskočené \n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, fuzzy, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
- msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
+ msgstr "kľúč %08lX: neplatný revokačný certifikát: %s - preskočené\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, fuzzy, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
- msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
+ msgstr "kľúč %08lX: podpis subkľúča na zlom mieste - preskočené \n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, fuzzy, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
- msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
+ msgstr "kľúč %08lX: neočakávaná podpisová trieda (0x%02X) - preskočené\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, fuzzy, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
- msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
+ msgstr "kľúč %08lX: zistený duplikovaný identifikátor užívateľa - zlúčený\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
- "VAROVANIE: k��� %08lX m�e by� revokovan�: sk��am z�ska� revoka�n� k��� "
+ "VAROVANIE: kľúč %08lX môže byť revokovaný: skúšam získať revokačný kľúč "
  "%08lX\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, fuzzy, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
- "VAROVANIE: k��� %08lX m�e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
+ "VAROVANIE: kľúč %08lX môže byť revokovaný: revokačný kľúč %08lX nenájdený.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, fuzzy, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
- msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
+ msgstr "kľúč %08lX: pridaný revokačný certifikát \"%s\"\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, fuzzy, c-format
  msgid "key %s: direct key signature added\n"
- msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
+ msgstr "kľúč %08lX: podpis kľúča ním samým (direct key signature)\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
- msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
+ msgstr "súbor kľúčov (keyring) `%s' vytvorený\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
- msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
+ msgstr "súbor kľúčov (keyring) `%s' vytvorený\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  msgid "keyblock resource '%s': %s\n"
- msgstr "chyba pri vytv�ran� `%s': %s\n"
+ msgstr "chyba pri vytváraní `%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
- msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
+ msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
  
 +#: g10/keyedit.c:264
  msgid "[revocation]"
- msgstr "[revok�cia]"
+ msgstr "[revokácia]"
  
 +#: g10/keyedit.c:264
  msgid "[self-signature]"
- msgstr "[podpis k���a n�m sam�m]"
+ msgstr "[podpis kľúča ním samým]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
+ msgstr "kľúč %08lX: nepodporovaný algoritmus verejného kľúča\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "%s podpis, hashovac� algoritmus %s\n"
+ msgstr "%s podpis, hashovací algoritmus %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  msgid " (reordered signatures follow)"
- msgstr "Dobr� podpis od \""
+ msgstr "Dobrý podpis od \""
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  msgid "key %s:\n"
- msgstr "presko�en� `%s': %s\n"
+ msgstr "preskočený `%s': %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
- msgstr[0] "U��vate�sk� ID \"%s\" je revokovan�."
- msgstr[1] "U��vate�sk� ID \"%s\" je revokovan�."
+ msgstr[0] "Užívateľské ID \"%s\" je revokované."
+ msgstr[1] "Užívateľské ID \"%s\" je revokované."
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 podpis neoveren�, preto�e ch�ba k���\n"
- msgstr[1] "1 podpis neoveren�, preto�e ch�ba k���\n"
+ msgstr[0] "1 podpis neoverený, pretože chýba kľúč\n"
+ msgstr[1] "1 podpis neoverený, pretože chýba kľúč\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
- msgstr[0] "%d zl�ch podpisov\n"
- msgstr[1] "%d zl�ch podpisov\n"
+ msgstr[0] "%d zlých podpisov\n"
+ msgstr[1] "%d zlých podpisov\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
- msgstr[0] "Dobr� podpis od \""
- msgstr[1] "Dobr� podpis od \""
+ msgstr[0] "Dobrý podpis od \""
+ msgstr[1] "Dobrý podpis od \""
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  #, fuzzy
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
@@@ -3889,449 -3080,361 +3907,449 @@@
  "(by looking at passports, checking fingerprints from different sources, "
  "etc.)\n"
  msgstr ""
- "Pros�m rozhodnite, nako�ko d�verujete tomuto u��vate�ovi, �e spr�vne\n"
- "verifikuje k���e in�ch u��vate�ov (prezret�m cestovn�ch pasov,\n"
- "kontrolou fingerprintov z r�znych zdrojov...)?\n"
+ "Prosím rozhodnite, nakoľko dôverujete tomuto užívateľovi, že správne\n"
+ "verifikuje kľúče iných užívateľov (prezretím cestovných pasov,\n"
+ "kontrolou fingerprintov z rôznych zdrojov...)?\n"
  "\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, fuzzy, c-format
  msgid "  %d = I trust marginally\n"
- msgstr " %d = D�verujem �iasto�ne\n"
+ msgstr " %d = Dôverujem čiastočne\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, fuzzy, c-format
  msgid "  %d = I trust fully\n"
- msgstr " %d = D�verujem �plne\n"
+ msgstr " %d = Dôverujem úplne\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
  "trust signatures on your behalf.\n"
  msgstr ""
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
- msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+ msgstr "Užívateľské ID \"%s\" je revokované."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
- msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
+ msgstr "Ste si istý, že stále chcete podpísať tento kľúč? (a/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
- msgstr "  Nemo�no podp�sa�.\n"
+ msgstr "  Nemožno podpísať.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
- msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+ msgstr "Užívateľské ID \"%s\" je revokované."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
- msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
+ msgstr "ID užívateľa \"%s\" nie je podpísané ním samým."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, fuzzy, c-format
  msgid "User ID \"%s\" is signable.  "
- msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
+ msgstr "ID užívateľa \"%s\" nie je podpísané ním samým."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  #, fuzzy
  msgid "Sign it? (y/N) "
- msgstr "Skuto�ne podp�sa�? "
+ msgstr "Skutočne podpísať? "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
  "is a PGP 2.x-style signature.\n"
  msgstr ""
- "Podpis k���a \"%s\" n�m sam�m je\n"
- "podpis vo form�te PGP 2.x.\n"
+ "Podpis kľúča \"%s\" ním samým je\n"
+ "podpis vo formáte PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
- msgstr "Prajete si ho zmeni� na form�t OpenPGP? (a/N) "
+ msgstr "Prajete si ho zmeniť na formát OpenPGP? (a/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "has expired.\n"
  msgstr ""
- "V� s��asn� podpis na \"%s\"\n"
- "je len lok�lny.\n"
+ "Váš súčasný podpis na \"%s\"\n"
+ "je len lokálny.\n"
  "\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
- msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
+ msgstr "Chcete, aby platnosť Vášho podpisu vypršala v rovnakom čase? (A/n) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "is a local signature.\n"
  msgstr ""
- "V� s��asn� podpis na \"%s\"\n"
- "je len lok�lny.\n"
+ "Váš súčasný podpis na \"%s\"\n"
+ "je len lokálny.\n"
  "\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
- msgstr "Prajete si ho zmeni� na plne exportovate�n� podpis? (a/N) "
+ msgstr "Prajete si ho zmeniť na plne exportovateľný podpis? (a/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, fuzzy, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
- msgstr "\"%s\" je u� lok�lne podp�san� k���om %08lX\n"
+ msgstr "\"%s\" je už lokálne podpísaný kľúčom %08lX\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, fuzzy, c-format
  msgid "\"%s\" was already signed by key %s\n"
- msgstr "\"%s\" je u� podp�san� k���om %08lX\n"
+ msgstr "\"%s\" je už podpísaný kľúčom %08lX\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
- msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
+ msgstr "Ste si istý, že stále chcete podpísať tento kľúč? (a/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, fuzzy, c-format
  msgid "Nothing to sign with key %s\n"
- msgstr "Ni� na podp�sanie k���om %08lX\n"
+ msgstr "Nič na podpísanie kľúčom %08lX\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
- msgstr "Platnos� k���a vypr�ala!"
+ msgstr "Platnosť kľúča vypršala!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
- msgstr "Platnos� k���a vypr�� %s.\n"
+ msgstr "Platnosť kľúča vyprší %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
- msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
+ msgstr "Chcete, aby platnosť Vášho podpisu vypršala v rovnakom čase? (A/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
  "to the person named above?  If you don't know what to answer, enter \"0\".\n"
  msgstr ""
- "S akou istotou ste preverili, �e k���, ktor� chcete podp�sa�\n"
- "patr� vy��ie uvedenej osobe?\n"
- "Pokia� nepozn�te odpove�, zadajte \"0\".\n"
+ "S akou istotou ste preverili, že kľúč, ktorý chcete podpísať\n"
+ "patrí vyššie uvedenej osobe?\n"
+ "Pokiaľ nepoznáte odpoveď, zadajte \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Neodpoviem.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
- msgstr "   (1) V�bec som to nekontroloval(a).%s\n"
+ msgstr "   (1) Vôbec som to nekontroloval(a).%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
- msgstr "   (2) �iasto�ne som to overil(a).%s\n"
+ msgstr "   (2) Čiastočne som to overil(a).%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
- msgstr "   (3) Ve�mi d�kladne som to overil(a).%s\n"
+ msgstr "   (3) Veľmi dôkladne som to overil(a).%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  msgid "Your selection? (enter '?' for more information): "
- msgstr "V� v�ber? ('?' - viac inform�ci�): "
+ msgstr "Váš výber? ('?' - viac informácií): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, fuzzy, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr ""
- "Ste si ist�, �e chcete podp�sa� tento k���\n"
- "svoj�m k���om: \""
+ "Ste si istý, že chcete podpísať tento kľúč\n"
+ "svojím kľúčom: \""
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  #, fuzzy
  msgid "This will be a self-signature.\n"
  msgstr ""
  "\n"
- "Ide o podpis k���a n�m sam�m\n"
+ "Ide o podpis kľúča ním samým\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr ""
  "\n"
- "VAROVANIE: podpis nebude ozna�en� ako neexportovate�n�.\n"
+ "VAROVANIE: podpis nebude označený ako neexportovateľný.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  #, fuzzy
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr ""
  "\n"
- "VAROVANIE: podpis nebude ozna�en� ako neodvolate�n� (non-revocable).\n"
+ "VAROVANIE: podpis nebude označený ako neodvolateľný (non-revocable).\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  #, fuzzy
  msgid "The signature will be marked as non-exportable.\n"
  msgstr ""
  "\n"
- "Podpis bude ozna�en� ako neexportovate�n�.\n"
+ "Podpis bude označený ako neexportovateľný.\n"
  "\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  #, fuzzy
  msgid "The signature will be marked as non-revocable.\n"
  msgstr ""
  "\n"
- "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
+ "Podpis bude označený ako neodvolateľný (non-revocable).\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  #, fuzzy
  msgid "I have not checked this key at all.\n"
  msgstr ""
  "\n"
- "V�bec som tento k��� neoveril.\n"
+ "Vôbec som tento kľúč neoveril.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  #, fuzzy
  msgid "I have checked this key casually.\n"
  msgstr ""
  "\n"
- "�iasto�ne som overil tento k���.\n"
+ "Čiastočne som overil tento kľúč.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  #, fuzzy
  msgid "I have checked this key very carefully.\n"
  msgstr ""
  "\n"
- "Velmi d�kladne som overil tento k���.\n"
+ "Velmi dôkladne som overil tento kľúč.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  #, fuzzy
  msgid "Really sign? (y/N) "
- msgstr "Skuto�ne podp�sa�? "
+ msgstr "Skutočne podpísať? "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "podpisovanie zlyhalo: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
- msgstr "ulo�i� a ukon�i�"
+ msgstr "uložiť a ukončiť"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  #, fuzzy
  msgid "show key fingerprint"
- msgstr "vyp�sa� fingerprint"
+ msgstr "vypísať fingerprint"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
- msgstr "Podpisov� not�cia: "
+ msgstr "Podpisová notácia: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
- msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
+ msgstr "vypísať zoznam kľúčov a id užívateľov"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
- msgstr "vyberte identifik�tor u��vate�a N"
+ msgstr "vyberte identifikátor užívateľa N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  #, fuzzy
  msgid "select subkey N"
- msgstr "vyberte identifik�tor u��vate�a N"
+ msgstr "vyberte identifikátor užívateľa N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  #, fuzzy
  msgid "check signatures"
- msgstr "revokova� podpisy"
+ msgstr "revokovať podpisy"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  #, fuzzy
  msgid "sign selected user IDs locally"
- msgstr "podp�sa� k��� lok�lne"
+ msgstr "podpísať kľúč lokálne"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  #, fuzzy
  msgid "sign selected user IDs with a trust signature"
- msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
+ msgstr "Nápoveda: Vyberte id užívateľa na podpísanie\n"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
- msgstr "prida� identifik�tor u��vate�a"
+ msgstr "pridať identifikátor užívateľa"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
- msgstr "prida� fotografick� ID"
+ msgstr "pridať fotografické ID"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  #, fuzzy
  msgid "delete selected user IDs"
- msgstr "zmaza� identifik�tor u��vate�a"
+ msgstr "zmazať identifikátor užívateľa"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  #, fuzzy
  msgid "add a subkey"
  msgstr "addkey"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr ""
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  #, fuzzy
  msgid "delete selected subkeys"
- msgstr "zmaza� sekund�rny k���"
+ msgstr "zmazať sekundárny kľúč"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
- msgstr "prida� revoka�n� k���"
+ msgstr "pridať revokačný kľúč"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  #, fuzzy
  msgid "delete signatures from the selected user IDs"
- msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
+ msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  #, fuzzy
  msgid "change the expiration date for the key or selected subkeys"
- msgstr "Nem�ete zmeni� dobu platnosti k���a verzie 3\n"
+ msgstr "Nemôžete zmeniť dobu platnosti kľúča verzie 3\n"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  #, fuzzy
  msgid "flag the selected user ID as primary"
- msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
+ msgstr "označiť užívateľské ID ako primárne"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
- msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
+ msgstr "vypísať zoznam predvolieb (pre expertov)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
- msgstr "vyp�sa� zoznam predvolieb (podrobne)"
+ msgstr "vypísať zoznam predvolieb (podrobne)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  #, fuzzy
  msgid "set preference list for the selected user IDs"
- msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
+ msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  #, fuzzy
  msgid "set the preferred keyserver URL for the selected user IDs"
- msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
+ msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  #, fuzzy
  msgid "set a notation for the selected user IDs"
- msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
+ msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
- msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
+ msgstr "zmeniť dôveryhodnosť vlastníka kľúča"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  #, fuzzy
  msgid "revoke signatures on the selected user IDs"
- msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
+ msgstr "Skutočne revokovať všetky vybrané id užívateľa? "
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  #, fuzzy
  msgid "revoke selected user IDs"
- msgstr "revokova� identifik�tor u��vate�a"
+ msgstr "revokovať identifikátor užívateľa"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  #, fuzzy
  msgid "revoke key or selected subkeys"
- msgstr "revokova� sekund�rny k���"
+ msgstr "revokovať sekundárny kľúč"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  #, fuzzy
  msgid "enable key"
- msgstr "nastavi� k��� ako platn� (enable)"
+ msgstr "nastaviť kľúč ako platný (enable)"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  #, fuzzy
  msgid "disable key"
- msgstr "nastavi� k��� ako neplatn� (disable)"
+ msgstr "nastaviť kľúč ako neplatný (disable)"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  #, fuzzy
  msgid "show selected photo IDs"
- msgstr "uk�za� fotografick� ID"
+ msgstr "ukázať fotografické ID"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
- msgstr "Tajn� k��� je dostupn�.\n"
+ msgstr "Tajný kľúč je dostupný.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
- msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
+ msgstr "Na vykonanie tejto operácie je potrebný tajný kľúč.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4339,673 -3442,532 +4357,674 @@@
  "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
  msgstr ""
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
- msgstr "K��� revokovan�."
+ msgstr "Kľúč revokovaný."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  #, fuzzy
  msgid "Really sign all user IDs? (y/N) "
- msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
+ msgstr "Skutočne podpísať všetky id užívateľa? "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  msgid "Really sign all text user IDs? (y/N) "
- msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
+ msgstr "Skutočne podpísať všetky id užívateľa? "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
- msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
+ msgstr "Nápoveda: Vyberte id užívateľa na podpísanie\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  msgid "Unknown signature type '%s'\n"
- msgstr "nezn�ma trieda podpisu"
+ msgstr "neznáma trieda podpisu"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
- msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
+ msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
- msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
+ msgstr "Musíte vybrať aspoň jedno id užívateľa.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
- msgstr "Nem�ete zmaza� posledn� id u��vate�a!\n"
+ msgstr "Nemôžete zmazať posledné id užívateľa!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  #, fuzzy
  msgid "Really remove all selected user IDs? (y/N) "
- msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
+ msgstr "Skutočne odstrániť všetky vybrané id užívateľa? "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  #, fuzzy
  msgid "Really remove this user ID? (y/N) "
- msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
+ msgstr "Skutočne odstrániť toto id užívateľa? "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
- msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
+ msgstr "Skutočne odstrániť toto id užívateľa? "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  #, fuzzy
  msgid "You must select exactly one key.\n"
- msgstr "Mus�te vybra� aspo� jeden k���.\n"
+ msgstr "Musíte vybrať aspoň jeden kľúč.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr ""
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  msgid "Can't open '%s': %s\n"
- msgstr "nem�em otvori� `%s': %s\n"
+ msgstr "nemôžem otvoriť `%s': %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  msgid "Error reading backup key from '%s': %s\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
- msgstr "Mus�te vybra� aspo� jeden k���.\n"
+ msgstr "Musíte vybrať aspoň jeden kľúč.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  #, fuzzy
  msgid "Do you really want to delete the selected keys? (y/N) "
- msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
+ msgstr "Skutočne chcete zmazať vybrané kľúče? "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  #, fuzzy
  msgid "Do you really want to delete this key? (y/N) "
- msgstr "Skuto�ne chcete zmaza� tento k���? "
+ msgstr "Skutočne chcete zmazať tento kľúč? "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  #, fuzzy
  msgid "Really revoke all selected user IDs? (y/N) "
- msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
+ msgstr "Skutočne revokovať všetky vybrané id užívateľa? "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  #, fuzzy
  msgid "Really revoke this user ID? (y/N) "
- msgstr "Skuto�ne revokova� toto id u��vate�a? "
+ msgstr "Skutočne revokovať toto id užívateľa? "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  #, fuzzy
  msgid "Do you really want to revoke the entire key? (y/N) "
- msgstr "Skuto�ne chcete revokova� tento k���? "
+ msgstr "Skutočne chcete revokovať tento kľúč? "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  #, fuzzy
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgstr "Skuto�ne chcete revokova� vybran� k���e? "
+ msgstr "Skutočne chcete revokovať vybrané kľúče? "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  #, fuzzy
  msgid "Do you really want to revoke this subkey? (y/N) "
- msgstr "Skuto�ne chcete revokova� tento k���? "
+ msgstr "Skutočne chcete revokovať tento kľúč? "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  #, fuzzy
  msgid "Set preference list to:\n"
- msgstr "nastavi� zoznam predvolieb"
+ msgstr "nastaviť zoznam predvolieb"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  #, fuzzy
  msgid "Really update the preferences for the selected user IDs? (y/N) "
- msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
+ msgstr "Skutočne aktualizovať predvoľby pre vybrané id užívateľa? "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  #, fuzzy
  msgid "Really update the preferences? (y/N) "
- msgstr "Skuto�ne aktualizova� predvo�by? "
+ msgstr "Skutočne aktualizovať predvoľby? "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  #, fuzzy
  msgid "Save changes? (y/N) "
- msgstr "Ulo�i� zmeny? "
+ msgstr "Uložiť zmeny? "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  #, fuzzy
  msgid "Quit without saving? (y/N) "
- msgstr "Ukon�i� bez ulo�enia? "
+ msgstr "Ukončiť bez uloženia? "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
- msgstr "aktualiz�cia zlyhala: %s\n"
+ msgstr "aktualizácia zlyhala: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
- msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
+ msgstr "kľúč nebol zmenený, takže nie je potrebné ho aktualizovať.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
- msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+ msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  msgid "\"%s\" is not a fingerprint\n"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
- msgstr "nem�em inicializova� datab�zu d�very: %s\n"
+ msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
- msgstr "neplatn� hodnota\n"
+ msgstr "neplatná hodnota\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
- msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
+ msgstr "Takýto identifikátor užívateľa neexistuje.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  msgid "Nothing to sign.\n"
- msgstr "Ni� na podp�sanie k���om %08lX\n"
+ msgstr "Nič na podpísanie kľúčom %08lX\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Digest: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Charakteristiky: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr ""
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr ""
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  #, fuzzy
  msgid "Notations: "
- msgstr "Not�cie: "
+ msgstr "Notácie: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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"
+ msgstr "Užívateľské ID vo formáte PGP 2.x nemá žiadne predvoľby\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
- msgstr "Tento k��� m�e by� revokovan� k���om %s "
+ msgstr "Tento kľúč môže byť revokovaný kľúčom %s "
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, fuzzy, c-format
  msgid "This key may be revoked by %s key %s"
- msgstr "Tento k��� m�e by� revokovan� k���om %s "
+ msgstr "Tento kľúč môže byť revokovaný kľúčom %s "
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  #, fuzzy
  msgid "(sensitive)"
- msgstr "(citliv� inform�cia)"
+ msgstr "(citlivá informácia)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, fuzzy, c-format
  msgid "created: %s"
- msgstr "%s: nem�em vytvori�: %s\n"
+ msgstr "%s: nemôžem vytvoriť: %s\n"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, fuzzy, c-format
  msgid "revoked: %s"
- msgstr "[revokovan�]"
+ msgstr "[revokované]"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, fuzzy, c-format
  msgid "expired: %s"
- msgstr " [platnos� skon��: %s]"
+ msgstr " [platnosť skončí: %s]"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, fuzzy, c-format
  msgid "expires: %s"
- msgstr " [platnos� skon��: %s]"
+ msgstr " [platnosť skončí: %s]"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, fuzzy, c-format
  msgid "usage: %s"
- msgstr " d�vera: %c/%c"
+ msgstr " dôvera: %c/%c"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr ""
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, fuzzy, c-format
  msgid "trust: %s"
- msgstr " d�vera: %c/%c"
+ msgstr " dôvera: %c/%c"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr ""
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
- msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
+ msgstr "Tento kľúč bol označený za neplatný (disabled)"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  msgstr ""
- "Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
- "by� spr�vne, pokia� znovu nespust�te program.\n"
+ "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:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  #, fuzzy
  msgid "revoked"
- msgstr "[revokovan�]"
+ msgstr "[revokované]"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  #, fuzzy
  msgid "expired"
  msgstr "expire"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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 ""
- "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"
+ "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:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
- msgstr "Nem�ete zmeni� dobu platnosti k���a verzie 3\n"
+ msgstr "Nemôžete zmeniť dobu platnosti kľúča verzie 3\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  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 ""
- "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"
+ "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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
- msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
+ msgstr "Ste si istý, že ho chcete stále pridať? (a/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  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"
+ msgstr "Nemali by ste pridávať fotografické ID k PGP2 kľúču.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
- msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
+ msgstr "Zmazať tento dobrý podpis? (a/N/u)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
- msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
+ msgstr "Zmazať tento neplatný podpis? (a/N/u)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
- msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
+ msgstr "Zmazať tento neznámy podpis? (a/N/u)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
- msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
+ msgstr "Skutočne zmazať tento podpis podpísaný sebou samým? (a/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
- msgstr[0] "Zmazan� %d podpis.\n"
- msgstr[1] "Zmazan� %d podpis.\n"
+ msgstr[0] "Zmazaný %d podpis.\n"
+ msgstr[1] "Zmazaný %d podpis.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
- msgstr "Ni� nebolo zmaznan�.\n"
+ msgstr "Nič nebolo zmaznané.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  #, fuzzy
  msgid "invalid"
- msgstr "neplatn� sp�sob reprezent�cie v ASCII"
+ msgstr "neplatný spôsob reprezentácie v ASCII"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
- msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+ msgstr "Užívateľské ID \"%s\" je revokované."
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
- msgstr[0] "U��vate�sk� ID \"%s\" je revokovan�."
- msgstr[1] "U��vate�sk� ID \"%s\" je revokovan�."
+ msgstr[0] "Užívateľské ID \"%s\" je revokované."
+ msgstr[1] "Užívateľské ID \"%s\" je revokované."
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
- msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+ msgstr "užívateľské ID \"%s\" je už revokované\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, fuzzy, c-format
  msgid "User ID \"%s\": already clean\n"
- msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+ msgstr "užívateľské ID \"%s\" je už revokované\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  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 ""
- "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"
+ "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:4585
++#: g10/keyedit.c:4601
  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"
+ msgstr "Nemali by ste pridávať fotografické ID k PGP2 kľúču.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
- msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
+ msgstr "Vložte identifikátor užívateľa povereného revokáciou: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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"
+ msgstr "kľúč vo formáte PGP 2.x nemožno poveriť revokáciou\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
- msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
+ msgstr "kľúč nemožno poveriť revokáciou ním samým\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  #, 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"
+ msgstr "VAROVANIE: Tento kľúč bol revokovaný jeho určeným revokátorom/!\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  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"
+ msgstr "VAROVANIE: označenie kľúča ako revokovací už nemôže byť zrušené!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  #, 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): "
+ msgstr "Ste si istý, že chcete označiť tento kľúč ako revokovací? (a/N): "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
- msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
+ msgstr "Ste si istý, že chcete označiť tento kľúč ako revokovací? (a/N): "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  #, fuzzy
  msgid "Changing expiration time for a subkey.\n"
- msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
+ msgstr "Mením dobu platnosti sekundárneho kľúča.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
- msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
+ msgstr "Mením dobu platnosti primárneho kľúča.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
- msgstr "Nem�ete zmeni� dobu platnosti k���a verzie 3\n"
+ msgstr "Nemôžete zmeniť dobu platnosti kľúča verzie 3\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, fuzzy, c-format
  msgid "signing subkey %s is already cross-certified\n"
- msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr�ovo certifikovan�\n"
+ msgstr "VAROVANIE: podpisovací podkľúč %08lX nie je krížovo certifikovaný\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
- msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
+ msgstr "Prosím, vyberte práve jedno id užívateľa.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, 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"
+ msgstr "preskočený v3 podpis kľúča ním samým u užívateľského id \"%s\"\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr ""
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  #, fuzzy
  msgid "Are you sure you want to replace it? (y/N) "
- msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
+ msgstr "Ste si istý, že ho chcete použiť? (a/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  #, fuzzy
  msgid "Are you sure you want to delete it? (y/N) "
- msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
+ msgstr "Ste si istý, že ho chcete použiť? (a/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  #, fuzzy
  msgid "Enter the notation: "
- msgstr "Podpisov� not�cia: "
+ msgstr "Podpisová notácia: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  #, fuzzy
  msgid "Proceed? (y/N) "
- msgstr "Prep�sa� (a/N)? "
+ msgstr "Prepísať (a/N)? "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
- msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
+ msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, fuzzy, c-format
  msgid "No user ID with hash %s\n"
- msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
+ msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  msgid "No subkey with key ID '%s'.\n"
- msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
+ msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, fuzzy, c-format
  msgid "No subkey with index %d\n"
- msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
+ msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, fuzzy, c-format
  msgid "user ID: \"%s\"\n"
- msgstr "id u��vate�a: \""
+ msgstr "id užívateľa: \""
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, fuzzy, c-format
  msgid "signed by your key %s on %s%s%s\n"
- msgstr "   podp�san� %08lX v %s%s%s\n"
+ msgstr "   podpísané %08lX v %s%s%s\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
- msgstr " (nexeportovate�n�)"
+ msgstr " (nexeportovateľné)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
- msgstr "Platnos� podpisu vypr�� %s.\n"
+ msgstr "Platnosť podpisu vyprší %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
- msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
+ msgstr "Ste si istý, že ho chcete stále revokovať? (a/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
- msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
+ msgstr "Vytvoriť pre tento podpis revokačný certifikát? (a/N)"
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  #, fuzzy
  msgid "Not signed by you.\n"
- msgstr "   podp�san� %08lX v %s%s\n"
+ msgstr "   podpísané %08lX v %s%s\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, 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"
+ msgstr "Podpísali ste nasledujúce identifikátory užívateľa:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  #, fuzzy
  msgid " (non-revocable)"
- msgstr " (nexeportovate�n�)"
+ msgstr " (nexeportovateľné)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, fuzzy, c-format
  msgid "revoked by your key %s on %s\n"
- msgstr "   revokovan� %08lX v %s\n"
+ msgstr "   revokované %08lX v %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
- msgstr "Chyst�te sa revokova� tieto podpisy:\n"
+ msgstr "Chystáte sa revokovať tieto podpisy:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
- msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
+ msgstr "Skutočne vytvoriť revokačné certifikáty? (a/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
- msgstr "neexistuje tajn� k���\n"
+ msgstr "neexistuje tajný kľúč\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
- msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+ msgstr "užívateľské ID \"%s\" je už revokované\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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"
+ msgstr "VAROVANIE: podpis použivateľkého ID vznikol %d sekund v budúcnosti\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, fuzzy, c-format
  msgid "Key %s is already revoked.\n"
- msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+ msgstr "užívateľské ID \"%s\" je už revokované\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, fuzzy, c-format
  msgid "Subkey %s is already revoked.\n"
- msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+ msgstr "užívateľské ID \"%s\" je už revokované\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, fuzzy, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
- "Zobrazujem %s fotografick� ID s ve�kos�ou %ld pre k��� 0x%08lX (uid %d)\n"
+ "Zobrazujem %s fotografické ID s veľkosťou %ld pre kľúč 0x%08lX (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  msgid "preference '%s' duplicated\n"
- msgstr "duplicita predvo�by %c%lu\n"
+ msgstr "duplicita predvoľby %c%lu\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  #, fuzzy
  msgid "too many cipher preferences\n"
- msgstr "pr�li� ve�a `%c' predvolieb\n"
+ msgstr "príliš veľa `%c' predvolieb\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  #, fuzzy
  msgid "too many digest preferences\n"
- msgstr "pr�li� ve�a `%c' predvolieb\n"
+ msgstr "príliš veľa `%c' predvolieb\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  #, fuzzy
  msgid "too many compression preferences\n"
- msgstr "pr�li� ve�a `%c' predvolieb\n"
+ msgstr "príliš veľa `%c' predvolieb\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  msgid "invalid item '%s' in preference string\n"
- msgstr "neplatn� znak v re�azci s predvo�bami\n"
+ msgstr "neplatný znak v reťazci s predvoľbami\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
- msgstr "zapisujem podpis k���a n�m sam�m (direct signature)\n"
+ msgstr "zapisujem podpis kľúča ním samým (direct signature)\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
- msgstr "zapisujem podpis k���a sebou sam�m\n"
+ msgstr "zapisujem podpis kľúča sebou samým\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "zapisujem \"key-binding\" podpis\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
- msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
+ msgstr "neplatná dĺžka kľúča; použijem %u bitov\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
- msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
+ msgstr "dĺžka kľúča zaokrúhlená na %u bitov\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  #, fuzzy
  msgid "Sign"
  msgstr "sign"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr ""
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  #, fuzzy
  msgid "Encrypt"
- msgstr "�ifrova� d�ta"
+ msgstr "šifrovať dáta"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr ""
  
@@@ -5019,157 -3981,126 +5038,157 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr ""
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr ""
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr ""
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr ""
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, fuzzy, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
- msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
+ msgstr "   (%d) ElGamal (len na šifrovanie)\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr ""
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
- msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
+ msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
- msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
+ msgstr "   (%d) DSA a ElGamal (implicitný)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
- msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
+ msgstr "   (%d) DSA a ElGamal (implicitný)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (len na podpis)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (len na podpis)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, fuzzy, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
- msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
+ msgstr "   (%d) ElGamal (len na šifrovanie)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
- msgstr "   (%d) RSA (len na �ifrovanie)\n"
+ msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, fuzzy, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (len na �ifrovanie)\n"
+ msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, fuzzy, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
- msgstr "   (%d) RSA (len na �ifrovanie)\n"
+ msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
- msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
+ msgstr "   (%d) DSA a ElGamal (implicitný)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (len na podpis)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
- msgstr "   (%d) RSA (len na �ifrovanie)\n"
+ msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
- msgstr "   (%d) RSA (len na �ifrovanie)\n"
+ msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
- msgstr "   (%d) RSA (len na �ifrovanie)\n"
+ msgstr "   (%d) RSA (len na šifrovanie)\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
- msgstr "Podpisov� not�cia: "
+ msgstr "Podpisová notácia: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
- msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
+ msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
- msgstr "zaokr�hlen� na %u bitov\n"
+ msgstr "zaokrúhlené na %u bitov\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr ""
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
- msgstr "Ak� ve�kos� k���a si prajete? (1024) "
+ msgstr "Akú veľkosť kľúča si prajete? (1024) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, fuzzy, c-format
  msgid "What keysize do you want? (%u) "
- msgstr "Ak� ve�kos� k���a si prajete? (1024) "
+ msgstr "Akú veľkosť kľúča si prajete? (1024) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
- msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
+ msgstr "Požadovaná dĺžka kľúča je %u bitov.\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
- msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
+ msgstr "Prosím, vyberte druh kľúča, ktorý chcete:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5178,14 -4109,13 +5197,14 @@@
  "      <n>m = key expires in n months\n"
  "      <n>y = key expires in n years\n"
  msgstr ""
- "Pros�m ur�te, ako dlho by mal k��� platit.\n"
- "         0 = doba platnosti k���a nie je obmedzen�\n"
- "      <n>  = doba platnosti k���a skon�� za n dn�\n"
- "      <n>w = doba platnosti k���a skon�� za n t��d�ov\n"
- "      <n>m = doba platnosti k���a skon�� za n mesiacov\n"
- "      <n>y = doba platnosti k���a skon�� za n rokov\n"
+ "Prosím určte, ako dlho by mal kľúč platit.\n"
+ "         0 = doba platnosti kľúča nie je obmedzená\n"
+ "      <n>  = doba platnosti kľúča skončí za n dní\n"
+ "      <n>w = doba platnosti kľúča skončí za n týždňov\n"
+ "      <n>m = doba platnosti kľúča skončí za n mesiacov\n"
+ "      <n>y = doba platnosti kľúča skončí za n rokov\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5194,60 -4124,50 +5213,60 @@@
  "      <n>m = signature expires in n months\n"
  "      <n>y = signature expires in n years\n"
  msgstr ""
- "Pros�m ur�te, ako dlho by mal podpis platit.\n"
- "         0 = doba platnosti podpisu nie je onmedzen�\n"
- "      <n>  = doba platnosti podpisu skon�� za n dn�\n"
- "      <n>w = doba platnosti podpisu skon�� za n t��d�ov\n"
- "      <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
- "      <n>y = doba platnosti podpisu skon�� za n rokov\n"
+ "Prosím určte, ako dlho by mal podpis platit.\n"
+ "         0 = doba platnosti podpisu nie je onmedzená\n"
+ "      <n>  = doba platnosti podpisu skončí za n dní\n"
+ "      <n>w = doba platnosti podpisu skončí za n týždňov\n"
+ "      <n>m = doba platnosti podpisu skončí za n mesiacov\n"
+ "      <n>y = doba platnosti podpisu skončí za n rokov\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
- msgstr "K��� je platn� na? (0) "
+ msgstr "Kľúč je platný na? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, fuzzy, c-format
  msgid "Signature is valid for? (%s) "
- msgstr "Podpis je platn� na? (0) "
+ msgstr "Podpis je platný na? (0) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
- msgstr "neplatn� hodnota\n"
+ msgstr "neplatná hodnota\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  #, fuzzy
  msgid "Key does not expire at all\n"
- msgstr "platnos� %s neskon��\n"
+ msgstr "platnosť %s neskončí\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  #, fuzzy
  msgid "Signature does not expire at all\n"
- msgstr "platnos� %s neskon��\n"
+ msgstr "platnosť %s neskončí\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, fuzzy, c-format
  msgid "Key expires at %s\n"
- msgstr "platnos� %s skon�� %s\n"
+ msgstr "platnosť %s skončí %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, fuzzy, c-format
  msgid "Signature expires at %s\n"
- msgstr "Platnos� podpisu vypr�� %s\n"
+ msgstr "Platnosť podpisu vyprší %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
  msgstr ""
- "V� syst�m nevie zobrazi� d�tumy po roku 2038.\n"
- "V ka�dom pr�pade bud� d�tumy korektne spracov�van� do roku 2106.\n"
+ "Váš systém nevie zobraziť dátumy po roku 2038.\n"
+ "V každom prípade budú dátumy korektne spracovávané do roku 2106.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  #, fuzzy
  msgid "Is this correct? (y/N) "
- msgstr "Je to spr�vne (a/n)? "
+ msgstr "Je to správne (a/n)? "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5258,7 -4178,6 +5277,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  #, fuzzy
  msgid ""
  "\n"
@@@ -5275,50 -4194,39 +5294,50 @@@ msgstr "
  "    \"Jozko Mrkvicka (student) <jozko at mrkvicka.sk>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Meno a priezvisko: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
- msgstr "Neplatn� znak ve mene\n"
+ msgstr "Neplatný znak ve mene\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
- msgstr "Meno nem�e za��na� ��slicou\n"
+ msgstr "Meno nemôže začínať číslicou\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
- msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
+ msgstr "Meno musí byť dlhé aspoň 5 znakov\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
- msgstr "E-mailov� adresa: "
+ msgstr "E-mailová adresa: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
- msgstr "Neplatn� e-mailov� adresa\n"
+ msgstr "Neplatná e-mailová adresa\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
- msgstr "Koment�r: "
+ msgstr "Komentár: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
- msgstr "Neplatn� znak v koment�ri\n"
+ msgstr "Neplatný znak v komentári\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
- msgstr "Pou��vate znakov� sadu `%s'.\n"
+ msgstr "Používate znakovú sadu `%s'.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5329,9 -4237,8 +5348,9 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
- msgstr "Do po�a meno alebo koment�r nep�te, pros�m, e-mailov� adresu.\n"
+ msgstr "Do poľa meno alebo komentár nepíšte, prosím, e-mailovú adresu.\n"
  
  #. TRANSLATORS: These are the allowed answers in
  #. lower and uppercase.  Below you will find the matching
@@@ -5344,53 -4251,43 +5363,53 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "mMkKeEPpUu"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
- msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
+ msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (U)končiť? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
- msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
+ msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (P)okračovať/(U)končiť? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
- msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
+ msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (U)končiť? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
- msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
+ msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (P)okračovať/(U)končiť? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
- msgstr "Najsk�r, pros�m, opravte chybu\n"
+ msgstr "Najskôr, prosím, opravte chybu\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
  "disks) during the prime generation; this gives the random number\n"
  "generator a better chance to gain enough entropy.\n"
  msgstr ""
- "Je potrebn� vytvori� ve�a n�hodn�ch bajtov. Po�as vytv�rania m�ete\n"
- "vykon�va� in� pr�cu na po��ta�i (p�sa� na kl�vesnici, pohybova� my�ou,\n"
- "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
+ "Je potrebné vytvoriť veľa náhodných bajtov. Počas vytvárania môžete\n"
+ "vykonávať inú prácu na počítači (písať na klávesnici, pohybovať myšou,\n"
+ "používať disky); vďaka tomu má generátor lepšiu šancu získať dostatok "
  "entropie.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
- msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+ msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5398,201 -4295,163 +5417,201 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  msgid "A key for \"%s\" already exists\n"
- msgstr "`%s' je u� skomprimovan�\n"
+ msgstr "`%s' je už skomprimovaný\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  msgid "Create anyway? (y/N) "
- msgstr "Pou�i� napriek tomu tento k���? "
+ msgstr "Použiť napriek tomu tento kľúč? "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  msgid "creating anyway\n"
- msgstr "vytvori� nov� p�r k���ov"
+ msgstr "vytvoriť nový pár kľúčov"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
- msgstr "Vytv�ranie k���a bolo zru�en�.\n"
+ msgstr "Vytváranie kľúča bolo zrušené.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  msgid "can't create backup file '%s': %s\n"
- msgstr "nem�em vytvori� `%s': %s\n"
+ msgstr "nemôžem vytvoriť `%s': %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  msgid "Note: backup of card key saved to '%s'\n"
- msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
+ msgstr "POZNÁMKA: platnosť tajného kľúča %08lX skončila %s\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
- msgstr "zapisujem verejn� k��� do `%s'\n"
+ msgstr "zapisujem verejný kľúč do `%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
- msgstr "nen�jden� zapisovate�n� s�bor verejn�ch k���ov (pubring): %s\n"
+ msgstr "nenájdený zapisovateľný súbor verejných kľúčov (pubring): %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
- msgstr "chyba pri z�pise do s�boru verejn�ch k���ov `%s': %s\n"
+ msgstr "chyba pri zápise do súboru verejných kľúčov `%s': %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
- msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
+ msgstr "verejný a tajný kľúč boli vytvorené a podpísané.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  #, fuzzy
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
  msgstr ""
- "Tento k��� nem�e by� pou�it� na �ifrovanie. Pre vytvorenie\n"
- "sekund�rneho k���a na tento ��el m�ete pou�i� pr�kaz \"--edit-key\".\n"
+ "Tento kľúč nemôže byť použitý na šifrovanie. Pre vytvorenie\n"
+ "sekundárneho kľúča na tento účel môžete použiť príkaz \"--edit-key\".\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr ""
- "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
- "je probl�m so syst�mov�m �asom)\n"
+ "kľúč bol vytvorený %lu sekund v budúcnosti (došlo k zmene času alebo\n"
+ "je problém so systémovým časom)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr ""
- "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
- "je probl�m so syst�mov�m �asom)\n"
+ "kľúč bol vytvorený %lu sekund v budúcnosti (došlo k zmene času alebo\n"
+ "je problém so systémovým časom)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
- msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
+ msgstr "POZNÁMKA: vytvorenie podkľúča pre kľúče v3 nie je v súlade s OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
- msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
+ msgstr "Tajné časti primárneho kľúča nie sú dostupné.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  #, fuzzy
  msgid "Secret parts of primary key are stored on-card.\n"
- msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
+ msgstr "Tajné časti primárneho kľúča nie sú dostupné.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  #, fuzzy
  msgid "Really create? (y/N) "
- msgstr "Skuto�ne vytvori�? "
+ msgstr "Skutočne vytvoriť? "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "nikdy     "
  
 +#: g10/keylist.c:331
  msgid "Critical signature policy: "
- msgstr "Kritick� podpisov� politika: "
+ msgstr "Kritická podpisová politika: "
  
 +#: g10/keylist.c:333
  msgid "Signature policy: "
- msgstr "Podpisov� politika: "
+ msgstr "Podpisová politika: "
  
 +#: g10/keylist.c:375
  msgid "Critical preferred keyserver: "
  msgstr ""
  
 +#: g10/keylist.c:428
  msgid "Critical signature notation: "
- msgstr "Kritick� podpisov� not�cia: "
+ msgstr "Kritická podpisová notácia: "
  
 +#: g10/keylist.c:430
  msgid "Signature notation: "
- msgstr "Podpisov� not�cia: "
+ msgstr "Podpisová notácia: "
  
 +#: g10/keylist.c:472
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d good signature\n"
  msgid_plural "%d good signatures\n"
- msgstr[0] "%d zl�ch podpisov\n"
- msgstr[1] "%d zl�ch podpisov\n"
+ msgstr[0] "%d zlých podpisov\n"
+ msgstr[1] "%d zlých podpisov\n"
  
 +#: g10/keylist.c:485
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to an error\n"
  msgid "%d signature not checked due to an error\n"
  msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "1 podpis neoveren�, preto�e vznikla chyba\n"
- msgstr[1] "1 podpis neoveren�, preto�e vznikla chyba\n"
+ msgstr[0] "1 podpis neoverený, pretože vznikla chyba\n"
+ msgstr[1] "1 podpis neoverený, pretože vznikla chyba\n"
  
 +#: g10/keylist.c:567
  #, c-format
  msgid "Warning: %lu key skipped due to its large size\n"
  msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
  msgstr[0] ""
  msgstr[1] ""
  
 +#: g10/keylist.c:589
  msgid "Keyring"
- msgstr "s�bor k���ov (keyring)"
+ msgstr "súbor kľúčov (keyring)"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
- msgstr "Prim�rny fingerprint k���a:"
+ msgstr "Primárny fingerprint kľúča:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
- msgstr "     Fingerprint podk���a:"
+ msgstr "     Fingerprint podkľúča:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
- msgstr " Prim�rny fingerprint k���a:"
+ msgstr " Primárny fingerprint kľúča:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
- msgstr "      Fingerprint podk���a:"
+ msgstr "      Fingerprint podkľúča:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  #, fuzzy
  msgid "      Key fingerprint ="
- msgstr "   Fingerprint k���a ="
+ msgstr "   Fingerprint kľúča ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr ""
  
 +#: g10/keyring.c:1498
  #, fuzzy, c-format
  msgid "caching keyring '%s'\n"
- msgstr "kontrolujem s�bor k���ov (keyring) `%s'\n"
+ msgstr "kontrolujem súbor kľúčov (keyring) `%s'\n"
  
 +#: g10/keyring.c:1572
  #, fuzzy, c-format
  msgid "%lu keys cached so far (%lu signature)\n"
  msgid_plural "%lu keys cached so far (%lu signatures)\n"
- msgstr[0] "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
- msgstr[1] "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
+ msgstr[0] "%lu kľúčov skontrolovaných (%lu podpisov)\n"
+ msgstr[1] "%lu kľúčov skontrolovaných (%lu podpisov)\n"
  
 +#: g10/keyring.c:1588
  #, c-format
  msgid "%lu key cached"
  msgid_plural "%lu keys cached"
@@@ -5604,583 -4462,466 +5623,583 @@@ msgstr[1] "
  #| msgid "1 bad signature\n"
  msgid " (%lu signature)\n"
  msgid_plural " (%lu signatures)\n"
- msgstr[0] "1 zl� podpis\n"
- msgstr[1] "1 zl� podpis\n"
+ msgstr[0] "1 zlý podpis\n"
+ msgstr[1] "1 zlý podpis\n"
  
 +#: g10/keyring.c:1665
  #, c-format
  msgid "%s: keyring created\n"
- msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
+ msgstr "%s: súbor kľúčov (keyring) vytvorený\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr ""
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr ""
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  #, fuzzy
  msgid "honor the preferred keyserver URL set on the key"
- msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
+ msgstr "zadané URL pre podpisovú politiku je neplatné\n"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  #, fuzzy
  msgid "disabled"
  msgstr "disable"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr ""
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, fuzzy, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
- msgstr "neplatn� parameter pre export\n"
+ msgstr "neplatný parameter pre export\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr ""
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
- msgstr[0] "po�adujem k��� %08lX z %s\n"
- msgstr[1] "po�adujem k��� %08lX z %s\n"
+ msgstr[0] "požadujem kľúč %08lX z %s\n"
+ msgstr[1] "požadujem kľúč %08lX z %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, fuzzy, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
- msgstr "VAROVANIE: nem�em vymaza� do�asn� s�bor (%s) `%s': %s\n"
+ msgstr "VAROVANIE: nemôžem vymazať dočasný súbor (%s) `%s': %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, fuzzy, c-format
  msgid "key \"%s\" not found on keyserver\n"
- msgstr "k��� `%s' nebol n�jden�: %s\n"
+ msgstr "kľúč `%s' nebol nájdený: %s\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  #, fuzzy
  msgid "key not found on keyserver\n"
- msgstr "k��� `%s' nebol n�jden�: %s\n"
+ msgstr "kľúč `%s' nebol nájdený: %s\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr ""
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, fuzzy, c-format
  msgid "requesting key %s from %s server %s\n"
- msgstr "po�adujem k��� %08lX z %s\n"
+ msgstr "požadujem kľúč %08lX z %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, fuzzy, c-format
  msgid "requesting key %s from %s\n"
- msgstr "po�adujem k��� %08lX z %s\n"
+ msgstr "požadujem kľúč %08lX z %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  msgid "no keyserver known\n"
- msgstr "neplatn� parameter pre export\n"
+ msgstr "neplatný parameter pre export\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, fuzzy, c-format
  msgid "skipped \"%s\": %s\n"
- msgstr "presko�en� `%s': %s\n"
+ msgstr "preskočený `%s': %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, fuzzy, c-format
  msgid "sending key %s to %s\n"
  msgstr ""
  "\"\n"
- "podp�san� Va��m k���om %08lX v %s\n"
+ "podpísané Vaším kľúčom %08lX v %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  msgid "requesting key from '%s'\n"
- msgstr "po�adujem k��� %08lX z %s\n"
+ msgstr "požadujem kľúč %08lX z %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, fuzzy, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
- msgstr "VAROVANIE: nem�em vymaza� do�asn� s�bor (%s) `%s': %s\n"
+ msgstr "VAROVANIE: nemôžem vymazať dočasný súbor (%s) `%s': %s\n"
  
 +#: g10/mainproc.c:254
  #, c-format
  msgid "weird size for an encrypted session key (%d)\n"
- msgstr "zvl�tna ve�kos� �ifrovacieho k���a pre sedenie (%d)\n"
+ msgstr "zvláštna veľkosť šifrovacieho kľúča pre sedenie (%d)\n"
  
 +#: g10/mainproc.c:302
  #, c-format
  msgid "%s encrypted session key\n"
- msgstr "%s k��� �ifrovan�ho sedenia\n"
+ msgstr "%s kľúč šifrovaného sedenia\n"
  
 +#: g10/mainproc.c:312
  #, fuzzy, c-format
  msgid "passphrase generated with unknown digest algorithm %d\n"
- msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
+ msgstr "zašifrované neznámym algoritmom %d\n"
  
 +#: g10/mainproc.c:378
  #, fuzzy, c-format
  msgid "public key is %s\n"
- msgstr "verejn� k��� je %08lX\n"
+ msgstr "verejný kľúč je %08lX\n"
  
 +#: g10/mainproc.c:456
  msgid "public key encrypted data: good DEK\n"
- msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
+ msgstr "dáta zašifrované verejným kľúčom: správny DEK\n"
  
 +#: g10/mainproc.c:489
  #, fuzzy, c-format
  msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
- msgstr "za�ifrovan� %u-bitov�m %s k���om, ID %08lX, vytvoren�m %s\n"
+ msgstr "zašifrované %u-bitovým %s kľúčom, ID %08lX, vytvoreným %s\n"
  
 +#: g10/mainproc.c:493 g10/pkclist.c:228
  #, fuzzy, c-format
  msgid "      \"%s\"\n"
  msgstr "                alias \""
  
- # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
+ # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
  # [kw]
 +#: g10/mainproc.c:497
  #, fuzzy, c-format
  msgid "encrypted with %s key, ID %s\n"
- msgstr "za�ifrovan� %s k���om, ID %08lX\n"
+ msgstr "zašifrovaná %s kľúčom, ID %08lX\n"
  
 +#: g10/mainproc.c:514
  #, c-format
  msgid "public key decryption failed: %s\n"
- msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
+ msgstr "dešifrovanie verejným kľúčom zlyhalo: %s\n"
  
 +#: g10/mainproc.c:530
  #, c-format
  msgid "encrypted with %lu passphrases\n"
- msgstr "za�ifrovan� s %lu heslami\n"
+ msgstr "zašifrované s %lu heslami\n"
  
 +#: g10/mainproc.c:532
  msgid "encrypted with 1 passphrase\n"
- msgstr "za�ifrovan� jedn�m heslom\n"
+ msgstr "zašifrované jedným heslom\n"
  
 +#: g10/mainproc.c:566 g10/mainproc.c:587
  #, c-format
  msgid "assuming %s encrypted data\n"
- msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
+ msgstr "predpokladám %s šifrovaných dát\n"
  
 +#: g10/mainproc.c:573
  #, c-format
  msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
  msgstr ""
- "algoritmus IDEA nie je dostupn�; optimisticky sa ho pok�sime nahradi� "
+ "algoritmus IDEA nie je dostupný; optimisticky sa ho pokúsime nahradiť "
  "algoritmom %s\n"
  
 +#: g10/mainproc.c:618 g10/mainproc.c:632
  msgid "WARNING: message was not integrity protected\n"
- msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
+ msgstr "VAROVANIE: správa nemá ochranu integrity\n"
  
 +#: g10/mainproc.c:628
  msgid "decryption okay\n"
- msgstr "de�ifrovanie o.k.\n"
+ msgstr "dešifrovanie o.k.\n"
  
 +#: g10/mainproc.c:637
  msgid "WARNING: encrypted message has been manipulated!\n"
- msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
+ msgstr "VAROVANIE: so zašifrovanou správou bolo manipulované!\n"
  
 +#: g10/mainproc.c:653
  #, c-format
  msgid "decryption failed: %s\n"
- msgstr "de�ifrovanie zlyhalo: %s\n"
+ msgstr "dešifrovanie zlyhalo: %s\n"
  
 +#: g10/mainproc.c:676
  #, fuzzy
  #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
  msgid "Note: sender requested \"for-your-eyes-only\"\n"
- msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
+ msgstr "POZNÁMKA: odosielateľ požadoval (\"for-your-eyes-only\")\n"
  
 +#: g10/mainproc.c:678
  #, c-format
  msgid "original file name='%.*s'\n"
- msgstr "p�vodn� meno s�boru='%.*s'\n"
+ msgstr "pôvodné meno súboru='%.*s'\n"
  
 +#: g10/mainproc.c:748
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr ""
- "samostatn� revoka�n� certifik�t -  pou�ite \"gpg --import\", ak ho chcete "
- "vyu�i�\n"
+ "samostatný revokačný certifikát -  použite \"gpg --import\", ak ho chcete "
+ "využiť\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  #, fuzzy
  msgid "no signature found\n"
- msgstr "Dobr� podpis od \""
+ msgstr "Dobrý podpis od \""
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, fuzzy, c-format
  msgid "BAD signature from \"%s\""
- msgstr "ZL� podpis od \""
+ msgstr "ZLÝ podpis od \""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, fuzzy, c-format
  msgid "Expired signature from \"%s\""
- msgstr "Podpis s vypr�anou platnos�ou od \""
+ msgstr "Podpis s vypršanou platnosťou od \""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, fuzzy, c-format
  msgid "Good signature from \"%s\""
- msgstr "Dobr� podpis od \""
+ msgstr "Dobrý podpis od \""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
- msgstr "verifik�cia podpisu potla�en�\n"
+ msgstr "verifikácia podpisu potlačená\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  #, fuzzy
  msgid "can't handle this ambiguous signature data\n"
- msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
+ msgstr "neviem pracovať s týmito násobnými podpismi\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, fuzzy, c-format
  msgid "Signature made %s\n"
- msgstr "Platnos� podpisu vypr�ala %s\n"
+ msgstr "Platnosť podpisu vypršala %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, fuzzy, c-format
  msgid "               using %s key %s\n"
  msgstr "                alias \""
  
- # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
- #: g10/mainproc.c:1749
+ # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
++#: g10/mainproc.c:1766
  #, fuzzy, c-format
  msgid "Signature made %s using %s key ID %s\n"
- msgstr "Podpis vytvoren� %.*s pomocou %s k���a ID %08lX\n"
+ msgstr "Podpis vytvorený %.*s pomocou %s kľúča ID %08lX\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  msgid "               issuer \"%s\"\n"
  msgstr "                alias \""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
- msgstr "K��� k dispoz�cii na: "
+ msgstr "Kľúč k dispozícii na: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
- msgstr "[neist�]  "
+ msgstr "[neistý]  "
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, fuzzy, c-format
  msgid "                aka \"%s\""
  msgstr "                alias \""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
- msgstr "Platnos� podpisu vypr�ala %s\n"
+ msgstr "Platnosť podpisu vypršala %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
- msgstr "Platnos� podpisu vypr�� %s\n"
+ msgstr "Platnosť podpisu vyprší %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
- msgstr "%s podpis, hashovac� algoritmus %s\n"
+ msgstr "%s podpis, hashovací algoritmus %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
- msgstr "bin�rne"
+ msgstr "binárne"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
- msgstr "textov� m�d"
+ msgstr "textový mód"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
- msgstr "nezn�me"
+ msgstr "neznáme"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
- msgstr "nezn�my algoritmus verejn�ho k���a"
+ msgstr "neznámy algoritmus verejného kľúča"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
- msgstr "Nem�em overi� podpis: %s\n"
+ msgstr "Nemôžem overiť podpis: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
- msgstr "toto nie je podpis oddelen� od dokumentu\n"
+ msgstr "toto nie je podpis oddelený od dokumentu\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
- msgstr "VAROVANIE: N�jden� viacn�sobne podpisy. Skontrolovan� bude len prv�.\n"
+ msgstr "VAROVANIE: Nájdené viacnásobne podpisy. Skontrolovaný bude len prvý.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
- msgstr "samostatn� podpis triedy 0x%02x\n"
+ msgstr "samostatný podpis triedy 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
- msgstr "podpis star�ho typu (PGP 2.x)\n"
+ msgstr "podpis starého typu (PGP 2.x)\n"
  
 +#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
  #, fuzzy, c-format
  msgid "fstat of '%s' failed in %s: %s\n"
- msgstr "nemo�no otvori� s�bor: %s\n"
+ msgstr "nemožno otvoriť súbor: %s\n"
  
 +#: g10/misc.c:170
  #, fuzzy, c-format
  msgid "fstat(%d) failed in %s: %s\n"
- msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
+ msgstr "databáza dôvery: procedúra read() (n=%d) zlyhala: %s\n"
  
 +#: g10/misc.c:279
  #, fuzzy, c-format
  msgid "WARNING: using experimental public key algorithm %s\n"
- msgstr "nem�em pracova� s algoritmom verejn�ho k���a %d\n"
+ msgstr "nemôžem pracovať s algoritmom verejného kľúča %d\n"
  
 +#: g10/misc.c:286
  #, fuzzy
  msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
  msgstr ""
- "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
+ "vyžiadaný hashovací algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
  
 +#: g10/misc.c:300
  #, fuzzy, c-format
  msgid "WARNING: using experimental cipher algorithm %s\n"
- msgstr "�ifrovac� algoritmus nie je implementovan�"
+ msgstr "šifrovací algoritmus nie je implementovaný"
  
 +#: g10/misc.c:319
  #, fuzzy, c-format
  msgid "WARNING: using experimental digest algorithm %s\n"
- msgstr "%s podpis, hashovac� algoritmus %s\n"
+ msgstr "%s podpis, hashovací algoritmus %s\n"
  
 +#: g10/misc.c:328
  #, fuzzy, c-format
  msgid "WARNING: digest algorithm %s is deprecated\n"
  msgstr ""
- "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
+ "vyžiadaný hashovací algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
  
 +#: g10/misc.c:353
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "Note: signatures using the %s algorithm are rejected\n"
- msgstr "%s podpis, hashovac� algoritmus %s\n"
+ msgstr "%s podpis, hashovací algoritmus %s\n"
  
 +#: g10/misc.c:375
  #, fuzzy, c-format
  msgid "(reported error: %s)\n"
- msgstr "chyba pri ��tan�: %s\n"
+ msgstr "chyba pri čítaní: %s\n"
  
 +#: g10/misc.c:378
  #, fuzzy, c-format
  msgid "(reported error: %s <%s>)\n"
- msgstr "chyba pri ��tan�: %s\n"
+ msgstr "chyba pri čítaní: %s\n"
  
 +#: g10/misc.c:397
  msgid "(further info: "
  msgstr ""
  
 +#: g10/misc.c:1056
  #, c-format
  msgid "%s:%d: deprecated option \"%s\"\n"
- msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
+ msgstr "%s:%d: použitie parametra \"%s\" sa neodporúča\n"
  
 +#: g10/misc.c:1060
  #, c-format
  msgid "WARNING: \"%s\" is a deprecated option\n"
- msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+ msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
  
 +#: g10/misc.c:1062
  #, c-format
  msgid "please use \"%s%s\" instead\n"
- msgstr "pou�ite namiesto neho \"%s%s\" \n"
+ msgstr "použite namiesto neho \"%s%s\" \n"
  
 +#: g10/misc.c:1069
  #, fuzzy, c-format
  msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
- msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+ msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
  
 +#: g10/misc.c:1079
  #, fuzzy, c-format
  msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
- msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+ msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
  
 +#: g10/misc.c:1083
  #, fuzzy, c-format
  msgid ""
  "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
- msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+ msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
  
 +#: g10/misc.c:1147
  msgid "Uncompressed"
- msgstr "Nekomprimovan�"
+ msgstr "Nekomprimované"
  
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: g10/misc.c:1172
  #, fuzzy
  msgid "uncompressed|none"
- msgstr "Nekomprimovan�"
+ msgstr "Nekomprimované"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
- msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
+ msgstr "táto správa nemusí použiteľná s %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  msgid "ambiguous option '%s'\n"
- msgstr "��tam mo�nosti z `%s'\n"
+ msgstr "čítam možnosti z `%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  msgid "unknown option '%s'\n"
- msgstr "nezn�my implicitn� adres�t `%s'\n"
+ msgstr "neznámy implicitný adresát `%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  msgid "unknown weak digest '%s'\n"
- msgstr "nezn�ma trieda podpisu"
+ msgstr "neznáma trieda podpisu"
  
 +#: g10/openfile.c:84
  #, fuzzy, c-format
  #| msgid "File `%s' exists. "
  msgid "File '%s' exists. "
- msgstr "S�bor `%s' existuje. "
+ msgstr "Súbor `%s' existuje. "
  
 +#: g10/openfile.c:88
  #, fuzzy
  msgid "Overwrite? (y/N) "
- msgstr "Prep�sa� (a/N)? "
+ msgstr "Prepísať (a/N)? "
  
 +#: g10/openfile.c:123
  #, c-format
  msgid "%s: unknown suffix\n"
- msgstr "%s: nezn�ma pr�pona\n"
+ msgstr "%s: neznáma prípona\n"
  
 +#: g10/openfile.c:147
  msgid "Enter new filename"
- msgstr "Vlo�te nov� n�zov s�boru"
+ msgstr "Vložte nový názov súboru"
  
 +#: g10/openfile.c:218
  msgid "writing to stdout\n"
- msgstr "zapisujem na �tandardn� v�stup (stdout)\n"
+ msgstr "zapisujem na štandardný výstup (stdout)\n"
  
 +#: g10/openfile.c:366
  #, fuzzy, c-format
  #| msgid "assuming signed data in `%s'\n"
  msgid "assuming signed data in '%s'\n"
- msgstr "predpoklad�m podp�san� d�ta v `%s'\n"
+ msgstr "predpokladám podpísané dáta v `%s'\n"
  
 +#: g10/openfile.c:457
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new configuration file '%s' created\n"
- msgstr "vytvoren� nov� konfigura�n� s�bor `%s'\n"
+ msgstr "vytvorený nový konfiguračný súbor `%s'\n"
  
 +#: g10/openfile.c:498
  #, fuzzy, c-format
  #| msgid "WARNING: options in `%s' are not yet active during this run\n"
  msgid "WARNING: options in '%s' are not yet active during this run\n"
- msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
+ msgstr "VAROVANIE: nastavenie v `%s' ešte nie je aktívne\n"
  
 +#: g10/parse-packet.c:257
  #, c-format
  msgid "can't handle public key algorithm %d\n"
- msgstr "nem�em pracova� s algoritmom verejn�ho k���a %d\n"
+ msgstr "nemôžem pracovať s algoritmom verejného kľúča %d\n"
  
 +#: g10/parse-packet.c:1113
  msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
  msgstr ""
- "VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
+ "VAROVANIE: pravdepodobne nebezpečný symetricky šifrovaný kľúč sedenia\n"
  
 +#: g10/parse-packet.c:1649
  #, c-format
  msgid "subpacket of type %d has critical bit set\n"
- msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
+ msgstr "podpaket typu %d má nastavený kritický bit\n"
  
 +#: g10/passphrase.c:73 g10/passphrase.c:258 g10/passphrase.c:291
  #, fuzzy, c-format
  msgid "problem with the agent: %s\n"
- msgstr "probl�m s agentom: agent vracia 0x%lx\n"
+ msgstr "problém s agentom: agent vracia 0x%lx\n"
  
 +#: g10/passphrase.c:241
  msgid "Enter passphrase\n"
- msgstr "Vlo�i� heslo\n"
+ msgstr "Vložiť heslo\n"
  
 +#: g10/passphrase.c:252
  msgid "cancelled by user\n"
- msgstr "zru�en� u��vate�om\n"
+ msgstr "zrušené užívateľom\n"
  
 +#: g10/passphrase.c:489
  #, fuzzy, c-format
  msgid " (main key ID %s)"
- msgstr " (hlavn� ID k���a %08lX)"
+ msgstr " (hlavné ID kľúča %08lX)"
  
 +#: g10/passphrase.c:496
  #, fuzzy
  msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
- msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+ msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
 +#: g10/passphrase.c:500
  #, fuzzy
  msgid "Please enter the passphrase to import the OpenPGP secret key:"
- msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+ msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
 +#: g10/passphrase.c:505
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
- msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+ msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
 +#: g10/passphrase.c:508
  #, fuzzy
  msgid "Please enter the passphrase to export the OpenPGP secret key:"
- msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+ msgstr "Prosím, vložte heslo; toto je tajná veta \n"
  
 +#: g10/passphrase.c:513
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
- msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
+ msgstr "Skutočne chcete zmazať vybrané kľúče? "
  
 +#: g10/passphrase.c:516
  #, fuzzy
  msgid "Do you really want to permanently delete the OpenPGP secret key:"
- msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
+ msgstr "Skutočne chcete zmazať vybrané kľúče? "
  
 +#: g10/passphrase.c:525
  #, fuzzy, c-format
  msgid ""
  "%s\n"
@@@ -6188,9 -4929,8 +6207,9 @@@
  "%u-bit %s key, ID %s,\n"
  "created %s%s.\n"
  "%s"
- msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
+ msgstr "dĺžka %u bitov, typ %s, ID %08lX, vytvorený %s"
  
 +#: g10/photoid.c:77
  msgid ""
  "\n"
  "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@@ -6199,71 -4939,57 +6218,71 @@@
  "Keeping the image close to 240x288 is a good size to use.\n"
  msgstr ""
  "\n"
- "Vyberte si obr�zok, ktor� bude pou�it� ako fotografick� ID. Tento obr�zok\n"
- "mus� by� vo form�te JPEG. Pam�tajte, �e bude ulo�en� vo Va�om verejnom "
- "k���i.\n"
- "Ak pou�ijete ve�mi ve�k� obr�zok, k��� bude tie� ve�k�! Odpor��an� ve�kos�\n"
- "obr�zka je okolo 240x288.\n"
+ "Vyberte si obrázok, ktorý bude použitý ako fotografické ID. Tento obrázok\n"
+ "musí byť vo formáte JPEG. Pamätajte, že bude uložený vo Vašom verejnom "
+ "kľúči.\n"
+ "Ak použijete veľmi veľký obrázok, kľúč bude tiež veľký! Odporúčaná veľkosť\n"
+ "obrázka je okolo 240x288.\n"
  
 +#: g10/photoid.c:99
  msgid "Enter JPEG filename for photo ID: "
- msgstr "Meno s�bor s fotografiou vo form�te JPEG: "
+ msgstr "Meno súbor s fotografiou vo formáte JPEG: "
  
 +#: g10/photoid.c:120
  #, fuzzy, c-format
  msgid "unable to open JPEG file '%s': %s\n"
- msgstr "nemo�no otvori� s�bor: %s\n"
+ msgstr "nemožno otvoriť súbor: %s\n"
  
 +#: g10/photoid.c:131
  #, c-format
  msgid "This JPEG is really large (%d bytes) !\n"
  msgstr ""
  
 +#: g10/photoid.c:133
  #, fuzzy
  msgid "Are you sure you want to use it? (y/N) "
- msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
+ msgstr "Ste si istý, že ho chcete použiť? (a/N) "
  
 +#: g10/photoid.c:149
  #, fuzzy, c-format
  msgid "'%s' is not a JPEG file\n"
- msgstr "\"%s\" nie je s�bor JPEG\n"
+ msgstr "\"%s\" nie je súbor JPEG\n"
  
 +#: g10/photoid.c:168
  msgid "Is this photo correct (y/N/q)? "
- msgstr "Je t�to fotografia spr�vna (a/N/u)? "
+ msgstr "Je táto fotografia správna (a/N/u)? "
  
 +#: g10/photoid.c:380
  msgid "unable to display photo ID!\n"
- msgstr "nemo�no nastavi� exec-path na %s\n"
+ msgstr "nemožno nastaviť exec-path na %s\n"
  
 +#: g10/pkclist.c:72 g10/revoke.c:757
  msgid "No reason specified"
- msgstr "D�vod nebol �pecifikovan�"
+ msgstr "Dôvod nebol špecifikovaný"
  
 +#: g10/pkclist.c:74 g10/revoke.c:759
  msgid "Key is superseded"
- msgstr "K��� je nahraden�"
+ msgstr "Kľúč je nahradený"
  
 +#: g10/pkclist.c:76 g10/revoke.c:758
  msgid "Key has been compromised"
- msgstr "K��� bol skompromitovan�"
+ msgstr "Kľúč bol skompromitovaný"
  
 +#: g10/pkclist.c:78 g10/revoke.c:760
  msgid "Key is no longer used"
- msgstr "K��� sa u� nepou��va"
+ msgstr "Kľúč sa už nepoužíva"
  
 +#: g10/pkclist.c:80 g10/revoke.c:761
  msgid "User ID is no longer valid"
- msgstr "Identifik�tor u��vate�a u� neplat�"
+ msgstr "Identifikátor užívateľa už neplatí"
  
 +#: g10/pkclist.c:84
  msgid "reason for revocation: "
- msgstr "d�vod na revok�ciu: "
+ msgstr "dôvod na revokáciu: "
  
 +#: g10/pkclist.c:100
  msgid "revocation comment: "
- msgstr "revoka�n� pozn�mka: "
+ msgstr "revokačná poznámka: "
  
  #. TRANSLATORS: These are the allowed answers in lower and
  #. uppercase.  Below you will find the matching strings which
@@@ -6283,10 -5007,9 +6302,10 @@@ msgstr "iImMuUsS
  #, fuzzy
  msgid "No trust value assigned to:\n"
  msgstr ""
- "Nie je priraden� �iadna hodnota d�very k:\n"
+ "Nie je priradená žiadna hodnota dôvery k:\n"
  "%4u%c/%08lX %s \""
  
 +#: g10/pkclist.c:257
  #, fuzzy, c-format
  msgid "  aka \"%s\"\n"
  msgstr "                alias \""
@@@ -6295,378 -5017,315 +6314,395 @@@
  #, fuzzy
  msgid ""
  "How much do you trust that this key actually belongs to the named user?\n"
- msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
+ msgstr "Tento kľúč pravdepodobne patrí jeho majiteľovi\n"
  
 +#: g10/pkclist.c:282
  #, fuzzy, c-format
  msgid "  %d = I don't know or won't say\n"
  msgstr " %d = Neviem\n"
  
 +#: g10/pkclist.c:284
  #, fuzzy, c-format
  msgid "  %d = I do NOT trust\n"
- msgstr " %d = Ned�verujem\n"
+ msgstr " %d = Nedôverujem\n"
  
 +#: g10/pkclist.c:290
  #, fuzzy, c-format
  msgid "  %d = I trust ultimately\n"
- msgstr " %d = D�verujem absol�tne\n"
+ msgstr " %d = Dôverujem absolútne\n"
  
 +#: g10/pkclist.c:296
  #, fuzzy
  msgid "  m = back to the main menu\n"
- msgstr " m = sp� do hlavn�ho menu\n"
+ msgstr " m = späť do hlavného menu\n"
  
 +#: g10/pkclist.c:299
  #, fuzzy
  msgid "  s = skip this key\n"
- msgstr " s = presko�i� tento k���\n"
+ msgstr " s = preskočiť tento kľúč\n"
  
 +#: g10/pkclist.c:300
  #, fuzzy
  msgid "  q = quit\n"
- msgstr " u = ukon�i�\n"
+ msgstr " u = ukončiť\n"
  
 +#: g10/pkclist.c:304
  #, c-format
  msgid ""
  "The minimum trust level for this key is: %s\n"
  "\n"
  msgstr ""
  
 +#: g10/pkclist.c:310 g10/revoke.c:786
  msgid "Your decision? "
- msgstr "Va�e rozhodnutie? "
+ msgstr "Vaše rozhodnutie? "
  
 +#: g10/pkclist.c:331
  #, fuzzy
  msgid "Do you really want to set this key to ultimate trust? (y/N) "
- msgstr "Skuto�ne chcete nastavi� pre tento k��� absol�tnu d�veru? "
+ msgstr "Skutočne chcete nastaviť pre tento kľúč absolútnu dôveru? "
  
 +#: g10/pkclist.c:345
  msgid "Certificates leading to an ultimately trusted key:\n"
- msgstr "Certifik�ty ved�ce k fin�lnemu d�veryhodn�mu k���u:\n"
+ msgstr "Certifikáty vedúce k finálnemu dôveryhodnému kľúču:\n"
  
 +#: g10/pkclist.c:434
  #, fuzzy, c-format
  msgid "%s: There is no assurance this key belongs to the named user\n"
  msgstr ""
- "%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
+ "%08lX: Nič nenaznačuje tomu, že tento podpis patrí vlastníkovi kľúča.\n"
  
 +#: g10/pkclist.c:439
  #, fuzzy, c-format
  msgid "%s: There is limited assurance this key belongs to the named user\n"
  msgstr ""
- "%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
+ "%08lX: Nič nenaznačuje tomu, že tento podpis patrí vlastníkovi kľúča.\n"
  
 +#: g10/pkclist.c:445
  #, fuzzy
  msgid "This key probably belongs to the named user\n"
- msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
+ msgstr "Tento kľúč pravdepodobne patrí jeho majiteľovi\n"
  
 +#: g10/pkclist.c:450
  msgid "This key belongs to us\n"
- msgstr "Tento k��� patr� n�m (m�me zodpovedaj�ci tajn� k���)\n"
+ msgstr "Tento kľúč patrí nám (máme zodpovedajúci tajný kľúč)\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "NIE JE isté, že tento kľúč patrí osobe, ktorá sa vydáva za jeho\n"
+ "vlastníka. Pokiaľ *skutočne* viete, čo robíte, môžete na otázku\n"
+ "odpovedať áno\n"
+ "\n"
+ 
++#: g10/pkclist.c:489
  #, fuzzy
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
  "you may answer the next question with yes.\n"
  msgstr ""
- "NIE JE ist�, �e tento k��� patr� osobe, ktor� sa vyd�va za jeho\n"
- "vlastn�ka. Pokia� *skuto�ne* viete, �o rob�te, m�ete na ot�zku\n"
- "odpoveda� �no\n"
+ "NIE JE isté, že tento kľúč patrí osobe, ktorá sa vydáva za jeho\n"
+ "vlastníka. Pokiaľ *skutočne* viete, čo robíte, môžete na otázku\n"
+ "odpovedať áno\n"
  "\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  #, fuzzy
  msgid "Use this key anyway? (y/N) "
- msgstr "Pou�i� napriek tomu tento k���? "
+ msgstr "Použiť napriek tomu tento kľúč? "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
- msgstr "VAROVANIE: Je pou�it� ned�veryhodn� k���!\n"
+ msgstr "VAROVANIE: Je použitý nedôveryhodný kľúč!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
- msgstr "VAROVANIE: k��� m�e by� revokovan� (revoka�n� k��� neexistuje)\n"
+ msgstr "VAROVANIE: kľúč môže byť revokovaný (revokačný kľúč neexistuje)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
- msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
+ msgstr "VAROVANIE: Tento kľúč bol revokovaný jeho určeným revokátorom/!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
- msgstr "VAROVANIE: Tento k��� bol revokovan� jeho vlastn�kom!\n"
+ msgstr "VAROVANIE: Tento kľúč bol revokovaný jeho vlastníkom!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  #, fuzzy
  msgid "         This could mean that the signature is forged.\n"
- msgstr "         To m�e znamena�, �e podpis je falo�n�.\n"
+ msgstr "         To môže znamenať, že podpis je falošný.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
- msgstr "VAROVANIE: Tento podk��� bol revokovan� jeho vlastn�kom!\n"
+ msgstr "VAROVANIE: Tento podkľúč bol revokovaný jeho vlastníkom!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
- msgstr "Pozn�mka: Tento k��� bol ozna�en� ako neplatn� (disabled).\n"
+ msgstr "Poznámka: Tento kľúč bol označený ako neplatný (disabled).\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr ""
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr ""
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr ""
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
- msgstr "Pozn�mka: Skon�ila platnos� tohto k���a!\n"
+ msgstr "Poznámka: Skončila platnosť tohto kľúča!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
- msgstr "VAROVANIE: Tento k��� nie certifikovan� d�veryhodn�m podpisom!\n"
+ msgstr "VAROVANIE: Tento kľúč nie certifikovaný dôveryhodným podpisom!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
- "         Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
+ "         Nič nenaznačuje tomu, že tento podpis patrí vlastníkovi kľúča.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
- msgstr "VAROVANIE: NEd�verujeme tomuto k���u!\n"
+ msgstr "VAROVANIE: NEdôverujeme tomuto kľúču!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
- msgstr "         Tento podpis je pravdepodobne FALO�N�.\n"
+ msgstr "         Tento podpis je pravdepodobne FALOŠNÝ.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
- "VAROVANIE: Tento k��� nie je certifikovan� dostato�ne d�veryhodn�mi "
+ "VAROVANIE: Tento kľúč nie je certifikovaný dostatočne dôveryhodnými "
  "podpismi!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
- msgstr "         Nie je ist�, �e tento podpis patr� vlastn�kovi.\n"
+ msgstr "         Nie je isté, že tento podpis patrí vlastníkovi.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
- msgstr "%s: presko�en�: %s\n"
+ msgstr "%s: preskočené: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
- msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
+ msgstr "%s: preskočené: verejný kľúč je neplatný (disabled)\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
- msgstr "%s: presko�en�: verejn� k��� je u� obsiahnut� v datab�ze\n"
+ msgstr "%s: preskočené: verejný kľúč je už obsiahnutý v databáze\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
- msgstr "nem�em sa pripoji� k `%s': %s\n"
+ msgstr "nemôžem sa pripojiť k `%s': %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr ""
- "Ne�pecifikovali ste identifik�tor u��vate�a (user ID). M�ete pou�i� \"-r\"\n"
+ "Nešpecifikovali ste identifikátor užívateľa (user ID). Môžete použiť \"-r\"\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr ""
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
  msgstr ""
  "\n"
- "Nap�te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
+ "Napíšte identifikátor užívateľa (user ID). Ukončite prázdnym riadkom: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
- msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
+ msgstr "Takýto identifikátor užívateľa neexistuje.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
- msgstr "presko�en�: verejn� k��� je u� nastaven� pod�a implicitn�ho adres�ta\n"
+ msgstr "preskočené: verejný kľúč je už nastavený podľa implicitného adresáta\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
- msgstr "Verejn� k��� je neplatn� (disabled).\n"
+ msgstr "Verejný kľúč je neplatný (disabled).\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
- msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
+ msgstr "preskočené: verejný kľúč je už nastavený\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, fuzzy, c-format
  msgid "unknown default recipient \"%s\"\n"
- msgstr "nezn�my implicitn� adres�t `%s'\n"
+ msgstr "neznámy implicitný adresát `%s'\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
- msgstr "�iadne platn� adresy\n"
+ msgstr "žiadne platné adresy\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
- msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
+ msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
- msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
+ msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
  
 +#: g10/plaintext.c:84
  msgid "data not saved; use option \"--output\" to save it\n"
- msgstr "d�ta neboli ulo�en�; na ich ulo�enie pou�ite prep�na� \"--output\"\n"
+ msgstr "dáta neboli uložené; na ich uloženie použite prepínač \"--output\"\n"
  
 +#: g10/plaintext.c:598
  msgid "Detached signature.\n"
- msgstr "Podpis oddelen� od dokumentu.\n"
+ msgstr "Podpis oddelený od dokumentu.\n"
  
 +#: g10/plaintext.c:606
  msgid "Please enter name of data file: "
- msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
+ msgstr "Prosím, vložte názov dátového súboru: "
  
 +#: g10/plaintext.c:643
  msgid "reading stdin ...\n"
- msgstr "��tam �tandardn� vstup (stdin) ...\n"
+ msgstr "čítam štandardný vstup (stdin) ...\n"
  
 +#: g10/plaintext.c:688
  msgid "no signed data\n"
- msgstr "ch�baj� podp�san� d�ta\n"
+ msgstr "chýbajú podpísané dáta\n"
  
 +#: g10/plaintext.c:706
  #, fuzzy, c-format
  #| msgid "can't open signed data `%s'\n"
  msgid "can't open signed data '%s'\n"
- msgstr "nem�em otvori� podp�san� d�ta '%s'\n"
+ msgstr "nemôžem otvoriť podpísané dáta '%s'\n"
  
 +#: g10/plaintext.c:741
  #, fuzzy, c-format
  msgid "can't open signed data fd=%d: %s\n"
- msgstr "nem�em otvori� podp�san� d�ta '%s'\n"
+ msgstr "nemôžem otvoriť podpísané dáta '%s'\n"
  
 +#: g10/pubkey-enc.c:116
  #, fuzzy, c-format
  msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr "anonymn� adres�t; sk��am tajn� k��� %08lX ...\n"
+ msgstr "anonymný adresát; skúšam tajný kľúč %08lX ...\n"
  
 +#: g10/pubkey-enc.c:123
  msgid "okay, we are the anonymous recipient.\n"
- msgstr "o.k., my sme anonymn� adres�t.\n"
+ msgstr "o.k., my sme anonymný adresát.\n"
  
 +#: g10/pubkey-enc.c:282
  msgid "old encoding of the DEK is not supported\n"
- msgstr "star� k�dovanie DEK nie je podporov�n�\n"
+ msgstr "staré kódovanie DEK nie je podporováné\n"
  
 +#: g10/pubkey-enc.c:310
  #, c-format
  msgid "cipher algorithm %d%s is unknown or disabled\n"
- msgstr "�ifrovac� algoritmus %d%s je neznam� alebo je zak�zan�\n"
+ msgstr "šifrovací algoritmus %d%s je neznamý alebo je zakázaný\n"
  
 +#: g10/pubkey-enc.c:352
  #, fuzzy, c-format
  msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
- msgstr "POZN�MKA: v predvo�b�ch nen�jden� �ifrovac� algoritmus %d\n"
+ msgstr "POZNÁMKA: v predvoľbách nenájdený šifrovací algoritmus %d\n"
  
 +#: g10/pubkey-enc.c:377
  #, fuzzy, c-format
  msgid "Note: secret key %s expired at %s\n"
- msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
+ msgstr "POZNÁMKA: platnosť tajného kľúča %08lX skončila %s\n"
  
 +#: g10/pubkey-enc.c:384
  #, fuzzy
  #| msgid "NOTE: key has been revoked"
  msgid "Note: key has been revoked"
- msgstr "POZN�MKA: k��� bol revokovan�"
+ msgstr "POZNÁMKA: kľúč bol revokovaný"
  
 +#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
 +#: g10/revoke.c:500
  #, c-format
  msgid "build_packet failed: %s\n"
  msgstr "build_packet zlyhala: %s\n"
  
 +#: g10/revoke.c:144
  #, fuzzy, c-format
  msgid "key %s has no user IDs\n"
- msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
+ msgstr "kľúč %08lX: chyba identifikátor užívateľa\n"
  
 +#: g10/revoke.c:312
  msgid "To be revoked by:\n"
- msgstr "Bude revokovan�:\n"
+ msgstr "Bude revokovaný:\n"
  
 +#: g10/revoke.c:316
  msgid "(This is a sensitive revocation key)\n"
- msgstr "(Toto je citliv� revoka�n� k���)\n"
+ msgstr "(Toto je citlivý revokačný kľúč)\n"
  
 +#: g10/revoke.c:322
  #, fuzzy
  #| msgid "Secret key is available.\n"
  msgid "Secret key is not available.\n"
- msgstr "Tajn� k��� je dostupn�.\n"
+ msgstr "Tajný kľúč je dostupný.\n"
  
 +#: g10/revoke.c:327
  #, fuzzy
  msgid "Create a designated revocation certificate for this key? (y/N) "
- msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
+ msgstr "Vytvoriť pre tento podpis revokačný certifikát? "
  
 +#: g10/revoke.c:336 g10/revoke.c:727
  msgid "ASCII armored output forced.\n"
- msgstr "Vyn�ten� ASCII textov� v�stup.\n"
+ msgstr "Vynútený ASCII textový výstup.\n"
  
 +#: g10/revoke.c:352 g10/revoke.c:479
  #, c-format
  msgid "make_keysig_packet failed: %s\n"
  msgstr "make_keysig_packet zlyhala: %s\n"
  
 +#: g10/revoke.c:415
  msgid "Revocation certificate created.\n"
- msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+ msgstr "Revokačný certifikát bol vytvorený.\n"
  
 +#: g10/revoke.c:421
  #, fuzzy, c-format
  msgid "no revocation keys found for \"%s\"\n"
- msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
+ msgstr "žiadne revokačné kľúče pre `%s' nenájdené\n"
  
 +#: g10/revoke.c:551
  #, fuzzy
  msgid "This is a revocation certificate for the OpenPGP key:"
- msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
+ msgstr "Vytvoriť pre tento podpis revokačný certifikát? "
  
 +#: g10/revoke.c:567
  msgid ""
  "A revocation certificate is a kind of \"kill switch\" to publicly\n"
  "declare that a key shall not anymore be used.  It is not possible\n"
@@@ -6693,12 -5349,11 +6729,12 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "Revocation certificate created.\n"
  msgid "revocation certificate stored as '%s.rev'\n"
- msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+ msgstr "Revokačný certifikát bol vytvorený.\n"
  
 +#: g10/revoke.c:634
  #, fuzzy, c-format
  msgid "secret key \"%s\" not found\n"
- msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
+ msgstr "tajný kľúč `%s' nebol nájdený: %s\n"
  
  #. TRANSLATORS: The %s prints a key specification which
  #. for example has been given at the command line.  Several lines
@@@ -6712,14 -5365,12 +6748,14 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error searching the keyring: %s\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
 +#: g10/revoke.c:711
  #, fuzzy
  msgid "Create a revocation certificate for this key? (y/N) "
- msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
+ msgstr "Vytvoriť pre tento podpis revokačný certifikát? "
  
 +#: g10/revoke.c:735
  msgid ""
  "Revocation certificate created.\n"
  "\n"
@@@ -6729,57 -5380,47 +6765,57 @@@
  "your media become unreadable.  But have some caution:  The print system of\n"
  "your machine might store the data and make it available to others!\n"
  msgstr ""
- "Bol vytvoren� revoka�n� certifik�t.\n"
+ "Bol vytvorený revokačný certifikát.\n"
  "\n"
- "Presu�te ho na m�dium, ktor� m�ete schova�; ak Mallory z�ska k\n"
- "tomuto certifik�tu pr�stup, m�e znefunk�ni� V� k���. Jednoduch� je\n"
- "vytla�i� certifik�t a schova� ho, pre pr�pad �e by m�dium bolo ne�itate�n�.\n"
- "Ale hroz� nebezpe�enstvo: Tla�ov� syst�m V�ho po��ta�a m�e uklada� d�ta a\n"
- "spr�stupni� ich in�m!\n"
+ "Presuňte ho na médium, ktoré môžete schovať; ak Mallory získa k\n"
+ "tomuto certifikátu prístup, môže znefunkčniť Váš kľúč. Jednoduché je\n"
+ "vytlačiť certifikát a schovať ho, pre prípad že by médium bolo nečitateľné.\n"
+ "Ale hrozí nebezpečenstvo: Tlačový systém Vášho počítača môže ukladať dáta a\n"
+ "sprístupniť ich iným!\n"
  
 +#: g10/revoke.c:769
  msgid "Please select the reason for the revocation:\n"
- msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
+ msgstr "Prosím výberte dôvod na revokáciu:\n"
  
 +#: g10/revoke.c:779
  msgid "Cancel"
- msgstr "Zru�i�"
+ msgstr "Zrušiť"
  
 +#: g10/revoke.c:781
  #, c-format
  msgid "(Probably you want to select %d here)\n"
- msgstr "(Pravdepodobne ste chceli vybra� %d)\n"
+ msgstr "(Pravdepodobne ste chceli vybrať %d)\n"
  
 +#: g10/revoke.c:822
  msgid "Enter an optional description; end it with an empty line:\n"
- msgstr "Ak chcete, nap�te popis; ukon�ite pr�zdnym riadkom:\n"
+ msgstr "Ak chcete, napíšte popis; ukončite prázdnym riadkom:\n"
  
 +#: g10/revoke.c:850
  #, c-format
  msgid "Reason for revocation: %s\n"
- msgstr "D�vod na revok�ciu: %s\n"
+ msgstr "Dôvod na revokáciu: %s\n"
  
 +#: g10/revoke.c:852
  msgid "(No description given)\n"
- msgstr "(�iadny popis)\n"
+ msgstr "(Žiadny popis)\n"
  
 +#: g10/revoke.c:857
  #, fuzzy
  msgid "Is this okay? (y/N) "
  msgstr "Je to v poriadku? "
  
 +#: g10/seskey.c:62 sm/encrypt.c:123
  msgid "weak key created - retrying\n"
- msgstr "vytvoren� slab� k��� - sk��am znovu\n"
+ msgstr "vytvorený slabý kľúč - skúšam znovu\n"
  
 +#: g10/seskey.c:66
  #, c-format
  msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
  msgstr ""
- "nem�em sa vyvarova� slab�ho k���a pre symetrick� �ifru; oper�ciu som sk�sil "
- "%d kr�t!\n"
+ "nemôžem sa vyvarovať slabého kľúča pre symetrickú šifru; operáciu som skúsil "
+ "%d krát!\n"
  
 +#: g10/seskey.c:306
  #, c-format
  msgid "%s key %s uses an unsafe (%zu bit) hash\n"
  msgstr ""
@@@ -6789,117 -5429,100 +6825,117 @@@
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr ""
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
- msgstr "VAROVANIE: konflikt hashu podpisu v spr�ve\n"
+ msgstr "VAROVANIE: konflikt hashu podpisu v správe\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
- msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr�ovo certifikovan�\n"
+ msgstr "VAROVANIE: podpisovací podkľúč %08lX nie je krížovo certifikovaný\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, fuzzy, c-format
  msgid "please see %s for more information\n"
- msgstr " i = pros�m o viac inform�c�i\n"
+ msgstr " i = prosím o viac informácíi\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, fuzzy, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
- "VAROVANIE: podpisovac� podk��� %08lX m� neplatn� kr�ov� certifik�ciu\n"
+ "VAROVANIE: podpisovací podkľúč %08lX má neplatnú krížovú certifikáciu\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
- msgstr[0] "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
- msgstr[1] "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
+ msgstr[0] "verejný kľúč %08lX je o %lu sekund novší než podpis\n"
+ msgstr[1] "verejný kľúč %08lX je o %lu sekund novší než podpis\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
- msgstr[0] "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
- msgstr[1] "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
+ msgstr[0] "verejný kľúč %08lX je o %lu sekund novší než podpis\n"
+ msgstr[1] "verejný kľúč %08lX je o %lu sekund novší než podpis\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu seconds in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
- "je probl�m so syst�mov�m �asom)\n"
+ "kľúč bol vytvorený %lu sekund v budúcnosti (došlo k zmene času alebo\n"
+ "je problém so systémovým časom)\n"
  msgstr[1] ""
- "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
- "je probl�m so syst�mov�m �asom)\n"
+ "kľúč bol vytvorený %lu sekund v budúcnosti (došlo k zmene času alebo\n"
+ "je problém so systémovým časom)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
  "key %s was created %lu days in the future (time warp or clock problem)\n"
  msgstr[0] ""
- "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
- "je probl�m so syst�mov�m �asom)\n"
+ "kľúč bol vytvorený %lu sekund v budúcnosti (došlo k zmene času alebo\n"
+ "je problém so systémovým časom)\n"
  msgstr[1] ""
- "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
- "je probl�m so syst�mov�m �asom)\n"
+ "kľúč bol vytvorený %lu sekund v budúcnosti (došlo k zmene času alebo\n"
+ "je problém so systémovým časom)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  msgid "Note: signature key %s expired %s\n"
- msgstr "POZN�MKA: podpisov�mu k���u %08lX skon�ila platnos� %s\n"
+ msgstr "POZNÁMKA: podpisovému kľúču %08lX skončila platnosť %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
- msgstr "POZN�MKA: k��� bol revokovan�"
+ msgstr "POZNÁMKA: kľúč bol revokovaný"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, fuzzy, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
- "predpoklad�m neplatn� podpis k���om %08lX, preto�e je nastaven� nezn�my "
- "kritick� bit\n"
+ "predpokladám neplatný podpis kľúčom %08lX, pretože je nastavený neznámy "
+ "kritický bit\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
- msgstr "k��� %08lX: neexistuje podk��� pre revok�ciu k���a\n"
+ msgstr "kľúč %08lX: neexistuje podkľúč pre revokáciu kľúča\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, fuzzy, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
- msgstr "k��� %08lX: neexistuje podk��� pre viazanie podk���ov\n"
+ msgstr "kľúč %08lX: neexistuje podkľúč pre viazanie podkľúčov\n"
  
 +#: g10/sign.c:88
  #, c-format
  msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
  msgstr ""
- "VAROVANIE: nemo�no %%-expandova� not�cie (pr�li� dlh�). Pou�it� "
- "neexpandovan�.\n"
+ "VAROVANIE: nemožno %%-expandovať notácie (príliš dlhé). Použité "
+ "neexpandované.\n"
  
 +#: g10/sign.c:114
  #, fuzzy, c-format
  msgid ""
  "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
  msgstr ""
- "VAROVANIE: nem�em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
- "neexpandovan�.\n"
+ "VAROVANIE: nemôžem %%-expandovať URL politiky (príliš dlhé). Použité "
+ "neexpandované.\n"
  
 +#: g10/sign.c:137
  #, fuzzy, c-format
  msgid ""
  "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
  "unexpanded.\n"
  msgstr ""
- "VAROVANIE: nem�em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
- "neexpandovan�.\n"
+ "VAROVANIE: nemôžem %%-expandovať URL politiky (príliš dlhé). Použité "
+ "neexpandované.\n"
  
 +#: g10/sign.c:329
  #, fuzzy, c-format
  msgid "%s/%s signature from: \"%s\"\n"
  msgstr "%s podpis od: \"%s\"\n"
@@@ -6909,494 -5531,431 +6945,530 @@@
  msgid ""
  "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
  msgstr ""
- "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
+ "vyžiadaný hashovací algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
  
 +#: g10/sign.c:1009
  msgid "signing:"
  msgstr "podpisujem:"
  
 +#: g10/sign.c:1286
  #, c-format
  msgid "%s encryption will be used\n"
- msgstr "bude pou�it� �ifrovanie %s\n"
+ msgstr "bude použité šifrovanie %s\n"
  
 +#: g10/skclist.c:155 g10/skclist.c:236
  msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
  msgstr ""
- "k��� nie je ozna�en� ako nedostato�ne bezpe�n� - nem�em ho pou�i� s "
- "falo�n�m RNG!\n"
+ "kľúč nie je označený ako nedostatočne bezpečný - nemôžem ho použiť s "
+ "falošným RNG!\n"
  
 +#: g10/skclist.c:187
  #, fuzzy, c-format
  msgid "skipped \"%s\": duplicated\n"
- msgstr "presko�en� `%s': duplikovan�\n"
+ msgstr "preskočený `%s': duplikovaný\n"
  
 +#: g10/skclist.c:206
  msgid "skipped: secret key already present\n"
- msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
+ msgstr "preskočené: tajný kľúč je už v databáze\n"
  
 +#: g10/skclist.c:225
  #, fuzzy
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr ""
- "presko�en� `%s': toto je vygenerovan� PGP k��� pod�a algoritmu ElGamal,\n"
- "podpisy vytvoren� t�mto k���om nie s� bezpe�n�!\n"
+ "preskočený `%s': toto je vygenerovaný PGP kľúč podľa algoritmu ElGamal,\n"
+ "podpisy vytvorené týmto kľúčom nie sú bezpečné!\n"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
- msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
+ msgstr "záznam dôvery %lu, typ %d: zápis zlyhal: %s\n"
  
 +#: g10/tdbdump.c:105
  #, c-format
  msgid ""
  "# List of assigned trustvalues, created %s\n"
  "# (Use \"gpg --import-ownertrust\" to restore them)\n"
  msgstr ""
- "# Zoznam pridelen�ch hodn�t d�veryhodnosti, vytvoren� %s\n"
- "# (Pou�ite \"gpg --import-ownertrust\" na obnovenie)\n"
+ "# Zoznam pridelených hodnôt dôveryhodnosti, vytvorený %s\n"
+ "# (Použite \"gpg --import-ownertrust\" na obnovenie)\n"
  
 +#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
  #, fuzzy, c-format
  msgid "error in '%s': %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: g10/tdbdump.c:162
  #, fuzzy
  msgid "line too long"
- msgstr "riadok je pr�li� dlh�\n"
+ msgstr "riadok je príliš dlhý\n"
  
 +#: g10/tdbdump.c:170
  msgid "colon missing"
  msgstr ""
  
 +#: g10/tdbdump.c:176
  #, fuzzy
  msgid "invalid fingerprint"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
 +#: g10/tdbdump.c:181
  #, fuzzy
  msgid "ownertrust value missing"
  msgstr ""
- "importova� hodnoty d�veryhodnosti\n"
- " vlastn�ka k���a"
+ "importovať hodnoty dôveryhodnosti\n"
+ " vlastníka kľúča"
  
 +#: g10/tdbdump.c:217
  #, fuzzy, c-format
  msgid "error finding trust record in '%s': %s\n"
- msgstr "chyba pri h�adan� z�znamu d�very: %s\n"
+ msgstr "chyba pri hľadaní záznamu dôvery: %s\n"
  
 +#: g10/tdbdump.c:221
  #, fuzzy, c-format
  msgid "read error in '%s': %s\n"
- msgstr "chyba pri ��tan�: %s\n"
+ msgstr "chyba pri čítaní: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
- msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
+ msgstr "databáza dôvery: synchronizácia zlyhala %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  msgid "can't create lock for '%s'\n"
- msgstr "nem�em vytvori� `%s': %s\n"
+ msgstr "nemôžem vytvoriť `%s': %s\n"
  
 +#: g10/tdbio.c:146
  #, fuzzy, c-format
  msgid "can't lock '%s'\n"
- msgstr "nemo�no otvori� `%s'\n"
+ msgstr "nemožno otvoriť `%s'\n"
  
 +#: g10/tdbio.c:205 g10/tdbio.c:1787
  #, c-format
  msgid "trustdb rec %lu: lseek failed: %s\n"
- msgstr "z�znam v datab�ze d�very %lu: lseek() sa nepodaril: %s\n"
+ msgstr "záznam v databáze dôvery %lu: lseek() sa nepodaril: %s\n"
  
 +#: g10/tdbio.c:213 g10/tdbio.c:1798
  #, c-format
  msgid "trustdb rec %lu: write failed (n=%d): %s\n"
- msgstr "z�znam v datab�ze d�very %lu: z�pis sa nepodaril (n=%d): %s\n"
+ msgstr "záznam v databáze dôvery %lu: zápis sa nepodaril (n=%d): %s\n"
  
 +#: g10/tdbio.c:352
  msgid "trustdb transaction too large\n"
- msgstr "transakcia s datab�zou d�very je pr�li� dlh�\n"
+ msgstr "transakcia s databázou dôvery je príliš dlhá\n"
  
 +#: g10/tdbio.c:682
  #, c-format
  msgid "%s: directory does not exist!\n"
- msgstr "%s: adres�r neexistuje!\n"
+ msgstr "%s: adresár neexistuje!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  msgid "can't access '%s': %s\n"
- msgstr "nem�em zavrie� `%s': %s\n"
+ msgstr "nemôžem zavrieť `%s': %s\n"
  
 +#: g10/tdbio.c:724
  #, c-format
  msgid "%s: failed to create version record: %s"
- msgstr "%s: nepodarilo sa vytvori� z�znam verzie: %s"
+ msgstr "%s: nepodarilo sa vytvoriť záznam verzie: %s"
  
 +#: g10/tdbio.c:729
  #, c-format
  msgid "%s: invalid trustdb created\n"
- msgstr "%s: vytvoren� neplatn� datab�za d�very\n"
+ msgstr "%s: vytvorená neplatná databáza dôvery\n"
  
 +#: g10/tdbio.c:732
  #, c-format
  msgid "%s: trustdb created\n"
- msgstr "%s: datab�za d�very vytvoren�\n"
+ msgstr "%s: databáza dôvery vytvorená\n"
  
 +#: g10/tdbio.c:788
  #, fuzzy
  #| msgid "NOTE: trustdb not writable\n"
  msgid "Note: trustdb not writable\n"
- msgstr "POZN�MKA: do trustdb nemo�no zapisova�\n"
+ msgstr "POZNÁMKA: do trustdb nemožno zapisovať\n"
  
 +#: g10/tdbio.c:797
  #, c-format
  msgid "%s: invalid trustdb\n"
- msgstr "%s: neplatn� datab�ze d�very\n"
+ msgstr "%s: neplatná databáze dôvery\n"
  
 +#: g10/tdbio.c:834
  #, c-format
  msgid "%s: failed to create hashtable: %s\n"
- msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
+ msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
  
 +#: g10/tdbio.c:842
  #, c-format
  msgid "%s: error updating version record: %s\n"
- msgstr "%s: chyba pri aktualiz�cii z�znamu verzie: %s\n"
+ msgstr "%s: chyba pri aktualizácii záznamu verzie: %s\n"
  
 +#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
 +#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
  #, c-format
  msgid "%s: error reading version record: %s\n"
- msgstr "%s: chyba pri ��tan� z�znamu verzie: %s\n"
+ msgstr "%s: chyba pri čítaní záznamu verzie: %s\n"
  
 +#: g10/tdbio.c:938
  #, c-format
  msgid "%s: error writing version record: %s\n"
- msgstr "%s: chyba pri z�pise z�znamu verzie: %s\n"
+ msgstr "%s: chyba pri zápise záznamu verzie: %s\n"
  
 +#: g10/tdbio.c:1461
  #, c-format
  msgid "trustdb: lseek failed: %s\n"
- msgstr "datab�ze d�very: proced�ra lseek() zlyhala: %s\n"
+ msgstr "databáze dôvery: procedúra lseek() zlyhala: %s\n"
  
 +#: g10/tdbio.c:1472
  #, c-format
  msgid "trustdb: read failed (n=%d): %s\n"
- msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
+ msgstr "databáza dôvery: procedúra read() (n=%d) zlyhala: %s\n"
  
 +#: g10/tdbio.c:1497
  #, c-format
  msgid "%s: not a trustdb file\n"
- msgstr "%s: nie je s�bor datab�zy d�very\n"
+ msgstr "%s: nie je súbor databázy dôvery\n"
  
 +#: g10/tdbio.c:1522
  #, c-format
  msgid "%s: version record with recnum %lu\n"
- msgstr "%s: z�znam verzie s ��slom %lu\n"
+ msgstr "%s: záznam verzie s číslom %lu\n"
  
 +#: g10/tdbio.c:1528
  #, c-format
  msgid "%s: invalid file version %d\n"
- msgstr "%s: neplatn� verzia s�boru %d\n"
+ msgstr "%s: neplatná verzia súboru %d\n"
  
 +#: g10/tdbio.c:1748
  #, c-format
  msgid "%s: error reading free record: %s\n"
- msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
+ msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
  
 +#: g10/tdbio.c:1757
  #, c-format
  msgid "%s: error writing dir record: %s\n"
- msgstr "%s: chyba pri z�pise adres�rov�ho z�znamu: %s\n"
+ msgstr "%s: chyba pri zápise adresárového záznamu: %s\n"
  
 +#: g10/tdbio.c:1768
  #, c-format
  msgid "%s: failed to zero a record: %s\n"
- msgstr "%s: vynulovanie z�znamu zlyhalo: %s\n"
+ msgstr "%s: vynulovanie záznamu zlyhalo: %s\n"
  
 +#: g10/tdbio.c:1804
  #, c-format
  msgid "%s: failed to append a record: %s\n"
- msgstr "%s: pridanie z�znamu zlyhalo: %s\n"
+ msgstr "%s: pridanie záznamu zlyhalo: %s\n"
  
 +#: g10/tdbio.c:1865
  #, fuzzy
  msgid "Error: The trustdb is corrupted.\n"
- msgstr "%s: datab�za d�very vytvoren�\n"
+ msgstr "%s: databáza dôvery vytvorená\n"
  
 +#: g10/textfilter.c:146
  #, c-format
  msgid "can't handle text lines longer than %d characters\n"
- msgstr "nem�em pracova� s riadkami dlh��mi ako %d znakov\n"
+ msgstr "nemôžem pracovať s riadkami dlhšími ako %d znakov\n"
  
 +#: g10/textfilter.c:241
  #, c-format
  msgid "input line longer than %d characters\n"
- msgstr "vstupn� riadok je dlh�� ako %d znakov\n"
+ msgstr "vstupný riadok je dlhší ako %d znakov\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
- msgstr "chyba pri posielan� na `%s': %s\n"
+ msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
- "Podporovan� algoritmy:\n"
+ "Podporované algoritmy:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
- msgstr "chyba pri posielan� na `%s': %s\n"
+ msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
- msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
+ msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
- msgstr "%s: chyba pri z�pise adres�rov�ho z�znamu: %s\n"
+ msgstr "%s: chyba pri zápise adresárového záznamu: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
- msgstr "chyba pri posielan� na `%s': %s\n"
+ msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
+ msgstr ""
+ 
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  msgid "error gathering other user IDs: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "vypísať zoznam kľúčov a id užívateľov"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "Policy: "
  msgid "policy: %s"
  msgstr "Politika: "
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
- msgstr "vyp�sa� zoznam k���ov"
+ msgstr "vypísať zoznam kľúčov"
+ 
++#: g10/tofu.c:1715
+ #, fuzzy, c-format
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "|algo [súbory]|vypíš hash"
+ msgstr[1] "|algo [súbory]|vypíš hash"
  
- #: g10/tofu.c:1342
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1351
- #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "|algo [s�bory]|vyp� hash"
- msgstr[1] "|algo [s�bory]|vyp� hash"
- 
- #: g10/tofu.c:1357
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Zmazaných %d podpisov.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|algo [s�bory]|vyp� hash"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|algo [súbory]|vypíš hash"
+ msgstr[1] "|algo [súbory]|vypíš hash"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "zašifrované s %lu heslami\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|algo [súbory]|vypíš hash"
+ msgstr[1] "|algo [súbory]|vypíš hash"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7410,134 -5969,117 +7482,146 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
- msgstr "chyba pri posielan� na `%s': %s\n"
+ msgstr "chyba pri posielaní na `%s': %s\n"
+ 
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "chyba pri zápise do súboru verejných kľúčov `%s': %s\n"
  
- #: g10/trustdb.c:215
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
- msgstr "`%s' nie je platn� dlh� keyID\n"
+ msgstr "`%s' nie je platné dlhé keyID\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, fuzzy, c-format
  msgid "key %s: accepted as trusted key\n"
- msgstr "k��� %08lX: akceptovan� ako d�veryhodn� k���\n"
+ msgstr "kľúč %08lX: akceptovaný ako dôveryhodný kľúč\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, fuzzy, c-format
  msgid "key %s occurs more than once in the trustdb\n"
- msgstr "k��� %08lX sa v datab�ze d�very vyskytuje viac ako raz\n"
+ msgstr "kľúč %08lX sa v databáze dôvery vyskytuje viac ako raz\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, fuzzy, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr ""
- "k��� %08lX: nen�jden� verejn� k��� k d�veryhodn�mu k���u - presko�en�\n"
+ "kľúč %08lX: nenájdený verejný kľúč k dôveryhodnému kľúču - preskočené\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, fuzzy, c-format
  msgid "key %s marked as ultimately trusted\n"
- msgstr "k��� ozna�en� ako absol�tne d�veryhodn�.\n"
+ msgstr "kľúč označený ako absolútne dôveryhodný.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
- msgstr "z�znam d�very %lu, typ po�. %d: ��tanie zlyhalo: %s\n"
+ msgstr "záznam dôvery %lu, typ pož. %d: čítanie zlyhalo: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
- msgstr "z�znam d�very %lu nie je po�adovan�ho typu %d\n"
+ msgstr "záznam dôvery %lu nie je požadovaného typu %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr ""
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
- msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
+ msgstr "nie je nutné kontrolovať databázu dôvery\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
- msgstr "dal�ia kontrola datab�zy d�very %s\n"
+ msgstr "dalšia kontrola databázy dôvery %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
- msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
+ msgstr "nie je nutné kontrolovať databázu dôvery\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
- msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
+ msgstr "nie je nutné kontrolovať databázu dôvery\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, fuzzy, c-format
  msgid "public key %s not found: %s\n"
- msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
+ msgstr "verejný kľúč %08lX nebol nájdený: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
- msgstr "pros�m vykonajte --check-trustdb\n"
+ msgstr "prosím vykonajte --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
- msgstr "kontrolujem datab�zu d�very\n"
+ msgstr "kontrolujem databázu dôvery\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
- msgstr[0] "%lu k���e boli doteraz spracovan�\n"
- msgstr[1] "%lu k���e boli doteraz spracovan�\n"
+ msgstr[0] "%lu kľúče boli doteraz spracované\n"
+ msgstr[1] "%lu kľúče boli doteraz spracované\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
- msgstr[0] "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
- msgstr[1] "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
+ msgstr[0] "%d kľúčov spracovaných (%d počtov platnosti vymazaných)\n"
+ msgstr[1] "%d kľúčov spracovaných (%d počtov platnosti vymazaných)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
- msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
+ msgstr "neboli nájdené žiadne absolútne dôveryhodné kľúče\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, fuzzy, c-format
  msgid "public key of ultimately trusted key %s not found\n"
- msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
+ msgstr "verejný kľúč k absolútne dôveryhodnému kľúču  %08lX nebol nájdený\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, fuzzy, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
- msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
+ msgstr "záznam dôvery %lu, typ %d: zápis zlyhal: %s\n"
  
 +#: g10/trust.c:105
  msgid "undefined"
  msgstr ""
  
@@@ -7570,22 -6107,18 +7654,22 @@@ msgstr "
  msgid "10 translator see trust.c:uid_trust_string_fixed"
  msgstr ""
  
 +#: g10/trust.c:149
  #, fuzzy
  msgid "[ revoked]"
- msgstr "[revokovan�]"
+ msgstr "[revokované]"
  
 +#: g10/trust.c:151 g10/trust.c:157
  #, fuzzy
  msgid "[ expired]"
- msgstr "[expirovan�]"
+ msgstr "[expirované]"
  
 +#: g10/trust.c:156
  #, fuzzy
  msgid "[ unknown]"
- msgstr "nezn�me"
+ msgstr "neznáme"
  
 +#: g10/trust.c:158
  msgid "[  undef ]"
  msgstr ""
  
@@@ -7612,21 -6140,18 +7696,21 @@@ msgid "
  "Please remember that the signature file (.sig or .asc)\n"
  "should be the first file given on the command line.\n"
  msgstr ""
- "podpis nebolo mo�n� overi�.\n"
- "Pros�m, nezab�dajte, �e s�bor s podpisom (.sig alebo .asc)\n"
- "by mal by� prv�m s�borom zadan�m na pr�kazovom riadku.\n"
+ "podpis nebolo možné overiť.\n"
+ "Prosím, nezabúdajte, že súbor s podpisom (.sig alebo .asc)\n"
+ "by mal byť prvým súborom zadaným na príkazovom riadku.\n"
  
 +#: g10/verify.c:204
  #, c-format
  msgid "input line %u too long or missing LF\n"
- msgstr "vstupn� riadok %u je pr�li� dlh� alebo na konci ch�ba znak LF\n"
+ msgstr "vstupný riadok %u je príliš dlhý alebo na konci chýba znak LF\n"
  
 +#: g10/verify.c:253
  #, fuzzy, c-format
  msgid "can't open fd %d: %s\n"
- msgstr "nem�em otvori� `%s': %s\n"
+ msgstr "nemôžem otvoriť `%s': %s\n"
  
 +#: kbx/kbxutil.c:92
  msgid "set debugging flags"
  msgstr ""
  
@@@ -7634,155 -6158,123 +7718,157 @@@
  msgid "enable full debugging"
  msgstr ""
  
 +#: kbx/kbxutil.c:117
  #, fuzzy
  msgid "Usage: kbxutil [options] [files] (-h for help)"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
 +#: kbx/kbxutil.c:120
  #, fuzzy
  msgid ""
  "Syntax: kbxutil [options] [files]\n"
  "List, export, import Keybox data\n"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr ""
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
- msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
+ msgstr "Prosím výberte dôvod na revokáciu:\n"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
- msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
+ msgstr "Prosím výberte dôvod na revokáciu:\n"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, fuzzy, c-format
  msgid "error getting new PIN: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, fuzzy, c-format
  msgid "failed to store the fingerprint: %s\n"
- msgstr "nem�em inicializova� datab�zu d�very: %s\n"
+ msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, fuzzy, c-format
  msgid "failed to store the creation date: %s\n"
- msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
- 
- #: scd/app-openpgp.c:1286
- #, fuzzy, c-format
- msgid "reading public key failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
  
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr ""
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "remove keys from the public keyring"
+ msgid "response does not contain the EC public key\n"
+ msgstr "odstrániť kľúč zo súboru verejných kľúčov"
+ 
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1551
+ #, fuzzy, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr ""
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, fuzzy, c-format
  msgid "verify CHV%d failed: %s\n"
- msgstr "nepodarilo posla� k��� na server: %s\n"
+ msgstr "nepodarilo poslať kľúč na server: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7792,26 -6284,21 +7878,26 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
- msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
+ msgstr "Prosím výberte dôvod na revokáciu:\n"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr ""
@@@ -7819,125 -6306,100 +7905,125 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr ""
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  #, fuzzy
  msgid "error reading application data\n"
- msgstr "chyba pri ��tan� bloku k���a: %s\n"
+ msgstr "chyba pri čítaní bloku kľúča: %s\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  #, fuzzy
  msgid "error reading fingerprint DO\n"
- msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
+ msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  #, fuzzy
  msgid "key already exists\n"
- msgstr "`%s' je u� skomprimovan�\n"
+ msgstr "`%s' je už skomprimovaný\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr ""
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  #, fuzzy
  msgid "generating new key\n"
- msgstr "vytvori� nov� p�r k���ov"
+ msgstr "vytvoriť nový pár kľúčov"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
- msgstr "vytvori� nov� p�r k���ov"
+ msgstr "vytvoriť nový pár kľúčov"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, fuzzy, c-format
  msgid "failed to store the key: %s\n"
- msgstr "nem�em inicializova� datab�zu d�very: %s\n"
+ msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
- msgstr "toto URI nie je podporovan�"
+ msgstr "toto URI nie je podporované"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  #, fuzzy
  msgid "generating key failed\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
- msgstr[0] "Vytvorenie k���a sa nepodarilo: %s\n"
- msgstr[1] "Vytvorenie k���a sa nepodarilo: %s\n"
+ msgstr[0] "Vytvorenie kľúča sa nepodarilo: %s\n"
+ msgstr[1] "Vytvorenie kľúča sa nepodarilo: %s\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, fuzzy, c-format
  msgid "card does not support digest algorithm %s\n"
- msgstr "%s podpis, hashovac� algoritmus %s\n"
+ msgstr "%s podpis, hashovací algoritmus %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, fuzzy, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
- msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
+ msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
  
 +#: scd/app-dinsig.c:299
  #, fuzzy
  msgid "||Please enter your PIN at the reader's pinpad"
- msgstr "zmeni� heslo"
+ msgstr "zmeniť heslo"
  
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
@@@ -7950,35 -6410,28 +8036,35 @@@ msgstr "
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
 +#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
  #, fuzzy
  msgid "|FILE|write a log to FILE"
- msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+ msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
 +#: scd/scdaemon.c:134
  msgid "|N|connect to reader at port N"
  msgstr ""
  
 +#: scd/scdaemon.c:136
  #, fuzzy
  msgid "|NAME|use NAME as ct-API driver"
- msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
+ msgstr "|MENO|použiť MENO ako implicitného adresáta"
  
 +#: scd/scdaemon.c:138
  #, fuzzy
  msgid "|NAME|use NAME as PC/SC driver"
- msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
+ msgstr "|MENO|použiť MENO ako implicitného adresáta"
  
 +#: scd/scdaemon.c:141
  #, fuzzy
  msgid "do not use the internal CCID driver"
- msgstr "v�bec nepou��va� termin�l"
+ msgstr "vôbec nepoužívať terminál"
  
 +#: scd/scdaemon.c:147
  msgid "|N|disconnect the card after N seconds of inactivity"
  msgstr ""
  
@@@ -7986,70 -6438,56 +8072,70 @@@
  msgid "do not use a reader's pinpad"
  msgstr ""
  
 +#: scd/scdaemon.c:155
  #, fuzzy
  msgid "deny the use of admin card commands"
- msgstr "konfliktn� pr�kazy\n"
+ msgstr "konfliktné príkazy\n"
  
 +#: scd/scdaemon.c:158
  msgid "use variable length input for pinpad"
  msgstr ""
  
 +#: scd/scdaemon.c:287
  #, fuzzy
  msgid "Usage: @SCDAEMON@ [options] (-h for help)"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
 +#: scd/scdaemon.c:289
  msgid ""
  "Syntax: scdaemon [options] [command [args]]\n"
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
  
 +#: sm/base64.c:327
  #, fuzzy, c-format
  msgid "invalid radix64 character %02x skipped\n"
- msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
+ msgstr "neplatný znak vo formáte radix64 %02x bol preskočený\n"
  
 +#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
  #, fuzzy
  msgid "no dirmngr running in this session\n"
- msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
+ msgstr "gpg-agent nie je v tomto sedení dostupný\n"
  
 +#: sm/certchain.c:194
  #, c-format
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  #, fuzzy
  msgid "shell"
  msgstr "help"
  
 +#: sm/certchain.c:256 dirmngr/validate.c:107
  #, fuzzy, c-format
  msgid "critical certificate extension %s is not supported"
- msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
+ msgstr "gpg-agent protokol verzie %d nie je podporovaný\n"
  
 +#: sm/certchain.c:295 dirmngr/validate.c:205
  msgid "issuer certificate is not marked as a CA"
  msgstr ""
  
@@@ -8057,224 -6494,174 +8143,224 @@@
  msgid "critical marked policy without configured policies"
  msgstr ""
  
 +#: sm/certchain.c:343
  #, fuzzy, c-format
  msgid "failed to open '%s': %s\n"
- msgstr "nem�em otvori� `%s': %s\n"
+ msgstr "nemôžem otvoriť `%s': %s\n"
  
 +#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
  #, fuzzy
  msgid "Note: non-critical certificate policy not allowed"
- msgstr "zapisujem tajn� k��� do `%s'\n"
+ msgstr "zapisujem tajný kľúč do `%s'\n"
  
 +#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
  #, fuzzy
  msgid "certificate policy not allowed"
- msgstr "zapisujem tajn� k��� do `%s'\n"
+ msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
- msgstr "nem�em inicializova� datab�zu d�very: %s\n"
+ msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
- msgstr "POZN�MKA: k��� bol revokovan�"
+ msgstr "POZNÁMKA: kľúč bol revokovaný"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
- msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
- msgstr "zapisujem tajn� k��� do `%s'\n"
+ msgstr "zapisujem tajný kľúč do `%s'\n"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
- msgstr "Platnos� k���a vypr�ala!"
+ msgstr "Platnosť kľúča vypršala!"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
- msgstr "Platnos� k���a vypr�ala!"
+ msgstr "Platnosť kľúča vypršala!"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
- msgstr "Platnos� k���a vypr�ala!"
+ msgstr "Platnosť kľúča vypršala!"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
- msgstr "Platnos� k���a vypr�ala!"
+ msgstr "Platnosť kľúča vypršala!"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
- msgstr "               nov� podpisy: %lu\n"
+ msgstr "               nové podpisy: %lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
- msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+ msgstr "Revokačný certifikát bol vytvorený.\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr ""
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
- msgstr "vyp�sa� fingerprint"
+ msgstr "vypísať fingerprint"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
- msgstr "vytvori� revoka�n� certifik�t"
+ msgstr "vytvoriť revokačný certifikát"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr ""
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
- msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
- msgstr "verifikova� podpis"
+ msgstr "verifikovať podpis"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
- msgstr "duplicita predvo�by %c%lu\n"
+ msgstr "duplicita predvoľby %c%lu\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
- msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+ msgstr "Revokačný certifikát bol vytvorený.\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8293,12 -6677,10 +8379,12 @@@ msgstr "
  msgid "none"
  msgstr "nie"
  
 +#: sm/certdump.c:552 sm/certdump.c:617
  #, fuzzy
  msgid "[Error - invalid encoding]"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
 +#: sm/certdump.c:560
  msgid "[Error - out of core]"
  msgstr ""
  
@@@ -8306,12 -6687,10 +8392,12 @@@
  msgid "[Error - No name]"
  msgstr ""
  
 +#: sm/certdump.c:623
  #, fuzzy
  msgid "[Error - invalid DN]"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
 +#: sm/certdump.c:833
  #, fuzzy, c-format
  msgid ""
  "Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -8320,20 -6699,17 +8406,20 @@@
  "S/N %s, ID 0x%08lX,\n"
  "created %s, expires %s.\n"
  msgstr ""
- "Potrebujete heslo, aby ste odomkli tajn� k��� pre u��vate�a:\n"
+ "Potrebujete heslo, aby ste odomkli tajný kľúč pre užívateľa:\n"
  "\"%.*s\"\n"
- "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
+ "kľúč s dĺžkou %u bitov, typ %s, ID %08lX, vytvorený %s%s\n"
  
 +#: sm/certlist.c:122 dirmngr/validate.c:1075
  msgid "no key usage specified - assuming all usages\n"
  msgstr ""
  
 +#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1085
  #, fuzzy, c-format
  msgid "error getting key usage information: %s\n"
- msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
+ msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
  
 +#: sm/certlist.c:142 dirmngr/validate.c:1095
  msgid "certificate should not have been used for certification\n"
  msgstr ""
  
@@@ -8357,12 -6728,10 +8443,12 @@@ msgstr "
  msgid "certificate is not usable for signing\n"
  msgstr ""
  
 +#: sm/certreqgen.c:464
  #, fuzzy, c-format
  msgid "line %d: invalid algorithm\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: sm/certreqgen.c:478
  #, c-format
  msgid "line %d: invalid key length %u (valid are %d to %d)\n"
  msgstr ""
@@@ -8372,27 -6740,22 +8458,27 @@@
  msgid "line %d: no subject name given\n"
  msgstr ""
  
 +#: sm/certreqgen.c:505
  #, fuzzy, c-format
  msgid "line %d: invalid subject name label '%.*s'\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: sm/certreqgen.c:508
  #, fuzzy, c-format
  msgid "line %d: invalid subject name '%s' at pos %d\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: sm/certreqgen.c:525
  #, fuzzy, c-format
  msgid "line %d: not a valid email address\n"
- msgstr "Neplatn� e-mailov� adresa\n"
+ msgstr "Neplatná e-mailová adresa\n"
  
 +#: sm/certreqgen.c:544
  #, fuzzy, c-format
  msgid "line %d: invalid serial number\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: sm/certreqgen.c:560
  #, c-format
  msgid "line %d: invalid issuer name label '%.*s'\n"
  msgstr ""
@@@ -8402,52 -6764,42 +8488,52 @@@
  msgid "line %d: invalid issuer name '%s' at pos %d\n"
  msgstr ""
  
 +#: sm/certreqgen.c:575 sm/certreqgen.c:586
  #, fuzzy, c-format
  msgid "line %d: invalid date given\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: sm/certreqgen.c:599
  #, fuzzy, c-format
  msgid "line %d: error getting signing key by keygrip '%s': %s\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
 +#: sm/certreqgen.c:618
  #, fuzzy, c-format
  msgid "line %d: invalid hash algorithm given\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: sm/certreqgen.c:633
  #, fuzzy, c-format
  msgid "line %d: invalid authority-key-id\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: sm/certreqgen.c:648
  #, fuzzy, c-format
  msgid "line %d: invalid subject-key-id\n"
- msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
+ msgstr "kľúč %08lX: neplatná väzba podkľúča\n"
  
 +#: sm/certreqgen.c:686
  #, fuzzy, c-format
  msgid "line %d: invalid extension syntax\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: sm/certreqgen.c:699
  #, fuzzy, c-format
  msgid "line %d: error reading key '%s' from card: %s\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
 +#: sm/certreqgen.c:712
  #, fuzzy, c-format
  msgid "line %d: error getting key by keygrip '%s': %s\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
 +#: sm/certreqgen.c:729
  #, fuzzy, c-format
  msgid "line %d: key generation failed: %s <%s>\n"
- msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+ msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
  
 +#: sm/certreqgen.c:1324
  msgid ""
  "To complete this certificate request please enter the passphrase for the key "
  "you just created once more.\n"
@@@ -8458,111 -6809,90 +8544,111 @@@ msgstr "
  msgid "   (%d) RSA\n"
  msgstr "   (%d) RSA (len na podpis)\n"
  
 +#: sm/certreqgen-ui.c:163
  #, fuzzy, c-format
  msgid "   (%d) Existing key\n"
- msgstr "   (%d) RSA (len na �ifrovanie)\n"
+ msgstr "   (%d) RSA (len na šifrovanie)\n"
  
 +#: sm/certreqgen-ui.c:164
  #, c-format
  msgid "   (%d) Existing key from card\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
  #, fuzzy, c-format
  msgid "error reading the card: %s\n"
- msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
+ msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
  
 +#: sm/certreqgen-ui.c:237
  #, fuzzy, c-format
  msgid "Serial number of the card: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: sm/certreqgen-ui.c:249
  #, fuzzy
  msgid "Available keys:\n"
- msgstr "nastavi� k��� ako neplatn� (disable)"
+ msgstr "nastaviť kľúč ako neplatný (disable)"
  
 +#: sm/certreqgen-ui.c:280
  #, c-format
  msgid "Possible actions for a %s key:\n"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:281
  #, fuzzy, c-format
  msgid "   (%d) sign, encrypt\n"
- msgstr "   (%d) RSA (pro �ifrov�n� a podpis)\n"
+ msgstr "   (%d) RSA (pro šifrování a podpis)\n"
  
 +#: sm/certreqgen-ui.c:282
  #, fuzzy, c-format
  msgid "   (%d) sign\n"
  msgstr "   (%d) DSA (len na podpis)\n"
  
 +#: sm/certreqgen-ui.c:283
  #, fuzzy, c-format
  msgid "   (%d) encrypt\n"
- msgstr "   (%d) RSA (len na �ifrovanie)\n"
+ msgstr "   (%d) RSA (len na šifrovanie)\n"
  
 +#: sm/certreqgen-ui.c:307
  msgid "Enter the X.509 subject name: "
  msgstr ""
  
 +#: sm/certreqgen-ui.c:311
  #, fuzzy
  msgid "No subject name given\n"
- msgstr "(�iadny popis)\n"
+ msgstr "(Žiadny popis)\n"
  
 +#: sm/certreqgen-ui.c:315
  #, fuzzy, c-format
  msgid "Invalid subject name label '%.*s'\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
  #. TRANSLATORS: The 22 in the second string is the
  #. length of the first string up to the "%s".  Please
  #. adjust it do the length of your translation.  The
  #. second string is merely passed to atoi so you can
  #. drop everything after the number.
 +#: sm/certreqgen-ui.c:324
  #, fuzzy, c-format
  msgid "Invalid subject name '%s'\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: sm/certreqgen-ui.c:326
  msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:338
  #, fuzzy
  msgid "Enter email addresses"
- msgstr "E-mailov� adresa: "
+ msgstr "E-mailová adresa: "
  
 +#: sm/certreqgen-ui.c:339
  #, fuzzy
  msgid " (end with an empty line):\n"
  msgstr ""
  "\n"
- "Nap�te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
+ "Napíšte identifikátor užívateľa (user ID). Ukončite prázdnym riadkom: "
  
 +#: sm/certreqgen-ui.c:343
  #, fuzzy
  msgid "Enter DNS names"
- msgstr "Vlo�te nov� n�zov s�boru"
+ msgstr "Vložte nový názov súboru"
  
 +#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
  #, fuzzy
  msgid " (optional; end with an empty line):\n"
- msgstr "Ak chcete, nap�te popis; ukon�ite pr�zdnym riadkom:\n"
+ msgstr "Ak chcete, napíšte popis; ukončite prázdnym riadkom:\n"
  
 +#: sm/certreqgen-ui.c:348
  msgid "Enter URIs"
  msgstr ""
  
 +#: sm/certreqgen-ui.c:355
  #, fuzzy
  msgid "Create self-signed certificate? (y/N) "
- msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
+ msgstr "Vytvoriť pre tento podpis revokačný certifikát? "
  
 +#: sm/certreqgen-ui.c:382
  msgid "These parameters are used:\n"
  msgstr ""
  
@@@ -8574,9 -6902,8 +8660,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Revocation certificate created.\n"
  msgid "Now creating certificate request.  "
- msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+ msgstr "Revokačný certifikát bol vytvorený.\n"
  
 +#: sm/certreqgen-ui.c:403
  msgid "This may take a while ...\n"
  msgstr ""
  
@@@ -8600,282 -6922,224 +8686,282 @@@ msgstr "
  msgid "(this does not seem to be an encrypted message)\n"
  msgstr ""
  
 +#: sm/delete.c:51 sm/delete.c:112
  #, fuzzy, c-format
  msgid "certificate '%s' not found: %s\n"
- msgstr "k��� `%s' nebol n�jden�: %s\n"
+ msgstr "kľúč `%s' nebol nájdený: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
- msgstr "chyba pri ��tan� bloku k���a: %s\n"
+ msgstr "chyba pri čítaní bloku kľúča: %s\n"
  
 +#: sm/delete.c:143
  #, fuzzy, c-format
  msgid "duplicated certificate '%s' deleted\n"
- msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+ msgstr "Revokačný certifikát bol vytvorený.\n"
  
 +#: sm/delete.c:145
  #, fuzzy, c-format
  msgid "certificate '%s' deleted\n"
- msgstr "duplicita predvo�by %c%lu\n"
+ msgstr "duplicita predvoľby %c%lu\n"
  
 +#: sm/delete.c:175
  #, fuzzy, c-format
  msgid "deleting certificate \"%s\" failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: sm/encrypt.c:328
  #, fuzzy
  msgid "no valid recipients given\n"
- msgstr "(�iadny popis)\n"
+ msgstr "(Žiadny popis)\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
- msgstr "vyp�sa� zoznam tajn�ch k���ov"
+ msgstr "vypísať zoznam tajných kľúčov"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr ""
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
- msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
+ msgstr "vytvor výstup zakódovaný pomocou ASCII"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
- msgstr "v�bec nepou��va� termin�l"
+ msgstr "vôbec nepoužívať terminál"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
- msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+ msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
- msgstr "d�vkov� re�im: nikdy sa na ni� nep�ta�"
+ msgstr "dávkový režim: nikdy sa na nič nepýtať"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
- msgstr "automaticky odpoveda� �no na v��inu ot�zok"
+ msgstr "automaticky odpovedať áno na väčšinu otázok"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
- msgstr "automaticky odpoveda� NIE na v��inu ot�zok"
+ msgstr "automaticky odpovedať NIE na väčšinu otázok"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr ""
- "prida� tento s�bor k���ov do zoznamu\n"
- " pou��van�ch s�borov k���ov"
+ "pridať tento súbor kľúčov do zoznamu\n"
+ " používaných súborov kľúčov"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  #, fuzzy
  msgid "|USER-ID|use USER-ID as default secret key"
- msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
+ msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  #, fuzzy
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr ""
- "|PO��TA�|pou�i tento server k���ov na vyh�ad�vanie\n"
- " k���ov"
+ "|POČÍTAČ|použi tento server kľúčov na vyhľadávanie\n"
+ " kľúčov"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
- msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
+ msgstr "|ALG|použiť šifrovací algoritmus ALG"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
- msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
+ msgstr "|ALG|použiť hashovací algoritmus ALG"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
  "Default operation depends on the input data\n"
  msgstr ""
- "Syntax: gpg [mo�nosti] [s�bory]\n"
- "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
- "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
+ "Syntax: gpg [možnosti] [súbory]\n"
+ "podpísať, overiť, šifrovať alebo dešifrovať\n"
+ "implicitné operácie závisia od vstupných dát\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
- msgstr "nem�em sa pripoji� k `%s': %s\n"
+ msgstr "nemôžem sa pripojiť k `%s': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
- msgstr "nezn�my implicitn� adres�t `%s'\n"
+ msgstr "neznámy implicitný adresát `%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
- msgstr "(�iadny popis)\n"
+ msgstr "(Žiadny popis)\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
- msgstr " s = presko�i� tento k���\n"
+ msgstr " s = preskočiť tento kľúč\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, fuzzy
  msgid "could not parse keyserver\n"
- msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
+ msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "zapisujem do '%s'\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
- msgstr "nem�em zavrie� `%s': %s\n"
+ msgstr "nemôžem zavrieť `%s': %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
 +#: sm/import.c:127
  #, fuzzy, c-format
  msgid "total number processed: %lu\n"
- msgstr "Celkovo spracovan�ch k���ov: %lu\n"
+ msgstr "Celkovo spracovaných kľúčov: %lu\n"
  
 +#: sm/import.c:246
  #, fuzzy
  msgid "error storing certificate\n"
- msgstr "vytvori� revoka�n� certifik�t"
+ msgstr "vytvoriť revokačný certifikát"
  
 +#: sm/import.c:254
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: sm/import.c:526 sm/import.c:558
  #, fuzzy, c-format
  msgid "error importing certificate: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: sm/import.c:746 tools/gpg-connect-agent.c:1433
  #, fuzzy, c-format
  msgid "error reading input: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
- msgstr "nem�em inicializova� datab�zu d�very: %s\n"
+ msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, fuzzy, c-format
  msgid "problem re-searching certificate: %s\n"
- msgstr "rev? probl�m overenia revok�cie: %s\n"
+ msgstr "rev? problém overenia revokácie: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: sm/keylist.c:657
  msgid "Error - "
  msgstr ""
  
@@@ -8883,17 -7146,14 +8969,17 @@@
  msgid "GPG_TTY has not been set - using maybe bogus default\n"
  msgstr ""
  
 +#: sm/qualified.c:105
  #, fuzzy, c-format
  msgid "invalid formatted fingerprint in '%s', line %d\n"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
 +#: sm/qualified.c:123
  #, fuzzy, c-format
  msgid "invalid country code in '%s', line %d\n"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
 +#: sm/qualified.c:206
  #, c-format
  msgid ""
  "You are about to create a signature using your certificate:\n"
@@@ -8918,46 -7176,37 +9004,46 @@@ msgid "
  "Note, that this certificate will NOT create a qualified signature!"
  msgstr ""
  
 +#: sm/sign.c:451
  #, fuzzy, c-format
  msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
- msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
+ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
  
 +#: sm/sign.c:465
  #, c-format
  msgid "hash algorithm used for signer %d: %s (%s)\n"
  msgstr ""
  
 +#: sm/sign.c:517
  #, fuzzy, c-format
  msgid "checking for qualified certificate failed: %s\n"
- msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
 +#: sm/verify.c:450
  #, fuzzy
  msgid "Signature made "
- msgstr "Platnos� podpisu vypr�ala %s\n"
+ msgstr "Platnosť podpisu vypršala %s\n"
  
 +#: sm/verify.c:454
  msgid "[date not given]"
  msgstr ""
  
 +#: sm/verify.c:455
  #, fuzzy, c-format
  msgid " using certificate ID 0x%08lX\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: sm/verify.c:474
  msgid ""
  "invalid signature: message digest attribute does not match computed one\n"
  msgstr ""
  
 +#: sm/verify.c:595
  #, fuzzy
  msgid "Good signature from"
- msgstr "Dobr� podpis od \""
+ msgstr "Dobrý podpis od \""
  
 +#: sm/verify.c:596
  #, fuzzy
  msgid "                aka"
  msgstr "                alias \""
@@@ -8967,14 -7215,12 +9053,14 @@@
  msgid "This is a qualified signature\n"
  msgstr ""
  "\n"
- "Ide o podpis k���a n�m sam�m\n"
+ "Ide o podpis kľúča ním samým\n"
  
 +#: dirmngr/certcache.c:106
  #, fuzzy, c-format
  msgid "can't initialize certificate cache lock: %s\n"
- msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
 +#: dirmngr/certcache.c:117
  #, c-format
  msgid "can't acquire read lock on the certificate cache: %s\n"
  msgstr ""
@@@ -8998,29 -7240,24 +9084,29 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't parse certificate '%s': %s\n"
- msgstr "nem�em vytvori� `%s': %s\n"
+ msgstr "nemôžem vytvoriť `%s': %s\n"
  
 +#: dirmngr/certcache.c:395
  #, fuzzy, c-format
  msgid "certificate '%s' already cached\n"
- msgstr "duplicita predvo�by %c%lu\n"
+ msgstr "duplicita predvoľby %c%lu\n"
  
 +#: dirmngr/certcache.c:399
  #, fuzzy, c-format
  msgid "trusted certificate '%s' loaded\n"
- msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+ msgstr "Revokačný certifikát bol vytvorený.\n"
  
 +#: dirmngr/certcache.c:401
  #, fuzzy, c-format
  msgid "certificate '%s' loaded\n"
- msgstr "duplicita predvo�by %c%lu\n"
+ msgstr "duplicita predvoľby %c%lu\n"
  
 +#: dirmngr/certcache.c:405
  #, fuzzy, c-format
  msgid "  SHA1 fingerprint = %s\n"
- msgstr "vyp�sa� fingerprint"
+ msgstr "vypísať fingerprint"
  
 +#: dirmngr/certcache.c:408
  msgid "   issuer ="
  msgstr ""
  
@@@ -9028,132 -7264,106 +9114,132 @@@
  msgid "  subject ="
  msgstr ""
  
 +#: dirmngr/certcache.c:413
  #, fuzzy, c-format
  msgid "error loading certificate '%s': %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/certcache.c:489
  #, fuzzy, c-format
  msgid "permanently loaded certificates: %u\n"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: dirmngr/certcache.c:491
  #, fuzzy, c-format
  msgid "    runtime cached certificates: %u\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/certcache.c:506 dirmngr/dirmngr-client.c:385
  #, fuzzy
  msgid "certificate already cached\n"
- msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+ msgstr "Revokačný certifikát bol vytvorený.\n"
  
 +#: dirmngr/certcache.c:508
  #, fuzzy
  msgid "certificate cached\n"
- msgstr "duplicita predvo�by %c%lu\n"
+ msgstr "duplicita predvoľby %c%lu\n"
  
 +#: dirmngr/certcache.c:510 dirmngr/certcache.c:530
 +#: dirmngr/dirmngr-client.c:389
  #, fuzzy, c-format
  msgid "error caching certificate: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/certcache.c:593
  #, fuzzy, c-format
  msgid "invalid SHA1 fingerprint string '%s'\n"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
 +#: dirmngr/certcache.c:1039 dirmngr/certcache.c:1048
  #, fuzzy, c-format
  msgid "error fetching certificate by S/N: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/certcache.c:1202 dirmngr/certcache.c:1211
  #, fuzzy, c-format
  msgid "error fetching certificate by subject: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/certcache.c:1315 dirmngr/validate.c:455
  #, fuzzy
  msgid "no issuer found in certificate\n"
- msgstr "vytvori� revoka�n� certifik�t"
+ msgstr "vytvoriť revokačný certifikát"
  
 +#: dirmngr/certcache.c:1325
  #, fuzzy, c-format
  msgid "error getting authorityKeyIdentifier: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/crlcache.c:213
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "creating directory '%s'\n"
- msgstr "nem�em vytvori� adres�r `%s': %s\n"
+ msgstr "nemôžem vytvoriť adresár `%s': %s\n"
  
 +#: dirmngr/crlcache.c:217
  #, fuzzy, c-format
  msgid "error creating directory '%s': %s\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
 +#: dirmngr/crlcache.c:245
  #, fuzzy, c-format
  msgid "ignoring database dir '%s'\n"
- msgstr "chyba v p�ti�ke\n"
+ msgstr "chyba v pätičke\n"
  
 +#: dirmngr/crlcache.c:254
  #, fuzzy, c-format
  msgid "error reading directory '%s': %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/crlcache.c:275
  #, fuzzy, c-format
  msgid "removing cache file '%s'\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: dirmngr/crlcache.c:284
  #, fuzzy, c-format
  #| msgid "enarmoring failed: %s\n"
  msgid "not removing file '%s'\n"
- msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
+ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
 +#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
  #, fuzzy, c-format
  msgid "error closing cache file: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
  #, fuzzy, c-format
  msgid "failed to open cache dir file '%s': %s\n"
- msgstr "nem�em otvori� `%s': %s\n"
+ msgstr "nemôžem otvoriť `%s': %s\n"
  
 +#: dirmngr/crlcache.c:421
  #, fuzzy, c-format
  msgid "error creating new cache dir file '%s': %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/crlcache.c:428
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing new cache dir file '%s': %s\n"
- msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
+ msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
  
 +#: dirmngr/crlcache.c:435
  #, fuzzy, c-format
  msgid "error closing new cache dir file '%s': %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/crlcache.c:440
  #, fuzzy, c-format
  #| msgid "new configuration file `%s' created\n"
  msgid "new cache dir file '%s' created\n"
- msgstr "vytvoren� nov� konfigura�n� s�bor `%s'\n"
+ msgstr "vytvorený nový konfiguračný súbor `%s'\n"
  
 +#: dirmngr/crlcache.c:445
  #, fuzzy, c-format
  msgid "failed to re-open cache dir file '%s': %s\n"
- msgstr "nem�em vytvori� adres�r `%s': %s\n"
+ msgstr "nemôžem vytvoriť adresár `%s': %s\n"
  
 +#: dirmngr/crlcache.c:473
  #, c-format
  msgid "first record of '%s' is not the version\n"
  msgstr ""
@@@ -9171,43 -7378,35 +9257,43 @@@ msgstr "
  msgid "extra field detected in crl record of '%s' line %u\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:623
  #, fuzzy, c-format
  msgid "invalid line detected in '%s' line %u\n"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
 +#: dirmngr/crlcache.c:632
  #, fuzzy, c-format
  msgid "duplicate entry detected in '%s' line %u\n"
- msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+ msgstr "Revokačný certifikát bol vytvorený.\n"
  
 +#: dirmngr/crlcache.c:647
  #, c-format
  msgid "unsupported record type in '%s' line %u skipped\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:673
  #, fuzzy, c-format
  msgid "invalid issuer hash in '%s' line %u\n"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
 +#: dirmngr/crlcache.c:679
  #, fuzzy, c-format
  msgid "no issuer DN in '%s' line %u\n"
- msgstr "chyba pri ��tan�: %s\n"
+ msgstr "chyba pri čítaní: %s\n"
  
 +#: dirmngr/crlcache.c:686
  #, fuzzy, c-format
  msgid "invalid timestamp in '%s' line %u\n"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
 +#: dirmngr/crlcache.c:692
  #, fuzzy, c-format
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid "WARNING: invalid cache file hash in '%s' line %u\n"
- msgstr "varovanie: neplatn� ve�kos� random_seed - s�bor nepou�it�\n"
+ msgstr "varovanie: neplatná veľkosť random_seed - súbor nepoužitý\n"
  
 +#: dirmngr/crlcache.c:698
  msgid "detected errors in cache dir file\n"
  msgstr ""
  
@@@ -9215,43 -7413,35 +9301,43 @@@
  msgid "please check the reason and manually delete that file\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
  #, fuzzy, c-format
  msgid "failed to create temporary cache dir file '%s': %s\n"
- msgstr "nem�em vytvori� adres�r `%s': %s\n"
+ msgstr "nemôžem vytvoriť adresár `%s': %s\n"
  
 +#: dirmngr/crlcache.c:937
  #, fuzzy, c-format
  msgid "error closing '%s': %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/crlcache.c:949
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error renaming '%s' to '%s': %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1003
  #, fuzzy, c-format
  msgid "can't hash '%s': %s\n"
- msgstr "nem�em zavrie� `%s': %s\n"
+ msgstr "nemôžem zavrieť `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1011
  #, fuzzy, c-format
  msgid "error setting up MD5 hash context: %s\n"
- msgstr "chyba pri posielan� na `%s': %s\n"
+ msgstr "chyba pri posielaní na `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1027
  #, fuzzy, c-format
  msgid "error hashing '%s': %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1055
  #, fuzzy, c-format
  msgid "invalid formatted checksum for '%s'\n"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
 +#: dirmngr/crlcache.c:1108
  msgid "too many open cache files; can't open anymore\n"
  msgstr ""
  
@@@ -9260,12 -7449,10 +9346,12 @@@
  msgid "opening cache file '%s'\n"
  msgstr "podpisovanie zlyhalo: %s\n"
  
 +#: dirmngr/crlcache.c:1145
  #, fuzzy, c-format
  msgid "error opening cache file '%s': %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/crlcache.c:1154
  #, c-format
  msgid "error initializing cache file '%s' for reading: %s\n"
  msgstr ""
@@@ -9278,18 -7463,15 +9364,18 @@@ msgstr "
  msgid "calling unlock_db_file on an unlocked file\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1231
  #, fuzzy, c-format
  msgid "failed to create a new cache object: %s\n"
- msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
+ msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
  
 +#: dirmngr/crlcache.c:1286
  #, fuzzy, c-format
  #| msgid "No help available for `%s'"
  msgid "no CRL available for issuer id %s\n"
- msgstr "Pomoc nie je dostupn� pre '%s'"
+ msgstr "Pomoc nie je dostupná pre '%s'"
  
 +#: dirmngr/crlcache.c:1293
  #, c-format
  msgid "cached CRL for issuer id %s too old; update required\n"
  msgstr ""
@@@ -9320,12 -7497,10 +9406,12 @@@ msgstr "
  msgid "WARNING: invalid cache record length for S/N "
  msgstr ""
  
 +#: dirmngr/crlcache.c:1357
  #, fuzzy, c-format
  msgid "problem reading cache record for S/N %s: %s\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+ msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
  
 +#: dirmngr/crlcache.c:1360
  #, c-format
  msgid "S/N %s is not valid; reason=%02X  date=%.15s\n"
  msgstr ""
@@@ -9335,18 -7509,15 +9421,18 @@@
  msgid "S/N %s is valid, it is not listed in the CRL\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1379
  #, fuzzy, c-format
  msgid "error getting data from cache file: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/crlcache.c:1542 dirmngr/validate.c:878
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "unknown hash algorithm '%s'\n"
- msgstr "neplatn� hashovac� algoritmus `%s'\n"
+ msgstr "neplatný hashovací algoritmus `%s'\n"
  
 +#: dirmngr/crlcache.c:1549
  #, c-format
  msgid "gcry_md_open for algorithm %d failed: %s\n"
  msgstr ""
@@@ -9355,30 -7525,25 +9441,30 @@@
  #, fuzzy
  #| msgid "invalid response from agent\n"
  msgid "got an invalid S-expression from libksba\n"
- msgstr "neplatn� reakcia od agenta\n"
+ msgstr "neplatná reakcia od agenta\n"
  
 +#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
  #, fuzzy, c-format
  msgid "converting S-expression failed: %s\n"
- msgstr "nemo�no otvori� s�bor: %s\n"
+ msgstr "nemožno otvoriť súbor: %s\n"
  
 +#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:421
  #, fuzzy, c-format
  msgid "creating S-expression failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: dirmngr/crlcache.c:1699
  #, fuzzy, c-format
  #| msgid "build_packet failed: %s\n"
  msgid "ksba_crl_parse failed: %s\n"
  msgstr "build_packet zlyhala: %s\n"
  
 +#: dirmngr/crlcache.c:1714
  #, fuzzy, c-format
  msgid "error getting update times of CRL: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/crlcache.c:1721
  #, c-format
  msgid "update times of this CRL: this=%s next=%s\n"
  msgstr ""
@@@ -9387,22 -7551,18 +9473,22 @@@
  msgid "nextUpdate not given; assuming a validity period of one day\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:1745
  #, fuzzy, c-format
  msgid "error getting CRL item: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/crlcache.c:1760
  #, fuzzy, c-format
  msgid "error inserting item into temporary cache file: %s\n"
  msgstr "zapisujem do '%s'\n"
  
 +#: dirmngr/crlcache.c:1787
  #, fuzzy, c-format
  msgid "no CRL issuer found in CRL: %s\n"
- msgstr "vytvori� revoka�n� certifik�t"
+ msgstr "vytvoriť revokačný certifikát"
  
 +#: dirmngr/crlcache.c:1802
  msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
  msgstr ""
  
@@@ -9410,55 -7569,45 +9496,55 @@@
  #, fuzzy, c-format
  #| msgid "signature verification suppressed\n"
  msgid "CRL signature verification failed: %s\n"
- msgstr "verifik�cia podpisu potla�en�\n"
+ msgstr "verifikácia podpisu potlačená\n"
  
 +#: dirmngr/crlcache.c:1858
  #, fuzzy, c-format
  msgid "error checking validity of CRL issuer certificate: %s\n"
- msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
 +#: dirmngr/crlcache.c:2001
  #, fuzzy, c-format
  msgid "ksba_crl_new failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: dirmngr/crlcache.c:2008
  #, fuzzy, c-format
  msgid "ksba_crl_set_reader failed: %s\n"
- msgstr "aktualiz�cia zlyhala: %s\n"
+ msgstr "aktualizácia zlyhala: %s\n"
  
 +#: dirmngr/crlcache.c:2042
  #, fuzzy, c-format
  msgid "removed stale temporary cache file '%s'\n"
- msgstr "nem�em vytvori� adres�r `%s': %s\n"
+ msgstr "nemôžem vytvoriť adresár `%s': %s\n"
  
 +#: dirmngr/crlcache.c:2046
  #, fuzzy, c-format
  msgid "problem removing stale temporary cache file '%s': %s\n"
- msgstr "nem�em vytvori� adres�r `%s': %s\n"
+ msgstr "nemôžem vytvoriť adresár `%s': %s\n"
  
 +#: dirmngr/crlcache.c:2056
  #, fuzzy, c-format
  msgid "error creating temporary cache file '%s': %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/crlcache.c:2066
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "crl_parse_insert failed: %s\n"
- msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
+ msgstr "aktualizácia tajného kľúča zlyhala: %s\n"
  
 +#: dirmngr/crlcache.c:2076
  #, fuzzy, c-format
  msgid "error finishing temporary cache file '%s': %s\n"
  msgstr "zapisujem do '%s'\n"
  
 +#: dirmngr/crlcache.c:2083
  #, fuzzy, c-format
  msgid "error closing temporary cache file '%s': %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/crlcache.c:2108
  #, c-format
  msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
  msgstr ""
@@@ -9473,22 -7620,18 +9559,22 @@@ msgstr "
  msgid "unknown critical CRL extension %s\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:2138
  #, fuzzy, c-format
  msgid "error reading CRL extensions: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/crlcache.c:2189
  #, fuzzy, c-format
  msgid "creating cache file '%s'\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/crlcache.c:2221
  #, fuzzy, c-format
  msgid "problem renaming '%s' to '%s': %s\n"
- msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
+ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
 +#: dirmngr/crlcache.c:2235
  msgid ""
  "updating the DIR file failed - cache entry will get lost with the next "
  "program start\n"
@@@ -9522,43 -7659,35 +9608,43 @@@ msgstr "
  #, fuzzy
  #| msgid "WARNING: invalid size of random_seed file - not used\n"
  msgid " WARNING: invalid cache record length\n"
- msgstr "varovanie: neplatn� ve�kos� random_seed - s�bor nepou�it�\n"
+ msgstr "varovanie: neplatná veľkosť random_seed - súbor nepoužitý\n"
  
 +#: dirmngr/crlcache.c:2333
  #, fuzzy, c-format
  msgid "problem reading cache record: %s\n"
- msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
+ msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
  
 +#: dirmngr/crlcache.c:2344
  #, fuzzy, c-format
  msgid "problem reading cache key: %s\n"
- msgstr "rev? probl�m overenia revok�cie: %s\n"
+ msgstr "rev? problém overenia revokácie: %s\n"
  
 +#: dirmngr/crlcache.c:2375
  #, fuzzy, c-format
  msgid "error reading cache entry from db: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/crlcache.c:2378
  msgid "End CRL dump\n"
  msgstr ""
  
 +#: dirmngr/crlcache.c:2499
  #, fuzzy, c-format
  msgid "crl_fetch via DP failed: %s\n"
- msgstr "aktualiz�cia zlyhala: %s\n"
+ msgstr "aktualizácia zlyhala: %s\n"
  
 +#: dirmngr/crlcache.c:2510
  #, fuzzy, c-format
  msgid "crl_cache_insert via DP failed: %s\n"
- msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
 +#: dirmngr/crlcache.c:2570
  #, fuzzy, c-format
  msgid "crl_cache_insert via issuer failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: dirmngr/crlfetch.c:74
  msgid "reader to file mapping table full - waiting\n"
  msgstr ""
  
@@@ -9577,40 -7701,32 +9663,40 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing reader object: %s\n"
- msgstr "%s: chyba pri z�pise adres�rov�ho z�znamu: %s\n"
+ msgstr "%s: chyba pri zápise adresárového záznamu: %s\n"
  
 +#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
  #, c-format
  msgid "URL '%s' redirected to '%s' (%u)\n"
  msgstr ""
  
 +#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
  #, fuzzy
  msgid "too many redirections\n"
- msgstr "pr�li� ve�a `%c' predvolieb\n"
+ msgstr "príliš veľa `%c' predvolieb\n"
  
 +#: dirmngr/crlfetch.c:274
  #, fuzzy, c-format
  msgid "error retrieving '%s': %s\n"
- msgstr "chyba pri vytv�ran� `%s': %s\n"
+ msgstr "chyba pri vytváraní `%s': %s\n"
  
 +#: dirmngr/crlfetch.c:279
  #, fuzzy, c-format
  msgid "error retrieving '%s': http status %u\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
 +#: dirmngr/crlfetch.c:381
  #, fuzzy
  msgid "CRL access not possible due to Tor mode\n"
- msgstr "k��� `%s' nebol n�jden�: %s\n"
+ msgstr "kľúč `%s' nebol nájdený: %s\n"
  
 +#: dirmngr/crlfetch.c:386
  #, fuzzy, c-format
  msgid "certificate search not possible due to disabled %s\n"
- msgstr "k��� `%s' nebol n�jden�: %s\n"
+ msgstr "kľúč `%s' nebol nájdený: %s\n"
  
 +#: dirmngr/dirmngr-client.c:71
  msgid "use OCSP instead of CRLs"
  msgstr ""
  
@@@ -9618,27 -7733,22 +9704,27 @@@
  msgid "check whether a dirmngr is running"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:73
  #, fuzzy
  msgid "add a certificate to the cache"
- msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+ msgstr "Revokačný certifikát bol vytvorený.\n"
  
 +#: dirmngr/dirmngr-client.c:74
  #, fuzzy
  msgid "validate a certificate"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: dirmngr/dirmngr-client.c:75
  #, fuzzy
  msgid "lookup a certificate"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: dirmngr/dirmngr-client.c:76
  #, fuzzy
  msgid "lookup only locally stored certificates"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: dirmngr/dirmngr-client.c:77
  msgid "expect an URL for --lookup"
  msgstr ""
  
@@@ -9650,24 -7758,20 +9736,24 @@@ msgstr "
  msgid "special mode for use by Squid"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:80
  #, fuzzy
  msgid "expect certificates in PEM format"
- msgstr "nespr�vny certifik�t"
+ msgstr "nesprávny certifikát"
  
 +#: dirmngr/dirmngr-client.c:82
  #, fuzzy
  #| msgid "Enter the user ID of the designated revoker: "
  msgid "force the use of the default OCSP responder"
- msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
+ msgstr "Vložte identifikátor užívateľa povereného revokáciou: "
  
 +#: dirmngr/dirmngr-client.c:169
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
 +#: dirmngr/dirmngr-client.c:173
  msgid ""
  "Syntax: dirmngr-client [options] [certfile|pattern]\n"
  "Test an X.509 certificate against a CRL or do an OCSP check\n"
@@@ -9675,17 -7779,14 +9761,17 @@@
  "not valid and other error codes for general failures\n"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
  #, fuzzy, c-format
  msgid "error reading certificate from stdin: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/dirmngr-client.c:281
  #, fuzzy, c-format
  msgid "error reading certificate from '%s': %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:295
  msgid "certificate too large to make any sense\n"
  msgstr ""
  
@@@ -9693,63 -7793,52 +9779,63 @@@
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to the dirmngr: %s\n"
- msgstr "nem�em sa pripoji� k `%s': %s\n"
+ msgstr "nemôžem sa pripojiť k `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:332
  #, fuzzy, c-format
  #| msgid "update failed: %s\n"
  msgid "lookup failed: %s\n"
- msgstr "aktualiz�cia zlyhala: %s\n"
+ msgstr "aktualizácia zlyhala: %s\n"
  
 +#: dirmngr/dirmngr-client.c:347
  #, fuzzy, c-format
  msgid "loading CRL '%s' failed: %s\n"
- msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
+ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
 +#: dirmngr/dirmngr-client.c:375
  msgid "a dirmngr daemon is up and running\n"
  msgstr ""
  
 +#: dirmngr/dirmngr-client.c:397
  #, fuzzy, c-format
  msgid "validation of certificate failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
  #, fuzzy
  msgid "certificate is valid\n"
- msgstr "duplicita predvo�by %c%lu\n"
+ msgstr "duplicita predvoľby %c%lu\n"
  
 +#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
  #, fuzzy
  msgid "certificate has been revoked\n"
- msgstr "POZN�MKA: k��� bol revokovan�"
+ msgstr "POZNÁMKA: kľúč bol revokovaný"
  
 +#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
  #, fuzzy, c-format
  msgid "certificate check failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: dirmngr/dirmngr-client.c:428
  #, fuzzy, c-format
  #| msgid "can't stat `%s': %s\n"
  msgid "got status: '%s'\n"
- msgstr "nem�em pou�i� pr�kaz stat na `%s': %s\n"
+ msgstr "nemôžem použiť príkaz stat na `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:443
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error writing base64 encoding: %s\n"
- msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
+ msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
  
 +#: dirmngr/dirmngr-client.c:701
  #, fuzzy, c-format
  msgid "unsupported inquiry '%s'\n"
  msgstr ""
  "\n"
- "Podporovan� algoritmy:\n"
+ "Podporované algoritmy:\n"
  
 +#: dirmngr/dirmngr-client.c:803
  msgid "absolute file name expected\n"
  msgstr ""
  
@@@ -9758,112 -7846,88 +9844,116 @@@
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
- msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+ msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  msgid "run without asking a user"
- msgstr "Ukon�i� bez ulo�enia? "
+ msgstr "Ukončiť bez uloženia? "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
- msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+ msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
- msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
+ msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9874,94 -7938,75 +9964,94 @@@ msgid "
  "options)\n"
  msgstr ""
  "@\n"
- "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
- "mo�nost�)\n"
+ "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
+ "možností)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
- msgstr "pou�itie: gpg [mo�nosti] "
+ msgstr "použitie: gpg [možnosti] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
- msgstr "Nie je dovolen� pou��va� %s s %s!\n"
+ msgstr "Nie je dovolené používať %s s %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
- msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
+ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
- msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
+ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
- msgstr "riadok je pr�li� dlh�\n"
+ msgstr "riadok je príliš dlhý\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
- msgstr "chyba: neplatn� odtla�ok\n"
+ msgstr "chyba: neplatný odtlačok\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  msgid "%s:%u: read error: %s\n"
- msgstr "chyba pri ��tan�: %s\n"
+ msgstr "chyba pri čítaní: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  msgid "shutdown forced\n"
- msgstr "nespracovan�"
+ msgstr "nespracované"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -9978,9 -8020,8 +10068,9 @@@ msgstr "
  #, fuzzy
  #| msgid "|NAME|set terminal charset to NAME"
  msgid "|NAME|connect to host NAME"
- msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
+ msgstr "|MENO|nastav znakovú sadu terminálu na MENO"
  
 +#: dirmngr/dirmngr_ldap.c:143
  msgid "|N|connect to port N"
  msgstr ""
  
@@@ -9988,9 -8028,8 +10078,9 @@@
  #, fuzzy
  #| msgid "|NAME|use NAME as default recipient"
  msgid "|NAME|use user NAME for authentication"
- msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
+ msgstr "|MENO|použiť MENO ako implicitného adresáta"
  
 +#: dirmngr/dirmngr_ldap.c:145
  msgid "|PASS|use password PASS for authentication"
  msgstr ""
  
@@@ -10014,9 -8048,8 +10104,9 @@@ msgstr "
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
 +#: dirmngr/dirmngr_ldap.c:212
  msgid ""
  "Syntax: dirmngr_ldap [options] [URL]\n"
  "Internal LDAP helper for Dirmngr\n"
@@@ -10027,31 -8059,24 +10117,31 @@@ msgstr "
  #, fuzzy, c-format
  #| msgid "invalid import options\n"
  msgid "invalid port number %d\n"
- msgstr "neplatn� parameter pre import\n"
+ msgstr "neplatný parameter pre import\n"
  
 +#: dirmngr/dirmngr_ldap.c:413
  #, c-format
  msgid "scanning result for attribute '%s'\n"
  msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
 +#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
 +#: dirmngr/dirmngr_ldap.c:677
  #, fuzzy, c-format
  msgid "error writing to stdout: %s\n"
- msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
+ msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:437
  #, c-format
  msgid "          available attribute '%s'\n"
  msgstr ""
  
 +#: dirmngr/dirmngr_ldap.c:475
  #, fuzzy, c-format
  msgid "attribute '%s' not found\n"
- msgstr "k��� `%s' nebol n�jden�: %s\n"
+ msgstr "kľúč `%s' nebol nájdený: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:482
  #, c-format
  msgid "found attribute '%s'\n"
  msgstr ""
@@@ -10060,15 -8084,13 +10150,15 @@@
  #, fuzzy, c-format
  #| msgid "reading from `%s'\n"
  msgid "processing url '%s'\n"
- msgstr "��tam z `%s'\n"
+ msgstr "čítam z `%s'\n"
  
 +#: dirmngr/dirmngr_ldap.c:593
  #, fuzzy, c-format
  #| msgid "          w/o user IDs: %lu\n"
  msgid "          user '%s'\n"
- msgstr "        bez identifik�torov: %lu\n"
+ msgstr "        bez identifikátorov: %lu\n"
  
 +#: dirmngr/dirmngr_ldap.c:595
  #, fuzzy, c-format
  msgid "          pass '%s'\n"
  msgstr "                alias \""
@@@ -10082,9 -8102,8 +10172,9 @@@ msgstr "                alias \"
  #, fuzzy, c-format
  #| msgid "          not imported: %lu\n"
  msgid "          port %d\n"
- msgstr "           neimportovan�: %lu\n"
+ msgstr "           neimportované: %lu\n"
  
 +#: dirmngr/dirmngr_ldap.c:600
  #, fuzzy, c-format
  msgid "            DN '%s'\n"
  msgstr "                alias \""
@@@ -10099,12 -8116,10 +10189,12 @@@ msgstr "
  msgid "          attr '%s'\n"
  msgstr "                alias \""
  
 +#: dirmngr/dirmngr_ldap.c:616
  #, fuzzy, c-format
  msgid "no host name in '%s'\n"
- msgstr "(�iadny popis)\n"
+ msgstr "(Žiadny popis)\n"
  
 +#: dirmngr/dirmngr_ldap.c:621
  #, c-format
  msgid "no attribute given for query '%s'\n"
  msgstr ""
@@@ -10113,56 -8127,41 +10203,50 @@@
  #, fuzzy
  #| msgid "WARNING: using insecure memory!\n"
  msgid "WARNING: using first attribute only\n"
- msgstr "VAROVANIE: Pou��van� pam� nie je bezpe�n�!\n"
+ msgstr "VAROVANIE: Používaná pamäť nie je bezpečná!\n"
  
 +#: dirmngr/dirmngr_ldap.c:636
  #, fuzzy, c-format
  msgid "LDAP init to '%s:%d' failed: %s\n"
- msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
+ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:659
  #, fuzzy, c-format
  msgid "binding to '%s:%d' failed: %s\n"
- msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
+ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:686
  #, fuzzy, c-format
  #| msgid "dearmoring failed: %s\n"
  msgid "searching '%s' failed: %s\n"
- msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
+ msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
  
 +#: dirmngr/dirmngr_ldap.c:718
  #, fuzzy, c-format
  msgid "'%s' is not an LDAP URL\n"
- msgstr "\"%s\" nie je s�bor JPEG\n"
+ msgstr "\"%s\" nie je súbor JPEG\n"
  
 +#: dirmngr/dirmngr_ldap.c:724
  #, c-format
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
- msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
+ msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
  
 +#: dirmngr/ldap-wrapper.c:236
  #, fuzzy, c-format
  msgid "error reading log from ldap wrapper %d: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/ldap-wrapper.c:304
  #, fuzzy, c-format
  msgid "npth_select failed: %s - waiting 1s\n"
- msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
+ msgstr "aktualizácia tajného kľúča zlyhala: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:343
  #, c-format
  msgid "ldap wrapper %d ready"
  msgstr ""
@@@ -10177,12 -8174,10 +10261,12 @@@ msgstr "
  msgid "ldap wrapper %d ready: exitcode=%d\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:364
  #, fuzzy, c-format
  msgid "waiting for ldap wrapper %d failed: %s\n"
- msgstr "aktualiz�cia zlyhala: %s\n"
+ msgstr "aktualizácia zlyhala: %s\n"
  
 +#: dirmngr/ldap-wrapper.c:376
  #, c-format
  msgid "ldap wrapper %d stalled - killing\n"
  msgstr ""
@@@ -10192,27 -8186,22 +10276,27 @@@
  msgid "error spawning ldap wrapper reaper thread: %s\n"
  msgstr ""
  
 +#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
  #, fuzzy, c-format
  msgid "reading from ldap wrapper %d failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: dirmngr/ldap.c:91
  #, c-format
  msgid "invalid char 0x%02x in host name - not added\n"
  msgstr ""
  
 +#: dirmngr/ldap.c:95
  #, fuzzy, c-format
  msgid "adding '%s:%d' to the ldap server list\n"
- msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
+ msgstr "vyhľadávam \"%s\" na HKP serveri %s\n"
  
 +#: dirmngr/ldap.c:98 dirmngr/misc.c:502
  #, fuzzy, c-format
  msgid "malloc failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: dirmngr/ldap.c:627
  #, c-format
  msgid "start_cert_fetch: invalid pattern '%s'\n"
  msgstr ""
@@@ -10225,83 -8212,67 +10309,83 @@@ msgstr "
  #, fuzzy
  #| msgid "%s: invalid file version %d\n"
  msgid "invalid canonical S-expression found\n"
- msgstr "%s: neplatn� verzia s�boru %d\n"
+ msgstr "%s: neplatná verzia súboru %d\n"
  
 +#: dirmngr/misc.c:194 dirmngr/misc.c:228
  #, fuzzy, c-format
  msgid "gcry_md_open failed: %s\n"
- msgstr "nemo�no otvori� s�bor: %s\n"
+ msgstr "nemožno otvoriť súbor: %s\n"
  
 +#: dirmngr/misc.c:199 dirmngr/misc.c:233
  #, fuzzy, c-format
  #| msgid "update secret failed: %s\n"
  msgid "oops: ksba_cert_hash failed: %s\n"
- msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
+ msgstr "aktualizácia tajného kľúča zlyhala: %s\n"
  
 +#: dirmngr/misc.c:518
  msgid "bad URL encoding detected\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:80
  #, fuzzy, c-format
  msgid "error reading from responder: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/ocsp.c:98
  #, c-format
  msgid "response from server too large; limit is %d bytes\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:139
  #, fuzzy
  msgid "OCSP request not possible due to Tor mode\n"
- msgstr "k��� `%s' nebol n�jden�: %s\n"
+ msgstr "kľúč `%s' nebol nájdený: %s\n"
  
 +#: dirmngr/ocsp.c:145
  msgid "OCSP request not possible due to disabled HTTP\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:152
  #, fuzzy, c-format
  msgid "error setting OCSP target: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/ocsp.c:170
  #, fuzzy, c-format
  msgid "error building OCSP request: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/ocsp.c:181
  #, fuzzy, c-format
  msgid "error connecting to '%s': %s\n"
- msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
+ msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
  
 +#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
  #, fuzzy, c-format
  msgid "error reading HTTP response for '%s': %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/ocsp.c:240
  #, fuzzy, c-format
  msgid "error accessing '%s': http status %u\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: dirmngr/ocsp.c:265
  #, fuzzy, c-format
  msgid "error parsing OCSP response for '%s': %s\n"
- msgstr "chyba pri posielan� na `%s': %s\n"
+ msgstr "chyba pri posielaní na `%s': %s\n"
  
 +#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
  #, c-format
  msgid "OCSP responder at '%s' status: %s\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:293
  #, fuzzy, c-format
  msgid "hashing the OCSP response for '%s' failed: %s\n"
- msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
 +#: dirmngr/ocsp.c:328
  msgid "not signed by a default OCSP signer's certificate"
  msgstr ""
  
@@@ -10309,46 -8279,37 +10393,46 @@@
  msgid "only SHA-1 is supported for OCSP responses\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:464
  #, fuzzy, c-format
  msgid "allocating list item failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: dirmngr/ocsp.c:479
  #, fuzzy, c-format
  msgid "error getting responder ID: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/ocsp.c:514
  msgid "no suitable certificate found to verify the OCSP response\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:553 dirmngr/validate.c:619
  #, fuzzy, c-format
  msgid "issuer certificate not found: %s\n"
- msgstr "k��� `%s' nebol n�jden�: %s\n"
+ msgstr "kľúč `%s' nebol nájdený: %s\n"
  
 +#: dirmngr/ocsp.c:563
  msgid "caller did not return the target certificate\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:570
  #, fuzzy
  msgid "caller did not return the issuing certificate\n"
- msgstr "vytvori� revoka�n� certifik�t"
+ msgstr "vytvoriť revokačný certifikát"
  
 +#: dirmngr/ocsp.c:580
  #, fuzzy, c-format
  msgid "failed to allocate OCSP context: %s\n"
- msgstr "nem�em inicializova� datab�zu d�very: %s\n"
+ msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
 +#: dirmngr/ocsp.c:614
  #, fuzzy, c-format
  #| msgid "%s: can't access: %s\n"
  msgid "can't get authorityInfoAccess: %s\n"
- msgstr "%s: nem�em pristupova� k: %s\n"
+ msgstr "%s: nemôžem pristupovať k: %s\n"
  
 +#: dirmngr/ocsp.c:621
  msgid "no default OCSP responder defined\n"
  msgstr ""
  
@@@ -10356,9 -8316,8 +10440,9 @@@
  #, fuzzy
  #| msgid "no default secret keyring: %s\n"
  msgid "no default OCSP signer defined\n"
- msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
+ msgstr "nie je nastavený implicitný súbor tajných kľúčov %s\n"
  
 +#: dirmngr/ocsp.c:634
  #, c-format
  msgid "using default OCSP responder '%s'\n"
  msgstr ""
@@@ -10367,19 -8325,16 +10451,19 @@@
  #, fuzzy, c-format
  #| msgid "using cipher %s\n"
  msgid "using OCSP responder '%s'\n"
- msgstr "pou�it� �ifra %s\n"
+ msgstr "použitá šifra %s\n"
  
 +#: dirmngr/ocsp.c:646
  #, c-format
  msgid "failed to establish a hashing context for OCSP: %s\n"
  msgstr ""
  
 +#: dirmngr/ocsp.c:676
  #, fuzzy, c-format
  msgid "error getting OCSP status for target certificate: %s\n"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: dirmngr/ocsp.c:701
  #, c-format
  msgid "certificate status is: %s  (this=%s  next=%s)\n"
  msgstr ""
@@@ -10388,12 -8342,10 +10472,12 @@@
  msgid "good"
  msgstr ""
  
 +#: dirmngr/ocsp.c:708
  #, fuzzy, c-format
  msgid "certificate has been revoked at: %s due to: %s\n"
- msgstr "POZN�MKA: k��� bol revokovan�"
+ msgstr "POZNÁMKA: kľúč bol revokovaný"
  
 +#: dirmngr/ocsp.c:743
  msgid "OCSP responder returned a status in the future\n"
  msgstr ""
  
@@@ -10405,77 -8355,61 +10489,77 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "podpisovanie zlyhalo: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "podpisovanie zlyhalo: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
- msgstr "chyba pri posielan� na `%s': %s\n"
+ msgstr "chyba pri posielaní na `%s': %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
- msgstr "nem�em vytvori� `%s': %s\n"
+ msgstr "nemôžem vytvoriť `%s': %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
- msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
+ msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
- msgstr "nem�em inicializova� datab�zu d�very: %s\n"
+ msgstr "nemôžem inicializovať databázu dôvery: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  msgid "failed to the register commands with Assuan: %s\n"
- msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
+ msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10489,46 -8421,37 +10573,46 @@@ msgstr "
  #, fuzzy
  #| msgid "checking the trustdb\n"
  msgid "CRL checking too deeply nested\n"
- msgstr "kontrolujem datab�zu d�very\n"
+ msgstr "kontrolujem databázu dôvery\n"
  
 +#: dirmngr/validate.c:245
  msgid "not checking CRL for"
  msgstr ""
  
 +#: dirmngr/validate.c:250
  #, fuzzy
  msgid "checking CRL for"
- msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
 +#: dirmngr/validate.c:528
  #, fuzzy
  msgid "selfsigned certificate has a BAD signature"
- msgstr "verifikova� podpis"
+ msgstr "verifikovať podpis"
  
 +#: dirmngr/validate.c:561
  #, fuzzy, c-format
  msgid "checking trustworthiness of root certificate failed: %s\n"
- msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
  
 +#: dirmngr/validate.c:738
  #, fuzzy
  msgid "certificate chain is good\n"
- msgstr "duplicita predvo�by %c%lu\n"
+ msgstr "duplicita predvoľby %c%lu\n"
  
 +#: dirmngr/validate.c:968
  msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
+ msgstr "DSA požaduje použitie 160 bitového hashovacieho algoritmu\n"
  
 +#: dirmngr/validate.c:1116
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
- msgstr "ukon�i�"
+ msgstr "ukončiť"
  
 +#: tools/gpg-connect-agent.c:79
  msgid "print data out hex encoded"
  msgstr ""
  
@@@ -10556,21 -8473,17 +10640,21 @@@ msgstr "
  msgid "do not use extended connect mode"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:92
  #, fuzzy
  msgid "|FILE|run commands from FILE on startup"
- msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+ msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
  
 +#: tools/gpg-connect-agent.c:93
  msgid "run /subst on startup"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:205
  #, fuzzy
  msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
 +#: tools/gpg-connect-agent.c:208
  msgid ""
  "Syntax: @GPG at -connect-agent [options]\n"
  "Connect to a running agent and send commands\n"
@@@ -10587,37 -8497,29 +10671,37 @@@ msgstr "
  msgid "option \"%s\" ignored due to \"%s\"\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
  #, fuzzy, c-format
  msgid "receiving line failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: tools/gpg-connect-agent.c:1458
  #, fuzzy
  msgid "line too long - skipped\n"
- msgstr "riadok je pr�li� dlh�\n"
+ msgstr "riadok je príliš dlhý\n"
  
 +#: tools/gpg-connect-agent.c:1462
  msgid "line shortened due to embedded Nul character\n"
  msgstr ""
  
 +#: tools/gpg-connect-agent.c:1837
  #, fuzzy, c-format
  msgid "unknown command '%s'\n"
- msgstr "nezn�my implicitn� adres�t `%s'\n"
+ msgstr "neznámy implicitný adresát `%s'\n"
  
 +#: tools/gpg-connect-agent.c:1855
  #, fuzzy, c-format
  msgid "sending line failed: %s\n"
  msgstr "podpisovanie zlyhalo: %s\n"
  
 +#: tools/gpg-connect-agent.c:2251
  #, fuzzy, c-format
  msgid "error sending standard options: %s\n"
- msgstr "chyba pri posielan� na `%s': %s\n"
+ msgstr "chyba pri posielaní na `%s': %s\n"
  
 +#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
 +#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
  msgid "Options controlling the diagnostic output"
  msgstr ""
  
@@@ -10667,43 -8556,34 +10751,43 @@@ msgstr "
  msgid "|FILE|check new passphrases against pattern in FILE"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:579
  #, fuzzy
  msgid "|N|expire the passphrase after N days"
- msgstr "|N|pou�i� m�d hesla N"
+ msgstr "|N|použiť mód hesla N"
  
 +#: tools/gpgconf-comp.c:583
  #, fuzzy
  msgid "do not allow the reuse of old passphrases"
- msgstr "chyba pri vytv�ran� hesla: %s\n"
+ msgstr "chyba pri vytváraní hesla: %s\n"
  
 +#: tools/gpgconf-comp.c:587
  msgid "|N|set the Pinentry timeout to N seconds"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
  msgid "|NAME|use NAME as default secret key"
- msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
+ msgstr "|MENO|použi MENO ako implicitný tajný kľúč"
  
 +#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
  #, fuzzy
  msgid "|NAME|encrypt to user ID NAME as well"
- msgstr "|MENO|�ifrova� pre MENO"
+ msgstr "|MENO|šifrovať pre MENO"
  
 +#: tools/gpgconf-comp.c:704
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
- msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
+ msgstr "nemožno použiť URI servera kľúčov - chyba analýzy URI\n"
  
 +#: tools/gpgconf-comp.c:735
  msgid "allow PKA lookups (DNS requests)"
  msgstr ""
  
@@@ -10715,12 -8593,10 +10799,12 @@@ msgstr "
  msgid "disable all access to the dirmngr"
  msgstr ""
  
 +#: tools/gpgconf-comp.c:790
  #, fuzzy
  msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
- msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG pre hesl�"
+ msgstr "|ALG|použiť šifrovací algoritmus ALG pre heslá"
  
 +#: tools/gpgconf-comp.c:820
  msgid "do not check CRLs for root certificates"
  msgstr ""
  
@@@ -10732,182 -8606,149 +10816,190 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "chyba siete"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
- msgstr "nespr�vne heslo"
+ msgid "Passphrase Entry"
+ msgstr "nesprávne heslo"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
- msgstr "verejn� k��� nen�jden�"
+ msgstr "verejný kľúč nenájdený"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
- msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
+ msgstr "neznáma položka konfigurácie \"%s\"\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
- msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
+ msgstr "neznáma položka konfigurácie \"%s\"\n"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "aktualizovať databázu dôvery"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
- msgstr "pou�i� ako v�stupn� s�bor"
+ msgstr "použiť ako výstupný súbor"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
- msgstr "verejn� k��� nen�jden�"
+ msgstr "verejný kľúč nenájdený"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  #, fuzzy
  msgid "No argument allowed"
- msgstr "zapisujem tajn� k��� do `%s'\n"
+ msgstr "zapisujem tajný kľúč do `%s'\n"
  
 +#: tools/symcryptrun.c:154
  #, fuzzy
  msgid ""
  "@\n"
  "Commands:\n"
  " "
  msgstr ""
- "@Pr�kazy:\n"
+ "@Príkazy:\n"
  " "
  
 +#: tools/symcryptrun.c:156
  #, fuzzy
  msgid "decryption modus"
- msgstr "de�ifrovanie o.k.\n"
+ msgstr "dešifrovanie o.k.\n"
  
 +#: tools/symcryptrun.c:157
  #, fuzzy
  msgid "encryption modus"
- msgstr "de�ifrovanie o.k.\n"
+ msgstr "dešifrovanie o.k.\n"
  
 +#: tools/symcryptrun.c:161
  msgid "tool class (confucius)"
  msgstr ""
  
 +#: tools/symcryptrun.c:162
  #, fuzzy
  msgid "program filename"
- msgstr "--store [meno s�boru]"
+ msgstr "--store [meno súboru]"
  
 +#: tools/symcryptrun.c:164
  msgid "secret key file (required)"
  msgstr ""
  
@@@ -10915,59 -8755,48 +11007,59 @@@
  msgid "input file name (default stdin)"
  msgstr ""
  
 +#: tools/symcryptrun.c:209
  #, fuzzy
  msgid "Usage: symcryptrun [options] (-h for help)"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
 +#: tools/symcryptrun.c:212
  msgid ""
  "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
  "[options...] COMMAND [inputfile]\n"
  "Call a simple symmetric encryption tool\n"
  msgstr ""
  
 +#: 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"
+ msgstr "Nie je dovolené používať %s s %s!\n"
  
 +#: tools/symcryptrun.c:285
  #, fuzzy, c-format
  msgid "%s on %s failed with status %i\n"
- msgstr "nemo�no otvori� s�bor: %s\n"
+ msgstr "nemožno otvoriť súbor: %s\n"
  
 +#: tools/symcryptrun.c:317
  #, fuzzy, c-format
  msgid "can't create temporary directory '%s': %s\n"
- msgstr "nem�em vytvori� adres�r `%s': %s\n"
+ msgstr "nemôžem vytvoriť adresár `%s': %s\n"
  
 +#: tools/symcryptrun.c:357 tools/symcryptrun.c:374
  #, fuzzy, c-format
  msgid "could not open %s for writing: %s\n"
- msgstr "nemo�no otvori� %s: %s\n"
+ msgstr "nemožno otvoriť %s: %s\n"
  
 +#: tools/symcryptrun.c:385
  #, fuzzy, c-format
  msgid "error writing to %s: %s\n"
- msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
+ msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
  
 +#: tools/symcryptrun.c:392
  #, fuzzy, c-format
  msgid "error reading from %s: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: tools/symcryptrun.c:399 tools/symcryptrun.c:406
  #, fuzzy, c-format
  msgid "error closing %s: %s\n"
- msgstr "chyba pri ��tan� `%s': %s\n"
+ msgstr "chyba pri čítaní `%s': %s\n"
  
 +#: tools/symcryptrun.c:490
  #, fuzzy
  msgid "no --program option provided\n"
- msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
+ msgstr "žiadne vzialené vykonávanie programu nie je podporované\n"
  
 +#: tools/symcryptrun.c:496
  msgid "only --decrypt and --encrypt are supported\n"
  msgstr ""
  
@@@ -10979,62 -8806,50 +11071,62 @@@ msgstr "
  msgid "cannot allocate args vector\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:531
  #, fuzzy, c-format
  msgid "could not create pipe: %s\n"
- msgstr "%s: nem�em vytvori�: %s\n"
+ msgstr "%s: nemôžem vytvoriť: %s\n"
  
 +#: tools/symcryptrun.c:538
  #, fuzzy, c-format
  msgid "could not create pty: %s\n"
- msgstr "%s: nem�em vytvori�: %s\n"
+ msgstr "%s: nemôžem vytvoriť: %s\n"
  
 +#: tools/symcryptrun.c:554
  #, c-format
  msgid "could not fork: %s\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:582
  #, fuzzy, c-format
  msgid "execv failed: %s\n"
- msgstr "aktualiz�cia zlyhala: %s\n"
+ msgstr "aktualizácia zlyhala: %s\n"
  
 +#: tools/symcryptrun.c:611
  #, fuzzy, c-format
  msgid "select failed: %s\n"
- msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
  
 +#: tools/symcryptrun.c:628
  #, fuzzy, c-format
  msgid "read failed: %s\n"
- msgstr "aktualiz�cia zlyhala: %s\n"
+ msgstr "aktualizácia zlyhala: %s\n"
  
 +#: tools/symcryptrun.c:680
  #, fuzzy, c-format
  msgid "pty read failed: %s\n"
- msgstr "aktualiz�cia zlyhala: %s\n"
+ msgstr "aktualizácia zlyhala: %s\n"
  
 +#: tools/symcryptrun.c:732
  #, fuzzy, c-format
  msgid "waitpid failed: %s\n"
- msgstr "aktualiz�cia zlyhala: %s\n"
+ msgstr "aktualizácia zlyhala: %s\n"
  
 +#: tools/symcryptrun.c:746
  #, c-format
  msgid "child aborted with status %i\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:801
  #, fuzzy, c-format
  msgid "cannot allocate infile string: %s\n"
- msgstr "nem�em vytvori� `%s': %s\n"
+ msgstr "nemôžem vytvoriť `%s': %s\n"
  
 +#: tools/symcryptrun.c:814
  #, fuzzy, c-format
  msgid "cannot allocate outfile string: %s\n"
- msgstr "nem�em vytvori� `%s': %s\n"
+ msgstr "nemôžem vytvoriť `%s': %s\n"
  
 +#: tools/symcryptrun.c:987
  #, c-format
  msgid "either %s or %s must be given\n"
  msgstr ""
@@@ -11043,17 -8857,14 +11135,17 @@@
  msgid "no class provided\n"
  msgstr ""
  
 +#: tools/symcryptrun.c:1018
  #, fuzzy, c-format
  msgid "class %s is not supported\n"
- msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
+ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
  
 +#: tools/gpg-check-pattern.c:144
  #, fuzzy
  msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
- msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
  
 +#: tools/gpg-check-pattern.c:147
  msgid ""
  "Syntax: gpg-check-pattern [options] patternfile\n"
  "Check a passphrase given on stdin against the patternfile\n"
diff --cc po/sv.po
index d62c741,de350a1..82ea732
--- a/po/sv.po
+++ b/po/sv.po
@@@ -24,7 -24,6 +24,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg trunk\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2011-01-12 14:53+0100\n"
  "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
  "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@@ -34,7 -33,6 +34,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
@@@ -45,47 -43,38 +45,47 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr "_OK"
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr "_Avbryt"
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_Yes"
  msgstr "_OK"
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_No"
  msgstr "_OK"
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr "PIN-kod:"
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  #, fuzzy
  #| msgid "|pinentry-label|_Cancel"
  msgid "|pinentry-label|_Save in password manager"
  msgstr "_Avbryt"
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "Enter new passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -93,7 -82,6 +93,7 @@@ msgstr "Ange ny lösenfras
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr "Kvalitet:"
  
@@@ -103,7 -91,6 +103,7 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Denna rad indikerar kvaliteten för ovan angiven lösenfras.\n"
@@@ -112,7 -99,6 +112,7 @@@
  "och specialtecken. Fråga din administratör om mer exakt information hur\n"
  "man anger säkra lösenfraser."
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -120,61 -106,47 +120,61 @@@ msgstr "
  "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
  "sessionen"
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  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:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Lösenfras:"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "stämmer inte överens - försök igen"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (försök %d av %d)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
  msgstr "PIN-koden är för lång"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
  msgstr "Lösenfrasen är för lång"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
  msgstr "Ogiltiga tecken i PIN-kod"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr "PIN-kod för kort"
  
  # MPI står för Multiple Precision Integer (tror jag)
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "Felaktig PIN-kod"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
  msgstr "Felaktig lösenfras"
  
@@@ -185,25 -156,11 +185,25 @@@
  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:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "kan inte skapa \"%s\": %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -230,41 -183,25 +230,31 @@@ msgstr "fel när nyckel-id för autenti
  msgid "no suitable card key found: %s\n"
  msgstr "ingen lämplig kortnyckel hittades: %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "skuggning av nyckeln misslyckades: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "fel vid skrivning av nyckel: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Ange lösenfrasen för ssh-nyckeln%0A  %c"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Ange denna lösenfras igen"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -273,16 -210,13 +263,16 @@@ msgstr "
  "Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A   %s%%0Ai  "
  "gpg-agents nyckellager"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "misslyckades med att skapa flöde från uttag: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr "Mata in kortet med serienummer"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "Ta bort det aktuella kortet och mata in det med serienummer"
  
@@@ -433,8 -343,6 +423,8 @@@ 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:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -442,141 -350,108 +432,147 @@@ msgstr "
  "@Flaggor:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "kör i demonläge (bakgrund)"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "kör i serverläge (förgrund)"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "run in server mode"
+ msgid "run in supervised mode"
+ msgstr "kör i serverläge"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "utförlig"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "var något tystare"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr "sh-liknande kommandoutdata"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr "csh-liknande kommandoutdata"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FIL|läs inställningar från FIL"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "frigör inte från konsollen"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr "fånga inte tangentbord och mus"
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
  msgstr "använd en loggfil för servern"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr "|PRG|använd PRG som SCdaemon-programmet"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
  msgstr "använd inte SCdaemon"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|connect to Assuan socket NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr "ignorera begäran om att ändra TTY"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr "ignorera begäran om att ändra X-display"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr "använd inte mellanlagring av PIN-kod vid signering"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  #| msgid "do not allow the reuse of old passphrases"
  msgid "disallow the use of an external password cache"
  msgstr "tillåt inte återanvändning av gamla lösenfraser"
  
  # Antar att värdet inte ska översättas.
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  #, fuzzy
  #| msgid "allow clients to mark keys as \"trusted\""
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "tillåt klienter att markera nycklar som \"trusted\""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
  msgstr "tillåt förinställning av lösenfras"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "enable ssh-agent emulation"
  msgid "enable ssh support"
  msgstr "aktivera ssh-agent-emulering"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
  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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "Rapportera fel till <@EMAIL@>.\n"
  "Skicka synpunkter på översättningen till <tp-sv at listor.tp-sv.se>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -588,151 -463,116 +584,151 @@@ msgstr "
  "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
  "Hantering av hemliga nycklar för GnuPG\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "invalid debug-level '%s' given\n"
  msgstr "ogiltig debug-level \"%s\" angiven\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "OBS: inställningsfilen \"%s\" saknas\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "inställningsfil \"%s\": %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "läser inställningar från \"%s\"\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
  msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "kan inte skapa uttag: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, fuzzy, c-format
  #| msgid "socket name `%s' is too long\n"
  msgid "socket name '%s' is too long\n"
  msgstr "namnet på uttaget \"%s\" är för långt\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  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:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
  msgstr "fel vid hämtning av nonce för uttaget\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error binding socket to '%s': %s\n"
  msgstr "fel när \"%s\" bands till uttag: %s\n"
  
  # Extension är vad? FIXME
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgid "can't set permissions of '%s': %s\n"
  msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() misslyckades: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
  msgstr "lyssnar på uttaget \"%s\"\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "%s: kan inte skapa katalog: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "katalogen \"%s\" skapades\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  #| msgid "stat() failed for `%s': %s\n"
  msgid "stat() failed for '%s': %s\n"
  msgstr "stat() misslyckades för \"%s\": %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  #| msgid "can't use `%s' as home directory\n"
  msgid "can't use '%s' as home directory\n"
  msgstr "kan inte använda \"%s\" som hemkatalog\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, 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:2307
++#: agent/gpg-agent.c:2598
  #, 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:2312
++#: agent/gpg-agent.c:2603
  #, 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:2387
++#: agent/gpg-agent.c:2678
  #, 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:2392
++#: agent/gpg-agent.c:2683
  #, 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:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  #| msgid "pth_select failed: %s - waiting 1s\n"
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "pth_select misslyckades: %s - väntar 1 s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s stoppad\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "ingen gpg-agent kör i den här sessionen\n"
  
@@@ -750,8 -588,6 +746,8 @@@ msgstr "
  "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
  "Underhåll av lösenordscache\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -760,9 -596,6 +756,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:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -816,7 -641,6 +812,8 @@@ msgstr "avbruten\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "fel vid fråga efter lösenfrasen: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -883,8 -698,6 +880,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Ja"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "Nej"
  
@@@ -916,14 -726,12 +913,14 @@@ msgstr "Korrekt
  msgid "Wrong"
  msgstr "Fel"
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  "Observera: Den här lösenfrasen har aldrig blivit ändrad.%0ADu bör ändra den "
  "nu."
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@@ -932,15 -740,12 +929,15 @@@ msgstr "
  "Den här lösenfrasen har inte ändrats%%0Asedan %.4s-%.2s-%.2s.  Du bör ändra "
  "den nu."
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
  msgstr "ändra lösenfras"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr "Jag ändrar den senare"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -948,13 -753,11 +945,13 @@@
  "%%0A?"
  msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
  msgstr "aktivera nyckel"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -969,13 -770,11 +966,13 @@@ msgstr "DSA kräver att hashlängden ä
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "%s-nyckeln använder en osäker hash (%u bitar)\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, fuzzy, c-format
  #| msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
@@@ -1002,89 -797,79 +999,102 @@@ msgstr "skyddsalgoritmen %d%s stöds in
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "skyddsalgoritmen %d%s stöds inte\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "fel när ett rör skapades: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "fel när ett rör skapades: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "fel vid grening av process: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- #| msgid "waiting for process %d to terminate failed: %s\n"
- msgid "waiting for processes to terminate failed: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
  msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  #| msgid "error running `%s': probably not installed\n"
  msgid "error running '%s': probably not installed\n"
  msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error running '%s': exit status %d\n"
  msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  #| msgid "error running `%s': terminated\n"
  msgid "error running '%s': terminated\n"
  msgstr "fel vid körning av \"%s\": avslutades\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "fel vid hämtning av avslutskod för processen %d: %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
  msgstr "kan inte ansluta till \"%s\": %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "inställningsproblem för gpg-agent\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "kan inte stänga av minnesutskrifter: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Varning: osäkert ägarskap på %s \"%s\"\n"
  
  # Extension är vad? FIXME
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ #| msgid "waiting %d seconds for the agent to come up\n"
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "väntar %d sekunder för att agenten ska komma igång\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ #| msgid "renaming `%s' to `%s' failed: %s\n"
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "ja"
  
@@@ -1138,7 -912,6 +1148,7 @@@ msgstr "slut på kärna i säkert minn
  msgid "out of core while allocating %lu bytes"
  msgstr "slut på kärna vid allokering av %lu byte"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
@@@ -1159,41 -929,34 +1169,41 @@@ msgstr "VARNING: \"%s\" är en föråld
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, fuzzy, c-format
  #| msgid "no running gpg-agent - starting one\n"
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr "ingen körande gpg-agent - startar en\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, fuzzy, c-format
  #| msgid "waiting %d seconds for the agent to come up\n"
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr "väntar %d sekunder för att agenten ska komma igång\n"
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  #| msgid "can't connect to the dirmngr - trying fall back\n"
  msgid "connection to agent is in restricted mode\n"
  msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, fuzzy, c-format
  #| msgid "no running dirmngr - starting `%s'\n"
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr "ingen körande dirmngr - startar \"%s\"\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, fuzzy, c-format
  #| msgid "waiting %d seconds for the agent to come up\n"
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr "väntar %d sekunder för att agenten ska komma igång\n"
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  #, fuzzy
  #| msgid "can't connect to the dirmngr - trying fall back\n"
  msgid "connection to the dirmngr established\n"
@@@ -1266,8 -1013,6 +1276,8 @@@ msgstr "Sessionsnyckel skapad
  msgid "algorithm: %s"
  msgstr "algoritm: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "algoritmen stöds inte: %s"
@@@ -1342,11 -1071,9 +1352,11 @@@ msgstr "Certifikatkedjan är giltig
  msgid "Root certificate trustworthy"
  msgstr "rotcertifikatet är pålitligt"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "ingen spärrlista hittades för certifikatet"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
  msgstr "den tillgängliga spärrlistan är för gammal"
  
@@@ -1384,7 -1103,6 +1394,7 @@@ msgstr "Det finns ingen hjälp tillgän
  msgid "ignoring garbage line"
  msgstr "ignorerar skräprad"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[ingen]"
  
@@@ -1457,7 -1160,6 +1467,7 @@@ msgstr "flagga \"%.50s\" är tvetydig\n
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "kommandot \"%.50s\" är tvetydigt\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
  msgstr "slut på minne\n"
  
@@@ -1520,8 -1211,6 +1530,8 @@@ msgstr "låset \"%s\" gjordes inte: %s\
  msgid "waiting for lock %s...\n"
  msgstr "väntar på låset %s...\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s är för gammal (behöver %s, har %s)\n"
@@@ -1610,13 -1281,11 +1620,13 @@@ msgstr "
  "beror sannolikt på att en felaktig e-postserver eller e-postklient har "
  "använts\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "inte läsbart"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1624,25 -1293,20 +1634,25 @@@ msgstr "
  "ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
  "sluta med ett \"'=\"\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "en användares notationsnamn måste innehåller tecknet \"@\"\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "ett notationsnamn får inte innehålla fler än ett \"@\"-tecken\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "ett notationsvärde får inte använda några styrtecken\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  #| msgid "a notation name must not contain more than one '@' character\n"
  msgid "a notation name may not contain an '=' character\n"
  msgstr "ett notationsnamn får inte innehålla fler än ett \"@\"-tecken\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
@@@ -1652,51 -1316,40 +1662,50 @@@ msgstr "
  "ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
  "sluta med ett \"'=\"\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "VARNING: ogiltig notationsdata hittades\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr "misslyckades med att förmedla %s-begäran till klient\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  #, fuzzy
  #| msgid "Enter passphrase\n"
  msgid "Enter passphrase: "
  msgstr "Ange lösenfrasen\n"
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
  msgstr "VARNING: %s gäller istället för %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "OpenPGP-kort nr. %s identifierades\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "kan inte göra detta i satsläge\n"
  
@@@ -1704,14 -1356,9 +1713,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Detta kommando är endast tillgängligt för kort av version 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
  msgstr "Återställningskoden är inte tillgänglig längre\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Vad väljer du? "
  
@@@ -1739,121 -1380,91 +1748,121 @@@ msgstr "inte tvingad
  msgid "forced"
  msgstr "tvingad"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr "Fel: Endast ren ASCII tillåts för närvarande.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "Fel: Tecknet \"<\" får inte användas.\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "Kortinnehavarens efternamn: "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "Kortinnehavarens förnamn: "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr "Fel: Fullständigt namn för långt (gränsen är %d tecken).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "Url för att hämta publik nyckel: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "fel vid läsning av \"%s\": %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  #| msgid "error writing `%s': %s\n"
  msgid "error writing '%s': %s\n"
  msgstr "fel vid skrivning till \"%s\": %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "Inloggningsdata (kontonamn): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr "Fel: Inloggningsdata är för långt (gräns är %d tecken).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "Privat DO-data: "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "Språkinställningar: "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
  msgstr "Fel: ogiltig längd på inställningssträngen\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
  msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
  msgstr "Fel: ogiltigt svar.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "CA-fingeravtryck: "
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "nyckelåtgärden är inte möjlig: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "inte ett OpenPGP-kort"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr "Ersätt existerande nyckel? (j/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  #, fuzzy
  #| msgid ""
  #| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1869,59 -1480,47 +1878,59 @@@ msgstr "
  "      kontrollera dokumentationen för ditt kort för att se vilka storlekar\n"
  "      som tillåts.\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Vilken nyckelstorlek vill du använda för signaturnyckeln? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "Vilken nyckelstorlek vill du använda för krypteringsnyckeln? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Vilken nyckelstorlek vill du använda för autentiseringsnyckeln? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "avrundade uppåt till %u bitar\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  "Kortet kommer nu att konfigureras om för att generera en nyckel med %u "
  "bitar\n"
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "fel vid ändring av storlek för nyckel %d till %u bitar: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  #| msgid "NOTE: keys are already stored on the card!\n"
  msgid "Note: keys are already stored on the card!\n"
  msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr "Ersätt existerande nycklar? (j/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, fuzzy, c-format
  #| msgid ""
  #| "Please note that the factory settings of the PINs are\n"
@@@ -1936,147 -1535,112 +1945,147 @@@ msgstr "
  "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
  "Du bör ändra dem med kommandot --change-pin\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "Välj vilken typ av nyckel som ska genereras:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "   (1) Signeringsnyckel\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) Krypteringsnyckel\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Autentiseringsnyckel\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Ogiltigt val.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "Välj var nyckeln ska sparas:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "KEYTOCARD failed: %s\n"
  msgstr "läsning misslyckades: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
  msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  #| msgid "NOTE: keys are already stored on the card!\n"
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  #| msgid "Sign it? (y/N) "
  msgid "Continue? (y/N) "
  msgstr "Signera den? (j/N) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "avsluta denna meny"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
  msgstr "visa administratörskommandon"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "visa denna hjälp"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "lista allt tillgängligt data"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "ändra kortinnehavarens namn"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "ändra url för att hämta nyckel"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "hämta nyckel som anges i kortets url"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "ändra inloggningsnamnet"
  
  # originalet borde ha ett value
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "ändra språkinställningarna"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "ändra kortinnehavarens kön"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "ändra ett CA-fingeravtryck"
  
  # den låter skum
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr "växla flagga för att tvinga signatur-PIN-kod"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "generera nya nycklar"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "meny för att ändra eller avblockera PIN-koden"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "validera PIN-koden och lista allt data"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr "lås upp PIN-koden med en nollställningskod"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr "gpg/kort> "
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "Kommandon endast för administratör\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "Administrationskommandon tillåts\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "Administrationskommandon tillåts inte\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Ogiltigt kommando (prova med \"help\")\n"
  
@@@ -2085,23 -1648,15 +2094,23 @@@ msgid "--output doesn't work for this c
  msgstr "--output kan inte användas för detta kommando\n"
  
  # se förra kommentaren
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "kan inte öppna \"%s\"\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "nyckeln \"%s\" hittades inte: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "fel vid läsning av nyckelblock: %s\n"
@@@ -2222,7 -1755,6 +2231,7 @@@ msgstr "
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s krypterad för: \"%s\"\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "du kan inte använda %s när du är i %s-läget\n"
@@@ -2307,59 -1824,45 +2316,59 @@@ msgstr "VARNING: kan inte ta bort tempf
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "VARNING: kunde inte ta bort temp-katalogen \"%s\": %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
  msgstr "exportera signaturer som är märkta som endast lokala"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr "exportera attribut i användaridentiteter (vanligtvis foto-id)"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "exportera spärrnycklar markerade som \"känslig\""
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "ta bort oanvändbara delar från nyckeln under exportering"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "ta bort så mycket som möjligt från nyckeln under exportering"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: hoppade över: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "skriver till \"%s\"\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "export av hemliga nycklar tillåts inte\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "nyckeln %s: nyckel av PGP 2.x-typ - hoppade över\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "VARNING: ingenting exporterat\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2369,8 -1871,6 +2378,8 @@@ msgstr "Fel när \"%s\" skapades: %s\n
  msgid "[User ID not found]"
  msgstr "[Användaridentiteten hittades inte]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "(check argument of option '%s')\n"
@@@ -2393,262 -1890,203 +2402,262 @@@ msgstr "fel vid stängning av %s: %s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  #| msgid "automatically retrieved `%s' via %s\n"
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "hämtade \"%s\" automatiskt via %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  #| msgid "error retrieving `%s' via %s: %s\n"
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "fel vid hämtning av \"%s\" via %s: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "Inget fingeravtryck"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
  "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "skapa en signatur"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
  msgstr "skapa en klartextsignatur"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "skapa signatur i en separat fil"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "kryptera data"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  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:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "dekryptera data (standard)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "validera en signatur"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "lista nycklar"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "lista nycklar och signaturer"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "lista och kontrollera nyckelsignaturer"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "lista nycklar och fingeravtryck"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "lista hemliga nycklar"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "generera ett nytt nyckelpar"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "generera ett nytt nyckelpar"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "generera ett nytt nyckelpar"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "generera ett nytt nyckelpar"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "generera ett spärrcertifikat"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "ta bort nycklar från den publika nyckelringen"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "ta bort nycklar från den hemliga nyckelringen"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "signera en nyckel"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "signera en nyckel lokalt"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "signera en nyckel"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "signera en nyckel lokalt"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "signera eller redigera en nyckel"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
  msgstr "ändra en lösenfras"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "exportera nycklar"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "exportera nycklar till en nyckelserver"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "importera nycklar från en nyckelserver"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "sök efter nycklar hos en nyckelserver"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "importera/slå samman nycklar"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "skriv ut kortstatus"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "ändra data på ett kort"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "ändra PIN-kod för ett kort"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "uppdatera tillitsdatabasen"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
  msgstr "skriv ut kontrollsummor"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "kör i serverläge"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "skapa utdata med ett ascii-skal"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID för att signera eller dekryptera"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  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:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "använd \"ursprunglig text\"-läget"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
  msgstr "|FIL|skriv utdata till FIL"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "gör inga ändringar"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "fråga innan överskrivning"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  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:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2656,7 -2094,6 +2665,7 @@@ msgstr "
  "@\n"
  "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2676,14 -2113,12 +2685,14 @@@ msgstr "
  "--list-keys [namn]          visa nycklar\n"
  "--fingerprint [namn]        visa fingeravtryck\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  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:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2698,7 -2133,6 +2707,7 @@@ msgstr "
  "signera, kontrollera, kryptera eller dekryptera\n"
  "standardåtgärden beror på inmatningsdata\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2706,84 -2140,69 +2715,84 @@@ msgstr "
  "\n"
  "Algoritmer som stöds:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "Publik nyckel: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Chiffer: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Kontrollsumma: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Komprimering: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] %s\n"
  msgstr "användning: gpgsm [flaggor] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "motstridiga kommandon\n"
  
  # Vad betyder detta?
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  #| msgid "no = sign found in group definition `%s'\n"
  msgid "no = sign found in group definition '%s'\n"
  msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on extension `%s'\n"
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
  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:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on extension `%s'\n"
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
  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:1556
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2793,21 -2212,18 +2802,21 @@@ msgstr "
  "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
  "\"%s\"\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
  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:1565
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
  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:1568
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2818,551 -2234,439 +2827,557 @@@ msgstr "
  "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
  "\"%s\"\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
  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:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
  msgstr "okänd konfigurationspost \"%s\"\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "visa foto-id under nyckellistning"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  #| msgid "show user ID validity during key listings"
  msgid "show key usage information during key listings"
  msgstr "visa giltighet för användaridentitet vid nyckellistningar "
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr "visa policy-url:er under signaturlistningar"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "visa alla notationer under signaturlistningar"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr "visa IETF-standardnotationer under signaturlistningar"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr "visa användarangivna notationer under signaturlistningar"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr "visa giltighet för användaridentitet vid nyckellistningar "
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "visa nyckelringens namn i nyckellistningar"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "visa utgångsdatum under signaturlistningar"
  
- #: g10/gpg.c:2011
- #, fuzzy
- #| msgid "Available keys:\n"
- msgid "available TOFU policies:\n"
- msgstr "Tillgängliga nycklar:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "valid values for option '%s':\n"
+ msgstr "argument för flaggan \"%.50s\" saknas\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "okänd flagga \"%s\"\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "invalid value for option '%s'\n"
+ msgstr "argument för flaggan \"%.50s\" saknas\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
  msgstr "OBS: %s är inte för normal användning!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid signature expiration\n"
  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:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "rad %d: inte en giltig e-postadress\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "invalid pinentry mode '%s'\n"
  msgstr "ogiltig landskod i \"%s\", rad %d\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid character set\n"
  msgid "'%s' is not a valid character set\n"
  msgstr "\"%s\" är ingen giltig teckentabell\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "kunde inte tolka url till nyckelserver\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "ogiltiga flaggor för nyckelserver\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: ogiltiga importeringsflaggor\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "ogiltiga importflaggor\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "ogiltiga listflaggor\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: ogiltiga exportflaggor\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "ogiltiga exportinställningar\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: ogiltiga listflaggor\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "ogiltiga listflaggor\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "visa foto-id under signaturvalidering"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr "visa policy-url:er under signaturvalidering"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "visa alla notationer under signaturvalidering"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr "visa IETF-standardnotationer under signaturvalidering"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr "visa användarangivna notationer under signaturvalidering"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
  msgstr "visa giltighet för användaridentitet vid signaturvalidering"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  msgid "show only the primary user ID in signature verification"
  msgstr "visa endast primär användaridentitet i signaturvalidering"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "validera signaturer med PKA-data"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "öka tillit på signaturer med giltigt PKA-data"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: ogiltiga flaggor för validering\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "ogiltiga flaggor för validering\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, 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:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  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:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "VARNING: %s gäller istället för %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s är inte tillåten tillsammans med %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, 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:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr "VARNING: kör med falsk systemtid: "
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, 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:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "den valda chifferalgoritmen är ogiltig\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "vald sammandragsalgoritm är ogiltig\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "vald komprimeringsalgoritm är ogiltig\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  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:3582
++#: g10/gpg.c:3680
  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:3584
++#: g10/gpg.c:3682
  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:3586
++#: g10/gpg.c:3684
  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:3588
++#: g10/gpg.c:3686
  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:3590
++#: g10/gpg.c:3688
  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:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  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:3604
++#: g10/gpg.c:3702
  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:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "ogiltig inställning av personligt chiffer\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s fungerar ännu inte med  %s\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  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:3704
++#: g10/gpg.c:3802
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  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:3709
++#: g10/gpg.c:3807
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  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:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  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:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [filnamn]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [filnamn]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  #| msgid "symmetric encryption of `%s' failed: %s\n"
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [filnamn]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [filnamn]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  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:3918
++#: g10/gpg.c:4021
  #, 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:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [filnamn]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [filnamn]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [filnamn]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  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:3978
++#: g10/gpg.c:4081
  #, 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:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [filnamn]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [filnamn]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [filnamn]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key användaridentitet"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key användaridentitet"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key användaridentitet [kommandon]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
  msgstr "--passwd <användaridentitet>"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "sändning till nyckelservern misslyckades: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "hämtning från nyckelservern misslyckades: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "export av nyckeln misslyckades: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "export av nyckeln misslyckades: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "sökning på nyckelservern misslyckades: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "misslyckades med att skapa ASCII-skal: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error parsing key specification '%s': %s\n"
  msgstr "fel vid lagring av certifikat: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[filnamn]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Skriv ditt meddelande här ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FIL|ta nycklarna från nyckelringen FIL "
  
  # Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
  # Kommandot är avsett att användas i "near online system".
  # Krav från RIPE.
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|skriv statusinformation till denna FD"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3380,138 -2682,110 +3395,138 @@@ msgstr "Det finns ingen hjälp tillgän
  msgid "No help available for '%s'"
  msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr "importera signaturer som är markerade som endast lokala"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr "reparera skada från pks-nyckelservern under importering"
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "uppdatera inte tillitsdatabasen efter importering"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "uppdatera inte tillitsdatabasen efter importering"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "visa nyckelns fingeravtryck"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr "acceptera endast uppdateringar till befintliga nycklar"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
  msgstr "ta bort oanvändbara delar från nyckeln efter importering"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "ta bort så mycket som möjligt från nyckeln efter importering"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "hoppar över block av typen %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "%lu nycklar behandlade än så länge\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Totalt antal behandlade enheter: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "        överhoppade nya nycklar: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "        överhoppade nya nycklar: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "       utan användaridentiteter: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                    importerade: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                    oförändrade: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "        nya användaridentiteter: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "               nya undernycklar: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "                 nya signaturer: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "          nya nyckelspärrningar: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "    antal lästa hemliga nycklar: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "    importerade hemliga nycklar: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "    oförändrade hemliga nycklar: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "               inte importerade: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "             signaturer rensade: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "    användaridentiteter rensade: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3520,198 -2794,160 +3535,198 @@@ msgstr "
  "VARNING: nyckeln %s innehåller inställningar för otillgängliga\n"
  "algoritmer för dessa användaridentiteter:\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": inställning för chifferalgoritmen %s\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": inställning för sammandragsalgoritmen %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": inställning för komprimeringsalgoritmen %s\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
  "med att algoritmerna inte stämmer\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "nyckel %s: ingen användaridentitet\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
  msgstr "hoppade över \"%s\": %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
  # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
  
  # vad innebär fnutten i slutet?
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "nyckel %s: accepterade icke-självsignerad användaridentitet \"%s\"\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "nyckel %s: inga giltiga användaridentiteter\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "detta kan bero på att det saknas en självsignatur\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "nyckel %s: ny nyckel - hoppade över\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
  
  # fixme: I appended the %s -wk
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "nyckel %s: \"%s\" inte ändrad\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "nyckel %s: hemlig nyckel importerades\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "hoppade över: hemlig nyckel finns redan\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "key %s: error sending to agent: %s\n"
  msgstr "fel vid sändning av %s-kommando: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
  msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "import av hemliga nycklar tillåts inte\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
@@@ -3726,184 -2962,150 +3741,184 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "nyckel %s: ingen användaridentitet för signaturen\n"
  
  # fixme: I appended the %s -wk
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "nyckel %s: algoritmen för publika nycklar stöds inte för "
  "användaridentiteten  \"%s\"\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "nyckel %s: ogiltig självsignatur på användaridentiteten \"%s\"\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "nyckel %s: ogiltig direkt nyckelsignatur\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "nyckel %s: ogiltig undernyckelbindning\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "nyckel %s: hoppade över undernyckel\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "nyckel %s: icke-exporterbar signatur (klass 0x%02X) - hoppade över\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "nyckel %s: spärrcertifikat på fel plats - hoppade över\n"
  
  # nyckeln eller certifikatet??
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "nyckel %s: signatur på undernyckel på fel plats - hoppade över\n"
  
  # nyckeln eller klassen?
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "nyckel %s: oväntad signaturklass  (0x%02X) - hoppade över\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr ""
  "nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "VARNING: nyckeln %s kan ha spärrats: hämtar spärrnyckeln %s\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "VARNING: nyckeln %s kan ha spärrats: spärrnyckeln %s saknas.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  #| msgid "error creating keybox `%s': %s\n"
  msgid "error creating keybox '%s': %s\n"
  msgstr "fel när nyckelskåpet \"%s\" skapades: %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
  msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  #| msgid "keybox `%s' created\n"
  msgid "keybox '%s' created\n"
  msgstr "nyckelskåpet \"%s\" skapat\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
  msgstr "%s: nyckelring skapad\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  #| msgid "keyblock resource `%s': %s\n"
  msgid "keyblock resource '%s': %s\n"
  msgstr "nyckelblockresurs \"%s\": %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening key DB: %s\n"
  msgstr "fel vid öppnandet av \"%s\": %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
@@@ -3916,32 -3116,32 +3931,39 @@@ msgstr "[spärr]
  msgid "[self-signature]"
  msgstr "[självsignatur]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ #| msgid "error allocating enough memory: %s\n"
+ msgid "error allocating memory: %s\n"
+ msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "Korrekt signatur från"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
  msgstr "hoppade över \"%s\": %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3949,7 -3149,6 +3971,7 @@@ msgid_plural "%d duplicate signatures r
  msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
  msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3957,7 -3156,6 +3979,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 signatur validerades inte eftersom nyckeln saknades\n"
  msgstr[1] "1 signatur validerades inte eftersom nyckeln saknades\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3965,7 -3163,6 +3987,7 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d felaktiga signaturer\n"
  msgstr[1] "%d felaktiga signaturer\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3973,14 -3170,12 +3995,14 @@@ msgid_plural "%d signatures reordered\n
  msgstr[0] "Korrekt signatur från"
  msgstr[1] "Korrekt signatur från"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3991,17 -3186,14 +4013,17 @@@ msgstr "
  "korrekt validera andra användares nycklar (genom att undersöka pass,\n"
  "undersöka fingeravtryck från olika källor, etc.)\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Jag litar marginellt\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Jag litar fullständigt\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -4011,51 -3203,39 +4033,51 @@@ msgstr "
  "Ett djup större än 1 tillåter att nyckeln som du signerar kan\n"
  "skapa tillitssignaturer åt dig.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Användaridentiteten \"%s\" är spärrad."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Vill du verkligen fortfarande signera den? (j/N)"
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  Kan inte signera.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Giltighetstiden för användaridentiteten \"%s\" har gått ut."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Användaridentiteten \"%s\" är inte självsignerad."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Användaridentiteten \"%s\" är signerbar.  "
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
  msgstr "Signera den? (j/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -4064,11 -3244,9 +4086,11 @@@ msgstr "
  "Självsignaturen på \"%s\"\n"
  "är en signatur av PGP 2.x-typ.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "Vill du göra om den till en självsignatur av OpenPGP-typ? (j/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4077,13 -3255,11 +4099,13 @@@ msgstr "
  "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
  "har gått ut.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
  "n) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4092,44 -3268,35 +4114,44 @@@ msgstr "
  "Din nuvarande signatur på \"%s\"\n"
  "är en lokal signatur.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "Vill du ändra den till en fullständig exporterbar signatur? (j/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" var redan lokalt signerad med nyckeln %s\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" var redan signerad av nyckeln %s\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Vill du verkligen signera den igen ändå?(j/N)"
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Det finns inget att signera med nyckeln %s\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "Giltighetstiden för denna nyckel har gått ut!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr ""
  "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4138,33 -3305,27 +4160,33 @@@ msgstr "
  "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
  "personen som nämns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Jag vill inte svara.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Jag har inte kontrollerat alls.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Jag har gjort viss kontroll.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Jag har gjort en noggrann kontroll.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Ditt val? (skriv \"?\" för mer information): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4173,230 -3334,176 +4195,230 @@@ msgstr "
  "Är du verkligen säker på att du vill signera denna nyckel\n"
  "med din nyckel \"%s\" (%s)\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
  msgstr "Detta kommer att bli en självsignatur.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "VARNING: signaturen kommer inte att markeras som icke-exporterbar.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "VARNING: signaturen kommer att markeras som icke-spärrbar.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Signaturen kommer att markeras som icke-exporterbar.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Signaturen kommer att märkas som icke möjlig att spärra.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "Jag har inte kontrollerat denna nyckel alls.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "Jag har gjort viss kontroll av denna nyckel.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
  msgstr "Verkligen signera? (j/N) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "signeringen misslyckades: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
  "att ändra.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "fel när lösenfras skapades: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "spara och avsluta"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "visa nyckelns fingeravtryck"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  #| msgid "Enter the keygrip: "
  msgid "show the keygrip"
  msgstr "Ange nyckelhashen: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "lista nycklar och användaridentiteter"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "välj användaridentiteten N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "välj undernyckel N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "kontrollera signaturer"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  "signera valda användaridentiteter [* se nedan för relaterade kommandon]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "signera valda användaridentiteter lokalt"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "signera valda användaridentiteter med en tillitssignatur"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "lägg till en användaridentitet"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "lägg till ett foto-id"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "ta bort valda användaridentiteter"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "lägg till en undernyckel"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "lägg till en nyckel till ett smartkort"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "flytta en nyckel till ett smartkort"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "flytta en nyckelkopia till ett smartkort"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "ta bort valda undernycklar"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "lägg till en spärrnyckel"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "ta bort signaturer från valda användaridentiteter"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "flagga vald användaridentitet som primär"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "lista inställningar (expertläge)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "lista inställningar (utförligt)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "ställ in inställningslista för valda användaridentiteter"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
  "ställ in url till föredragen nyckelserver för valda användaridentiteter"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
  msgstr "ställ in en notation för valda användaridentiteter"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "ändra lösenfrasen"
  
  # originalet borde ha ett value
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "ändra ägartillitsvärdet"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "spärra signaturer på valda användaridentiteter"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "spärra valda användaridentiteter"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "spärra nyckel eller valda undernycklar"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "aktivera nyckel"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "inaktivera nyckel"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "visa valda foto-id:n"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "komprimera oanvändbara användaridentiteter och ta bort oanvändbara "
  "signaturer från nyckeln"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "komprimera oanvändbara användaridentiteter och ta bort alla signaturer från "
  "nyckeln"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "Den hemliga nyckeln finns tillgänglig.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4416,273 -3523,214 +4438,273 @@@ msgstr "
  "signaturer\n"
  "  (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "Nyckeln är spärrad."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Verkligen signera alla användaridentiteter? (j/N) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Verkligen signera alla användaridentiteter? (j/N) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "Okänd signaturtyp \"%s\"\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Du måste välja åtminstone en användaridentitet.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
  msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
  msgstr "Verkligen flytta den primära nyckeln? (j/N) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "Du måste välja exakt en nyckel.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "Kommandot förväntar ett filnamnsargument\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "Kan inte öppna \"%s\": %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Fel vid läsning av säkerhetskopierad nyckel från \"%s\": %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Du måste välja åtminstone en nyckel.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Verkligen spärra denna användaridentitet? (j/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Vill du verkligen spärra hela nyckeln? (j/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Vill du verkligen spärra de valda undernycklarna? (j/N) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Ägartillit får inte ställas in när en tillitsdatabas används som användaren "
  "tillhandahåller\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "Ställ in inställningslista till:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Vill du verkligen uppdatera inställningarna för valda användaridentiteter? "
  "(j/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
  msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
  msgstr "Spara ändringar? (j/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
  msgstr "Avsluta utan att spara? (j/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "uppdateringen misslyckades: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  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:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Nyckelgenereringen misslyckades: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "ogiltigt fingeravtryck"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  #| msgid "failed to get the fingerprint\n"
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "misslyckades med att få fingeravtrycket\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "ogiltigt värde\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Ingen sådan användaridentitet.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "Nothing to sign with key %s\n"
  msgid "Nothing to sign.\n"
  msgstr "Det finns inget att signera med nyckeln %s\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Sammandrag: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Funktioner: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "Nyckelserver no-modify"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Föredragen nyckelserver: "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "Notationer: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Följande nyckel blev spärrad den %s av %s nyckel %s\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, 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:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(känsligt)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "skapat: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "spärrad: %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "utgånget: %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "går ut: %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "användning: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "kortnummer: "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "tillit: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "giltighet: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Denna nyckel har stängts av"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4690,17 -3738,12 +4712,18 @@@ msgstr "
  "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
  "såvida inte du startar om programmet.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "spärrad"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "utgånget"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4709,17 -3752,14 +4732,17 @@@ msgstr "
  "Detta kommando kan göra att en annan användaridentitet antas\n"
  "vara den primära identiteten.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
  msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4728,36 -3768,28 +4751,36 @@@ 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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  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:4298
++#: g10/keyedit.c:4311
  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:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Vill du radera denna okända signatur? (j/N/a)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  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:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4765,20 -3797,16 +4788,20 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "Raderade %d signatur.\n"
  msgstr[1] "Raderade %d signatur.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Ingenting raderat.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "ogiltigt"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4786,17 -3814,14 +4809,17 @@@ msgid_plural "User ID \"%s\": %d signat
  msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
  msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Användaridentitet \"%s\": redan minimerad\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Användaridentitet \"%s\": redan rensad\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4806,39 -3831,31 +4829,39 @@@ msgstr "
  "denna\n"
  "         nyckel inte användas i vissa versioner av PGP.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  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:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Ange användaridentiteten för spärrnyckeln: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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:4642
++#: g10/keyedit.c:4658
  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:4664
++#: g10/keyedit.c:4680
  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:4682
++#: g10/keyedit.c:4698
  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:4688
++#: g10/keyedit.c:4704
  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) "
  
  # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4848,238 -3865,187 +4871,238 @@@ msgid "
  msgstr ""
  "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Ändrar utgångstid för en undernyckel.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  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"
  
  # Vad betyder det?
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, 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:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Välj endast en användaridentitet.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, 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:5304
++#: g10/keyedit.c:5320
  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:5383
++#: g10/keyedit.c:5399
  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:5384
++#: g10/keyedit.c:5400
  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:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "Ange notationen: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
  msgstr "Fortsätt? (j/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Ingen användaridentitet med indexet %d\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Ingen användaridentitet med hashen %s\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Ingen undernyckel med indexet %d\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Ingen undernyckel med indexet %d\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "användaridentitet: \"%s\"\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr "  (icke exporterbar)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Denna signatur gick ut den %s.\n"
  
  # nyckel? signatur?
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  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:6005
++#: g10/keyedit.c:6021
  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:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr "Inte signerad av dig.\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, 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:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (inte spärrbar)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "spärrad av din nyckel %s den %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Du är på väg att spärra dessa signaturer:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "ingen hemlig nyckel\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "användaridentiteten \"%s\" är redan spärrad\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Nyckeln %s är redan spärrad.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Undernyckeln %s är redan spärrad.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "inställningen \"%s\" förekommer flera gånger\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "för många chifferinställningar\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "för många sammandragsinställningar\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
  msgstr "för många komprimeringsinställningar\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
  msgstr "ogiltig post \"%s\" i inställningssträngen\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "skriver direkt signatur\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "skriver självsignatur\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "skriver signatur knuten till nyckeln\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här "
  "sammandragsstorleken\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "Signera"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "Certifiera"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "Kryptera"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "Autentisera"
  
@@@ -5097,159 -4063,128 +5120,159 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "SsKkAaQq"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Möjliga åtgärder för en %s-nyckel: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "För närvarande tillåtna åtgärder: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) Växla signeringsförmågan\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Växla krypteringsförmågan\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Växla autentiseringsförmågan\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Färdig\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Välj vilken typ av nyckel du vill ha:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA och RSA (standard)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA och Elgamal\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (endast signering)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (endast signering)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (endast kryptering)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (endast kryptering)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (ställ in dina egna förmågor)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  #| msgid "   (%d) DSA and Elgamal\n"
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA och Elgamal\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (endast signering)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (endast kryptering)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Befintlig nyckel\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Ange nyckelhashen: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Inte en giltig nyckelhash (förväntade 40 hexadecimala siffror)\n"
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Ingen nyckel med denna nyckelhash\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "avrundade uppåt till %u bitar\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s-nycklar kan vara mellan %u och %u bitar långa.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Vilken nyckelstorlek vill du använda för undernyckeln? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Vilken nyckelstorlek vill du ha? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Välj vilken typ av nyckel du vill ha:\n"
  
  # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5266,7 -4201,6 +5289,7 @@@ msgstr "
  "      <n>y = nyckeln blir ogiltig efter n år\n"
  
  # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5282,38 -4216,30 +5305,38 @@@ msgstr "
  "      <n>m = signaturen blir ogiltig efter n månader\n"
  "      <n>y = signaturen blir ogiltig efter n år\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Signaturen är giltig hur länge? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "ogiltigt värde\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "Nyckeln går aldrig ut\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "Signaturen går aldrig ut\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Nyckeln går ut %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Signaturen går ut %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5321,11 -4247,9 +5344,11 @@@ msgstr "
  "Ditt system kan inte visa datum senare än år 2038.\n"
  "Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "Stämmer detta? (j/N) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5340,7 -4264,6 +5363,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5358,50 -4281,39 +5381,50 @@@ msgstr "
  "    \"Gustav Vasa (Brutal kung) <gustav at trekronor.se>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Namn: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Ogiltigt tecken i namnet\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "Namnet får inte börja med en siffra\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "E-postadress: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "E-postadressen är ogiltig\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Kommentar: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Ogiltigt tecken i kommentaren\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "Du använder teckentabellen \"%s\"\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5412,7 -4324,6 +5435,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "Ange inte e-postadressen som namn eller kommentar\n"
  
@@@ -5428,35 -4339,28 +5451,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnKkEeOoAa"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Rätta först felet\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5468,13 -4372,10 +5491,13 @@@ msgstr "
  "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
  "en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Nyckelgenereringen misslyckades: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5482,72 -4383,59 +5505,72 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "nyckeln finns redan\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  #| msgid "Use this key anyway? (y/N) "
  msgid "Create anyway? (y/N) "
  msgstr "Vill du använda nyckeln ändå? (j/N) "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "genererar ny nyckel\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "Skapandet av nycklar avbröts.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
  msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "skriver den publika nyckeln till \"%s\"\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
  
  # Flagga.. inte kommando
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5557,7 -4445,6 +5580,7 @@@ msgstr "
  "syfte.\n"
  
  # c-format behövs inte i singularis
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5565,7 -4452,6 +5588,7 @@@ msgstr "
  "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
  "relaterat till tidsresande eller en felställd klocka)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5573,25 -4459,20 +5596,25 @@@ msgstr "
  "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
  "relaterat till tidsresande eller en felställd klocka)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
  msgstr "Verkligen skapa? (j/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "aldrig"
  
@@@ -5642,29 -4514,23 +5665,29 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "Nyckelring"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Primära nyckelns fingeravtryck:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "   Undernyckelns fingeravtryck:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr "Primära nyckelns fingeravtryck:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "   Undernyckelns fingeravtryck:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "Nyckelns fingeravtryck ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr "       Kortets serienr ="
  
@@@ -5702,53 -4563,41 +5725,53 @@@ msgstr[1] "1 felaktig signatur\n
  msgid "%s: keyring created\n"
  msgstr "%s: nyckelring skapad\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr "inkludera spärrade nycklar i sökresultatet"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr "inkludera undernycklar vid sökning efter nyckel-id"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr "hämta automatiskt nycklar vid validering av signaturer"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "respektera föredragen nyckelserver-url inställd i nyckeln"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr "respektera PKA-posten inställd på en nyckel när nycklar hämtas"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "inaktiverad"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  #| msgid "refreshing %d keys from %s\n"
  msgid "refreshing %d key from %s\n"
@@@ -5756,57 -4605,46 +5779,57 @@@ msgid_plural "refreshing %d keys from %
  msgstr[0] "uppdaterar %d nycklar från %s\n"
  msgstr[1] "uppdaterar %d nycklar från %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "VARNING: kunde inte uppdatera nyckeln %s via %s: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "nyckeln hittades inte på nyckelservern\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "begär nyckeln %s från %s-servern %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "begär nyckeln %s från %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  #| msgid "no keyserver action!\n"
  msgid "no keyserver known\n"
  msgstr "ingen nyckelserveråtgärd!\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "hoppade över \"%s\": %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "skickar nyckeln %s till %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  #| msgid "requesting key %s from %s\n"
  msgid "requesting key from '%s'\n"
  msgstr "begär nyckeln %s från %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
@@@ -5912,136 -4730,109 +5935,136 @@@ msgstr "ursprungligt filnamn=\"%.*s\"\n
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr "VARNING: multipla klartexter har påträffats\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr ""
  "fristående spärrcertifikat - använd \"gpg --import\" för\n"
  "att verkställa\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "ingen signatur hittades\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "FELAKTIG signatur från \"%s\""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Utgången signatur från \"%s\""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Korrekt signatur från \"%s\""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "signaturvalidering utlämnad\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "kan inte hantera detta tvetydliga signaturdata\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Signatur gjord %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "             med %s-nyckeln %s\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "      även känd som \"%s\""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Nyckeln tillgänglig hos: "
  
  # Visas vid ogiltig signatur:
  # Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[osäkert]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "      även känd som \"%s\""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Giltighetstiden för signaturen har upphört %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Giltighetstiden för signaturen går ut %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s signatur, sammandragsalgoritm %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "binär"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "textläge"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "okänd"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "algorithm: %s"
  msgid ", key algorithm "
  msgstr "algoritm: %s"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Kan inte kontrollera signaturen: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "detta är inte någon signatur i en separat fil\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr ""
  "VARNING: multipla signaturer upptäckta. Endast den första kommer att "
  "kontrolleras.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "fristående signatur av klassen 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "signatur av den gamla (PGP 2.x) typen\n"
  
@@@ -6144,30 -4916,25 +6167,30 @@@ msgstr "Okomprimerad
  msgid "uncompressed|none"
  msgstr "okomprimerad|ingen"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "detta meddelande kanske inte kan användas av %s\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  #| msgid "ambiguous option `%s'\n"
  msgid "ambiguous option '%s'\n"
  msgstr "tvetydlig flagga \"%s\"\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown option '%s'\n"
  msgstr "okänd flagga \"%s\"\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  #, fuzzy
  #| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr "DSA kräver att hashlängden är delbar med 8 bitar\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "unknown weak digest '%s'\n"
@@@ -6471,7 -5183,25 +6494,28 @@@ msgstr "Den här nyckel tillhör antagl
  msgid "This key belongs to us\n"
  msgstr "Denna nyckel tillhör oss\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ #| msgid "root certificate has now been marked as trusted\n"
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "rotcertifikatet har nu markerats som betrott\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "Det är INTE säkert att nyckeln tillhör den namngivna personen i\n"
+ "användaridentiteten. Om du *verkligen* vet vad du gör, kan du svara\n"
+ "ja på nästkommande fråga.\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6481,134 -5211,106 +6525,134 @@@ msgstr "
  "användaridentiteten. Om du *verkligen* vet vad du gör, kan du svara\n"
  "ja på nästkommande fråga.\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "Vill du använda nyckeln ändå? (j/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr "VARNING: denna nyckel kan ha spärrats (spärrnyckeln saknas)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "VARNING: Denna nyckel har spärrats av sin ägare!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
  msgstr "         Detta kan betyda att signaturen är förfalskad.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Obs: Denna nyckel har stängts av.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, fuzzy, c-format
  #| msgid "Note: Verified signer's address is `%s'\n"
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr "Observera: Validerad adress för signeraren är \"%s\"\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, fuzzy, c-format
  #| msgid "Note: Signer's address `%s' does not match DNS entry\n"
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr "Observera: Signerarens adress \"%s\" matchar inte DNS-objektet\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr "trustlevel justerad till FULL på grund av giltig PKA-info\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr "trustlevel justerad till NEVER på grund av felaktig PKA-info\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr ""
  "         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "         Signaturen är sannolikt en FÖRFALSKNING.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
  "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
  "tillräckligt högt tillitsvärde!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "         Det är inte säkert att signaturen tillhör ägaren.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: hoppade över: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
  
  # överhoppad?
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: hoppades över: publik nyckel finns redan\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "kan inte ansluta till \"%s\": %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "rad %d: ogiltig algoritm\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "rad %d: ogiltig algoritm\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "Du angav ingen användaridentitet. (du kan använda \"-r\")\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "Nuvarande mottagare:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6616,24 -5318,19 +6660,24 @@@ msgstr "
  "\n"
  "Ange användaridentiteten.  Avsluta med en tom rad: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Ingen sådan användaridentitet.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr ""
  "hoppade över: den publika nyckeln är redan inställd som standardmottagare\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "Den publika nyckeln är inaktiverad.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "hoppade över: publik nyckel redan angiven\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "okänd standardmottagare \"%s\"\n"
@@@ -6641,16 -5338,13 +6685,16 @@@
  # plural av adressee
  # dvs. den som meddelandet är adresserat till.
  # Åtskillnad görs mellan adressee och receiver.
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "inga giltiga adressater\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Observera: nyckeln %s har ingen %s-förmåga\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
@@@ -6908,29 -5556,24 +6952,29 @@@ msgstr "%s-nyckeln använder en osäke
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr "DSA-nyckeln %s kräver en hash med %u bitar eller större\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
  
  # Vad betyder det?
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "VARNING: signeringsundernyckeln %s är inte korscertifierad\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
  msgstr "se %s för mer information\n"
  
  # cross-certification?
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr "VARNING signeringsundernyckel  %s har en ogiltig korscertifiering\n"
  
  # behövs verkligen c-format här?
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu second newer than the signature\n"
@@@ -6939,7 -5582,6 +6983,7 @@@ msgstr[0] "den publika nyckeln %s är %
  msgstr[1] "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
  
  # behövs verkligen c-format här?
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu day newer than the signature\n"
@@@ -6948,7 -5590,6 +6992,7 @@@ msgstr[0] "den publika nyckeln %s är %
  msgstr[1] "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
  
  # c-format behövs inte i singularis
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6964,7 -5605,6 +7008,7 @@@ msgstr[1] "
  "klocka)\n"
  
  # c-format behövs inte i singularis
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6978,30 -5618,25 +7022,30 @@@ msgstr[1] "
  "nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd "
  "klocka)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  #| msgid "NOTE: signature key %s expired %s\n"
  msgid "Note: signature key %s expired %s\n"
  msgstr "OBSERVERA: signaturnyckeln %s gick ut %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  #| msgid "NOTE: signature key %s has been revoked\n"
  msgid "Note: signature key %s has been revoked\n"
  msgstr "OBSERVERA: signaturnyckeln %s har spärrats\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
  "antar felaktig signatur från nyckeln %s på grund av en okänd kritisk bit\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr "nyckel %s: ingen undernyckel med spärrsignatur för undernyckel\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n"
@@@ -7073,7 -5697,6 +7117,7 @@@ msgid "this is a PGP generated Elgamal 
  msgstr ""
  "det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
@@@ -7121,12 -5736,10 +7165,12 @@@ msgstr "fel vid sökning av tillitsvär
  msgid "read error in '%s': %s\n"
  msgstr "läsfel i \"%s\":  %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  #| msgid "can't create lock for `%s'\n"
  msgid "can't create lock for '%s'\n"
@@@ -7158,7 -5766,6 +7202,7 @@@ msgstr "tillitsdatabastransaktion för 
  msgid "%s: directory does not exist!\n"
  msgstr "%s: katalogen finns inte!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
@@@ -7270,179 -5855,170 +7314,208 @@@ msgstr "kan inte hantera text med rade
  msgid "input line longer than %d characters\n"
  msgstr "indataraden är längre än %d tecken\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "fel vid sändning av standardflaggor: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "algoritmen stöds inte: %s"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "fel vid sändning av %s-kommando: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: fel vid läsning av katalogpost: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "fel vid öppnandet av \"%s\": %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "fel vid sändning av %s-kommando: %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
+ msgstr ""
+ 
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "fel vid hämtning av ny PIN-kod: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "lista nycklar och användaridentiteter"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "giltighet: %s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "fel vid hämtning av lagrade flaggor: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "lista nycklar"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "skriv ut kontrollsummor"
  msgstr[1] "skriv ut kontrollsummor"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
+ #, c-format
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ #| msgid "error writing key: %s\n"
+ msgid "resetting keydb: %s\n"
+ msgstr "fel vid skrivning av nyckel: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "fel vid lagring av flaggor: %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
@@@ -7450,94 -6026,87 +7523,103 @@@ msgstr "fel när ett rör skapades: %s\
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Raderade %d signaturer.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "skriv ut kontrollsummor"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "skriv ut kontrollsummor"
+ msgstr[1] "skriv ut kontrollsummor"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "krypterad med %lu lösenfraser\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "skriv ut kontrollsummor"
+ msgstr[1] "skriv ut kontrollsummor"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7551,109 -6120,98 +7633,121 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "fel vid sändning av %s-kommando: %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
  msgstr "\"%s\" är inget giltigt långt nyckel-id\n"
  
  # trusted??
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "nyckel %s: accepterad som betrodd nyckel\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "nyckeln %s förekommer fler än en gång i tillitsdatabasen\n"
  
  # nyckeln?
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr "nyckel %s: ingen publik nyckel för pålitlig nyckel - hoppades över\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "nyckeln %s är markerad med förbehållslöst förtroende\n"
  
  # req står för request
  # kollat med Werner. Per
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "tillitsvärdet %lu är inte av begärd typ %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr "Du kan försöka att skapa tillitsdatabasen igen med dessa kommandon:\n"
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr "Referera till handboken om detta inte fungerar för dig\n"
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "använder tillitsmodellen %s\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  #| msgid "no need for a trustdb check with `%s' trust model\n"
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr ""
  "det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  #| msgid "no need for a trustdb update with `%s' trust model\n"
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr ""
  "det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "publika nyckeln %s hittades inte: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
  
  # originalet borde ha ett value
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "kontrollerar  tillitsdatabasen\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7662,7 -6220,6 +7756,7 @@@ msgstr[0] "%lu nycklar behandlade än s
  msgstr[1] "%lu nycklar behandlade än så länge\n"
  
  # Vad är detta!?
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7670,23 -6227,19 +7764,23 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d nycklar behandlade (%d validity counts rensade)\n"
  msgstr[1] "%d nycklar behandlade (%d validity counts rensade)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "publik nyckel för förbehållslöst betrodda nyckeln %s hittades inte\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  "djup: %d  giltig: %3d  signerad: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7814,53 -6346,40 +7908,53 @@@ msgstr "
  "Syntax: kbxutil [flaggor] [filer]\n"
  "lista, exportera, importera nyckelskåpsdata\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSA modulus saknas eller är inte %d bitar stor\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN-återanrop returnerade fel: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr "NullPIN har ännu inte ändrats\n"
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "|N|Ange en ny PIN-kod för standardnycklarna."
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
  msgstr "||Ange PIN-koden för standardnycklarna."
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|NP|Ange en ny upplåsningskod (PUK-kod) för standardnycklarna."
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|P|Ange upplåsningskoden (PUK-kod) för standardnycklarna."
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  "|N|Ange en ny PIN-kod för nyckeln att skapa kvalificerade signaturer med."
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr "||Ange PIN-koden för nyckeln att skapa kvalificerade signaturer med."
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7868,7 -6387,6 +7962,7 @@@ msgstr "
  "|NP|Ange en ny upplåsningskod (PUK-kod) för nyckeln att skapa kvalificerade "
  "signaturer med."
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7876,85 -6394,67 +7970,85 @@@ msgstr "
  "|P|Ange upplåsningskoden (PUK-koden) för nyckeln att skapa kvalificerade "
  "signaturer med."
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "fel vid hämtning av ny PIN-kod: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "misslyckades med att lagra datum för skapandet: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "läsning av publik nyckel misslyckades: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "svaret innehåller inte publikt nyckeldata\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr "svaret innehåller inte en RSA-modulus\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr "svaret innehåller inte den publika RSA-exponenten\n"
  
- #: scd/app-openpgp.c:1322
++#: scd/app-openpgp.c:1353
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
- msgid "response does not contain the EC public point\n"
+ msgid "response does not contain the EC public key\n"
  msgstr "svaret innehåller inte den publika RSA-exponenten\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "svaret innehåller inte publikt nyckeldata\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "läsning av publik nyckel misslyckades: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "använder standard-PIN som %s\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "misslyckades med att använda standard-PIN som %s: %s - inaktiverar "
  "ytterligare standardanvändning\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
  msgstr "||Ange PIN-koden"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "validering av CHV%d misslyckades: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "fel vid hämtning av CHV-status från kort\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr "kortet är låst permanent!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7967,24 -6467,19 +8061,24 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|Ange administratörens PIN-kod%%0A[återstående försök: %d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Ange administratörens PIN-kod"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Ange nollställningskoden för kortet"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Nollställningskoden är för kort; minimumlängd är %d\n"
@@@ -7992,83 -6487,65 +8086,83 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr "|RN|Ny nollställningskod"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Ny Admin PIN-kod"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|Ny PIN-kod"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  #| msgid "|A|Please enter the Admin PIN"
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "|A|Ange administratörens PIN-kod"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  #| msgid "||Please enter the PIN"
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Ange PIN-koden"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
  msgstr "fel vid läsning av programdata\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "fel vid läsning av fingeravtryckets DO\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "nyckeln finns redan\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr "befintlig nyckel kommer att ersättas\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "genererar ny nyckel\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
  msgstr "skriver ny nyckel\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "tidsstämpel för skapandet saknas\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "misslyckades med att lagra nyckeln: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported curve\n"
  msgstr "algoritmen stöds inte: %s"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "var god vänta under tiden nyckeln genereras ...\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
  msgstr "nyckelgenereringen misslyckades\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -8076,32 -6553,26 +8170,32 @@@ msgid_plural "key generation completed 
  msgstr[0] "nyckelgenereringen är färdig (%d sekunder)\n"
  msgstr[1] "nyckelgenereringen är färdig (%d sekunder)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr "avtrycket på kortet stämmer inte med den begärda\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "signaturer skapade hittills: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr ""
  "validering av Admin PIN-kod är för närvarande förbjudet genom detta "
  "kommando\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@@ -8123,7 -6591,6 +8217,7 @@@ msgstr "|N|Initial PIN-kod
  msgid "run in multi server mode (foreground)"
  msgstr "kör i multiserverläge (förgrund)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
  
@@@ -8183,19 -6639,16 +8277,19 @@@ msgstr "
  "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
  "Smartkortsdemon för GnuPG\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  #, fuzzy
  #| msgid ""
  #| "please use the option `--daemon' to run the program in the background\n"
  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:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "hanterare för fd %d startad\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "hanterare för fd %d avslutad\n"
@@@ -8217,11 -6667,9 +8311,11 @@@ msgstr "ingen gpg-agent kör i den hä
  msgid "validation model requested by certificate: %s"
  msgstr "valideringsmodellen begärd av certifikat: %s"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr "kedja"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr "skal"
  
@@@ -8254,195 -6696,148 +8348,195 @@@ msgstr "observera: icke-kritisk certifi
  msgid "certificate policy not allowed"
  msgstr "certifikatpolicy tillåts inte"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr "slår upp utfärdare på extern plats\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr "antal utfärdare som matchar: %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr "slår upp utfärdare från Dirmngr-cachen\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "antal matchande certifikat: %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "uppslag av endast-mellanlagrad dirmngr-nyckel misslyckades: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "misslyckades med att allokera keyDB-hanterare\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
  msgstr "certifikatet har spärrats"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "status för certifikatet är okänt"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr "se till att \"dirmngr\" är korrekt installerat\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
  msgstr "kontroll mot spärrlistan misslyckades: %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "certifikat med felaktig giltighetstid: %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr "certifikatet är ännu inte giltigt"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
  msgstr "rotcertifikatet är ännu inte giltigt"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr "tillfälligt certifikat är ännu inte giltigt"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
  msgstr "certifikatet har gått ut"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
  msgstr "rotcertifikatet har gått ut"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
  msgstr "tillfälligt certifikat har gått ut"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr "nödvändiga certifikattillägg saknas: %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
  msgstr "certifikat med felaktig giltighetstid"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr "signaturen inte skapad under certifikatets livstid"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr "certifikatet skapades inte under utfärdarens livstid"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr "tillfälligt certifikat är inte skapat under utfärdarens livstid"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  (  signatur skapad "
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "  (certifikat skapat "
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
  msgstr "  (certifikat giltigt från "
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr "  (     utfärdare giltig från "
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "fingeravtryck=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr "rotcertifikatet har nu markerats som betrott\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr "interaktiv markering som betrodd inte aktiverad i gpg-agent\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr "interaktiv markering som betrodd inaktiverad för den här sessionen\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  "VARNING: tid för skapandet av signaturen är inte känd - antar aktuell tid"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "ingen utfärdare hittades i certifikatet"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr "självsignerat certifikat har en FELAKTIG signatur"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr "rotcertifikatet har inte markerats som betrott"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "kontroll mot tillitslistan misslyckades: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr "certifikatkedjan är för lång\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "utfärdarens certifikat hittades inte"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
  msgstr "certifikatet har en FELAKTIG signatur"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr "hittade ett annat möjligen matchande CA-certifikat - försöker igen"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "certifikatkedjan längre än vad som tillåts av CA (%d)"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "certifikatet är korrekt\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
  msgstr "tillfälligt certifikat är korrekt\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
  msgstr "rotcertifikatet är korrekt\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr "växlar till kedjemodell"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr "valideringsmodell använd: %s"
@@@ -8798,7 -7127,6 +8892,7 @@@ msgstr "(det här verkar inte vara ett 
  msgid "certificate '%s' not found: %s\n"
  msgstr "certifikatet \"%s\" hittades inte: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
  msgstr "fel vid låsning av nyckelskåp: %s\n"
@@@ -8824,126 -7148,96 +8918,126 @@@ msgstr "borttagning av certifikatet \"%
  msgid "no valid recipients given\n"
  msgstr "inga giltiga mottagare angavs\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
  msgstr "lista externa nycklar"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
  msgstr "lista certifikatkedja"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
  msgstr "importera certifikat"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
  msgstr "exportera certifikat"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "registrera ett smartkort"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "skicka ett kommando till dirmngr"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr "starta gpg-protect-tool"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
  msgstr "skapa base-64-kodat utdata"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr "anta att inmatning är i PEM-format"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr "anta att inmatning är i base-64-format"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr "anta att inmatning är i binärformat"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr "kontrollera aldrig mot spärrlista"
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr "kontrollera giltigheten med OCSP"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr "|N|antal certifikat att inkludera"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr "|FIL|hämta policyinformation från FIL"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr "kontrollera inte certifikatpolicier"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr "hämta saknade utfärdarcertifikat"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "använd inte terminalen alls"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FIL|skriv en serverlägeslogg till FIL"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FIL|skriv en granskningslogg till FIL"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "satsläge: fråga aldrig"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "anta ja på de flesta frågorna"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "anta nej på de flesta frågorna"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FIL|lägg till nyckelring till listan över nyckelringar"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID som förvald hemlig nyckel"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAMN|använd chifferalgoritmen NAMN"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|NAMN|använd algoritmen NAMN för kontrollsummor"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [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.
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgsm [options] [files]\n"
@@@ -8958,50 -7252,41 +9052,50 @@@ msgstr "
  "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
  "standardåtgärden beror på inmatningsdata\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  #| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "OBSERVERA: kommer inte att kunna kryptera till \"%s\": %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  #| msgid "unknown validation model `%s'\n"
  msgid "unknown validation model '%s'\n"
  msgstr "okänd valideringsmodell \"%s\"\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: inget värdnamn angivet\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: lösenord angivet utan användare\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: hoppar över denna rad\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
  msgstr "kunde inte tolka nyckelserver\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  #| msgid "importing common certificates `%s'\n"
  msgid "importing common certificates '%s'\n"
  msgstr "importerar vanliga certifikat \"%s\"\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  #| msgid "can't sign using `%s': %s\n"
  msgid "can't sign using '%s': %s\n"
  msgstr "kan inte signera med \"%s\": %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
  
@@@ -9018,7 -7300,6 +9112,7 @@@ msgstr "fel vid lagring av certifikat\n
  msgid "basic certificate checks failed - not imported\n"
  msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "fel vid hämtning av lagrade flaggor: %s\n"
@@@ -9033,31 -7312,25 +9127,31 @@@ msgstr "fel vid import av certifikat: %
  msgid "error reading input: %s\n"
  msgstr "fel vid läsning av indata: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
  msgstr "misslyckades med att få fingeravtrycket\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr "problem vid sökandet efter befintligt certifikat: %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "fel vid sökning efter skrivbar keyDB: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
  msgstr "fel vid lagring av certifikat: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
  msgstr "fel vid lagring av flaggor: %s\n"
@@@ -10037,124 -8133,100 +10131,128 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "|FILE|run commands from FILE on startup"
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FIL|kör kommandon från FIL vid uppstart"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "skicka ett kommando till dirmngr"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FIL|skriv serverlägesloggar till FIL"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "Avsluta utan att spara? (j/N) "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  #| msgid "|FILE|read options from FILE"
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FIL|läs inställningar från FIL"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  #| msgid "|URL|use keyserver at URL"
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL| använd nyckelservern på URL"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
  # inställningar istället för flaggor?
  # Nej, här är det bruksanvisningen för kommandoraden.
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10167,13 -8239,11 +10265,13 @@@ msgstr "
  "@\n"
  "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10185,88 -8255,71 +10283,88 @@@ msgstr "
  "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
  "Hantering av hemliga nycklar för GnuPG\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "valid debug levels are: %s\n"
  msgstr "ogiltig debug-level \"%s\" angiven\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "användning: gpgsm [flaggor] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "%s är inte tillåten tillsammans med %s!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  #| msgid "conversion from `%s' to `%s' failed: %s\n"
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  #| msgid "line too long - skipped\n"
  msgid "%s:%u: line too long - skipped\n"
  msgstr "raden är för lång - hoppades över\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "ogiltigt fingeravtryck"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "%s:%u: read error: %s\n"
  msgstr "läsfel i \"%s\":  %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "inte tvingad"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10458,14 -8475,6 +10556,7 @@@ msgstr "\"%s\" är inte en JPEG-fil\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- #| msgid "error allocating enough memory: %s\n"
- msgid "error allocating memory: %s\n"
- msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  #| msgid "error writing to %s: %s\n"
  msgid "error printing log line: %s\n"
@@@ -10753,86 -8710,70 +10844,86 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "sändande rad misslyckades: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire failed: %s\n"
  msgstr "sändande rad misslyckades: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "val misslyckades: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error sending data: %s\n"
  msgstr "fel vid sändning av %s-kommando: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "start_cert_fetch failed: %s\n"
  msgstr "val misslyckades: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_next_cert failed: %s\n"
  msgstr "val misslyckades: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  #| msgid "cannot allocate outfile string: %s\n"
  msgid "can't allocate control structure: %s\n"
  msgstr "kan inte allokera utfilssträng: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  #| msgid "failed to create stream from socket: %s\n"
  msgid "failed to allocate assuan context: %s\n"
  msgstr "misslyckades med att skapa flöde från uttag: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  #| msgid "failed to store the creation date: %s\n"
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "misslyckades med att lagra datum för skapandet: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10889,7 -8821,6 +10980,7 @@@ msgstr "
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "certifikatet skulle inte använts för signering\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "tyst"
  
@@@ -11068,11 -8958,9 +11159,11 @@@ msgstr "|NAMN|kryptera även till anvä
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|ange e-postalias (ett eller flera)"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr "Konfiguration för nyckelservrar"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
  msgstr "|URL| använd nyckelservern på URL"
  
@@@ -11104,144 -8985,118 +11195,150 @@@ msgstr "Flaggor som kontrollerar format
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Flaggor som kontrollerar säkerheten"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr "Konfiguration för HTTP-servrar"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr "använd systemets HTTP-proxyinställningar"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr "Konfiguration av LDAP-servrar som ska användas"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr "LDAP-serverlista"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr "Konfiguration för OCSP"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
++#: tools/gpgconf-comp.c:1070
+ msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
  #| msgid "Bad Passphrase"
- msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "Felaktig lösenfras"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Komponenten hittades inte"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Extern validering av komponenten %s misslyckades"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr "Observera att gruppspecifikationer ignoreras\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr "lista alla komponenter"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr "kontrollera alla program"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|KOMPONENT|lista flaggor"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|KOMPONENT|ändra flaggor"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|KOMPONENT|kontrollera flaggor"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr "tillämpa globala standardvärden"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  #, fuzzy
  #| msgid "get the configuration directories for gpgconf"
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "hämta konfigurationskatalogerna för gpgconf"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
  msgstr "lista global konfigurationsfil"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
  msgstr "kontrollera global konfigurationsfil"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "uppdatera tillitsdatabasen"
+ 
++#: tools/gpgconf.c:86
  #, fuzzy
  #| msgid "list all components"
  msgid "reload all or a given component"
  msgstr "lista alla komponenter"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  #| msgid "list all components"
  msgid "launch a given component"
  msgstr "lista alla komponenter"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  #, fuzzy
  #| msgid "list all components"
  msgid "kill a given component"
  msgstr "lista alla komponenter"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "använd som fil för utdata"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr "aktivera ändringar vid körtid, om möjligt"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgconf [options]\n"
@@@ -11253,15 -9108,12 +11350,15 @@@ msgstr "
  "Syntax: gpgconf [flaggor]\n"
  "Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "Behöver ett komponentargument"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "Komponenten hittades inte"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr "Inget argument tillåts"
  
diff --cc po/tr.po
index 71ec375,093de7a..f080bdc
--- a/po/tr.po
+++ b/po/tr.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 2.0.10rc1\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2015-02-11 19:18+0100\n"
  "Last-Translator: Nilgün Belma Bugüner <nilgun at belgeler.gen.tr>\n"
  "Language-Team: Turkish\n"
@@@ -18,7 -17,6 +18,7 @@@
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  "X-Generator: KBabel 1.11.4\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "PIN giriş kilidi edinilemedi: %s\n"
@@@ -29,41 -27,32 +29,41 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "Enter new passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -71,7 -60,6 +71,7 @@@ msgstr "Yeni anahtar parolasını girin
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr "Kalite:"
  
@@@ -81,11 -69,9 +81,11 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -93,7 -79,6 +93,7 @@@ msgstr "
  "Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
  "olabilecek"
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -101,53 -86,40 +101,53 @@@ msgstr "
  "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
  "kilitsiz olabilecek"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Anahtar Parolası:"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "aynı değiller - tekrar deneyin"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (%d/%d dene)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
  msgstr "PIN çok uzun"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
  msgstr "Anahtar Parolası çok uzun"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
  msgstr "PIN içinde geçersiz karakterler var"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr "PIN çok kısa"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "PIN hatalı"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
  msgstr "Anahtar Parolası hatalı"
  
@@@ -156,25 -127,11 +156,25 @@@
  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:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "\"%s\" oluşturulamıyor: %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -201,41 -154,25 +201,31 @@@ msgstr "kartın öntanımlı kimlik do�
  msgid "no suitable card key found: %s\n"
  msgstr "uygun bir kart anahtarı yok: %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "anahtar gölgelenemedi: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "anahtarı yazarken hata: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Lütfen SSH anahtarı %0A  %c için anahtar parolasını giriniz"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Lütfen bu anahtar parolasını tekrar girin"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -244,16 -181,13 +234,16 @@@ msgstr "
  "gpg-agent'in anahtar deposuna korumak için alınan gizli anahtar %%0A  %s%%0A "
  "için lütfen anahtar parolası giriniz"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "sokette akım oluşturulamadı: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr ""
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
  
@@@ -403,8 -313,6 +393,8 @@@ msgstr "Yeni anahtarınızı korumak i�
  msgid "Please enter the new passphrase"
  msgstr "Lütfen yeni anahtar parolasını girin"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -412,139 -320,106 +402,145 @@@ msgstr "
  "@Seçenekler:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "artalan süreci olarak çalışır"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "sunucu olarak (önalanda) çalışır"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "run in server mode"
+ msgid "run in supervised mode"
+ msgstr "sunucu kipinde çalışır"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "ayrıntılı"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "biraz daha sessiz olur"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr "sh tarzı komut çıktısı"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr "csh tarzı komut çıktısı"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|DOSYA|seçenekler DOSYAdan okunur"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "konsoldan kopulmaz"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr "klavye ve fare gaspedilmez"
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
  msgstr "sunucu için bir günlük dosyası kullanılır"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
  msgstr "Akıllı kart süreci kullanılmaz"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|connect to Assuan socket NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr "TTY değiştirme istekleri yoksayılır"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr "X birimi değiştirme istekleri yoksayılır"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr "imzalarken PIN arabelleği kullanılmaz"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  #| msgid "do not allow the reuse of old passphrases"
  msgid "disallow the use of an external password cache"
  msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  #, fuzzy
  #| msgid "allow clients to mark keys as \"trusted\""
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
  msgstr "anahtar parolasının önceden atanmasına izin verilir"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "enable ssh-agent emulation"
  msgid "enable ssh support"
  msgstr "ssh-agent öykünümü etkinleşir"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
  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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  #, fuzzy
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Yazılım hatalarını lütfen <"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -556,149 -431,114 +552,149 @@@ msgstr "
  "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
  "GnuPG için gizli anahtar yönetimi\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "invalid debug-level '%s' given\n"
  msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "seçenek dosyası \"%s\": %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "\"%s\"den seçenekler okunuyor\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
  msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "soket oluşturulamıyor: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, fuzzy, c-format
  #| msgid "socket name `%s' is too long\n"
  msgid "socket name '%s' is too long\n"
  msgstr "soketin ismi `%s' çok uzun\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  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:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
  msgstr "soket için tuz alınırken hata\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  #| msgid "error binding socket to `%s': %s\n"
  msgid "error binding socket to '%s': %s\n"
  msgstr "soket `%s'e bağlanırken hata: %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgid "can't set permissions of '%s': %s\n"
  msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "soket dinleme başarısız: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  #| msgid "listening on socket `%s'\n"
  msgid "listening on socket '%s'\n"
  msgstr "`%s' soketi dinlemede\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "`%s' dizini oluşturulamıyor: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "dizin `%s' oluşturuldu\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  #| msgid "stat() failed for `%s': %s\n"
  msgid "stat() failed for '%s': %s\n"
  msgstr "%s için stat() başarısız oldu: %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  #| msgid "can't use `%s' as home directory\n"
  msgid "can't use '%s' as home directory\n"
  msgstr "`%s' ev dizini olarak kullanılamıyor\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, 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:2312
++#: agent/gpg-agent.c:2603
  #, 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:2387
++#: agent/gpg-agent.c:2678
  #, 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:2392
++#: agent/gpg-agent.c:2683
  #, 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:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  #| msgid "pth_select failed: %s - waiting 1s\n"
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "pth_select başarısız: %s - 1s bekliyor\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s durdu\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "bu oturumda çalışan gpg-agent yok\n"
  
@@@ -715,8 -553,6 +711,8 @@@ msgstr "
  "Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
  "Parola arabelleği bakımcısı\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -724,9 -560,6 +720,9 @@@ msgstr "
  "@Komutlar:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -782,7 -607,6 +778,8 @@@ msgstr "iptal edildi\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "anahtar parolası sorulurken hata: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening '%s': %s\n"
@@@ -849,8 -664,6 +846,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Evet"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "Hayır"
  
@@@ -882,13 -692,11 +879,13 @@@ msgstr "Doğru
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  "Bilginize: Bu anahtar parolası hiç değişmedi%0ALütfen şimdi değiştirin."
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@@ -897,15 -705,12 +894,15 @@@ msgstr "
  "Bu anahtar parolası %.4s-%.2s-%.2s tarihinden beri hiç değişmedi%%0ALütfen "
  "şimdi değiştirin."
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
  msgstr "Anahtar parolasını değiştir"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr "Sonra değiştireceğim"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -913,13 -718,11 +910,13 @@@
  "%%0A?"
  msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
  msgstr "anahtarı kullanıma sokar"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -934,13 -735,11 +931,13 @@@ msgstr "DSA sekizin katlarında bir çi
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "%s anahtarı, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, fuzzy, c-format
  #| msgid "a %u bit hash is not valid for a %u bit %s key\n"
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "%u bitlik çittirim %u bitlik %s anahtarı için geçersiz\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
@@@ -967,88 -762,78 +964,101 @@@ msgstr "koruma algoritması %d%s destek
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "koruma algoritması %d%s desteklenmiyor\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "boru oluşturulurken hata: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "boru oluşturulurken hata: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "süreç çatallanırken hata: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- #| msgid "waiting for process %d to terminate failed: %s\n"
- msgid "waiting for processes to terminate failed: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
  msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  #| msgid "error running `%s': probably not installed\n"
  msgid "error running '%s': probably not installed\n"
  msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  #| msgid "error running `%s': exit status %d\n"
  msgid "error running '%s': exit status %d\n"
  msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  #| msgid "error running `%s': terminated\n"
  msgid "error running '%s': terminated\n"
  msgstr "`%s' çalışırken hata: sonlandırıldı\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "süreç %d çıkış kodu alınırken hata: %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
  msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "gpg-agent seçenekleri ayarlanırken sorun çıktı\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "UYARI: %s üzerinde sahiplik güvensiz: \"%s\"\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ #| msgid "renaming `%s' to `%s' failed: %s\n"
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "evet"
  
@@@ -1102,7 -876,6 +1112,7 @@@ msgstr "%lu bayt ayrılırken güvenli 
  msgid "out of core while allocating %lu bytes"
  msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "yeterli bellek ayrılırken hata: %s\n"
@@@ -1123,39 -893,32 +1133,39 @@@ msgstr "UYARI: \"%s\" seçeneği eskid
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, fuzzy, c-format
  #| msgid "no running gpg-agent - starting one\n"
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr "çalışan gpg-agent yok - bir tane başlatılıyor\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  #| msgid "can't connect to the dirmngr - trying fall back\n"
  msgid "connection to agent is in restricted mode\n"
  msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, fuzzy, c-format
  #| msgid "no running dirmngr - starting `%s'\n"
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr "çalışan dirmngr yok - `%s' başlatılıyor\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  #, fuzzy
  #| msgid "can't connect to the dirmngr - trying fall back\n"
  msgid "connection to the dirmngr established\n"
@@@ -1234,8 -981,6 +1244,8 @@@ msgstr "Oturum anahtarı oluşturuldu
  msgid "algorithm: %s"
  msgstr "algoritma: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "desteklenmeyen algoritma: %s"
@@@ -1312,11 -1041,9 +1322,11 @@@ msgstr "Sertifika zinciri geçerli
  msgid "Root certificate trustworthy"
  msgstr "Kök sertifika güvenilir"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "sertifika için bir CRL yok"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
  msgstr "mevcut CRL çok eski"
  
@@@ -1354,7 -1073,6 +1364,7 @@@ msgstr "`%s' için yardım mevcut deği
  msgid "ignoring garbage line"
  msgstr "bozuk satır yok sayılıyor"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[yok]"
  
@@@ -1427,7 -1130,6 +1437,7 @@@ msgstr "\"%.50s\" seçeneği belirsiz\n
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "\"%.50s\" komutu belirsiz\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
  msgstr "nüve dışında\n"
  
@@@ -1490,8 -1181,6 +1500,8 @@@ msgstr "kilit `%s' yapılmadı: %s\n
  msgid "waiting for lock %s...\n"
  msgstr "%s kilidi için bekleniyor...\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s çok eski (gereken %s, sizinki %s)\n"
@@@ -1575,13 -1246,11 +1585,13 @@@ msgstr "
  "zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
  "sunucusu kullanılmış\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "insan okuyabilir değil"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1589,25 -1258,20 +1599,25 @@@ msgstr "
  "bir simgelem ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
  "sonuna bir '=' gelir.\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "bir kullanıcı simgelem ismi '@' karakteri içermeli\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "bir simgelem isminin birden fazla '@' karakteri içermemesi gerekir\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "bir simgelem değerinde kontrol karakterleri kullanılamaz\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  #| msgid "a notation name must not contain more than one '@' character\n"
  msgid "a notation name may not contain an '=' character\n"
  msgstr "bir simgelem isminin birden fazla '@' karakteri içermemesi gerekir\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
@@@ -1617,51 -1281,40 +1627,50 @@@ msgstr "
  "bir simgelem ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
  "sonuna bir '=' gelir.\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr ""
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  #, fuzzy
  #| msgid "Enter passphrase\n"
  msgid "Enter passphrase: "
  msgstr "Anahtar parolasını giriniz\n"
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
  msgstr "UYARI: %s %s'i aşıyor\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "%s numaralı OpenPGP kartı saptandı\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "bu önceden betik kipinde yapılamaz\n"
  
@@@ -1669,14 -1321,9 +1678,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Bu komut sadece 2. sürüm kartlar için kullanılabilir\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
  msgstr "Sıfırlama kodu ya yok ya da kullanım dışı\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Seçiminiz? "
  
@@@ -1704,176 -1345,134 +1713,176 @@@ msgstr "zorlanmadı
  msgid "forced"
  msgstr "zorlandı"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "Hata: Çift boşluğa izin verilmez.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "Kart sahibinin soyadı: "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "Kart sahibinin adı: "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr "Hata: İsimler birlikte çok uzun oluyor (sınır: %d karakter).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "genel anahtarın alınacağı URL: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "\"%s\" okunurken hata: %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "`%s' yazılırken hata: %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "Oturum açma verisi (hesap adı): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "Özel DO verisi: "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "Dil tercihleri: "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
  msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
  msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
  msgstr "Hata: yanıt geçersiz.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "CA parmak izi: "
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "Hata: biçimli parmakizi geçersiz\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "anahtar işlemi mümkün değil: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "bir OpenPGP kartı değil"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "%u bite yuvarlandı\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "soket `%s'e bağlanırken hata: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
  msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, fuzzy, c-format
  #| msgid ""
  #| "Please note that the factory settings of the PINs are\n"
@@@ -1888,144 -1487,109 +1897,144 @@@ msgstr "
  "   PIN = `%s'     Admin PIN = `%s'\n"
  "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "   (1) İmzalama anahtarı\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) Şifreleme anahtarı\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Kimlik kanıtlama anahtarı\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Seçim geçersiz.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  #| msgid "read failed: %s\n"
  msgid "KEYTOCARD failed: %s\n"
  msgstr "read başarısız: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
  msgstr "%s kipindeyken bu komut kullanılamaz.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  #| msgid "Sign it? (y/N) "
  msgid "Continue? (y/N) "
  msgstr "İmzalayacak mısınız? (e/H veya y/N) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "bu menüden çık"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
  msgstr "yönetici komutlarını gösterir"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "bunu gösterir"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "tüm kullanılabilir veriyi listeler"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "kart sahibinin ismini değiştirir"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "anahtarın alınacağı URL değiştirilir"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "kart URL'sinde belirtilmiş anahtarı alır"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "oturum açma ismini değiştirir"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "dil tercihlerini değiştirir"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "kart sahibinin cinsiyetini değiştirir"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "bir CA parmakizini değiştirir"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr "imza zorlama PIN'i bayrağını değiştirir"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "yeni anahtarlar üretir"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "PIN'i değiştirme veya engelleme menüsü"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "PIN'i doğrular ve tüm veriyi listeler"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr "Bir Sıfırlama Kodu kullanarak PIN'in engelini kaldır"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "Yöneticiye özel komut\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "Yönetici komutlarına izin verilir\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "Yönetici komutlarına izin verilmez\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
  
@@@ -2033,23 -1596,15 +2042,23 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output seçeneği bu komutla çalışmaz\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "`%s' açılamadı\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "anahtar \"%s\" yok: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "anahtar bloğu okunurken hata: %s\n"
@@@ -2170,7 -1703,6 +2179,7 @@@ msgstr "
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s \"%s\" için şifrelendi\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
@@@ -2252,60 -1769,46 +2261,60 @@@ msgstr "UYARI: geçici dosya silinemiyo
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
  msgstr "sadece-yerel olarak imli imzalar ihraç edilir"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  "öznitelik kullanıcı kimliklerini (genellikle foto kimliklerini) ihraç eder"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "\"hassas\" olarak imli yürürlükten kaldırma anahtarlarını ihraç eder"
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "ihraç sırasında anahtardan kullanışsız parçalar kaldırılır"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "ihraç sırasında anahtardan mümkün olduğunca çok şey kaldırılır"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s: atlandı: %s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "\"%s\"e yazıyor\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "anahtar %s: anahtar malzemesi kartta - atlandı\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "gizli anahtarların ihracına izin verilmez\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2315,8 -1817,6 +2324,8 @@@ msgstr "`%s' oluşturulurken hata: %s\n
  msgid "[User ID not found]"
  msgstr "[Kullanıcı kimliği yok]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "(check argument of option '%s')\n"
@@@ -2339,261 -1836,202 +2348,261 @@@ msgstr "%s kapanırken hata: %s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  #| msgid "automatically retrieved `%s' via %s\n"
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "`%s' %s üzerinden özdevinimli olarak alındı\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  #| msgid "error retrieving `%s' via %s: %s\n"
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "`%s' %s üzerinden alınırken hata: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "Parmak izi yok"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "gizli anahtar \"%s\" yok: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
  "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "bir imza yapar"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
  msgstr "açıkça okunabilen bir imza yapar"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "bağımsız bir imza yapar"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "veriyi şifreler"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "sadece simetrik şifre ile şifreler"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "veri şifresini açar (öntanımlı)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "bir imzayı doğrular"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "anahtarları listeler"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "anahtarları ve imzaları listeler"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "anahtar imzalarını listeler ve sınar"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "anahtarları ve parmak izlerini listeler"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "gizli anahtarları listeler"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "yeni bir anahtar çifti üretir"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "yeni bir anahtar çifti üretir"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "yeni bir anahtar çifti üretir"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "yeni bir anahtar çifti üretir"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "bir yürürlükten kaldırma sertifikası üretir"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "anahtarları genel anahtar zincirinden siler"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "anahtarları gizli anahtar zincirinden siler"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "bir anahtarı imzalar"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "bir anahtarı yerel olarak imzalar"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "bir anahtarı imzalar"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "bir anahtarı yerel olarak imzalar"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "bir anahtarı düzenler ve imzalar"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
  msgstr "anahtar parolası değiştirir"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "anahtarları gönderir"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "anahtarları bir anahtar sunucusuna gönderir"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "anahtarları bir anahtar sunucusundan indirir"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "bir anahtar sunucusunda anahtarları arar"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "anahtarları bir anahtar sunucusundan günceller"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "anahtarları indirir/katıştırır"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "kart durumunu basar"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "kart üzerindeki veriyi değiştirir"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "bir kartın PIN'ini değiştirir"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "güvence veritabanını günceller"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
  msgstr "ileti özetlerini gösterir"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "sunucu kipinde çalışır"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "ascii zırhlı çıktı oluşturur"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  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:535
++#: g10/gpg.c:539
  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:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "kurallı metin kipini kullanır"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
  msgstr "|DOSYA|çıktı DOSYAya yazılır"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "hiçbir değişiklik yapmaz"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "üzerine yazmadan önce sorar"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr "kesin OpenPGP davranışı etkin olur"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2601,7 -2039,6 +2610,7 @@@ msgstr "
  "@\n"
  "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2621,13 -2058,11 +2630,13 @@@ msgstr "
  " --list-keys [isimler]      anahtarları listeler\n"
  " --fingerprint [isimler]    parmak izlerini gösterir\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2642,7 -2077,6 +2651,7 @@@ msgstr "
  "imzalama, kontrol, şifreleme veya çözme\n"
  "öntanımlı işlem girilen veriye bağımlıdır\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2650,81 -2084,66 +2659,81 @@@ msgstr "
  "\n"
  "Desteklenen algoritmalar:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "GenAnah: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Şifre: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Hash: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Sıkıştırma: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] %s\n"
  msgstr "kullanımı: gpgsm [seçenekler] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "çelişen komutlar\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  #| msgid "no = sign found in group definition `%s'\n"
  msgid "no = sign found in group definition '%s'\n"
  msgstr "grup tanımı '%s' içinde = işareti yok\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on extension `%s'\n"
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on extension `%s'\n"
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2732,19 -2151,16 +2741,19 @@@ 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:1559
++#: g10/gpg.c:1567
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
  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:1565
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2753,544 -2169,433 +2762,551 @@@ 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:1571
++#: g10/gpg.c:1579
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
  msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  #| msgid "show user ID validity during key listings"
  msgid "show key usage information during key listings"
  msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr ""
  "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  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:1903
++#: g10/gpg.c:1911
  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:1905
++#: g10/gpg.c:1913
  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:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "anahtarı iptal eder"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "valid values for option '%s':\n"
+ msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "`%s' seçeneği bilinmiyor\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ #| msgid "missing argument for option \"%.50s\"\n"
+ msgid "invalid value for option '%s'\n"
+ msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  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:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
  msgstr "BİLGİ: %s normal kullanım için değil!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid signature expiration\n"
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "%d. satır: geçerli bir eposta adresi değil\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  #| msgid "invalid country code in `%s', line %d\n"
  msgid "invalid pinentry mode '%s'\n"
  msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid character set\n"
  msgid "'%s' is not a valid character set\n"
  msgstr "'%s' geçerli bir karakter kümesi değil\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "anahtar sunucusu seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "içselleştirme seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "liste seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "dışsallaştırma seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: liste seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "liste seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  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:3107
++#: g10/gpg.c:3202
  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:3109
++#: g10/gpg.c:3204
  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:3111
++#: g10/gpg.c:3206
  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:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "imzaları PKA verisi ile doğrular"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  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:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "doğrulama seçenekleri geçersiz\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, 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:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "UYARI: %s %s'i aşıyor\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s ile %s birlikte kullanılmaz!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s, %s ile etkisiz olur!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, 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:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "seçilen şifre algoritması geçersiz\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "seçilen özet algoritması geçersiz\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "seçilen şifre algoritması geçersiz\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  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:3588
++#: g10/gpg.c:3686
  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:3590
++#: g10/gpg.c:3688
  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:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  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:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "öntanımlı tercihler geçersiz\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "kişisel şifre tercihleri geçersiz\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "kişisel özet tercihleri geçersiz\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s, %s ile henüz çalışmıyor\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  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:3704
++#: g10/gpg.c:3802
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  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:3709
++#: g10/gpg.c:3807
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  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:3803
++#: g10/gpg.c:3906
  #, 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:3815
++#: g10/gpg.c:3918
  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:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [dosyaismi]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [dosyaismi]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  #| msgid "symmetric encryption of `%s' failed: %s\n"
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [dosyaismi]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [dosyaismi]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  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:3918
++#: g10/gpg.c:4021
  #, 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:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [dosyaismi]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [dosyaismi]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [dosyaismi]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  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:3978
++#: g10/gpg.c:4081
  #, 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:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [DOSYA]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [dosyaismi]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [dosyaismi]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key kullanıcı-kimliği"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key kullanıcı-kimliği"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key kullanıcı-kimliği [komutlar]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
  msgstr "--sign-key kullanıcı-kimliği"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, 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:4313
++#: g10/gpg.c:4416
  #, 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:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "anahtar sunucusunda arama başarısız: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "zırhın kaldırılması başarısız: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "zırhlama başarısız: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "`%s' çittirim algoritması geçersiz\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  #| msgid "error storing certificate: %s\n"
  msgid "error parsing key specification '%s': %s\n"
  msgstr "serifika saklanırken hata: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[dosyaismi]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "İletinizi yazın ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "belirtilen sertifika güvence adresi geçersiz\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "belirtilen imza güvence adresi geçersiz\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|DOSYA|anahtarlar DOSYA anahtar zincirinden alınır"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|durum bilgisini bu FD'ye yazar"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -3309,138 -2612,110 +3325,138 @@@ msgstr "yardım mevcut değil
  msgid "No help available for '%s'"
  msgstr "\"%s\" için yardım mevcut değil"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr "salt-yerel olarak imlenmiş imzaları ithal eder"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr "ithalat sırasında pks anahtar sunucusundaki bozukluğu giderir"
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "ithalat sonrası güvence veritabanını güncellemez"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "ithalat sonrası güvence veritabanını güncellemez"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "parmakizini gösterir"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr "güncellemeleri sadece mevcut anahtarlar için kabul eder"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
  msgstr "ithalat sonrası anahtardan kullanışsız parçaları kaldırır"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "ithalat sonrası anahtardan mümkün olduğunca çok şey kaldırır"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "%d türündeki blok atlanıyor\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "şu ana kadar %lu anahtar işlendi\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "İşlenmiş toplam miktar: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "     yeni anahtarlar atlandı: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "     yeni anahtarlar atlandı: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "         kullanıcı kimliksiz: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                      alınan: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "                   değişmedi: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "      yeni kullanıcı kimliği: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "    yeni yardımcı anahtarlar: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "                yeni imzalar: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "      yeni anahtar iptalleri: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "     gizli anahtarlar okundu: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "  gizli anahtarlar indirildi: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "  gizli anahtarlar değişmedi: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "             alınamadı: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "    temizlenen imzalar: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "     temizlenen kullanıcı kimlikleri: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3449,197 -2724,159 +3465,197 @@@ msgstr "
  "UYARI: anahtar %s bu kullanıcı kimliklerde kullanışsız algoritmalar için "
  "tercihler içeriyor:\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": şifreleme algoritması %s için tercih edilir\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": özet algoritması %s için tercih edilir\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr ""
  "         \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
  "\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "tercihlerinizi güncellemenizi ve\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
  "tekrar dağıtmanızı şiddetle öneririz.\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "anahtar %s: kullanıcı kimliği yok\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
  msgstr "\"%s\" atlandı: %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "anahtar %s: genel anahtar yok: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "anahtar %s: yeni anahtar - atlandı\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "\"%s\" anahtarlığına yazarken hata oluştu: %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "anahtar %s: \"%s\" %d yeni imza\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "anahtar %s: \"%s\" değişmedi\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "anahtar %s: gizli anahtar alındı\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "atlandı: gizli anahtar zaten var\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "key %s: error sending to agent: %s\n"
  msgstr "%s komutu gönderilirken hata: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
  msgstr "gizli anahtar \"%s\" yok: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "gizli anahtarı alımına izin verilmez\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
@@@ -3654,188 -2891,154 +3670,188 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
  "uygulanamaz\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr ""
  "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
  "desteklenmiyor\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr ""
  "anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "anahtar %s: yardımcı anahtar atlandı\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr ""
  "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
  "anahtarı %s alınıyor\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr ""
  "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
  "anahtarı %s mevcut değil.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  #| msgid "error creating keybox `%s': %s\n"
  msgid "error creating keybox '%s': %s\n"
  msgstr "anahtar bloku `%s' oluşturulurken hata: %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
  msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  #| msgid "keybox `%s' created\n"
  msgid "keybox '%s' created\n"
  msgstr "`%s' anahtar bloğu oluşturuldu\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
  msgstr "`%s' anahtarlığı oluşturuldu\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  #| msgid "keyblock resource `%s': %s\n"
  msgid "keyblock resource '%s': %s\n"
  msgstr "anahtar bloku özkaynağı `%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening key DB: %s\n"
  msgstr "'%s' açılırken hata: %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "anahtar zinciri önbelleği yeniden oluşturulurken hata: %s\n"
@@@ -3848,32 -3049,32 +3864,39 @@@ msgstr "[yürürlükten kaldırma]
  msgid "[self-signature]"
  msgstr "[öz-imza]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ #| msgid "error allocating enough memory: %s\n"
+ msgid "error allocating memory: %s\n"
+ msgstr "yeterli bellek ayrılırken hata: %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "kart %s özet algoritmasını desteklemiyor\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "Buradaki imzeler iyi:"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
  msgstr "\"%s\" atlandı: %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
@@@ -3881,7 -3082,6 +3904,7 @@@ msgid_plural "%d duplicate signatures r
  msgstr[0] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
  msgstr[1] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3889,7 -3089,6 +3912,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
  msgstr[1] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3897,7 -3096,6 +3920,7 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d kötü imza\n"
  msgstr[1] "%d kötü imza\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
@@@ -3905,14 -3103,12 +3928,14 @@@ msgid_plural "%d signatures reordered\n
  msgstr[0] "Buradaki imzeler iyi:"
  msgstr[1] "Buradaki imzeler iyi:"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3923,17 -3119,14 +3946,17 @@@ msgstr "
  "derecesine lütfen karar verin. (pasportuna mı bakarsınız yoksa farklı\n"
  "kaynaklardan parmakizlerini mi kontrol edersiniz...) kararınızı verin\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr " %d = Şöyle böyle güveniyorum\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr " %d = Tamamen güveniyorum\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3943,50 -3136,38 +3966,50 @@@ msgstr "
  "1'den büyük bir derinlik, imzaladığınız anhatarın kendi yararınıza\n"
  "güvence imzaları yapmayı mümkün kılar.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  İmzalanamıyor.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Kullanıcı kimliği \"%s\" imzalanabilir.  "
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
  msgstr "İmzalayacak mısınız? (e/H veya y/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3995,12 -3176,10 +4018,12 @@@ msgstr "
  "\"%s\" üzerindeki öz-imza\n"
  "bir PGP 2.x tarzı imza.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr ""
  "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H veya y/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4009,13 -3188,11 +4032,13 @@@ msgstr "
  "\"%s\" üzerindeki imzanızın\n"
  "kullanım süresi dolmuş.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr ""
  "Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H "
  "veya y/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -4024,46 -3201,37 +4047,46 @@@ msgstr "
  "\"%s\" üzerindeki imzanız\n"
  "dahili bir imza.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H veya "
  "y/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "Bu anahtarın kullanım süresi dolmuş!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr ""
  "İmzanızın da aynı süreyle geçerli olmasını ister misiniz? (E/h veya Y/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -4072,33 -3240,27 +4095,33 @@@ msgstr "
  "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
  "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Cevabı bilmiyorum. %s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Tamamen kontrol edildi.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) İlişkisel denetim yaptım.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4108,232 -3270,178 +4131,232 @@@ msgstr "
  "gerçekten\n"
  "emin misiniz?\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
  msgstr "Bu bir öz-imza olacak.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "Bu anahtarı çok dikkatle sınadım.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
  msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "imzalama başarısız: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
  "değiştirilecek bir anahtar parolası yok.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "anahtar parolası oluşturulurken hata: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "kaydet ve çık"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "parmakizini gösterir"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
  msgstr "Simgelemi giriniz: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "anahtarı ve kullanıcı kimliğini gösterir"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "N kullanıcı kimliğini seçer"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "N yardımcı anahtarını"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "imzaları sınar"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  "seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "kullanıcı kimlikleri yerel olarak imzalar"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  "seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "bir kullanıcı kimliği ekler"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "bir foto kimliği ekler"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "seçili kullanıcı kimlikleri siler"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "bir yardımcı anahtar ekler"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "bir akıllı karta bir anahtar ekler"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "bir akıllı karttan bir anahtarı taşır"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "seçili yardımcı anahtarları siler"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "bir yürürlükten kaldırma anahtarı ekler"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "seçili kullanıcı kimliklerden imzaları siler"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr ""
  "anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
  "değiştirir"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "seçili kullanıcı kimliğini asıl olarak imler"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "tercihleri listeler (uzman)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "tercihleri listeler (ayrıntılı)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
  "seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
  "belirler"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
  msgstr "seçili kullanıcı kimlikleri için bir simgelem belirler"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "anahtar parolasını değiştirir"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "sahibiningüvencesini değiştirir"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "anahtarı kullanıma sokar"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "anahtarı iptal eder"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "seçili foto kimlikleri gösterir"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "kullanışsız kullanıcı kimlikleri sıkıştırır ve kullanışsız imzaları "
  "anahtardan kaldırır"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "kullanışsız kullanıcı kimlikleri sıkıştırır ve tüm imzaları anahtardan "
  "kaldırır"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "Gizli anahtar mevcut.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4352,284 -3460,225 +4375,284 @@@ msgstr "
  "  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
  "(ltsign, tnrsign gibi).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "Anahtar yürürlükten kaldırıldı."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "imza türü `%s' bilinmiyor\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "%s kipindeyken bu komut kullanılamaz.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr ""
  "Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
  msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
  msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "Komut değiştirge olarak bir dosya ismi gerektiriyor\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "`%s' açılamıyor: %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "En az bir anahtar seçmelisiniz.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr ""
  "Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
  "ya da y/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
  msgstr ""
  "Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr ""
  "Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
  "da y/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr ""
  "Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
  "(e/H ya da y/N) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr ""
  "Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
  "ya da y/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
  "sahibiningüvencesi belirlenemez\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "Belirlenecek tercih listesi:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
  "musunuz? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
  msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
  msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
  msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "güncelleme başarısız: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "parmakizi geçersiz"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  #| msgid "failed to get the fingerprint\n"
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "parmakizinin alınması başarısız oldu\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "değer hatalı\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "Böyle bir kullanıcı kimliği yok.\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "Nothing to sign with key %s\n"
  msgid "Nothing to sign.\n"
  msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Özet: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Özellikler: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "Anahtar sunucusu değişmez"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Tercih edilen anahtar sunucusu: "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "Simgelemler: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  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:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following 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:3847
++#: g10/keyedit.c:3860
  #, 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:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(duyarlı)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "oluşturuldu: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "yürürlükten kaldırıldı: %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "son kullanma tarihi: %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "son kullanma tarihi: %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "kullanımı: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "kart-no: "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "güvencesi: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "geçerliliği: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Bu anahtar iptal edilmişti"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4637,17 -3686,12 +4660,18 @@@ 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:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "yürürlükten kaldırıldı"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "zamanaşımına uğradı"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4656,17 -3700,14 +4680,17 @@@ msgstr "
  "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
  "       kabul edilmesini sağlayabilirsiniz.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
  msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4675,35 -3716,27 +4699,35 @@@ 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:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  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:4298
++#: g10/keyedit.c:4311
  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:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  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:4422
++#: g10/keyedit.c:4438
  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:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4711,20 -3744,16 +4735,20 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "%d imza silindi.\n"
  msgstr[1] "%d imza silindi.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Hiçbir şey silinmedi.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "geçersiz"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "kullanıcı kimliği \"%s\" yoğun: %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
@@@ -4732,17 -3761,14 +4756,17 @@@ msgid_plural "User ID \"%s\": %d signat
  msgstr[0] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
  msgstr[1] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "kullanıcı kimliği \"%s\": zaten küçük\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4752,47 -3778,39 +4776,47 @@@ msgstr "
  "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
  "       ile sonuçlanabilir.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  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:4602
++#: g10/keyedit.c:4618
  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:4627
++#: g10/keyedit.c:4643
  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:4642
++#: g10/keyedit.c:4658
  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:4664
++#: g10/keyedit.c:4680
  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:4682
++#: g10/keyedit.c:4698
  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:4688
++#: g10/keyedit.c:4704
  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:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4803,240 -3821,189 +4827,240 @@@ 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:4744
++#: g10/keyedit.c:4760
  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:4747
++#: g10/keyedit.c:4763
  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:4798
++#: g10/keyedit.c:4814
  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:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, 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:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, 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:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "Tercih ettiğiniz sunucunun adresini girin: "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  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:5384
++#: g10/keyedit.c:5400
  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:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "Simgelemi giriniz: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
  msgstr "Devam? (e/H ya da y/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "%s çittirmeli kullanıcı kimliği yok\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
  msgstr "%d indisli bir yardımcı anahtar yok\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "%d indisli bir yardımcı anahtar yok\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "Kullanıcı kimliği: \"%s\"\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, 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:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (dışarda geçersiz)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  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:6005
++#: g10/keyedit.c:6021
  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:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr ""
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, 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:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (yürülükten kaldırılmaz)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, 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:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  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:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "gizli anahtar yok\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, 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:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, 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:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr ""
  "Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
  "gösteriliyor\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "'%s' tercihi yinelendi\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "çok fazla şifreleme tercihi\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "çok fazla özet tercihi\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
  msgstr "çok fazla sıkıştırma tercihi\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
  msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "doğrudan imza yazılıyor\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "öz-imza yazılıyor\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "anahtarı garantileyen imzayı yazıyor\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "UYARI: bazı OpenPGP uygulamaları bu özet boyutlu bir DSA anahtarıyla "
  "çalışamayabilir\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "İmzalama"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "Onayla"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "Şifrele"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "Kimlik kanıtla"
  
@@@ -5050,159 -4017,128 +5074,159 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "OoŞşKkçÇ"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "bir %s anahtarı için olası eylemler: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "Şimdilik mümkün eylemler: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) Bitti\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (yalnız imzalamak için)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (sadece imzalamak için)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (sadece şifrelemek için)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (yalnız imzalamak için)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (sadece şifrelemek için)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  #| msgid "   (%d) Existing key\n"
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Mevcut anahtar\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "Simgelemi giriniz: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "%d indisli bir yardımcı anahtar yok\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "%u bite yuvarlandı\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "İstenen anahtar uzunluğu: %u bit\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5218,7 -4154,6 +5242,7 @@@ msgstr "
  "      <n>m = anahtar n ay geçerli\n"
  "      <n>y = anahtar n yıl geçerli\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5234,38 -4169,30 +5258,38 @@@ msgstr "
  "      <n>m = imza n ay geçerli\n"
  "      <n>y = imza n yıl geçerli\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "Anahtar ne kadar geçerli olacak? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "İmza ne kadar geçerli olacak? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "değer hatalı\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "Anahtar hep geçerli olacak\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "İmza hep geçerli olacak\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Anahtarın geçerliliği %s de bitecek.\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "İmzanın geçerliliği %s de bitecek.\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5273,11 -4200,9 +5297,11 @@@ msgstr "
  "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
  "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "Bu doğru mu? (e/H ya da y/N) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5292,7 -4217,6 +5316,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5308,50 -4232,39 +5332,50 @@@ msgstr "
  "\t\"Fatih Sultan Mehmed (Padisah) <padisah at ottoman.gov>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Adınız ve Soyadınız: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Ad ve soyadınızda geçersiz karakter var\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "E-posta adresiniz: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "geçerli bir E-posta adresi değil\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Önbilgi: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Önbilgi alanında geçersiz karakter var\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5362,7 -4275,6 +5386,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@@ -5378,37 -4290,30 +5402,37 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "AaYyEeTtKk"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
  "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr ""
  "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Lütfen önce hatayı düzeltin\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5421,13 -4326,10 +5445,13 @@@ msgstr "
  "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
  "üretecine yardımcı olur. \n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5435,71 -4337,58 +5459,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "anahtar zaten mevcut\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  #| msgid "Use this key anyway? (y/N) "
  msgid "Create anyway? (y/N) "
  msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "yeni anahtar üretiliyor\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "Anahtar üretimi durduruldu.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
  msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "genel anahtarı `%s'e yazıyor\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5507,14 -4396,12 +5531,14 @@@ msgstr "
  "Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
  "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr ""
  "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5522,26 -4409,21 +5546,26 @@@ msgstr "
  "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
  "problemi)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr ""
  "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
  msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "asla    "
  
@@@ -5592,29 -4465,23 +5616,29 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "Anahtar zinciri"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Birincil anahtar parmak izi:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "Yardımcı anahtar parmak izi:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr "Birincil anahtar parmak izi:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "Yardımcı anahtar parmak izi:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "     Anahtar parmakizi ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr "      Kart seri no. ="
  
@@@ -5652,54 -4514,42 +5676,54 @@@ msgstr[1] "1 kötü imza\n
  msgid "%s: keyring created\n"
  msgstr "%s: anahtar zinciri oluşturuldu\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr "yürürlükten kaldırılan anahtarlar arama sonuçlarına dahil edilir"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr ""
  "anahtar kimliğine göre arama yapılırken yardımcı anahtarlar dahil edilir"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr "imzaları doğrularken anahtarları özdevinimli olarak alır"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "tercihli anahtar sunucusunun adresini adrese atar"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr "anahtarları alırken PKA kaydını bir anahtara atar"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "iptal edildi"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  #| msgid "refreshing %d keys from %s\n"
  msgid "refreshing %d key from %s\n"
@@@ -5707,57 -4557,46 +5731,57 @@@ msgid_plural "refreshing %d keys from %
  msgstr[0] "%d anahtar %s adresinden tazeleniyor\n"
  msgstr[1] "%d anahtar %s adresinden tazeleniyor\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "anahtar, anahtar sunucusunda yok\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "%s anahtarı %s adresinden isteniyor\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  #| msgid "no keyserver action!\n"
  msgid "no keyserver known\n"
  msgstr "bir anahtar sunucusu eylemi yok!\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "\"%s\" atlandı: %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "%s anahtarı %s adresine gönderiliyor\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  #| msgid "requesting key %s from %s\n"
  msgid "requesting key from '%s'\n"
  msgstr "%s anahtarı %s adresinden isteniyor\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
@@@ -5860,131 -4679,104 +5884,131 @@@ msgstr "özgün dosya adı = '%.*s'\n
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr "UYAR: çok sayıda salt metin görüldü\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr ""
  "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "hiç imza yok\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "\"%s\" deki imza KÖTÜ"
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "\"%s\" deki imza zamanaşımına uğramış"
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "\"%s\" deki imza iyi"
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "imza doğrulama engellendi\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "bu belirsiz imza verisi elde edilemiyor\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "İmza %s de\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                nam-ı diğer \"%s\""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Anahtar burada:"
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[şüpheli]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                nam-ı diğer \"%s\""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Bu imzanın geçerliliği %s de bitti.\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s imzası, %s özet algoritması\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "ikili"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "metinkipi"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "bilinmeyen"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "algorithm: %s"
  msgid ", key algorithm "
  msgstr "algoritma: %s"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "İmza kontrol edilemedi: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "bir bağımsız imza değil\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "0x%02x sınıfı tek başına imza\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "eski stil (PGP 2.x) imza\n"
  
@@@ -6087,30 -4860,25 +6111,30 @@@ msgstr "Sıkıştırılmamış
  msgid "uncompressed|none"
  msgstr "Sıkıştırılmamış|yok"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "bu ileti %s tarafından kullanılamayabilir\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  #| msgid "ambiguous option `%s'\n"
  msgid "ambiguous option '%s'\n"
  msgstr "`%s' seçeneği belirsiz\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown option '%s'\n"
  msgstr "`%s' seçeneği bilinmiyor\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  #, fuzzy
  #| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr "DSA sekizin katlarında bir çittirim uzunluğu gerektirir\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "unknown weak digest '%s'\n"
@@@ -6414,7 -5127,25 +6438,28 @@@ msgstr "Bu anahtarın ismi belirtilen �
  msgid "This key belongs to us\n"
  msgstr "Bu anahtar bizim\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ #| msgid "root certificate has now been marked as trusted\n"
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "kök sertifika artık güvenilir olarak imlenmiş oldu\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "Bu anahtarın kullanıcı kimliğinde ismi belirtilen şahsa ait\n"
+ "olduğu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n"
+ "sonraki soruya da evet cevabı verebilirsiniz.\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6424,135 -5155,107 +6469,135 @@@ msgstr "
  "olduğu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n"
  "sonraki soruya da evet cevabı verebilirsiniz.\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr ""
  "UYARI: bu anahtar yürürlükten kaldırılmamış olabilir (yürürlükten kaldırma "
  "anahtarı mevcut değil)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "UYARI: Bu anahtar onu üreten tarafından yürürlükten kaldırılmıştı!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
  msgstr "         Bu imza sahte anlamına gelebilir.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr ""
  "UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Bilgi: Bu anahtar iptal edildi.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, fuzzy, c-format
  #| msgid "Note: Verified signer's address is `%s'\n"
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr "Bilgi: Doğrulanmış imzacının adresi: `%s'\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, fuzzy, c-format
  #| msgid "Note: Signer's address `%s' does not match DNS entry\n"
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr "Bilgi: İmzacının adresi `%s', DNS girdisiyle eşleşmiyor\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr "geçerli PKA bilgisinden dolayı güvence seviyesi TAM olarak ayarlandı\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr "kötü PKA bilgisinden dolayı güvence seviyesi ASLA olarak ayarlandı\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr "         Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "         Bu imza SAHTE olabilir.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr ""
  "UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
  "sertifikalanmamış!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "         Bu imzanın sahibine ait olduğu kesin değil.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: atlandı: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: atlandı: genel anahtar iptal edildi\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: atlandı: genel anahtar zaten var\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "`%d. satır: algoritma geçersiz\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  #| msgid "line %d: invalid algorithm\n"
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "`%d. satır: algoritma geçersiz\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "Şimdiki alıcılar:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6560,37 -5263,29 +6605,37 @@@ msgstr "
  "\n"
  "Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Böyle bir kullanıcı kimliği yok.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "Genel anahtar iptal edildi.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "geçerli adresler yok\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Bilginize: anahtar %s %s özelliğine sahip değil\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Bilginize: anahtar %s %s için bir tercihe sahip değil\n"
@@@ -6845,27 -5494,22 +6890,27 @@@ msgstr "%s anahtarı, güvensiz bir çi
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr "DSA anahtarı %s, %u bitlik veya daha geniş bir çittirim gerektiriyor\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "UYARI: iletideki imza özeti çelişkili\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
  msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
  "UYARI: yardımcı imzalama anahtarı %s geçersiz çapraz sertifikalamaya sahip\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu second newer than the signature\n"
@@@ -6873,7 -5517,6 +6918,7 @@@ msgid_plural "public key %s is %lu seco
  msgstr[0] "genel anahtar %s imzadan %lu saniye daha yeni\n"
  msgstr[1] "genel anahtar %s imzadan %lu saniye daha yeni\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu day newer than the signature\n"
@@@ -6881,7 -5524,6 +6926,7 @@@ msgid_plural "public key %s is %lu day
  msgstr[0] "genel anahtar %s imzadan %lu saniye daha yeni\n"
  msgstr[1] "genel anahtar %s imzadan %lu saniye daha yeni\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6894,7 -5536,6 +6939,7 @@@ msgstr[0] "
  msgstr[1] ""
  "anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6906,32 -5547,27 +6951,32 @@@ msgstr[0] "
  msgstr[1] ""
  "anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  #| msgid "NOTE: signature key %s expired %s\n"
  msgid "Note: signature key %s expired %s\n"
  msgstr "BİLGİ: %s imza anahtarının kullanım süresi %s sularında dolmuş\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  #| msgid "NOTE: signature key %s has been revoked\n"
  msgid "Note: signature key %s has been revoked\n"
  msgstr "BİLGİ: imza anahtarı %s yürürlükten kaldırılmıştı\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
  "hatalı imzanın bilinmeyen bir kritik bitten dolayı %s anahtarından "
  "kaynaklandığı sanılıyor\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr ""
  "anahtar %s: anahtarı yürürlükten kaldırma imzası için yardımcı anahtar yok\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr ""
@@@ -7000,7 -5625,6 +7045,7 @@@ msgstr "atlandı: gizli anahtar zaten v
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr "bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
@@@ -7048,12 -5664,10 +7093,12 @@@ msgstr "`%s' deki güvence kaydını ar
  msgid "read error in '%s': %s\n"
  msgstr "`%s' için okuma hatası: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  #| msgid "can't create lock for `%s'\n"
  msgid "can't create lock for '%s'\n"
@@@ -7084,7 -5693,6 +7129,7 @@@ msgstr "güvence veritabanı işlemi ç
  msgid "%s: directory does not exist!\n"
  msgstr "%s: dizin yok!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
@@@ -7197,179 -5783,170 +7242,208 @@@ msgstr "%d karakterden daha uzun metin 
  msgid "input line longer than %d characters\n"
  msgstr "girdi satırı %d karakterden daha uzun\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "standart seçenekler gönderilirken hata: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "desteklenmeyen algoritma: %s"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "%s komutu gönderilirken hata: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s: dizin kaydını yazma hatası: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  #| msgid "error opening `%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "'%s' açılırken hata: %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "%s komutu gönderilirken hata: %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
+ msgstr ""
+ 
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "yeni PIN alınırken hata: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "anahtarı ve kullanıcı kimliğini gösterir"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "geçerliliği: %s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "saklanmış bayraklar alınırken hata: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "anahtarları listeler"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "ileti özetlerini gösterir"
  msgstr[1] "ileti özetlerini gösterir"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
+ #, c-format
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ #| msgid "error writing key: %s\n"
+ msgid "resetting keydb: %s\n"
+ msgstr "anahtarı yazarken hata: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  #| msgid "error storing flags: %s\n"
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "bayraklar saklanırken hata: %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
@@@ -7377,94 -5954,87 +7451,103 @@@ msgstr "boru oluşturulurken hata: %s\n
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "%d imza silindi.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "ileti özetlerini gösterir"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "ileti özetlerini gösterir"
+ msgstr[1] "ileti özetlerini gösterir"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "%lu anahtar parolası ile şifrelenmiş\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "ileti özetlerini gösterir"
+ msgstr[1] "ileti özetlerini gösterir"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7478,103 -6048,92 +7561,115 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "%s komutu gönderilirken hata: %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
  msgstr "`%s' geçerli bir anahtar kimliği değil\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "anahtar %s: güvenli anahtar olarak kabul edildi\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "anahtar %s güvence veritabanında birden fazla görünüyor\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr "anahtar %s: güvenli anahtar için genel anahtar yok - atlandı\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "anahtar %s son derece güvenli olarak imlendi.\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "güvence veritabanı kaydı %lu, istek tipi %d: okuma başarısız: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "güvence veritabanının %lu. kaydı %d istek türünde değil\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "bilinmeyen güvence modeli (%d) kullanılamıyor - %s güvence modeli "
  "varsayılıyor\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "%s güvence modeli kullanılıyor\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "bir güvence veritabanı denetimi gereksiz\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "sonraki güvence veritabanı denetimi %s de\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  #| msgid "no need for a trustdb check with `%s' trust model\n"
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  #| msgid "no need for a trustdb update with `%s' trust model\n"
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "genel anahtar %s yok: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "lütfen bir --check-trustdb yapın\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "güvence veritabanı denetleniyor\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7582,7 -6141,6 +7677,7 @@@ msgid_plural "%d keys processed
  msgstr[0] "şu ana kadar %lu anahtar işlendi\n"
  msgstr[1] "şu ana kadar %lu anahtar işlendi\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7590,16 -6148,13 +7685,16 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "%d anahtar işlendi (%d doğrulama temizlendi)\n"
  msgstr[1] "%d anahtar işlendi (%d doğrulama temizlendi)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "son derece güvenli bir anahtar yok\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "son derece güvenli %s için genel anahtar yok\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7607,7 -6162,6 +7702,7 @@@ msgstr "
  "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
  "%du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr ""
@@@ -7725,146 -6258,114 +7820,146 @@@ msgstr "
  "Sözdizimi: kbxutil [seçenekler] [dosyalar]\n"
  "Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSA modülü ya eksik ya da %d bitlik değil\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "RSA genel üstel sayısı ya eksik ya da %d bitten büyük\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN eylemcisi hata döndürdü: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr "BoşPIN henüz değişmedi\n"
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
  msgstr "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "yeni PIN alınırken hata: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "parmakizinin saklanması başarısız oldu: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "genel anahtar okuması başarısız: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "yanıt genel anahtar verisi içermiyor\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr "yanıt RSA modülü içermiyor\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr "yanıt RSA genel bileşenini içermiyor\n"
  
- #: scd/app-openpgp.c:1322
++#: scd/app-openpgp.c:1353
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
- msgid "response does not contain the EC public point\n"
+ msgid "response does not contain the EC public key\n"
  msgstr "yanıt RSA genel bileşenini içermiyor\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "yanıt genel anahtar verisi içermiyor\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "genel anahtar okuması başarısız: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "%s olarak öntanımlı PIN kullanılamadı: %s - öntanımlı kullanımı iptal "
  "ediliyor\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Lütfen PIN'i giriniz%%0A[yapılan imza: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
  msgstr "||Lütfen PIN'i giriniz"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "karttan CHV durumu alınırken hata\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr "kart kalıcı olarak kilitli!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7877,27 -6378,22 +7972,27 @@@ msgstr[1] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr ""
  "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz%%0A[kalan deneme: "
  "%d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "||Lütfen PIN'i giriniz"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Sıfırlama Kodu çok kısa; asgari uzunluk: %d\n"
@@@ -7905,83 -6401,65 +8000,83 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr "|YSK|Yeni Sıfırlama Kodu"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|YYP|Yeni Yönetici PIN'i"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|Yeni PIN"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Lütfen PIN'i giriniz"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  #| msgid "||Please enter the PIN"
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Lütfen PIN'i giriniz"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
  msgstr "uygulama verisi okunurken hata\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "parmakizi DO okunurken hata\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "anahtar zaten mevcut\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr "mevcut anahtar konulacak\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "yeni anahtar üretiliyor\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
  msgstr "yeni anahtar üretiliyor\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "oluşturum zaman damgası kayıp\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA asal sayısı %s ya eksik la da %d bitlik değil\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "anahtarın saklanması başarısız: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported curve\n"
  msgstr "desteklenmeyen algoritma: %s"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
  msgstr "anahtar üretimi başarısızlığa uğradı\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -7989,30 -6467,24 +8084,30 @@@ msgid_plural "key generation completed 
  msgstr[0] "anahtar üretimi tamamlandı (%d saniye)\n"
  msgstr[1] "anahtar üretimi tamamlandı (%d saniye)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr "karttaki parmak izi istenenle eşleşmiyor\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "kart %s özet algoritmasını desteklemiyor\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "Yönetici PIN'inin doğrulanması bu komut yüzünden şimdilik yasaktır\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@@ -8034,7 -6503,6 +8129,7 @@@ msgstr "|N|İlk Yeni PIN
  msgid "run in multi server mode (foreground)"
  msgstr "çoklu sunucu kipinde çalışır (önalanda)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
  
@@@ -8095,7 -6552,6 +8190,7 @@@ msgstr "
  "Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
  "GnuPG için akıllı kart artalan süreci\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  #, fuzzy
  #| msgid ""
  #| "please use the option `--daemon' to run the program in the background\n"
@@@ -8104,12 -6560,10 +8199,12 @@@ msgstr "
  "Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
  "kullanın\n"
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "fd %d için eylemci başlatıldı\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "fd %d için eylemci sonlandı\n"
@@@ -8130,11 -6581,9 +8225,11 @@@ msgstr "bu oturumda çalışan gpg-agen
  msgid "validation model requested by certificate: %s"
  msgstr "sertifika tarafından istenen geçerlilik modeli: %s"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr "zincir"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr "kabuk"
  
@@@ -8167,195 -6610,148 +8262,195 @@@ msgstr "bilgi: kritik olmayan sertifik
  msgid "certificate policy not allowed"
  msgstr "sertifika poliçesine izin verilmiyor"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr "harici bir sertifikacı arar\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr "eşleşen sertifikacı sayısı: %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr "Dirmngr önbelleğinde sertifikacıyı arar\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "eşleşen sertifika sayısı: %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "dirmngr sadece-önbellek anahtar araması başarısızi: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
  msgstr "sertifika yürürlükten kaldırılmıştı"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "sertifika durumu bilinmiyor"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr "\"dirmngr\"'ın düzgün olarak kurulu olduğundan lütfen emin olunuz\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
  msgstr "CRL sınaması başarısız: %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "geçersiz doğrulukla sertifika: %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr "sertifika henüz geçersiz"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
  msgstr "kök sertifika henüz geçersiz"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr "ara sertifika henüz geçersiz"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
  msgstr "sertifika kullanım süresi dolmuş"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
  msgstr "kök sertifikanın kullanım süresi dolmuş"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
  msgstr "ara sertifikanın kullanım süresi dolmuş"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr "gerekli sertifika özellikleri eksik: %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
  msgstr "geçersiz doğrulukla sertifika"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr "sertifika yaşam süresi boyunca imza oluşturulmadı"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr "sertifikacının yaşam süresi boyunca sertifika oluşturulmadı"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr "sertifikacının yaşam süresi boyunca ara sertifika oluşturulmadı"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  (  imzanın oluşturuluşu: "
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "  (  sertifikanın oluşturuluşu: "
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
  msgstr "  (sertifika geçerlilik başlangıcı: "
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr "  (sertifikacı geçerlilik başlangıcı: "
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "parmakizi=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr "kök sertifika artık güvenilir olarak imlenmiş oldu\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr "güvenilir olarak etkileşimli imleme gpg-agent'ta etkin değil\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr "güvenilir olarak etkileşimli imleme bu oturum için iptal edildi\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  "UYARI: imzanın oluşturulma zamanı bilinmiyor - şimdiki zaman varsayılıyor"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "sertifikacı kim belli değil"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr "kök sertifika güvenilir olarak imli değil"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "güvence listesinin sınanması başarısız: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr "sertifika zinciri çok uzun\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "sertifikacı belli değil"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
  msgstr "sertifika KÖTÜ bir imzaya sahip"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr "başka bir eşleşmesi olası CA sertifikası var - tekrar deneniyor"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "sertifika zinciri CA tarafından izin verilenden uzun (%d)"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "sertifika iyi durumda\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
  msgstr "ara sertifika iyi durumda\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
  msgstr "kök sertifika iyi durumda\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr "zincir modeline geçiş"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr "kullanılan geçerlilik modeli: %s"
@@@ -8709,7 -7039,6 +8804,7 @@@ msgstr "(bu bir şifreli iletiymiş gib
  msgid "certificate '%s' not found: %s\n"
  msgstr "sertifika \"%s\" yok: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
  msgstr "anahtar bloğu kilitlenirken hata: %s\n"
@@@ -8735,127 -7060,97 +8830,127 @@@ msgstr "\"%s\" sertifikası silinemedi
  msgid "no valid recipients given\n"
  msgstr "geçerli alıcılar verilmedi\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
  msgstr "harici anahtarları listeler"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
  msgstr "sertifika zincirini listeler"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
  msgstr "sertifikaları ithal eder"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
  msgstr "sertifikaları ihraç eder"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "bir akıllı kartı kayda alır"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "dirmngr'a bir komut aktarır"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr "gpg-protect-tool'u çalıştırır"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
  msgstr "base-64 kodlu çıktı oluşturur"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr "girdinin PEM biçiminde olduğu kabul edilir"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr "girdinin ikilik biçimde olduğu kabul edilir"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr "asla bir CRL sormaz"
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr "doğruluğu OCSP kullarak sınar"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr "|N|içerilecek sertifika sayısı"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr "sertifika poliçeleri sınanmaz"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr "kayıp sertifikacı sertifikalarını alır"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "terminali hiç kullanma"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|DOSYA|bir sunucu kipi günlüğü DOSYAya yazar"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
  msgstr "|DOSYA|bir denetim günlüğünü DOSYAya yazar"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "soruların çoğunda cevap evet farzedilir"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "soruların çoğunda cevap hayır farzedilir"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|DOSYA|anahtar zincirini anahtar zincirleri listesine ekler"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr ""
  "|KULLANICI-KİMLİĞİ|öntanımlı gizli anahtar olarak KULLANICI-KİMLİĞİ "
  "kullanılır"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|BELİRTİM|anahtarları aramak için bu anahtar sunucusu kullanılır"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|İSİM|özet algoritması olarak İSİM kullanılır"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgsm [options] [files]\n"
@@@ -8870,50 -7165,41 +8965,50 @@@ msgstr "
  "imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
  "öntanımlı işlem girilen veriye bağımlıdır\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  #| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "BİLGİ:`%s'e şifrelenemez: %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  #| msgid "unknown validation model `%s'\n"
  msgid "unknown validation model '%s'\n"
  msgstr "`%s' geçerlilik modeli bilinmiyor\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: konak adı belirtilmemiş\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: kullanıcısız parola verilmiş\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: bu satır atlanıyor\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
  msgstr "anahtar sunucusu çözümlenemedi\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  #| msgid "importing common certificates `%s'\n"
  msgid "importing common certificates '%s'\n"
  msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  #| msgid "can't sign using `%s': %s\n"
  msgid "can't sign using '%s': %s\n"
  msgstr "`%s' kullanarak imzalanamıyor: %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
  
@@@ -8930,7 -7213,6 +9025,7 @@@ msgstr "sertifika saklanırken hata\n
  msgid "basic certificate checks failed - not imported\n"
  msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "saklanmış bayraklar alınırken hata: %s\n"
@@@ -8945,31 -7225,25 +9040,31 @@@ msgstr "sertifika ithal edilirken hata
  msgid "error reading input: %s\n"
  msgstr "girdi okunurken hata: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
  msgstr "parmakizinin alınması başarısız oldu\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr "mevcut sertifika aranırken sorun çıktı: %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "yazılabilir anahtar veritabanı bulunurken hata: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
  msgstr "serifika saklanırken hata: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
  msgstr "bayraklar saklanırken hata: %s\n"
@@@ -9945,122 -8042,98 +10040,126 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  #| msgid "|FILE|run commands from FILE on startup"
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|DOSYA|DOSYAdaki komutlar başlangıçta çalıştırılır"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  #, fuzzy
  #| msgid "pass a command to the dirmngr"
  msgid "shutdown the dirmngr"
  msgstr "dirmngr'a bir komut aktarır"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  #, fuzzy
  #| msgid "allow PKA lookups (DNS requests)"
  msgid "allow sending OCSP requests"
  msgstr "PKA aramalarına izin verilir (DNS istekleri)"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  #| msgid "|FILE|read options from FILE"
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|DOSYA|seçenekler DOSYAdan okunur"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  #, fuzzy
  #| msgid "|N|set maximum PIN cache lifetime to N seconds"
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  #| msgid "|URL|use keyserver at URL"
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -10073,13 -8146,11 +10172,13 @@@ msgstr "
  "@\n"
  "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg-agent [options] [command [args]]\n"
@@@ -10091,88 -8162,71 +10190,88 @@@ msgstr "
  "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
  "GnuPG için gizli anahtar yönetimi\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, fuzzy, c-format
  #| msgid "invalid debug-level `%s' given\n"
  msgid "valid debug levels are: %s\n"
  msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  #| msgid "usage: gpgsm [options] "
  msgid "usage: %s [options] "
  msgstr "kullanımı: gpgsm [seçenekler] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "%s ile %s birlikte kullanılmaz!\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  #| msgid "conversion from `%s' to `%s' failed: %s\n"
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  #| msgid "line too long - skipped\n"
  msgid "%s:%u: line too long - skipped\n"
  msgstr "satır çok uzun - atlandı\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "parmakizi geçersiz"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "%s:%u: read error: %s\n"
  msgstr "`%s' için okuma hatası: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "zorlanmadı"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10362,14 -8380,6 +10461,7 @@@ msgstr "'%s' bir JPEG dosyası değil\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- #| msgid "error allocating enough memory: %s\n"
- msgid "error allocating memory: %s\n"
- msgstr "yeterli bellek ayrılırken hata: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  #| msgid "error writing to %s: %s\n"
  msgid "error printing log line: %s\n"
@@@ -10657,86 -8615,70 +10749,86 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "satır göndirimi başarısız: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  #| msgid "sending line failed: %s\n"
  msgid "assuan_inquire failed: %s\n"
  msgstr "satır göndirimi başarısız: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "select başarısız: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  #| msgid "error sending %s command: %s\n"
  msgid "error sending data: %s\n"
  msgstr "%s komutu gönderilirken hata: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "start_cert_fetch failed: %s\n"
  msgstr "select başarısız: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  #| msgid "select failed: %s\n"
  msgid "fetch_next_cert failed: %s\n"
  msgstr "select başarısız: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  #| msgid "cannot allocate outfile string: %s\n"
  msgid "can't allocate control structure: %s\n"
  msgstr "dosya dışı dizge ayrılamıyor: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  #| msgid "failed to create stream from socket: %s\n"
  msgid "failed to allocate assuan context: %s\n"
  msgstr "sokette akım oluşturulamadı: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  #| msgid "failed to store the creation date: %s\n"
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10792,7 -8725,6 +10884,7 @@@ msgstr "
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "sertifika imzalama için kullanılmamalıydı\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "sessiz"
  
@@@ -10972,11 -8863,9 +11064,11 @@@ msgstr "|İSİM|İSİM kullanıcısı i
  msgid "|SPEC|set up email aliases"
  msgstr "|BELİRTİM|eposta rumuzlarını ayarlar"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr "Anahtar sunucular için yapılandırma"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
  msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
  
@@@ -11010,144 -8892,118 +11102,150 @@@ msgstr "Çıktı biçimini denetleyen s
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "Güvenliği denetleyen seçenekler"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr "HTTP sunucuları için yapılandırma"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr "sistemin HTTP vekil ayarları kullanılır"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr "Kullanılacak LDAP sunucularının yapılandırması"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr "LDAP sunucu listesi"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr "OCSP için yapılandırma"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
++#: tools/gpgconf-comp.c:1070
+ msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
  #| msgid "Bad Passphrase"
- msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "Anahtar Parolası hatalı"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  #| msgid "Component not found"
  msgid "Component not suitable for launching"
  msgstr "Bileşen yok"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "%s bileşeninin harici doğrulaması başarısız oldu"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr "Grup belirtimlerinin yoksayıldığına dikkat edin\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr "tüm bileşenleri listeler"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr "tüm programları sınar"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|BİLEŞEN|seçenekleri listeler"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|BİLEŞEN|seçenekleri değiştirir"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|BİLEŞEN|seçenekleri sınar"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr "öntanımlı küresel değerleri uygular"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  #, fuzzy
  #| msgid "get the configuration directories for gpgconf"
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "gpgconf için yapılandırma dizinlerini getirir"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
  msgstr "küresel yapılandırma dosyasını listeler"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
  msgstr "küresel yapılandırma dosayasını sınar"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "güvence veritabanını günceller"
+ 
++#: tools/gpgconf.c:86
  #, fuzzy
  #| msgid "list all components"
  msgid "reload all or a given component"
  msgstr "tüm bileşenleri listeler"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  #, fuzzy
  #| msgid "list all components"
  msgid "launch a given component"
  msgstr "tüm bileşenleri listeler"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  #, fuzzy
  #| msgid "list all components"
  msgid "kill a given component"
  msgstr "tüm bileşenleri listeler"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "çıktı dosyası olarak kullanılır"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr "mümkünse değişiklikleri çalışma sırasında etkin kılar"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  #| msgid "Usage: gpgconf [options] (-h for help)"
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpgconf [options]\n"
@@@ -11159,15 -9015,12 +11257,15 @@@ msgstr "
  "Sözdizimi: gpgconf [seçenekler]\n"
  "GnuPG sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "Tek bileşenlik değiştirge gerekli"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "Bileşen yok"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr "Değiştirgeye izin verilmez"
  
diff --cc po/uk.po
index f0552cd,65529e2..4ddc75c
--- a/po/uk.po
+++ b/po/uk.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: GNU gnupg 2.1.0\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2016-07-10 15:11+0300\n"
  "Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
  "Language-Team: Ukrainian <kde-i18n-uk at kde.org>\n"
@@@ -19,7 -18,6 +19,7 @@@
  "%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
  "X-Generator: Lokalize 1.5\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "не вдалося встановити блокування запису пінкоду: %s\n"
@@@ -30,45 -28,35 +30,45 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr "_Гаразд"
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr "_Скасувати"
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr "_Так"
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr "_Ні"
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr "Пінкод:"
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr "_Зберегти у засобі керування паролями"
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "Справді хочете зробити пароль видимим на екрані?"
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr "Зробити пароль видимим"
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  msgid "|pinentry-tt|Hide passphrase"
  msgstr "Приховати пароль"
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr "Якість:"
  
@@@ -78,13 -66,11 +78,13 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "Якість введеного вище тексту.\n"
  "Дані щодо критеріїв якості можна отримати у вашого адміністратора."
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
@@@ -92,7 -78,6 +92,7 @@@ msgstr "
  "Будь ласка, вкажіть ваш пінкод, щоб ключ можна було розблокувати для цього "
  "сеансу"
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
@@@ -100,53 -85,40 +100,53 @@@ msgstr "
  "Будь ласка, вкажіть ваш пароль, щоб ключ можна було розблокувати для цього "
  "сеансу"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr "Пінкод:"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "Пароль:"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "паролі не збігаються, повторіть спробу"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "SETERROR %s (спроба %d з %d)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr "Повторіть:"
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
  msgstr "Занадто довгий пінкод"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
  msgstr "Занадто довгий пароль"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
  msgstr "Некоректні символи у пінкоді"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr "Занадто короткий пінкод"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "Помилковий пінкод"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
  msgstr "Помилковий пароль"
  
@@@ -156,24 -127,10 +156,24 @@@ msgid "ssh keys greater than %d bits ar
  msgstr ""
  "підтримки ключів ssh, що складаються з понад %d бітів, не передбачено\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "не вдалося створити «%s»: %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "не вдалося відкрити «%s»: %s\n"
@@@ -198,17 -151,6 +198,7 @@@ msgstr "на карті немає кл
  msgid "no suitable card key found: %s\n"
  msgstr "не виявлено відповідних ключів картки: %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "помилка під час спроби хешування ключа: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "помилка під час спроби запису ключа: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -217,24 -159,19 +207,24 @@@ msgstr "
  "Процесом ssh надіслано запит щодо використання ключа%%0A  %s%%0A  "
  "(%s)%%0AНадати доступ до цього ключа?"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr "Надати"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr "Заборонити"
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "Будь ласка, вкажіть пароль до ключа ssh%%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "Будь ласка, повторіть введення пароля"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -243,16 -180,13 +233,16 @@@ msgstr "
  "Будь ласка, вкажіть пароль для захисту отриманого закритого ключа%%0A   %s"
  "%%0A   %s%%0Aу сховищі ключів gpg-agent"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "не вдалося створити потік даних з сокета: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr "Будь ласка, вставте картку з серійним номером"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "Будь ласка, вийміть поточну картку і вставте картку з серійним номером"
  
@@@ -378,8 -288,6 +368,8 @@@ msgstr "Вкажіть пароль д�
  msgid "Please enter the new passphrase"
  msgstr "Вкажіть новий пароль"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -387,128 -295,95 +377,134 @@@ msgstr "
  "@Параметри:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "запустити у режимі фонової служби (фоновий)"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "запустити у режимі сервера (основному)"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "run in server mode"
+ msgid "run in supervised mode"
+ msgstr "запустити у режимі сервера"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "докладний режим"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "дещо зменшити кількість повідомлень"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr "виведення команд у форматі sh"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr "виведення команд у форматі csh"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|FILE|прочитати параметри з вказаного файла"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "не від’єднувати від консолі"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr "не захоплювати керування клавіатурою і мишею"
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
  msgstr "використовувати файл журналу для сервера"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr "|PGM|використовувати вказану програму пінзаписів"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr "|PGM|використовувати вказану програму SCdaemon"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
  msgstr "не використовувати SCdaemon"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  msgid "|NAME|accept some commands via NAME"
  msgstr "|NAME|приймати певні команди через NAME"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr "ігнорувати запити щодо зміни TTY"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr "ігнорувати запити щодо зміни графічного дисплея"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr "|N|вважати кешовані пінкоди за вказану кількість секунд"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr "не використовувати кеш пін-кодів для підписування"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  msgid "disallow the use of an external password cache"
  msgstr "заборонити використання зовнішнього кешу паролів"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "заборонити клієнтам позначати ключі як надійні"
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
  msgstr "дозволити попереднє встановлення пароля"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr "заборонити функції виклику перевизначати pinentry"
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr "дозволити запит пароля з Emacs"
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  msgid "enable ssh support"
  msgstr "увімкнути підтримку ssh"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
  msgstr "увімкнути підтримку putty"
  
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "Будь ласка, надсилайте повідомлення про помилки на <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "Використання: @GPG_AGENT@ [параметри] (-h — довідка)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -516,137 -391,102 +512,137 @@@ msgstr "
  "Синтаксис: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
  "Керування закритими ключами у @GNUPG@\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "вказано некоректне значення рівня діагностики «%s»\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "файл параметрів «%s»: %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "прочитати параметри з «%s»\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "не вдалося створити сокет: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "назва сокета «%s» є надто довгою\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "gpg-agent вже запущено, потреби у запуску нової копії немає\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
  msgstr "помилка під час спроби отримання поточного стану сокета\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "помилка під час спроби прив’язування сокета до «%s»: %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "не вдалося встановити права доступу до «%s»: %s\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "помилка listen(): %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "очікування даних на сокеті «%s»\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "не вдалося створити каталог «%s»: %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "створено каталог «%s»\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "помилка stat() щодо «%s»: %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "не можна використовувати як домашній каталог «%s»\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr ""
  "помилка під час спроби читання поточного стану на файловому дескрипторі %d: "
  "%s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "запущено обробки 0x%lx для файлового дескриптора %d\n"
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "обробник 0x%lx дескриптора файла %d завершив роботу\n"
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr "запущено обробник ssh 0x%lx для дескриптора файла %d\n"
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "обробник ssh 0x%lx дескриптора файла %d завершив роботу\n"
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "помилка pth_select: %s — очікування у 1 с\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s зупинено\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "у цьому сеансі не запущено gpg-agent\n"
  
@@@ -663,8 -501,6 +659,8 @@@ msgstr "
  "Синтаксис: gpg-preset-passphrase [параметри] KEYGRIP\n"
  "Керування кешем паролів\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -672,9 -508,6 +668,9 @@@ msgstr "
  "@Команди:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -728,7 -553,6 +724,8 @@@ msgstr "скасовано\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "помилка під час спроби запиту пароля: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "помилка під час відкриття «%s»: %s\n"
@@@ -788,8 -603,6 +785,8 @@@ msgstr "
  msgid "Yes"
  msgstr "Так"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "Ні"
  
@@@ -821,13 -631,11 +818,13 @@@ msgstr "Підтверджую
  msgid "Wrong"
  msgstr "Не підтверджую"
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  "Зауваження: цей пароль ще не змінювався.%0AБудь ласка, змініть його зараз."
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@@ -836,15 -644,12 +833,15 @@@ msgstr "
  "Цей пароль не змінювався%%0Aз %.4s-%.2s-%.2s.  Будь ласка, змініть його "
  "зараз."
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
  msgstr "Змінити пароль"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr "Я зміню його пізніше"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, c-format
  msgid ""
  "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@@ -852,11 -657,9 +849,11 @@@
  msgstr ""
  "Справді хочете вилучити ключ, що визначається keygrip%%0A  %s%%0A  %%C%%0A?"
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  msgid "Delete key"
  msgstr "Вилучити ключ"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -874,12 -675,10 +871,12 @@@ msgstr "Для DSA довжина хе�
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "Ключ %s використовує недостатньо міцний (%u-бітовий) хеш\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "%zu-бітовий хеш не є коректним для %u-бітового ключа %s\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "невдала спроба перевірити створений підпис: %s\n"
@@@ -904,83 -699,72 +901,95 @@@ msgstr "підтримки алгори
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "підтримки алгоритму захисту хешуванням %d (%s) не передбачено\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "помилка під час спроби створення каналу: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "помилка під час спроби створення потоку для каналу: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "помилка під час спроби розгалужування процесу: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
  #, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "не вдалося дочекатися переривання процесу: %s\n"
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr "не вдалося дочекатися завершення процесу %d: %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr ""
  "помилка під час спроби виконання «%s»: ймовірно, програму не встановлено\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "помилка під час спроби виконання «%s»: стан виходу %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, c-format
  msgid "error running '%s': terminated\n"
  msgstr "помилка під час спроби виконання «%s»: виконання перервано\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
  #, c-format
- msgid "error getting exit code of process %d: %s\n"
- msgstr "помилка під час спроби отримання коду виходу процесу %d: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "не вдалося дочекатися переривання процесу: %s\n"
  
- #: common/exechelp-w32ce.c:767
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "не вдалося дочекатися завершення процесу %d: %s\n"
+ msgid "error getting exit code of process %d: %s\n"
+ msgstr "помилка під час спроби отримання коду виходу процесу %d: %s\n"
  
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, c-format
  msgid "can't connect to '%s': %s\n"
  msgstr "не вдалося встановити з’єднання з «%s»: %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "проблема під час спроби встановлення параметрів gpg-agent\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "не вдалося вимкнути створення дампів образів у пам’яті: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "Увага: визначення власника не є безпечним для %s — «%s»\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "Увага: визначення прав доступу не є безпечним для %s — «%s»\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ #| msgid "waiting for the agent to come up ... (%ds)\n"
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "очікування на працездатність агента… (%d с)\n"
+ 
++#: common/sysutils.c:685
+ #, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "спроба перейменування «%s» на «%s» зазнала невдачі: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "yes|так"
  
@@@ -1035,7 -808,6 +1044,7 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr "вихід за межі області під час спроби отримання %lu байтів"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "помилка під час спроби розподілу пам’яті: %s\n"
@@@ -1055,35 -824,28 +1064,35 @@@ msgstr "УВАГА: «%s%s» є зас�
  msgid "unknown debug flag '%s' ignored\n"
  msgstr "невідомий прапорець діагностики «%s» проігноровано\n"
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr "не запущено gpg-agent — запускаємо «%s»\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr "очікування на працездатність агента… (%d с)\n"
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr "встановлено з’єднання з агентом\n"
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  msgid "connection to agent is in restricted mode\n"
  msgstr "з’єднання з агентом відбувається у обмеженому режимі\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr "Dirmngr не запущено — запускаємо «%s»\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr "очікування на працездатність dirmngr… (%d с)\n"
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr "встановлено з’єднання з dirmngr\n"
  
@@@ -1154,8 -900,6 +1163,8 @@@ msgstr "Створено ключ се�
  msgid "algorithm: %s"
  msgstr "алгоритм: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "непідтримуваний алгоритм: %s"
@@@ -1230,11 -958,9 +1239,11 @@@ msgstr "Ланцюжок сертифі
  msgid "Root certificate trustworthy"
  msgstr "Кореневий сертифікат є гідним довіри"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "не знайдено списку відкликання для сертифіката"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
  msgstr "доступний список відкликання є занадто старим"
  
@@@ -1271,7 -989,6 +1280,7 @@@ msgstr "Довідки щодо «%s» 
  msgid "ignoring garbage line"
  msgstr "ігноруємо беззмістовний рядок"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[немає]"
  
@@@ -1341,7 -1043,6 +1350,7 @@@ msgstr "параметр «%.50s» є �
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "команда «%.50s» є неоднозначною\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
  msgstr "вихід за межі області пам’яті\n"
  
@@@ -1399,8 -1089,6 +1408,8 @@@ msgstr "блокування «%s» н�
  msgid "waiting for lock %s...\n"
  msgstr "очікування на блокування %s…\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s є занадто застарілою (потрібно %s, маємо %s)\n"
@@@ -1484,12 -1154,10 +1493,12 @@@ msgstr "
  "символи quoted printable у кодуванні ASCII — ймовірно, використано "
  "помилковий MTA\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, c-format
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "[ незручне для читання (%zu байтів: %s%s) ]"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
@@@ -1497,67 -1165,51 +1506,66 @@@ msgstr "
  "назва примітки має складатися з друкованих символів або пробілів і "
  "завершуватися символом «=»\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "назва примітки користувача має містити символ «@»\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "назва примітки не повинна містити більше за один символ «@»\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "у значенні примітки не повинно міститися керівних символів\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  msgid "a notation name may not contain an '=' character\n"
  msgstr "назва позначення не може містити символів «=»\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr "назва примітки має складатися з друкованих символів або пробілів\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "УВАГА: виявлено некоректні дані примітки\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr "не вдалося пропустити через проксі запит %s до клієнта\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "Введіть пароль: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, c-format
  msgid "error getting version from '%s': %s\n"
  msgstr "помилка під час спроби отримання даних щодо версії з «%s»: %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr "сервер «%s» має версію, старішу за нашу (%s < %s)"
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, c-format
  msgid "WARNING: %s\n"
  msgstr "УВАГА: %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "Не вдалося отримати доступ до картки OpenPGP: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "Виявлено картку OpenPGP з номером %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "це не можна робити у пакетному режимі\n"
  
@@@ -1565,14 -1216,9 +1573,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "Цією командою можна користуватися лише для карток версії 2\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
  msgstr "Немає коду скидання або код скидання вже недоступний\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "Ваш вибір? "
  
@@@ -1600,122 -1240,92 +1608,122 @@@ msgstr "не увімкнено
  msgid "forced"
  msgstr "увімкнено"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr ""
  "Помилка: у поточній версії можна використовувати лише звичайний ASCII.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "Помилка: символ «<» не можна використовувати.\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "Помилка: не можна використовувати подвійні пробіли.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "Прізвище власника картки: "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "Ім’я власника картки: "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr "Помилка: складена назва є занадто довгою (максимум — %d символів).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "Адреса для отримання відкритого ключа: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "Помилка: адреса є занадто довгою (максимум — %d символів).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "помилка під час спроби читання «%s»: %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "помилка під час спроби читання «%s»: %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "Дані користувача (назва запису): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr ""
  "Помилка: дані користувача є занадто довгими (максимум — %d символів).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "Особисті дані DO: "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr ""
  "Помилка: особисті дані D0 є занадто довгими (максимум — %d символів).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "Основна мова: "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
  msgstr "Помилка: некоректна довжина рядка основної мови.\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
  msgstr "Помилка: некоректні символи у рядку основної мови.\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "Стать (чоловіча (M), жіноча (F) або пробіл): "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
  msgstr "Помилка: некоректна відповідь.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "Відбиток CA: "
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "Помилка: некоректне форматування відбитка.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "дія над ключем неможлива: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "не є карткою OpenPGP"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "помилка під час отримання даних поточного ключа: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr "Замінити вже створений ключ? (y/N або т/Н) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
@@@ -1726,56 -1336,44 +1734,56 @@@ msgstr "
  "      ознайомтеся з документацією до вашої картки, щоб\n"
  "      визначити дозволені розміри.\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "Якому розміру ключа підписування ви надаєте перевагу? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "Яким має бути розмір ключа для шифрування? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "Якому розміру ключа для розпізнавання ви надаєте перевагу? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "округлено до %u бітів\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "Розміри ключів %s мають перебувати у діапазоні %u—%u\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  "Зараз налаштування картки буде змінено для створення %u-бітового ключа\n"
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "помилка під час спроби зміни розміру ключа з %d на %u: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr "Створити резервну копію ключа шифрування поза карткою? (Y/n або Т/н) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  msgid "Note: keys are already stored on the card!\n"
  msgstr "ЗАУВАЖЕННЯ: ключі вже збережено на картці!\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr "Замірити вже створені ключі? (y/N або т/Н) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1786,141 -1384,106 +1794,141 @@@ msgstr "
  "   PIN = «%s»     Адміністративний PIN = «%s»\n"
  "Вам слід змінити параметри за допомогою команди --change-pin\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "Виберіть тип ключа, який слід створити:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "   (1) Ключ підписування\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) Ключ шифрування\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) Ключ розпізнавання\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "Некоректний вибір.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "Виберіть сховище для зберігання ключа:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "Помилка KEYTOCARD: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  msgid "This command is not supported by this card\n"
  msgstr "Цією карткою не передбачено підтримки вказаної команди\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr ""
  "Зауваження: у результаті виконання цієї команди усі ключі на картці буде "
  "знищено!\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  msgid "Continue? (y/N) "
  msgstr "Продовжити? (y (так)/N (ні)) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  "Справді хочете скинути усе до типових налаштувань? (введіть «yes» («так»)) "
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "вийти з цього меню"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
  msgstr "показати керівні команди"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "показати цю довідкову інформацію"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "показати всі доступні дані"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "змінити ім’я власника картки"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "змінити адресу для отримання ключа"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "отримати ключ, вказаний у полі адреси картки"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "змінити ім’я користувача"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "змінити основну мову"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "змінити поле статі власника картки"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "змінити відбиток CA"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr "увімкнути або вимкнути позначку примусового пінкоду підпису"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "створити ключі"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "меню зміни або розблокування пінкоду"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "перевірити пінкод і показати список всіх даних"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr "розблокувати під коду за допомогою коду скидання"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr "знищити усі ключі і дані"
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr "gpg/картка> "
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "Команда адміністратора\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "Команди адміністрування дозволено\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "Команди адміністрування заборонено\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "Некоректна команда  (скористайтеся командою «help»)\n"
  
@@@ -1928,22 -1490,14 +1936,22 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output не працює з цією командою\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "не вдалося відкрити «%s»\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "ключ «%s» не знайдено: %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "помилка під час спроби читання блокування ключа: %s\n"
@@@ -2059,7 -1591,6 +2067,7 @@@ msgstr "
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s зашифровано для «%s»\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "не можна використовувати %s у режимі %s\n"
@@@ -2139,59 -1655,45 +2147,59 @@@ msgstr "УВАГА: не вдалос�
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "УВАГА: не вдалося вилучити тимчасовий каталог «%s»: %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
  msgstr ""
  "експортувати підписи, які позначено як придатні лише для локального "
  "використання"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr ""
  "експортувати ідентифікатори користувача атрибута (типово фотоідентифікатори)"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "експортувати ключі відкликання, позначені як «важливі»"
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "вилучити невикористовувані частини ключа під час експортування"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "вилучити максимум частин з ключа під час експортування"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  msgid " - skipped"
  msgstr " - пропущено"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "записуємо до «%s»\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "ключ %s: матеріал ключа на карті — пропущено\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "експортування закритих ключів заборонено\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "ключ %s: ключ у стилі PGP 2.x — пропущено\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "УВАГА: нічого не експортовано\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "помилка створення «%s»: %s.\n"
@@@ -2200,8 -1701,6 +2208,8 @@@
  msgid "[User ID not found]"
  msgstr "[Ідентифікатор не знайдено]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, c-format
  msgid "(check argument of option '%s')\n"
  msgstr "(перевірте аргумент параметра «%s»)\n"
@@@ -2222,248 -1718,189 +2230,248 @@@ msgstr "помилка під час п
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "Попередження: запис %s наявний у сховищі %d разів\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "автоматично отримано «%s» за допомогою %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "помилка під час спроби отримання «%s» за допомогою %s: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "Без відбитка"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "закритий ключ «%s» не знайдено: %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, c-format
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "Попередження: «%s» не використовується як типовий ключ: %s\n"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, c-format
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "використовуємо «%s» як типовий закритий ключ для підписування\n"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr "усі значення, передані «%s», проігноровано\n"
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr ""
  "Некоректний ключ %s визнано чинним через параметр --allow-non-selfsigned-"
  "uid\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "використовуємо підключ %s замість основного ключа %s\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "створити підпис"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
  msgstr "створити текстовий підпис"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "створити від’єднаний підпис"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "зашифрувати дані"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "шифрувати лише за допомогою симетричного шифру"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "розшифрувати дані (типова дія)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "перевірити підпис"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "показати список ключів"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "показати список ключів і підписів"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "показати список і перевірити підписи ключів"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "показати список ключів і відбитків"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "показати список закритих ключів"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "створити пару ключів"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  msgid "quickly generate a new key pair"
  msgstr "швидке створення пари ключів"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  msgid "quickly add a new user-id"
  msgstr "швидке додавання нового ідентифікатора користувача"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  msgid "quickly revoke a user-id"
  msgstr "швидке відкликання ідентифікатора користувача"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr "повноцінне створення пари ключів"
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "створити сертифікат відкликання"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "вилучити ключі з відкритого сховища ключів"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "вилучити ключів з закритого сховища ключів"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  msgid "quickly sign a key"
  msgstr "швидко підписати ключ"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  msgid "quickly sign a key locally"
  msgstr "швидко підписати ключ локально"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "підписати ключ"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "підписати ключ локально"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "підписати або редагувати ключ"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
  msgstr "змінити пароль"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "експортувати ключі"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "експортувати ключі на сервер ключів"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "імпортувати ключі з сервера ключів"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "шукати ключі на сервері ключів"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "оновити всі ключів з сервера ключів"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "імпортувати/об’єднати ключі"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "показати дані про стан картки"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "змінити дані на картці"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "змінити пінкод картки"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "оновити базу даних довіри"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
  msgstr "показати контрольні суми повідомлень"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "запустити у режимі сервера"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr "|VALUE|встановити вказане правило TOFU для ключа"
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "створити дані у форматі ASCII"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|USER-ID|зашифрувати для вказаного ідентифікатора"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr ""
  "|USER-ID|використовувати для створення підписів або розшифрування вказаний "
  "ідентифікатор"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|встановити рівень стиснення (0 — вимкнути)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "використовувати канонічний текстовий режим"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
  msgstr "|FILE|записати дані до вказаного файла"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "не вносити змін"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "запитувати перед перезаписом"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr "строго використовувати стандарт OpenPGP"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2472,7 -1909,6 +2480,7 @@@ msgstr "
  "(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
  "довідника (man))\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2493,11 -1929,9 +2501,11 @@@ msgstr "
  " --list-keys [назви]        показати ключі\n"
  " --fingerprint [назви]      показати відбитки\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "Використання: @GPG@ [параметри] [файли] (-h — довідка)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2507,7 -1941,6 +2515,7 @@@ msgstr "
  "Підписування, перевірка підписів, шифрування або розшифрування\n"
  "Типова дія залежатиме від вхідних даних\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2515,76 -1948,61 +2523,76 @@@ msgstr "
  "\n"
  "Підтримувані алгоритми:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "Відкритий ключ: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "Шифр: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "Хеш: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "Стиснення: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "користування: %s [параметри] %s\n"
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "несумісні команди\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "у визначенні групи «%s» немає знаку «=»\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "УВАГА: визначення власника домашнього каталогу «%s» не є безпечним\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "УВАГА: визначення власника у файлі налаштувань «%s» не є безпечним\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "УВАГА: визначення власника додатка «%s» не є безпечним\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr ""
  "УВАГА: визначення прав доступу до домашнього каталогу «%s» не є безпечним\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr ""
  "УВАГА: визначення прав доступу до файла налаштувань «%s» не є безпечним\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "УВАГА: визначення прав доступу до додатка «%s» не є безпечним\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr ""
  "УВАГА: визначення власника підлеглого каталогу домашнього каталогу «%s» не є "
  "безпечним\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2592,21 -2010,18 +2600,21 @@@ msgstr "
  "УВАГА: визначення власника у підлеглому каталозі, визначеному файлом "
  "налаштувань «%s», не є безпечним\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr ""
  "УВАГА: визначення власника підлеглого каталогу у додатку «%s» не є "
  "безпечним\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr ""
  "УВАГА: визначення прав доступу до підлеглого каталогу домашнього каталогу "
  "«%s» не є безпечним\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2614,535 -2029,425 +2622,543 @@@ msgstr "
  "УВАГА: визначення прав доступу до підлеглого каталогу, визначеного файлом "
  "налаштувань «%s», не є безпечним\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr ""
  "УВАГА: визначення прав доступу до підлеглого каталогу у додатку «%s» не є "
  "безпечним\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "невідомий пункт налаштувань «%s»\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "показувати фотоідентифікатори у списках ключів"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  msgid "show key usage information during key listings"
  msgstr "показувати дані щодо використання ключа у списках ключів"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr "показувати адреси правил у списках підписів"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "показувати всі примітки у списках підписів"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr "показувати стандартні примітки IETF у списках підписів"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr "показувати примітки користувача у списках підписів"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "показувати адреси основних серверів ключів у списках підписів"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr ""
  "показувати відкликані та застарілі ідентифікатори користувачів у списках "
  "ключів"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr "показувати відкликані та застарілі підключі у списках ключів"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "показувати назву сховища ключів у списках ключів"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "показувати дати завершення строків дії у списку підписів"
  
- #: g10/gpg.c:2011
- msgid "available TOFU policies:\n"
- msgstr "можливі варіанти правил TOFU:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "valid values for option '%s':\n"
+ msgstr "некоректний аргумент параметра «%.50s»\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, c-format
  msgid "unknown TOFU policy '%s'\n"
  msgstr "невідомі правила TOFU «%s»\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr "(команда «help» виводить список можливих варіантів)\n"
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "invalid value for option '%s'\n"
+ msgstr "некоректний аргумент параметра «%.50s»\n"
+ 
++#: g10/gpg.c:2203
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "рядок %d: некоректна адреса електронної пошти\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "некоректний режим pinentry, «%s»\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "«%s» не є коректним набором символів\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "не вдалося обробити адресу сервера ключів\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: некоректні параметри сервера ключів\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "некоректні параметри сервера ключів\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: некоректні параметри імпортування\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "некоректні параметри імпортування\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, c-format
  msgid "invalid filter option: %s\n"
  msgstr "некоректний параметр фільтрування: %s\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: некоректні параметри експортування\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "некоректні параметри експортування\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: некоректні параметри побудови списку\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "некоректні параметри побудови списку\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "показувати фотоідентифікатори під час перевірки підписів"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr "показувати адреси правил під час перевірки підписів"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "показувати всі примітки під час перевірки підписів"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr "показувати стандартні примітки IETF під час перевірки підписів"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr "показувати вказані користувачем примітки під час перевірки підписів"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
  msgstr ""
  "показувати адреси основних серверів ключів у списках перевірки підписів"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
  msgstr ""
  "показувати чинність ідентифікаторів користувача під час перевірки підписів"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr ""
  "показувати відкликані та застарілі ідентифікатори користувачів у списках "
  "перевірки підписів"
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  msgid "show only the primary user ID in signature verification"
  msgstr ""
  "показувати лише основний ідентифікатор користувача під час перевірки підписів"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "перевірити підписи за допомогою даних PKA"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "підняти рівень довіри до підписів з коректними даними PKA"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: некоректні параметри перевірки\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "некоректні параметри перевірки\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "не вдалося встановити шлях для запуску у значення %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: некоректний список auto-key-locate\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr "некоректний список auto-key-locate\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "УВАГА: %s перевизначає %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s не можна використовувати разом з %s!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s є зайвим, якщо використано %s!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr "УВАГА: запущено з фіктивним системним часом: "
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "вибраний алгоритм шифрування є некоректним\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "вибраний алгоритм стискання є некоректним\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr ""
  "вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "значення completes-needed має бути більшим за 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "значення marginals-needed має перевищувати 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "значення max-cert-depth має перебувати у діапазоні від 1 до 255\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  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:3590
++#: g10/gpg.c:3688
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr ""
  "ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
  "S2K (0)\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "некоректні типові параметри\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "некоректні особисті параметри шифрування\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "некоректні особисті параметри контрольної суми\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "некоректні особисті параметри стискання\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s ще не може працювати разом з %s\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "не можна використовувати алгоритм шифрування «%s» у режимі %s\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr ""
  "не можна використовувати алгоритм створення контрольних сум «%s» у режимі "
  "%s\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "не можна використовувати алгоритм стискання «%s» у режимі %s\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr ""
  "УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
  "ключем\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [назва файла]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [назва файла]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [назва файла]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [назва файла]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr ""
  "не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
  "mode 0\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr ""
  "не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [назва файла]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [назва файла]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [назва файла]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr ""
  "не можна використовувати комбінацію --symmetric --sign --encrypt у режимі --"
  "s2k-mode 0\n"
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr ""
  "не можна використовувати комбінацію --symmetric --sign --encrypt у режимі "
  "%s\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [назва файла]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [назва файла]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [назва файла]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key user-id"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key user-id"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key user-id [команди]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
  msgstr "--passwd <ідентифікатор-користувача>"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "помилка під час спроби експортування ключа: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, c-format
  msgid "export as ssh key failed: %s\n"
  msgstr "спроба експортування ключа ssh зазнала невдачі: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "помилка пошуку на сервері ключів: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "помилка оновлення з сервера ключів: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "помилка перетворення з формату ASCII: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "помилка перетворення у формат ASCII: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "некоректний алгоритм хешування «%s»\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "помилка під час спроби обробки специфікації ключа «%s»: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[назва файла]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "Почніть вводити ваше повідомлення...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "вказана адреса правил сертифікації є некоректною\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "вказана адреса правил підписування є некоректною\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "вказана адреса основного сервера ключів є некоректною\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|FILE|визначити ключі з файла сховища ключів ФАЙЛ"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "супроводжувати конфлікти часових позначок лише попередженнями"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|записувати до дескриптора файла дані щодо стану"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr "|ALGO|відкидати підписи, створені за допомогою алгоритму ALGO"
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "Використання: gpgv [параметри] [файли] (-h — довідка)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3159,133 -2462,105 +3175,133 @@@ msgstr "Довідки не перед�
  msgid "No help available for '%s'"
  msgstr "Довідки щодо %s не виявлено"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr "імпортувати підписи, позначені як лише локальні"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr "відновлювати пошкодження сервером ключів pks під час імпортування"
  
- #: g10/import.c:144
++#: g10/import.c:157
  msgid "do not clear the ownertrust values during import"
  msgstr "не вилучати значень власної довіри під час імпортування"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "не оновлювати базу даних довіри після імпортування"
  
- #: g10/import.c:150
++#: g10/import.c:163
  msgid "show key during import"
  msgstr "показувати ключ під час імпортування"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr "приймати оновлення лише вже створених ключів"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
  msgstr "вилучити невикористані частини ключа після імпортування"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "вилучити максимум частин з ключа після імпортування"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr "запустити фільтри імпортування та експортувати ключ негайно"
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "пропускаємо блок типу %d\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "оброблено %lu ключів\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "Загалом оброблено: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, c-format
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "    пропущено ключів PGP-2: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "пропущено нових ключів: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "   без ід. користувача: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "           імпортовано: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "              без змін: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "нових ід. користувачів: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "       нових підключів: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        нових підписів: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "відкликань нових ключів: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "прочитано закритих ключів: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "імпортовано закр. ключів: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr " закр. ключів без змін: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "        не імпортовано: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "    вилучених підписів: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr " вилучених ід. корист.: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
@@@ -3294,190 -2569,152 +3310,190 @@@ msgstr "
  "УВАГА: у ключі %s містяться записи надання переваги\n"
  "недоступним алгоритмам для таких ід. користувачів:\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         «%s»: перевага алгоритму шифрування %s\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         «%s»: перевага алгоритму контрольних сум %s\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         «%s»: перевага алгоритму стискання %s\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "наполегливо рекомендуємо вам оновити записи переваг і\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr ""
  "повторно поширити цей ключ, щоб уникнути потенційних проблем з алгоритмами\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr ""
  "оновити записи перевад можна за допомогою команди: gpg --edit-key %s updpref "
  "save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "ключ %s: немає ідентифікатор користувача\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, c-format
  msgid "key %s: %s\n"
  msgstr "ключ %s: %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr "відкинуто екранувальником імпорту"
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "ключ %s: відновлено пошкоджений підключ PKS\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "ключ %s: прийнято несамопідписаний ідентифікатор користувача «%s»\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "ключ %s: немає чинних ідентифікаторів користувача\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "причиною цього може бути те, що немає самопідпису\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "ключ %s: не знайдено відкритий ключ: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "ключ %s: новий ключ — пропущено\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "не виявлено придатного до запису сховища ключів: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "помилка під час спроби запису сховища ключів «%s»: %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "ключ %s: імпортовано відкритий ключ «%s»\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "ключ %s: не відповідає нашій копії\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "ключ %s: не вдалося знайти початковий блок ключів: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "ключ %s: не вдалося прочитати початковий блок ключів: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "ключ %s: «%s» 1 новий ідентифікатор користувача\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "ключ %s: «%s» %d нових ідентифікаторів користувачів\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "ключ %s: «%s» 1 новий підпис\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "ключ %s: «%s» %d нових підписів\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "ключ %s: «%s» 1 новий підключ\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "ключ %s: «%s» %d нових підключів\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "ключ %s: «%s» вилучено %d підпис\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "ключ %s: «%s» вилучено %d підписів\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "ключ %s: «%s» спорожнено %d ідентифікатор користувача\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "ключ %s: «%s» спорожнено %d ідентифікаторів користувачів\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "ключ %s: «%s» не змінено\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "ключ %s: імпортовано закритий ключ\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "ключ %s: закритий ключ вже існує\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "ключ %s: помилка під час спроби надсилання агенту: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "закритий ключ %s: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "імпортування закритих ключів заборонено\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "ключ %s: закритий ключ з некоректним шифром %d — пропущено\n"
@@@ -3492,178 -2729,144 +3508,178 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  "Для перенесення «%s» на кожній із карток пам’яті слід виконати таку команду: "
  "%s\n"
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr ""
  "ключ %s: немає відкритого ключа — не можна застосовувати сертифікат "
  "відкликання\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "ключ %s: некоректний сертифікат відкликання: %s — відкинуто\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "ключ %s: імпортовано сертифікат відкликання «%s»\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "ключ %s: немає ідентифікатор користувача для підпису\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr ""
  "ключ %s: непідтримуваний алгоритм створення відкритого ключа для "
  "ідентифікатора користувача «%s»\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "ключ %s: некоректний самопідпис для ідентифікатора користувача «%s»\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "ключ %s: непідтримуваний алгоритм створення відкритого ключа\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "ключ %s: некоректний безпосередній підпис ключа\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "ключ %s: немає підключа для зв’язування ключів\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "ключ %s: некоректне зв’язування підключів\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "ключ %s: вилучено кратне зв’язування підключів\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "ключ %s: немає підключа для відкликання ключа\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "ключ %s: некоректне відкликання підключа\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "ключ %s: вилучено кратне відкликання підключа\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "ключ %s: пропущено ідентифікатор користувача «%s»\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "ключ %s: пропущено підключ\n"
  
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "ключ %s: непридатний до експорту підпис (клас 0x%02X) — пропущено\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "ключ %s: сертифікат відкликання у помилковому місці — пропущено\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "ключ %s: некоректний сертифікат відкликання: %s — пропущено\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "ключ %s: підпис підключа у помилковому місці — пропущено\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "ключ %s: неочікуваний клас підпису (0x%02X) — пропущено\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "ключ %s: виявлено дублювання ідентифікаторів користувача — об’єднано\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "УВАГА: ключ %s могло бути відкликано: отримуємо ключ відкликання %s\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "УВАГА: ключ %s могло бути відкликано: ключа відкликання %s немає.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "ключ %s: додано сертифікат відкликання «%s»\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "ключ %s: додано безпосередній підпис ключа\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, c-format
  msgid "error creating keyring '%s': %s\n"
  msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, c-format
  msgid "keybox '%s' created\n"
  msgstr "створено сховище ключів «%s»\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, c-format
  msgid "keyring '%s' created\n"
  msgstr "створено сховище ключів «%s»\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "ресурс блоку ключів «%s»: %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, c-format
  msgid "error opening key DB: %s\n"
  msgstr "помилка під час спроби відкрити базу даних ключів: %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "не вдалося перебудувати кеш сховища ключів: %s\n"
@@@ -3676,14 -2877,16 +3692,20 @@@ msgstr "[відкликання]
  msgid "[self-signature]"
  msgstr "[самопідпис]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "помилка під час спроби отримання області пам’яті: %s\n"
+ 
++#: g10/keyedit.c:629
  #, c-format
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr ""
  "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
  "відкритого ключа (%d): %s.\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, c-format
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
@@@ -3691,16 -2894,13 +3713,16 @@@ msgstr "
  "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
  "контрольної суми %d: %s.\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  msgid " (reordered signatures follow)"
  msgstr " (нижче наведено перевпорядковані підписи)"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, c-format
  msgid "key %s:\n"
  msgstr "ключ %s:\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
@@@ -3708,7 -2908,6 +3730,7 @@@ msgstr[0] "вилучено %d дубл
  msgstr[1] "вилучено %d дублікати підписів\n"
  msgstr[2] "вилучено %d дублікатів підписів\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, c-format
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
@@@ -3716,7 -2915,6 +3738,7 @@@ msgstr[0] "%d підпис не пер�
  msgstr[1] "%d підписи не перевірено через те, що немає ключа\n"
  msgstr[2] "%d підписів не перевірено через те, що немає ключа\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, c-format
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
@@@ -3724,7 -2922,6 +3746,7 @@@ msgstr[0] "%d помилкових пі
  msgstr[1] "%d помилкових підписи\n"
  msgstr[2] "%d помилкових підписів\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
@@@ -3732,7 -2929,6 +3754,7 @@@ msgstr[0] "перевпорядкова
  msgstr[1] "перевпорядковано %d підписи\n"
  msgstr[2] "перевпорядковано %d підписів\n"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3741,7 -2937,6 +3763,7 @@@ msgstr "
  "Попередження: виявлено помилки, перевірка виконувалася лише для "
  "самопідписування, віддайте команду «%s», щоб перевірити усі підписи.\n"
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3752,17 -2947,14 +3774,17 @@@ msgstr "
  "ключів інших\n"
  "користувачів (за паспортами, відбитками з інших джерел тощо)\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = Я довіряю не повністю\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = Я довіряю повністю\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3772,52 -2964,40 +3794,52 @@@ msgstr "
  "Глибина, більша за 1, дозволяє ключу, який ви підписуєте, створювати\n"
  "надійні підписи від вашого імені.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr ""
  "Будь ласка, вкажіть домен обмеження цього підпису або натисніть Enter, якщо "
  "такого домену немає.\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr "Пропускаємо ідентифікатор користувача «%s», який не є текстовим.\n"
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "Ідентифікатор користувача «%s» відкликано."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "Ви певні, що все ще бажаєте підписати його? (y/N або т/Н) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  Неможливо підписати.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "Строк дії ідентифікатор користувача «%s» сплив."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "Ідентифікатор користувача «%s» не є самопідписаним."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "Ідентифікатор користувача «%s» можна підписувати.  "
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
  msgstr "Підписати його? (y/N або т/Н) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3826,12 -3006,10 +3848,12 @@@ msgstr "
  "Самопідпис «%s»\n"
  "є підписом у форматі PGP 2.x.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr ""
  "Бажаєте розширити сферу використання до самопідпису OpenPGP? (y/N або т/Н) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3840,11 -3018,9 +3862,11 @@@ msgstr "
  "Строк дії вашого поточного підпису «%s»\n"
  "завершено.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "Бажаєте видати новий підпис для заміни застарілого? (y/N або т/Н) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3853,45 -3029,36 +3875,45 @@@ msgstr "
  "Ваш поточний підпис «%s»\n"
  "є локальним підписом.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr ""
  "Бажаєте розширити сферу використання до повністю експортованого підпису? (y/"
  "N або т/Н) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "«%s» вже було локально підписано ключем %s\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "«%s» вже було підписано ключем %s\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "Бажаєте підписати його попри все? (y/N або т/Н) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "Нічого підписувати ключем %s\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "Строк дії цього ключа вичерпано!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "Строк дії цього ключа завершиться %s.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "Бажаєте, щоб строк дії вашого підпису був таким самим? (Y/n або Т/н) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3902,261 -3069,201 +3924,261 @@@ msgstr "
  "справді належить особі, ім’я якої вказано вище? Якщо ви не знаєте відповіді, "
  "введіть «0».\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) Не буду відповідати.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) Мною не виконувалося ніяких перевірок.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) Мною виконано часткову перевірку.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) Мною виконано ретельну перевірку.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  msgid "Your selection? (enter '?' for more information): "
  msgstr "Ваш вибір? (введіть «?», щоб дізнатися більше): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
  "key \"%s\" (%s)\n"
  msgstr "Ви справді бажаєте підписати цей ключ вашим ключем «%s» (%s)\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
  msgstr "Це буде самопідпис.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "УВАГА: підпис не буде позначено як непридатний до експортування.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "УВАГА: підпис не буде позначено як непридатний до відкликання.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "Підпис буде позначено як непридатний до експортування.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "Підпис буде позначено як непридатний до відкликання.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "Цей ключ не перевірявся мною.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "Цей ключ перевірено мною частково.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "Цей ключ ретельно перевірено мною.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
  msgstr "Підписати? (y/N або т/Н) "
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "помилка під час спроби підписування: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr ""
  "До ключа включено лише типовий заповнювач або записи ключа з картки — ніяких "
  "паролів не потрібно змінювати.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "ключ %s: помилка під час спроби зміни пароля: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "зберегти і вийти"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "показати відбиток ключа"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  msgid "show the keygrip"
  msgstr "показати keygrip"
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "показати список ключів та ідентифікаторів користувача"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "вибрати вказаний ідентифікатор користувача"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "вибрати вказаний підключ"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "перевірити підписи"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr ""
  "підписати вибрані ідентифікатори користувачів [* нижче наведено відповідні "
  "команди]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "підписати вибрані ідентифікатори користувача локально"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "підписати вибрані ідентифікатори користувача підписом надійності"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr ""
  "підписати вибрані ідентифікатори користувача підписом, який не можна "
  "відкликати"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "додати ідентифікатор користувача"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "додати фотоідентифікатор"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "вилучити вибрані ідентифікатори користувача"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "додати підключ"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "додати ключ на картку пам’яті"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "пересунути ключ на картку пам’яті"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "пересунути резервний ключ на картку пам’яті"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "вилучити вибрані підключі"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "додати ключ відкликання"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "вилучити підписи з вибраних ідентифікаторів користувача"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "змінити дату завершення строку дії ключа або вибраних ключів"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "позначити вибраний ідентифікатор користувача як основний"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "список переваг (експертний)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "список переваг (докладний)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "встановити список параметрів для вибраних ідентифікаторів користувачів"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr ""
  "встановити адресу основного сервера ключів для вибраних ідентифікаторів "
  "користувачів"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
  msgstr "встановити примітку для вибраного ідентифікатора користувача"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "змінити пароль"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "змінити рівень довіри до власника"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "відкликати підписи для вибраних ідентифікаторів користувачів"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "відкликати вибрані ідентифікатори користувачів"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "відкликати ключ або вибрані підключі"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "увімкнути ключ"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "вимкнути ключ"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "показати вибрані фотоідентифікатори"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr ""
  "ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
  "невикористані підписи з ключа"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr ""
  "ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
  "всі підписи з ключа"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "Доступний закритий ключ.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "Для цього потрібен закритий ключ.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4167,258 -3274,199 +4189,258 @@@ msgstr "
  "  «t» для надійних підписів (tsign), «nr» для підписів без відкликання\n"
  "  (nrsign) або будь-яку комбінацію (ltsign, tnrsign тощо).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "Ключ відкликано."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
  msgstr "Підписати всі ідентифікатори користувача? (y/N або т/Н) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "Підписати всі текстові ідентифікатори користувача? (y/N або т/Н) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "Підказка: виберіть ідентифікатори користувача для підписування\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "Невідомий тип підпису «%s»\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "Цією командою не можна користуватися у режимі %s.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "Вам слід вибрати принаймні один ідентифікатор користувача.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr "(Скористайтеся командою «%s».)\n"
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "Не можна вилучати останній ідентифікатор користувача!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "Вилучити всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
  msgstr "Вилучити цей ідентифікатор користувача? (y/N або т/Н) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
  msgstr "Вилучити основний ключ? (y/N або т/Н) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "Вам слід вибрати лише один ключ.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "Для команди слід вказати аргумент з назвою файла\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "Не вдалося відкрити «%s»: %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "Помилка читання резервного ключа з «%s»: %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "Вам слід вибрати принаймні один ключ.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "Справді бажаєте вилучити вибрані ключі? (y/N або т/Н) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "Справді бажаєте вилучити цей ключ? (y/N або т/Н) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "Відкликати всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
  msgstr "Відкликати цей ідентифікатор користувача? (y/N або т/Н) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "Ви справді бажаєте відкликати весь ключ? (y/N або т/Н) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "Ви справді бажаєте відкликати позначені підключі? (y/N або т/Н) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "Ви справді бажаєте відкликати цей підключ? (y/N або т/Н) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr ""
  "Не можна встановлювати довіру до власника, якщо використовується вказана "
  "користувачем база даних довіри\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "Встановити список переваг:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr ""
  "Оновити переваги для вибраних ідентифікаторів користувачів? (y/N або т/Н) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
  msgstr "Оновити параметри? (y/N або т/Н) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
  msgstr "Зберегти зміни? (y/N або т/Н) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
  msgstr "Вийти без збереження? (y/N або т/Н) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "помилка оновлення: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "Ключ не змінено, отже оновлення непотрібне.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, c-format
  msgid "User ID revocation failed: %s\n"
  msgstr "Спроба відкликання ідентифікатор користувача зазнала невдачі: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "«%s» не є відбитком\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "«%s» не є основним відбитком\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, c-format
  msgid "Invalid user ID '%s': %s\n"
  msgstr "Некоректний ідентифікатор користувача «%s»: %s\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "No matching user IDs."
  msgstr "Немає відповідних ідентифікаторів користувачів."
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "Nothing to sign.\n"
  msgstr "Нічого підписувати.\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "Контрольна сума: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "Можливості: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "Сервер ключів без можливості зміни"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "Основний сервер ключів: "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "Примітки: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr ""
  "Переваг для ідентифікаторів користувачів у форматі PGP 2.x не передбачено.\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "Вказаний нижче ключ було відкликано %s %s ключем %s\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "Цей ключ може бути відкликано %s ключем %s"
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(важливий)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "створено: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "відкликано: %s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "не діє з: %s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "діє до: %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "використання: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "номер картки: "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "надійність: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "чинність: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "Цей ключ було вимкнено"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4426,17 -3474,12 +4448,18 @@@ msgstr "
  "Зауважте, що показані дані щодо чинності ключів не обов’язково є коректними\n"
  "до перезапуску програми.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "відкликано"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "збіг строк дії"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4446,15 -3489,12 +4469,15 @@@ msgstr "
  "              цієї команди можна зробити основним інший ідентифікатор "
  "користувача.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "УВАГА: строк дії вашого підключа імпортування невдовзі завершиться.\n"
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  msgid "You may want to change its expiration date too.\n"
  msgstr "Ймовірно, вам варто змінити також і його строк дії.\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4464,35 -3504,27 +4487,35 @@@ msgstr "
  "до відмови\n"
  "         у використанні цього ключа деякими версіями PGP.\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "Ви справді бажаєте додати його? (y/N або т/Н) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "Не можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "Вилучити цей дійсний підпис? (y/N/q або т/Н/в)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "Вилучити цей некоректний підпис? (y/N/q або т/Н/в)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "Вилучити цей невідомий підпис? (y/N/q або т/Н/в)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "Вилучити цей самопідпис? (y/N або т/Н)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, c-format
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
@@@ -4500,20 -3532,16 +4523,20 @@@ msgstr[0] "Вилучено %d підп
  msgstr[1] "Вилучено %d підписи.\n"
  msgstr[2] "Вилучено %d підписів.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "Нічого не вилучено.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "некоректний"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "Ідентифікатор користувача «%s» ущільнено: %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
@@@ -4521,17 -3549,14 +4544,17 @@@ msgstr[0] "Ідентифікатор �
  msgstr[1] "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
  msgstr[2] "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "Ідентифікатор користувача «%s»: вже мінімізовано\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "Ідентифікатор користувача «%s»: вже очищено\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4541,39 -3566,31 +4564,39 @@@ msgstr "
  "призвести до відмови\n"
  "         у використанні цього ключа деякими версіями PGP.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "Не можна додавати підписане відкликання до ключа у форматі PGP 2.x.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "Вкажіть ідентифікатор користувача підписаного відкликання: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
  msgstr "не можна призначати ключ у форматі PGP 2.x підписаним відкликанням\n"
  
- #: g10/keyedit.c:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "не можна призначати ключ власним підписаним відкликанням\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
  msgstr "цей ключ вже було позначено як призначений для відкликання\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr ""
  "УВАГА: призначення ключа як підписаного відкликання не можна скасовувати!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr ""
  "Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
  "Н) "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  msgid ""
  "Are you sure you want to change the expiration time for multiple subkeys? (y/"
  "N) "
@@@ -4581,233 -3598,182 +4604,233 @@@ msgstr "
  "Ви справді хочете змінити час вичерпання строку дії для декількох підключів? "
  "(y/N або т/Н) "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "Зміна часу завершення строку дії для підключа.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "Зміна часу завершення строку дії для основного ключа.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "Не можна змінювати дату завершення строку дії ключа v3\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "підписування підключа %s вже перехресно сертифіковано\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr ""
  "підключ %s не призначено для підписування, отже його не потрібно перехресно "
  "сертифікувати\n"
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "Будь ласка, виберіть лише один ідентифікатор користувача.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "пропускаємо самопідпис v3 для ідентифікатора користувача «%s»\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "Вкажіть адресу вашого основного сервера ключів: "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "Ви справді бажаєте замінити його? (y/N або т/Н) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "Ви справді бажаєте вилучити його? (y/N або т/Н) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "Вкажіть примітку: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
  msgstr "Продовжувати? (y/N або т/Н) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "Ідентифікатора користувача з індексом %d не існує\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "Ідентифікатора користувача з хешем %s не існує\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, c-format
  msgid "No subkey with key ID '%s'.\n"
  msgstr "Піключа із ідентифікатором ключа «%s» не існує.\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "Підключа з індексом %d не існує\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "Ідентифікатор користувача: «%s»\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "підписано вашим ключем %s %s%s%s\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (неекспортовний)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "Строк дії цього підпису завершується %s.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "Ви справді бажаєте відкликати його? (y/N або т/Н) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "Створити сертифікат відкликання для цього підпису? (y/N або т/Н) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr "Не підписано вами.\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "Вами підписано ці ідентифікатори користувачів у ключі %s:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (невідкликуваний)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "відкликано вашим ключем %s у %s\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "Ви маєте намір відкликати ці підписи:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "Справді створити сертифікати відкликання? (y/N або т/Н) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "немає закритого ключа\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr "спроба відкликати ідентифікатор, який не належить користувачеві: %s\n"
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "ідентифікатор користувача «%s» вже відкликано\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr ""
  "УВАГА: підпис ідентифікатора користувача позначено датою на %d секунд у "
  "майбутньому\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "Ключ %s вже відкликано.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "Підключ %s вже відкликано.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "Показ фотоідентифікатора %s розміру %ld для ключа %s (uid %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "запис переваги «%s» продубльовано\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "занадто багато записів переваг шифрів\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "занадто багато записів переваг контрольних сум\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
  msgstr "занадто багато записів переваг стискання\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "некоректний запис «%s» у рядку переваг\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "записування безпосереднього підпису\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "записування самопідпису\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "записування підпису прив’язування ключа\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "некоректний розмір ключа; використовуємо %u-бітовий\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "розмір ключа округлено до %u-бітового\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  "УВАГА: деякі з програм OpenPGP не можуть працювати з ключем DSA з таким "
  "розміром контрольної суми\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "Підписати"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "Сертифікувати"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "Зашифрувати"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "Пройти розпізнавання"
  
@@@ -4821,151 -3787,120 +4844,151 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "Можливі дії з ключем %s: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "Поточні дозволені дії: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) увімкнути або вимкнути можливість підписування\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) увімкнути або вимкнути можливість шифрування\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr ""
  "   (%c) увімкнути або вимкнути можливість використання для розпізнавання\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) вийти\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "Вкажіть потрібний вам тип ключа:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA і RSA (типовий)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA і Elgamal\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (лише підписування)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (лише підписування)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (лише шифрування)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (лише шифрування)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (із визначенням можливостей власноруч)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (із визначенням можливостей власноруч)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC та ECC\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "  (%d) ECC (лише підписування)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "  (%d) ECC (із визначенням можливостей власноруч)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "  (%d) ECC (лише шифрування)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) Вже записаний ключ\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "Вкажіть keygrip: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "Некоректний keygrip (мало бути вказано 40 шістнадцяткових цифр)\n"
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "Немає ключів з таким значенням keygrip\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "округлено до %u бітів\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "ключі %s можуть мати довжину від %u до %u бітів.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "Якою має бути довжина підключа? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "Якою має бути довжина ключа? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "Запитана довжина ключа — %u бітів\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  msgid "Please select which elliptic curve you want:\n"
  msgstr "Вкажіть потрібну вам еліптичну криву:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4981,7 -3916,6 +5004,7 @@@ msgstr "
  "      <n>m = строк чинності у n місяців\n"
  "      <n>y = строк чинності у n років\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4997,38 -3931,30 +5020,38 @@@ msgstr "
  "      <n>m = строк чинності підпису у n місяців\n"
  "      <n>y = строк чинності підпису у n років\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "Яким є строк чинності ключа? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "Яким є строк чинності підпису? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "некоректне значення\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "Ключ не має обмеження строку дії\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "Підпис не має обмеження строку дії\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "Ключ діє до %s\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "Підпис діє до %s\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5036,11 -3962,9 +5059,11 @@@ msgstr "
  "У вашій системі неможливий показ дат після 2038 року.\n"
  "Але програма коректно оброблятиме ці дати до 2106 року.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "Все правильно? (y/N або т/Н) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5055,7 -3979,6 +5078,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5072,49 -3995,38 +5095,49 @@@ msgstr "
  "    \"Ivan Ivanenko (farmer) <iivanenko at moyahata.ua>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "Справжнє ім’я: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "Некоректний символ у імені\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr "Не можна використовувати символи «%s» і «%s» у назві\n"
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "Ім’я не може починатися з цифри\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "Ім’я має бути не коротшим за 5 літер\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "Адреса ел. пошти: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "Некоректна адреса електронної пошти\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "Коментар: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "Некоректний символ у коментарі\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "Вами використано таблицю символів «%s».\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5125,7 -4037,6 +5148,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr ""
  "Будь ласка, не використовуйте адресу електронної пошти у полях справжнього "
@@@ -5142,32 -4053,25 +5165,32 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "Змінити назву (N), коментар (C), ел. пошту (E) або вийти (Q)? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr ""
  "Змінити назву (N), коментар (C), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "Змінити назву (N), ел. пошту (E) або вийти (Q)? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "Змінити назву (N), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "Спочатку виправте помилку\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5179,13 -4083,10 +5202,13 @@@ msgstr "
  "під час створення простого числа. Це надасть змогу генератору\n"
  "псевдовипадкових чисел створити краще випадкове число.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "Помилка під час спроби створення ключа: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5196,64 -4097,51 +5219,64 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr "Продовжити? (Y (так)/n (ні)) "
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "Ключ для «%s» вже існує\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  msgid "Create anyway? (y/N) "
  msgstr "Створити попри це? (y (так)/N (ні)) "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  msgid "creating anyway\n"
  msgstr "створюємо попри усе\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  "Зауваження: скористайтеся «%s %s», щоб викликати повноцінне діалогове вікно "
  "створення ключа.\n"
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "Створення ключа скасовано.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "не вдалося створити файл резервної копії «%s»: %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "ЗАУВАЖЕННЯ: резервну копію ключа на картці збережено до «%s»\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "записуємо відкритий ключ до «%s»\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "не знайдено придатного до запису сховища відкритих ключів: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "помилка під час спроби запису до сховища відкритих ключів «%s»: %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "відкритий і закритий ключі створено і підписано.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5261,7 -4149,6 +5284,7 @@@ msgstr "
  "Зауважте, що цей ключ не може бути використано для шифрування. Ви можете\n"
  "скористатися командою «--edit-key» для створення підключа з цією метою.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5269,7 -4156,6 +5292,7 @@@ msgstr "
  "ключ було створено з позначкою на %lu секунд у майбутньому (часова петля або "
  "проблема з годинником)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5277,23 -4163,18 +5300,23 @@@ msgstr "
  "ключ було створено з позначкою на %lu секунду у майбутньому (часова петля "
  "або проблема з годинником)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "ЗАУВАЖЕННЯ: створення підключів для ключів v3 несумісне з OpenPGP\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "Закриті частини основного ключа недоступні.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "Закриті частини основного ключа зберігаються на картці.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
  msgstr "Створити? (y/N або т/Н) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "ніколи    "
  
@@@ -5347,29 -4219,23 +5370,29 @@@ msgstr[2] "
  msgid "Keyring"
  msgstr "Сховище ключів"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "Основний відбиток ключа:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "      Відбиток підключа:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr "Відбиток основного ключа:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "       Відбиток підключа:"
  
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "      Відбиток ключа ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr "Серійний номер картки ="
  
@@@ -5407,54 -4268,42 +5430,54 @@@ msgstr[2] " (%lu підписів)\n
  msgid "%s: keyring created\n"
  msgstr "%s: створено сховище ключів\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr "перевизначити параметри проксі, встановлені для dirmngr"
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr "включити до результатів пошуку відкликані ключі"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr "включити підключі до пошуку за ідентифікатором ключа"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr "перевизначити параметри часу очікування, встановлені для dirmngr"
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr "автоматично отримувати ключі під час перевірки підписів"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "брати до уваги адресу основного сервера ключів, встановлену у ключі"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr ""
  "брати до уваги запис PKA, встановлений у ключі під час отримання ключів"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "вимкнено"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr "Вкажіть номер, далі (N) чи вийти (Q) > "
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "некоректний протокол сервера ключів (наш %d!=%d обробника)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "«%s» не є ідентифікатором ключа: пропускаємо\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, c-format
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
@@@ -5462,55 -4311,44 +5485,55 @@@ msgstr[0] "оновлюємо %d клю
  msgstr[1] "оновлюємо %d ключі з %s\n"
  msgstr[2] "оновлюємо %d ключів з %s\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "УВАГА: не вдалося оновити ключ %s за допомогою %s: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "ключ «%s» не знайдено на сервері ключів\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "ключ не знайдено на сервері ключів\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr ""
  "не вказано жодного сервера ключів (скористайтеся параметром --keyserver)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "надсилаємо запит щодо ключа %s до %s сервера %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "надсилаємо запит щодо ключа %s з %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  msgid "no keyserver known\n"
  msgstr "немає відомих серверів ключів\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "пропущено «%s»: %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "надсилаємо ключ %s на %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, c-format
  msgid "requesting key from '%s'\n"
  msgstr "надсилаємо запит щодо ключа з «%s»\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "УВАГА: не вдалося отримати адресу %s: %s\n"
@@@ -5612,128 -4430,101 +5635,128 @@@ msgstr "початкова назва �
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr "УВАГА: виявлено декілька фрагментів нешифрованого тексту\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr ""
  "окреме відкликання — скористайтеся командою «gpg --import» для застосування\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "підпису не знайдено\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "ПОМИЛКОВИЙ підпис від «%s»"
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "Прострочений підпис від «%s»"
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "Належний підпис від «%s»"
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "перевірку підписів придушено\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "не вдалося обробити ці дані з неоднозначним підписом\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "Підпис створено %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               за допомогою %s ключа %s\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "Підпис створено %s ключем %s з ідентифікатором %s\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                або «%s»"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "Ключ доступний на: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[непевний]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                або «%s»"
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "Строк дії підпису вичерпано %s\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "Підпис діє до %s\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s підпис, алгоритм контрольної суми %s%s%s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "двійковий"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "текстовий"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "невідомо"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  msgid ", key algorithm "
  msgstr ", алгоритм ключа "
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr "УВАГА: не відє’днаний підпис; файл «%s» не було перевірено!\n"
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "Не вдалося перевірити підпис: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "не є від’єднаним підписом\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "УВАГА: виявлено кратні підписи. Буде перевірено лише перший.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "окремий підпис класу 0x%02x\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "підпис у застарілому форматі (PGP 2.x)\n"
  
@@@ -5836,27 -4608,22 +5859,27 @@@ msgstr "Нестиснений
  msgid "uncompressed|none"
  msgstr "uncompressed|немає"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "використання цього повідомлення щодо %s може бути неможливим\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "неоднозначний параметр «%s»\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, c-format
  msgid "unknown option '%s'\n"
  msgstr "невідомий параметр «%s»\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr ""
  "Відкритий ключ ECDSA має зберігатися у кодуванні SEC кратному 8-бітовому\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, c-format
  msgid "unknown weak digest '%s'\n"
  msgstr "невідома слабка контрольна сума «%s»\n"
@@@ -6146,7 -4858,26 +6169,29 @@@ msgstr "Ймовірно, цей клю
  msgid "This key belongs to us\n"
  msgstr "Цей ключ належить нам\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ #| msgid "root certificate has now been marked as trusted\n"
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "кореневий сертифікат було позначено як надійний\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "Не можна з певністю вважати, що ключ належить особі,\n"
+ "вказаній у ідентифікаторі користувача. Якщо вам *точно*\n"
+ "відомі наслідки ваших дій, можете ствердно відповісти\n"
+ "на наступне питання.\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6157,126 -4888,98 +6202,126 @@@ msgstr "
  "відомі наслідки ваших дій, можете ствердно відповісти\n"
  "на наступне питання.\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "Попри все використовувати цей ключ? (y/N або т/Н) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "УВАГА: використовуємо ненадійний ключ!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr "УВАГА: цей ключ могло бути відкликано (немає ключа відкликання)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "УВАГА: цей ключ було відкликано відповідною особою!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "УВАГА: цей ключ було відкликано власником!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
  msgstr "         Це може означати, що підпис було підроблено.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "УВАГА: цей підключ було відкликано його власником!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "Зауваження: цей ключ було вимкнено.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr "Зауваження: перевіреною адресою автора підпису є «%s»\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr "Зауваження: адреса автора підпису «%s» не збігається з записом DNS\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr "рівень довіри змінено на FULL (повна) через коректність даних PKA\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr "рівень довіри змінено на NEVER (ніколи) через помилки у даних PKA\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "Зауваження: строк дії цього ключа вичерпано!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr "УВАГА: цей ключ не сертифіковано за допомогою надійного підпису!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr "         Немає підтверджень належності підпису його власнику.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "УВАГА: ми НЕ довіряємо цьому ключу!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "         Підпис, ймовірно, є ПІДРОБКОЮ.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr "УВАГА: цей ключ не сертифіковано достатньо надійними підписами!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "         Певності у належності підпису його власнику немає.\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: пропущено: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: пропущено: відкритий ключ вимкнено\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: пропущено: відкритий ключ вже існує\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, c-format
  msgid "can't encrypt to '%s'\n"
  msgstr "не вдалося зашифрувати до «%s»\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "вказано параметр «%s», але не вказано коректних типових ключів\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "вказано параметр «%s», але не вказано параметр «%s»\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr ""
  "Вами не вказано ідентифікатора користувача. (можете скористатися «-r»)\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "Поточні отримувачі:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6284,37 -4987,29 +6329,37 @@@ msgstr "
  "\n"
  "Вкажіть ідентифікатор користувача. Дані слід завершити порожнім рядком: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "Немає такого ідентифікатора користувача.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr "пропущено: відкритий ключ вже встановлено для типового отримувача\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "Відкритий ключ вимкнено.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "пропущено: відкритий ключ вже встановлено\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "невідомий типовий отримувач «%s»\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "немає коректних адрес\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "Зауваження: у ключі %s не передбачено можливості %s\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "Зауваження: у ключі %s не передбачено переваг для %s\n"
@@@ -6570,27 -5219,22 +6615,27 @@@ msgstr "
  "Для використання %s ключа %s потрібен хеш з %zu або більше бітів (маємо хеш "
  "%s)\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "УВАГА: конфлікт контрольних сум підписів у повідомленні\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "УВАГА: підписування підключа %s не є перехресно сертифікованим\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
  msgstr "будь ласка, ознайомтеся з %s, щоб дізнатися більше\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr ""
  "УВАГА: підписування підключа %s містить некоректну перехресну сертифікацію\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, c-format
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
@@@ -6598,7 -5242,6 +6643,7 @@@ msgstr[0] "відкритий ключ 
  msgstr[1] "відкритий ключ %s є на %lu секунди новішим за підпис\n"
  msgstr[2] "відкритий ключ %s є на %lu секунд новішим за підпис\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, c-format
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
@@@ -6606,7 -5249,6 +6651,7 @@@ msgstr[0] "відкритий ключ 
  msgstr[1] "відкритий ключ %s є на %lu дні новішим за підпис\n"
  msgstr[2] "відкритий ключ %s є на %lu днів новішим за підпис\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, c-format
  msgid ""
  "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6622,7 -5264,6 +6667,7 @@@ msgstr[2] "
  "ключ %s було створено з позначкою на %lu секунду у майбутньому (часова петля "
  "або проблема з годинником)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, c-format
  msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
  msgid_plural ""
@@@ -6637,28 -5278,23 +6682,28 @@@ msgstr[2] "
  "ключ %s було створено з позначкою на %lu днів у майбутньому (часова петля "
  "або проблема з годинником)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "ЗАУВАЖЕННЯ: строк дії ключа підпису %s завершився %s\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "ЗАУВАЖЕННЯ: ключ підпису %s було відкликано\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr ""
  "припускаємо помилковий підпису від ключа %s через невідомий критичний біт\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr "ключ %s: немає підключа для підпису відкликання підключа\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "ключ %s: немає підключа для підпису прив’язування підключа\n"
@@@ -6730,7 -5355,6 +6775,7 @@@ msgstr "
  "це ключ Elgamal створений за допомогою PGP, цей ключ недостатньо безпечний "
  "для підписування!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "запис щодо довіри %lu, тип %d: помилка записування: %s\n"
@@@ -6775,12 -5391,10 +6820,12 @@@ msgstr "не вдалося знайт�
  msgid "read error in '%s': %s\n"
  msgstr "помилка читання у «%s»: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "trustdb: помилка синхронізації: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "не вдалося створити блокування для «%s»\n"
@@@ -6809,7 -5418,6 +6854,7 @@@ msgstr "занадто велика о�
  msgid "%s: directory does not exist!\n"
  msgstr "%s: каталогу не існує!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "немає доступу до «%s»: %s\n"
@@@ -6919,97 -5505,89 +6964,109 @@@ msgstr "
  msgid "input line longer than %d characters\n"
  msgstr "рядок вхідних даних довший за %d символів\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr ""
  "помилка під час спроби розпочати внесення змін до бази даних TOFU: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr "помилка під час внесення змін до бази даних TOFU: %s\n"
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr "помилка під час скасовування змін у базі даних TOFU: %s\n"
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr "непідтримувана версія бази даних TOFU: %s\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "помилка під час спроби читання бази даних TOFU: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, c-format
  msgid "error determining TOFU database's version: %s\n"
  msgstr "помилка під час спроби визначення версії бази даних TOFU: %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, c-format
  msgid "error initializing TOFU database: %s\n"
  msgstr "помилка під час спроби ініціалізації бази даних TOFU: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "помилка під час спроби відкрити бази даних TOFU «%s»: %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "помилка під час спроби оновлення бази даних TOFU: %s\n"
  
- #: g10/tofu.c:1118
- #, c-format
- msgid "The binding %s is NOT known."
- msgstr "Прив’язка %s є невідомою."
- 
- #: g10/tofu.c:1128
- #, c-format
++#: g10/tofu.c:1239
+ #, fuzzy, c-format
+ #| msgid "The email address \"%s\" is associated with %d key:\n"
+ #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ "This is the first time the email address \"%s\" is being used with key %s."
+ msgstr "Адресу електронної пошти «%s» пов’язано із %d ключем:\n"
+ 
++#: g10/tofu.c:1247
+ #, fuzzy, c-format
+ #| msgid "The email address \"%s\" is associated with %d key:\n"
+ #| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
+ msgid "The email address \"%s\" is associated with %d keys!"
+ msgstr "Адресу електронної пошти «%s» пов’язано із %d ключем:\n"
+ 
++#: g10/tofu.c:1251
+ #, fuzzy
+ #| msgid ""
+ #| "The key with fingerprint %s raised a conflict with the binding %s.  Since "
+ #| "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
  msgstr ""
  "Ключ із відбитком %s конфліктує із прив’язкою %s. Оскільки правилами цієї "
  "прив’язки визначалося «автоматично», їх змінено на «запитувати»."
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
- "Будь ласка, вкажіть, чи вважаєте прив’язку %s%sчинною (ключ належить "
- "декларованому власнику) чи підробною (помилковою)."
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, c-format
  msgid "error gathering other user IDs: %s\n"
  msgstr "помилка під час збирання інших ідентифікаторів користувачів: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr "Відомі ідентифікатори користувачів, пов’язані із цим ключем:\n"
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "показати список ключів та ідентифікаторів користувача"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, c-format
  msgid "policy: %s"
  msgstr "правило: %s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr ""
  "помилка під час спроби зібрати статистичні дані щодо підписування: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@@ -7017,59 -5595,67 +7074,77 @@@ msgstr[0] "Адресу електро�
  msgstr[1] "Адресу електронної пошти «%s» пов’язано із %d ключами:\n"
  msgstr[2] "Адресу електронної пошти «%s» пов’язано із %d ключами:\n"
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr "Статистичні дані для ключів із адресою електронної пошти «%s»:\n"
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  msgid "this key"
  msgstr "цей ключ"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] "%ld повідомлення підписано у майбутньому."
- msgstr[1] "%ld повідомлення підписано у майбутньому."
- msgstr[2] "%ld повідомлень підписано у майбутньому."
++#: g10/tofu.c:1715
+ #, fuzzy, c-format
+ #| msgid "Verified %ld messages signed by \"%s\"."
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
+ msgstr[0] "Перевірено %ld повідомлень, підписаних «%s»."
+ msgstr[1] "Перевірено %ld повідомлень, підписаних «%s»."
+ msgstr[2] "Перевірено %ld повідомлень, підписаних «%s»."
  
- #: g10/tofu.c:1351
++#: g10/tofu.c:1719
  #, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
- msgstr[0] "підписано %ld повідомлення"
- msgstr[1] "підписано %ld повідомлення"
- msgstr[2] "підписано %ld повідомлень"
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
  
- #: g10/tofu.c:1357
- #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
++#: g10/tofu.c:1734
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] " протягом %ld попереднього дня."
  msgstr[1] " протягом %ld попередніх днів."
  msgstr[2] " протягом %ld попередніх днів."
  
- #: g10/tofu.c:1361
- #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
- msgstr[0] " протягом %ld попереднього тижня."
- msgstr[1] " протягом %ld попередніх тижнів."
- msgstr[2] " протягом %ld попередніх тижнів."
- 
- #: g10/tofu.c:1365
- #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
++#: g10/tofu.c:1740
+ #, fuzzy, c-format
+ #| msgid " over the past %ld month."
+ #| msgid_plural " over the past %ld months."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] " протягом %ld попереднього місяця."
  msgstr[1] " протягом %ld попередніх місяців."
  msgstr[2] " протягом %ld попередніх місяців."
  
++#: g10/tofu.c:1746
+ #, fuzzy, c-format
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
+ msgstr[0] " протягом %ld попереднього дня."
+ msgstr[1] " протягом %ld попередніх днів."
+ msgstr[2] " протягом %ld попередніх днів."
+ 
++#: g10/tofu.c:1752
+ #, fuzzy
+ #| msgid " over the past %ld day."
+ #| msgid_plural " over the past %ld days."
+ msgid " in the past."
+ msgstr " протягом %ld попереднього дня."
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  "Зазвичай, з певною адресою електронної пошти пов’язано лише один ключ. Втім, "
@@@ -7082,30 -5668,36 +7157,45 @@@
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr "gGaAuUrRbB"
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  "(G)Добрий, (A)Прийняти одноразово, (U)Невідомий, (R)Відкинути одноразово, "
  "(B)Поганий? "
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ #| msgid "error writing key: %s\n"
+ msgid "resetting keydb: %s\n"
+ msgstr "помилка під час спроби запису ключа: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr ""
  "помилка під час спроби встановлення рівня довіри до прив’язки TOFU до %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "помилка під час спроби змінити правила TOFU: %s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
@@@ -7113,7 -5705,6 +7203,7 @@@ msgstr[0] "%d~рік
  msgstr[1] "%d~роки"
  msgstr[2] "%d~років"
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
@@@ -7121,7 -5712,6 +7211,7 @@@ msgstr[0] "%d~місяць
  msgstr[1] "%d~місяці"
  msgstr[2] "%d~місяців"
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
@@@ -7129,7 -5719,6 +7219,7 @@@ msgstr[0] "%d~день
  msgstr[1] "%d~дні"
  msgstr[2] "%d~днів"
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
@@@ -7137,7 -5726,6 +7227,7 @@@ msgstr[0] "%d~година
  msgstr[1] "%d~години"
  msgstr[2] "%d~годин"
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
@@@ -7145,7 -5733,6 +7235,7 @@@ msgstr[0] "%d~хвилина
  msgstr[1] "%d~хвилини"
  msgstr[2] "%d~хвилин"
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
@@@ -7153,33 -5740,24 +7243,27 @@@ msgstr[0] "%d~секунда
  msgstr[1] "%d~секунди"
  msgstr[2] "%d~секунд"
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
- msgstr "Ніколи не перевірялося повідомлення, підписане ключем %s!\n"
- 
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
+ msgid "%s: "
  msgstr ""
- "Не вдалося зібрати статистичні дані щодо підписування для «%s»\n"
- "(ключ %s)\n"
  
- #: g10/tofu.c:1996
- #, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "Перевірено %ld повідомлень, підписаних «%s»."
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "Вилучено %d підписів.\n"
  
- #: g10/tofu.c:2007
- #, c-format
- msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
++#: g10/tofu.c:2816
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Verified %ld message signed by \"%s\"\n"
+ #| "in the past %s."
+ #| msgid_plural ""
+ #| "Verified %ld messages signed by \"%s\"\n"
+ #| "in the past %s."
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
  msgstr[0] ""
  "Перевірено %ld повідомлення, підписане «%s»,\n"
  "протягом такого строку: %s."
@@@ -7190,23 -5768,67 +7274,74 @@@ msgstr[2] "
  "Перевірено %ld повідомлень, підписаних «%s»,\n"
  "протягом такого строку: %s."
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
- msgstr "Останнє повідомлення було перевірено %s тому."
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "зашифровано за допомогою %lu паролів\n"
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Verified %ld message signed by \"%s\"\n"
+ #| "in the past %s."
+ #| msgid_plural ""
+ #| "Verified %ld messages signed by \"%s\"\n"
+ #| "in the past %s."
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] ""
+ "Перевірено %ld повідомлення, підписане «%s»,\n"
+ "протягом такого строку: %s."
+ msgstr[1] ""
+ "Перевірено %ld повідомлення, підписаних «%s»,\n"
+ "протягом такого строку: %s."
+ msgstr[2] ""
+ "Перевірено %ld повідомлень, підписаних «%s»,\n"
+ "протягом такого строку: %s."
+ 
++#: g10/tofu.c:2880
+ #, fuzzy
+ #| msgid "Warning: we've have yet to see a message signed by this key!\n"
+ msgid ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
  msgstr "Попередження: повідомлень, які було б підписано цим ключем, не було!\n"
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2883
+ #, fuzzy
+ #| msgid "Warning: we've only seen a single message signed by this key!\n"
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr "Попередження: цим ключем було підписано лише одне повідомлення!\n"
  
- #: g10/tofu.c:2077
- #, c-format
++#: g10/tofu.c:2887
+ #, fuzzy
+ #| msgid "Warning: we've have yet to see a message signed by this key!\n"
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
+ msgstr "Попередження: повідомлень, які було б підписано цим ключем, не було!\n"
+ 
++#: g10/tofu.c:2890
+ #, fuzzy
+ #| msgid "Warning: we've only seen a single message signed by this key!\n"
+ msgid "Warning: you have only encrypted one message to this key!\n"
+ msgstr "Попередження: цим ключем було підписано лише одне повідомлення!\n"
+ 
++#: g10/tofu.c:2919
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Warning: if you think you've seen more than %ld message signed by this "
+ #| "key, then this key might be a forgery!  Carefully examine the email "
+ #| "address for small variations.  If the key is suspect, then use\n"
+ #| "  %s\n"
+ #| "to mark it as being bad.\n"
+ #| msgid_plural ""
+ #| "Warning: if you think you've seen more than %ld messages signed by this "
+ #| "key, then this key might be a forgery!  Carefully examine the email "
+ #| "address for small variations.  If the key is suspect, then use\n"
+ #| "  %s\n"
+ #| "to mark it as being bad.\n"
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7239,100 -5861,89 +7374,112 @@@ msgstr[2] "
  "  %s\n"
  "для позначення ключа як помилкового.\n"
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "помилка під час спроби відкрити бази даних TOFU: %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring '%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "помилка під час спроби запису до сховища відкритих ключів «%s»: %s\n"
+ 
++#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
  msgstr "«%s» не є коректним довгим ідентифікатором ключа\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "ключ %s: прийнято як надійний ключ\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "ключ %s зустрічається у trustdb декілька разів\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr "ключ %s: немає відкритого ключа для надійного ключа — пропущено\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "ключ %s позначено як ключ з необмеженою довірою\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "запис довіри %lu, тип запиту %d: помилка читання: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "запис довіри %lu не належить до вказаного типу %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr "Ви можете спробувати повторно створити trustdb за допомогою команд:\n"
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  "Якщо результат буде незадовільним, будь ласка, зверніться до підручника\n"
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr ""
  "використання невідомої моделі довіри (%d) неможливе — припускаємо модель "
  "довіри %s\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "використовуємо модель довіри %s\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "потреби у перевірці trustdb немає\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "наступну перевірку trustdb призначено на %s\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "потреби у перевірці trustdb на основі моделі довіри «%s» немає\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "потреби у оновленні trustdb на основі моделі довіри «%s» немає\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "відкритий ключ %s не знайдено: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "будь ласка, скористайтеся параметром --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "перевірка trustdb\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, c-format
  msgid "%d key processed"
  msgid_plural "%d keys processed"
@@@ -7340,7 -5951,6 +7487,7 @@@ msgstr[0] "оброблено %d клю
  msgstr[1] "оброблено %d ключі"
  msgstr[2] "оброблено %d ключів"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, c-format
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
@@@ -7348,16 -5958,13 +7495,16 @@@ msgstr[0] " (очищено %d знач
  msgstr[1] " (очищено %d значення чинності)\n"
  msgstr[2] " (очищено %d значень чинності)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "не знайдено ключів з необмеженою довірою\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "не знайдено відкритий ключ ключа з необмеженою довірою %s\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7365,7 -5972,6 +7512,7 @@@ msgstr "
  "глибина: %d  чинність: %3d  підписано: %3d  надійність: %d-, %dq, %dn, %dm, "
  "%df, %du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "не вдалося оновити запис версії trustdb: помилка запису: %s\n"
@@@ -7474,64 -6059,51 +7621,64 @@@ msgstr "
  "Синтаксис: kbxutil [параметри] [файли]\n"
  "Перегляд, експортування, імпортування даних Keybox\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr ""
  "Не знайдено основи числення RSA або основа числення не належить до %d-"
  "бітових\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr ""
  "Не вистачає відкритого показника RSA або розмірність показника перевищує %d "
  "бітів\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "Зворотний виклик пінкоду повернув повідомлення про помилку: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr "NullPIN ще не було змінено\n"
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "|N|Вкажіть новий пінкод для стандартних ключів."
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
  msgstr "||Вкажіть пінкод для стандартних ключів."
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr ""
  "|NP|Будь ласка, вкажіть новий код розблокування пінкоду (PUK) для "
  "стандартних ключів."
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr ""
  "|P|Будь ласка, вкажіть код розблокування пінкоду (PUK) для стандартних "
  "ключів."
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  "|N|Будь ласка, вкажіть новий пінкод для ключа, призначеного для створення "
  "якісних підписів."
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  "||Будь ласка, вкажіть пінкод для ключа, призначеного для створення якісних "
  "підписів."
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7539,7 -6111,6 +7686,7 @@@ msgstr "
  "|NP|Будь ласка, вкажіть новий код розблокування пінкоду (PUK) для створення "
  "якісних підписів."
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
@@@ -7547,83 -6118,67 +7694,85 @@@ msgstr "
  "|P|Будь ласка, вкажіть код розблокування пінкоду (PUK) для створення якісних "
  "підписів."
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "помилка під час отримання нового пінкоду: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "не вдалося зберегти відбиток: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "не вдалося зберегти дату створення: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "помилка читання відкритого ключа: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "відповідь не містить даних відкритого ключа\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr "відповідь не містить основи числення RSA\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr "відповідь не містить відкритого показника RSA\n"
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "response does not contain the EC public point\n"
+ msgid "response does not contain the EC public key\n"
  msgstr "відповідь не містить відкритої точки еліптичної кривої\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "відповідь не містить даних відкритого ключа\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "помилка читання відкритого ключа: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "використовуємо типовий пінкод як %s\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  "не вдалося використати типовий пінкод як %s: %s — вимикаємо подальше типове "
  "використання\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||Будь ласка, вкажіть пінкод%%0A[підписів: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
  msgstr "||Вкажіть пінкод"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "Пінкод для CHV%d занадто короткий; мінімальна довжина — %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "помилка перевірки CHV%d: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "помилка отримання стану CHV з картки\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr "картку заблоковано!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, c-format
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
  msgid_plural ""
@@@ -7640,25 -6195,20 +7789,25 @@@ msgstr[2] "
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr ""
  "|A|Будь ласка, вкажіть адміністративний пінкод%%0A[залишилося спроб: %d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|Вкажіть адміністративний пінкод"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr "доступ до адміністративних команд не налаштовано\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
  msgstr "||Вкажіть код скидання коду картки"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "Занадто короткий код скидання; мінімальна довжина — %d\n"
@@@ -7666,78 -6216,60 +7815,78 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr "|RN|Новий код скидання"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|Новий адміністративний пінкод"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|Новий пінкод"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||Вкажіть адміністративний пінкод та новий адміністративний пінкод"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  msgid "||Please enter the PIN and New PIN"
  msgstr "||Вкажіть пінкод та новий пінкод"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
  msgstr "помилка читання даних програми\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "помилка читання відбитка DO\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "ключ вже існує\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr "вже створений ключ буде замінено\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "створення нового ключа\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
  msgstr "записування нового ключа\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "не вказано часової позначки створення\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr ""
  "Не знайдено простого числа RSA %s або число не належить до %d-бітових\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "не вдалося зберегти ключ: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  msgid "unsupported curve\n"
  msgstr "непідтримувана крива\n"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "зачекайте на завершення створення ключа...\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
  msgstr "помилка під час створення ключа\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, c-format
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
@@@ -7745,30 -6277,24 +7894,30 @@@ msgstr[0] "створення ключ�
  msgstr[1] "створення ключа завершено (за %d секунди)\n"
  msgstr[2] "створення ключа завершено (за %d секунд)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "некоректна структура картки OpenPGP (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr "відбиток на картці не відповідає запитаному\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "карткою не підтримується алгоритм контрольних сум %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "вже створено підписів: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "перевірку адміністративного пінкоду заборонено цією командою\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "не вдалося отримати доступ до %s — некоректна картка OpenPGP?\n"
@@@ -7788,7 -6311,6 +7937,7 @@@ msgstr "|N|Початковий нов�
  msgid "run in multi server mode (foreground)"
  msgstr "запустити у режимі декількох серверів (основному режимі)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|LEVEL|встановити вказаний рівень діагностики"
  
@@@ -7840,18 -6351,15 +7989,18 @@@ msgstr "
  "Синтаксис: scdaemon [параметри] [команди [аргументи]]\n"
  "Фонова служба карток пам’яті для @GNUPG@\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  "будь ласка, скористайтеся параметром «--daemon» для запуску програми у "
  "фоновому режимі\n"
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "запущено запуск обробки для дескриптора %d\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "роботу обробника для дескриптора %d перервано\n"
@@@ -7870,11 -6375,9 +8019,11 @@@ msgstr "у цьому сеансі н�
  msgid "validation model requested by certificate: %s"
  msgstr "модель перевірки, запитана сертифікатом: %s"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr "ланцюжок"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr "оболонка"
  
@@@ -7904,196 -6401,149 +8053,196 @@@ msgstr "Зауваження: забо�
  msgid "certificate policy not allowed"
  msgstr "заборонено правила сертифікації"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr "пошук видавця за зовнішньою адресою\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr "кількість відповідних видавців: %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr "пошук видавця у кеші dirmngr\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "кількість відповідних сертифікатів: %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "помилка пошуку ключів лише з dirmngr: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "не вдалося розмістити дескриптор keyDB\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
  msgstr "сертифікат відкликано"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "стан сертифікату є невідомим"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr "будь ласка, переконайтеся, що «dirmngr» встановлено належним чином\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
  msgstr "помилка під час перевірки CRL: %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "сертифікат з некоректною чинністю: %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr "сертифікат ще не набув чинності"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
  msgstr "кореневий сертифікат ще не набув чинності"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr "проміжний сертифікат ще не набув чинності"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
  msgstr "строк дії сертифіката завершився"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
  msgstr "строк дії кореневого сертифіката завершився"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
  msgstr "строк дії проміжного сертифіката завершився"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr "не вистачає обов’язкових атрибутів сертифіката: %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
  msgstr "сертифікат з некоректною чинністю"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr "підпис не було створено під час строку дії сертифіката"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr "сертифікат не було створено під час строку чинності видавця"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr "проміжний сертифікат не було створено під час строку чинності видавця"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  (       підпис створено "
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "  (   сертифікат створено "
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
  msgstr "  (   сертифікат чинний з "
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr "  (     видавець чинний з "
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "відбиток=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr "кореневий сертифікат було позначено як надійний\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr "не увімкнено інтерактивне позначення надійності у gpg-agent\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr "інтерактивне позначення надійності вимкнено для цього сеансу\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr "УВАГА: невідомий час створення підпису — припускаємо поточний час"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "у сертифікаті не було знайдено даних щодо видавця"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr "самопідписаний сертифікат має ПОМИЛКОВИЙ підпис"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr "кореневий сертифікат не позначено як надійний"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "помилка перевірки списку довіри: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr "занадто довгий ланцюжок сертифікації\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "не знайдено видавця сертифіката"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
  msgstr "сертифікат має ПОМИЛКОВИЙ підпис"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  "виявлено інший можливий відповідний сертифікат служби сертифікації (CA) — "
  "повторюємо спробу"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "ланцюжок сертифікації є довшим за дозволений CA (%d)"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "сертифікат є належним\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
  msgstr "належний проміжний сертифікат\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
  msgstr "належний кореневий сертифікат\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr "перемикаємося на ланцюгову модель"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr "використана модель перевірки: %s"
@@@ -8420,7 -6804,6 +8569,7 @@@ msgstr "(здається, це не з
  msgid "certificate '%s' not found: %s\n"
  msgstr "сертифіката «%s» не знайдено: %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
  msgstr "помилка під час блокування сховища ключів: %s\n"
@@@ -8444,126 -6823,96 +8593,126 @@@ msgstr "помилка під час с
  msgid "no valid recipients given\n"
  msgstr "не вказано коректних отримувачів\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
  msgstr "показати ключ зовнішніх ключів"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
  msgstr "показати ланцюжок сертифікації"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
  msgstr "імпортувати сертифікати"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
  msgstr "експортувати сертифікати"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "зареєструвати картку пам’яті"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "передати команду dirmngr"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr "виклик gpg-protect-tool"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
  msgstr "створити дані, закодовані у BASE64"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr "вважати вхідні дані даними у форматі PEM"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr "вважати вхідні дані даними у форматі BASE64"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr "вважати вхідні дані даними у двійковому форматі"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr "не використовувати САС"
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr "перевіряти чинність за допомогою OCSP"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr "кількість сертифікатів, які слід включити"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr "|FILE|взяти дані щодо правил з вказаного файла"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr "не перевіряти правила сертифікатів"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr "Надіслати запит щодо незнайдених сертифікатів видавця"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "взагалі не використовувати термінал"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|FILE|записувати журнал режиму сервера до файла"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
  msgstr "|FILE|записувати журнал перевірки до файла"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "пакетний режим: нічого не запитувати"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "вважати відповіддю на більшість питань «так»"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "вважати відповіддю на більшість питань «ні»"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|FILE|додати сховище ключів до списку сховищ ключів"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr ""
  "|USER-ID|використовувати ідентифікатор користувача як типовий закритий ключ"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "використовувати цей сервер ключів для пошуку"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|NAME|використовувати вказаний алгоритм шифрування"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr ""
  "|NAME|використовувати вказаний алгоритм обчислення контрольної суми "
  "повідомлення"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "Використання: @GPGSM@ [параметри] [файли] (-h — довідка)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8574,46 -6923,37 +8723,46 @@@ msgstr "
  "протоколу S/MIME\n"
  "Типова дія залежатиме від вхідних даних\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "ЗАУВАЖЕННЯ: не вдасться зашифрувати до «%s»: %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "невідома модель перевірки «%s»\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: не вказано назви вузла\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: вказано пароль, але не вказано користувача\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: пропускаємо цей рядок\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
  msgstr "не вдалося обробити сервер ключів\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "імпортуємо загальні сертифікати «%s»\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "підписування за допомогою «%s» неможливе: %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr "некоректна команда (немає неявної команди)\n"
  
@@@ -8630,7 -6967,6 +8779,7 @@@ msgstr "помилка під час с
  msgid "basic certificate checks failed - not imported\n"
  msgstr "помилка під час основних перевірок сертифіката — не імпортовано\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "помилка під час спроби отримання збережених прапорців: %s\n"
@@@ -8645,31 -6979,25 +8794,31 @@@ msgstr "помилка під час с
  msgid "error reading input: %s\n"
  msgstr "помилка під час спроби читання вхідних даних: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
  msgstr "не вдалося отримати відбиток\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr "проблем з пошуком вже створеного сертифіката: %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "помилка під час спроби знайти придатну до запису keyDB: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
  msgstr "помилка під час спроби збереження сертифіката: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "проблема з повторним пошуком сертифіката: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
  msgstr "помилка під час спроби збереження позначок: %s\n"
@@@ -9552,108 -7703,84 +9701,112 @@@ msgstr "мало бути вказан�
  msgid "looking up '%s'\n"
  msgstr "пошук «%s»\n"
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr "показати вміст кешу CRL"
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|FILE|завантажити CRL з вказаного файла до кешу"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr "|URL|отримати CRL з вказаної адреси"
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr "завершити роботу dirmngr"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr "спорожнити кеш"
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|FILE|записувати журнал режиму сервера до файла"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  msgid "run without asking a user"
  msgstr "запустити без запиту до користувача"
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr "примусове завантаження застарілих САС"
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr "дозволити надсилання запитів OCSP"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr "заборонити використання HTTP"
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr "заборонити використання LDAP"
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr "ігнорувати точки поширення САС протоколу HTTP"
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr "ігнорувати точки поширення САС протоколу LDAP"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "ігнорувати адреси служб OCSP з сертифікатами"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|URL|переспрямувати всі запити HTTP на вказану адресу"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|HOST|використовувати вказаний вузол для запитів LDAP"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "не використовувати резервні вузли з --ldap-proxy"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|FILE|прочитати список серверів LDAP з вказаного файла"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr "додати виявлені у точках поширення CRL нові сервери до списку серверів"
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|встановити вказаний час очікування даних від LDAP"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  msgid "|URL|use OCSP responder at URL"
  msgstr "|URL|використовувати відповідач OCSP за вказаною адресою"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|відповідь OCSP підписано FPR"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|повертати не більше за вказану кількість записів на запит"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|FILE|використовувати сертифікати CA з файла для HKP крізь TLS"
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr "маршрутизувати увесь обмін даними з мережею через Tor"
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9663,11 -7790,9 +9816,11 @@@ msgstr "
  "(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
  "довідника (man) «info»)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "Використання: @DIRMNGR@ [параметри] (-h — довідка)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9675,78 -7800,61 +9828,78 @@@ msgstr "
  "Синтаксис: @DIRMNGR@ [параметри] [команда [аргументи]]\n"
  "Доступ до сервера ключів, CRL та OCSP для @GNUPG@\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "коректними рівнями зневаджування є: %s\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, c-format
  msgid "usage: %s [options] "
  msgstr "використання: %s [параметри]"
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  msgid "colons are not allowed in the socket name\n"
  msgstr "не можна використовувати двокрапки у назві сокета\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "помилка під час спроби отримання CRL з «%s»: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "помилка під час обробки CRL з «%s»: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: занадто довгий рядок — пропущено\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: виявлено некоректний відбиток\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: помилка під час читання: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: беззмістовні дані наприкінці рядка проігноровано\n"
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  "отримано сигнал SIGHUP — повторне читання налаштувань та спорожнення кешу\n"
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "отримано сигнал SIGUSR2 — дій не визначено\n"
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "отримано сигнал SIGTERM — завершуємо роботу…\n"
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "отримано сигнал SIGTERM — підтримується %d активних з’єднань\n"
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  msgid "shutdown forced\n"
  msgstr "примусове завершення роботи\n"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "отримано сигнал SIGINT — негайне завершення роботи\n"
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "отримано сигнал %d — дій не визначено\n"
@@@ -9917,13 -7989,6 +10070,7 @@@ msgstr "«%s» не є адресою L
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr "«%s» є некоректною адресою LDAP\n"
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, c-format
- msgid "error allocating memory: %s\n"
- msgstr "помилка під час спроби отримання області пам’яті: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, c-format
  msgid "error printing log line: %s\n"
  msgstr "помилка під час спроби виводу рядка журналу: %s\n"
@@@ -10173,76 -8186,60 +10320,76 @@@ msgstr "Відповідачем OCSP �
  msgid "OCSP responder returned an too old status\n"
  msgstr "Відповідачем OCSP повернуто занадто застарілі дані щодо стану\n"
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "помилка assuan_inquire(%s): %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr "не вказано ldapserver"
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr "у ідентифікаторі сертифіката немає серійного номера"
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "помилка assuan_inquire: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "помилка fetch_cert_by_url: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "помилка під час спроби надсилання даних: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "помилка start_cert_fetch: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "помилка fetch_next_cert: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "перевищено max_replies у %d\n"
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "не вдалося розмістити структуру керування: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "не вдалося розмістити контекст assuan: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "не вдалося ініціалізувати сервер: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "не вдалося зареєструвати команди за допомогою Assuan: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "проблема з прийняттям Assuan: %s\n"
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "помилка обробки за допомогою Assuan: %s\n"
@@@ -10285,7 -8273,6 +10432,7 @@@ msgstr "DSA потребує викор
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "сертифікат не мав використовуватися для підписування CRL\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "без повідомлень"
  
@@@ -10453,11 -8399,9 +10600,11 @@@ msgstr "|NAME|шифрувати так
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|встановити замінники адреси електронної пошти"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr "Налаштування для серверів ключів"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|використовувати сервер ключів за адресою"
  
@@@ -10490,128 -8427,110 +10637,142 @@@ msgstr "Параметри керува
  msgid "Options controlling the interactivity and enforcement"
  msgstr "Параметри керування інтерактивністю та примусом"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr "Параметри керування використанням Tor"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr "Налаштування для серверів HTTP"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr "використовувати загальносистемний проксі-сервер HTTP"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr "Налаштування використання серверів LDAP"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr "список серверів LDAP"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr "Налаштування OCSP"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ #, fuzzy
+ #| msgid "GPG for OpenPGP"
+ msgid "OpenPGP"
  msgstr "GPG для OpenPGP"
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
- msgstr "Агент GPG"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
+ msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ #, fuzzy
+ #| msgid "Smartcard Daemon"
+ msgid "Smartcards"
  msgstr "Фонова служба карток пам’яті"
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ #, fuzzy
+ #| msgid "GPG for S/MIME"
+ msgid "S/MIME"
  msgstr "GPG для S/MIME"
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr "Засіб запиту ключів"
++#: tools/gpgconf-comp.c:1070
+ msgid "Network"
+ msgstr ""
  
- #: tools/gpgconf-comp.c:1068
- msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1071
+ #, fuzzy
+ #| msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "Введення пінкодів і паролів"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  msgid "Component not suitable for launching"
  msgstr "Компонент не є придатним до запуску"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "Помилка зовнішньої перевірки компонента %s"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr "Зауважте, що специфікації груп буде проігноровано\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr "показати список всіх компонентів"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr "перевірити всі програми"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|COMPONENT|показати список параметрів"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|COMPONENT|змінити параметри"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|COMPONENT|перевірити параметри"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr "застосувати загальні типові значення"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "отримати назви каталогів налаштувань для @GPGCONF@"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
  msgstr "показати загальний файл налаштувань"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
  msgstr "перевірити загальний файл налаштувань"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "оновити базу даних довіри"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr "перезавантажити всі або вказаний компонент"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr "запустити вказаний компонент"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr "завершити роботу вказаного компонента"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "використати файл для виведення даних"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr "якщо можна, задіяти зміни у динамічному режимі"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "Використання: @GPGCONF@ [параметри] (-h — довідка)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10619,15 -8538,12 +10780,15 @@@ msgstr "
  "Синтаксис: @GPGCONF@ [параметри]\n"
  "Керування параметрами налаштування інструментів системи @GNUPG@\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "Слід вказати один аргумент компонента"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "Компонент не знайдено"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr "Не можна вказувати аргументів"
  
diff --cc po/zh_CN.po
index 76c8b80,00025a9..fabaf80
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: gnupg 1.4.4\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2009-07-09 10:03+0200\n"
  "Last-Translator: Meng Jie <zuxyhere at eastday.com>\n"
  "Language-Team: Chinese (simplified) <i18n-translation at lists.linux.net.cn>\n"
@@@ -20,7 -19,6 +20,7 @@@
  "X-Poedit-SourceCharset: iso-8859-1\n"
  "X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, fuzzy, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "无法存储指纹:%s\n"
@@@ -31,41 -29,32 +31,41 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr ""
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr ""
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  msgid "|pinentry-label|_Yes"
  msgstr ""
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  msgid "|pinentry-label|_No"
  msgstr ""
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  msgid "|pinentry-label|_Save in password manager"
  msgstr ""
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "您真的想要删除选定的密钥吗?(y/N)"
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "invalid passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -73,7 -62,6 +73,7 @@@ msgstr "无效的密码
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  #, fuzzy
  msgid "Quality:"
  msgstr "有效性:%s"
@@@ -84,75 -72,59 +84,75 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr ""
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  #, fuzzy
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "请输入密码:这是一个秘密的句子 \n"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  #, fuzzy
  msgid "Passphrase:"
  msgstr "错误的密码"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr ""
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr ""
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr ""
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  #, fuzzy
  msgid "PIN too long"
  msgstr "列太长"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  #, fuzzy
  msgid "Passphrase too long"
  msgstr "列太长"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  #, fuzzy
  msgid "Invalid characters in PIN"
  msgstr "姓名含有无效的字符\n"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr ""
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad PIN"
  msgstr "损坏的多精度整数(MPI)"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  #, fuzzy
  msgid "Bad Passphrase"
  msgstr "错误的密码"
@@@ -162,25 -133,11 +162,25 @@@
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "不支持保护散列 %d\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, fuzzy, c-format
  #| msgid "can't create `%s': %s\n"
  msgid "can't create '%s': %s\n"
  msgstr "无法建立‘%s’:%s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, fuzzy, c-format
  #| msgid "can't open `%s': %s\n"
  msgid "can't open '%s': %s\n"
@@@ -206,61 -159,42 +206,51 @@@ msgstr "取得当前密钥信息时出�
  msgid "no suitable card key found: %s\n"
  msgstr "找不到可写的私钥钥匙环:%s\n"
  
- #: agent/command-ssh.c:2494
- #, fuzzy, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "无法读出公钥:%s\n"
- 
- #: agent/command-ssh.c:2509
- #, fuzzy, c-format
- msgid "error writing key: %s\n"
- msgstr "写入钥匙环‘%s’时出错: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
  "allow this?"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr ""
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr ""
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, fuzzy, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "请输入密码:这是一个秘密的句子 \n"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  #, fuzzy
  msgid "Please re-enter this passphrase"
  msgstr "更改密码"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, fuzzy, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
  "%s%%0Awithin gpg-agent's key storage"
  msgstr "请输入密码:这是一个秘密的句子 \n"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, fuzzy, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "%s:建立散列表失败:%s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  #, fuzzy
  msgid "Please insert the card with serial number"
  msgstr ""
  "请取出当前的卡,并插入有下列序列号的卡:\n"
  "  %.*s\n"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  #, fuzzy
  msgid "Please remove the current card and insert the one with serial number"
  msgstr ""
@@@ -395,8 -305,6 +385,8 @@@ msgstr "
  msgid "Please enter the new passphrase"
  msgstr "更改密码"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  #, fuzzy
  msgid ""
  "@Options:\n"
@@@ -406,117 -314,91 +396,123 @@@ msgstr "
  "选项:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr ""
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr ""
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "Key is superseded"
+ msgid "run in supervised mode"
+ msgstr "密钥被替换"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "详细模式"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "尽量减少提示信息"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr ""
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  #, fuzzy
  msgid "|FILE|read options from FILE"
  msgstr "从‘%s’读取选项\n"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr ""
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr ""
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  #, fuzzy
  msgid "use a log file for the server"
  msgstr "在公钥服务器上搜寻密钥"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr ""
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr ""
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  #, fuzzy
  msgid "do not use the SCdaemon"
  msgstr "导入后不更新信任度数据库"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  msgid "|NAME|accept some commands via NAME"
  msgstr "|某甲|为收件者“某甲”加密"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr ""
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr ""
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr ""
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr ""
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  msgid "disallow the use of an external password cache"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr ""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  #, fuzzy
  msgid "allow presetting passphrase"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  #, fuzzy
  #| msgid "not supported"
  msgid "enable ssh support"
  msgstr "未被支持"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  #, fuzzy
  #| msgid "not supported"
  msgid "enable putty support"
@@@ -525,164 -407,122 +521,164 @@@ 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr ""
  "请向 <@EMAIL@> 报告程序缺陷。\n"
  "请向 <zuxyhere at eastday.com> 反映简体中文翻译的问题。\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  #, fuzzy
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
  msgstr ""
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr ""
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, fuzzy, c-format
  #| msgid "NOTE: no default option file `%s'\n"
  msgid "Note: no default option file '%s'\n"
  msgstr "注意:没有默认配置文件‘%s’\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, fuzzy, c-format
  #| msgid "option file `%s': %s\n"
  msgid "option file '%s': %s\n"
  msgstr "配置文件‘%s’:%s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, fuzzy, c-format
  #| msgid "reading options from `%s'\n"
  msgid "reading options from '%s'\n"
  msgstr "从‘%s’读取选项\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, fuzzy, c-format
  #| msgid "WARNING: \"%s\" is a deprecated option\n"
  msgid "Note: '%s' is not considered an option\n"
  msgstr "警告:“%s”选项已不建议使用\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, fuzzy, c-format
  msgid "can't create socket: %s\n"
  msgstr "无法建立‘%s’:%s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr ""
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  #, fuzzy
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "gpg-agent 在此次舍话中无法使用\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  #, fuzzy
  msgid "error getting nonce for the socket\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, fuzzy, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  msgid "can't set permissions of '%s': %s\n"
  msgstr "警告:扩展模块‘%s’权限不安全\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, fuzzy, c-format
  msgid "listen() failed: %s\n"
  msgstr "更新失败:%s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, fuzzy, c-format
  msgid "listening on socket '%s'\n"
  msgstr "正在将私钥写至`%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, fuzzy, c-format
  #| msgid "can't create directory `%s': %s\n"
  msgid "can't create directory '%s': %s\n"
  msgstr "无法建立目录‘%s’:%s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, fuzzy, c-format
  #| msgid "directory `%s' created\n"
  msgid "directory '%s' created\n"
  msgstr "已创建目录‘%s’\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, fuzzy, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "fstat(%d) 在 %s 中出错:%s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, fuzzy, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "无法建立目录‘%s’:%s\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, fuzzy, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr ""
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, fuzzy, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "更新私钥失败:%s\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, fuzzy, c-format
  msgid "%s %s stopped\n"
  msgstr "%s:已跳过:%s\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  #, fuzzy
  msgid "no gpg-agent running in this session\n"
  msgstr "gpg-agent 在此次舍话中无法使用\n"
@@@ -698,8 -536,6 +694,8 @@@ msgid "
  "Password cache maintenance\n"
  msgstr ""
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -707,9 -543,6 +703,9 @@@ msgstr "
  "@指令:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -763,7 -588,6 +759,8 @@@ msgstr "已取消
  msgid "error while asking for the passphrase: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, fuzzy, c-format
  msgid "error opening '%s': %s\n"
  msgstr "‘%s’中出错:%s\n"
@@@ -822,8 -637,6 +819,8 @@@ msgstr "
  msgid "Yes"
  msgstr "yes"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr ""
  
@@@ -853,28 -663,23 +850,28 @@@ msgstr "
  msgid "Wrong"
  msgstr ""
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr ""
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr ""
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  #, fuzzy
  msgid "Change passphrase"
  msgstr "更改密码"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr ""
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -882,13 -687,11 +879,13 @@@
  "%%0A?"
  msgstr "您真的想要删除选定的密钥吗?(y/N)"
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  #, fuzzy
  #| msgid "enable key"
  msgid "Delete key"
  msgstr "启用密钥"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -903,12 -704,10 +900,12 @@@ msgstr "DSA 需要散列值长度为 8 
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr ""
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "检查已建立的签名时发生错误: %s\n"
@@@ -935,83 -730,72 +932,95 @@@ msgstr "保护算法 %d%s 未被支持\
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "保护算法 %d%s 未被支持\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, fuzzy, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, fuzzy, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, fuzzy, c-format
  msgid "error forking process: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- msgid "waiting for processes to terminate failed: %s\n"
- msgstr "更新失败:%s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
+ msgstr ""
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, fuzzy, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, fuzzy, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, fuzzy, c-format
  msgid "error running '%s': terminated\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "更新失败:%s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, fuzzy, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't connect to '%s': %s\n"
  msgstr "无法连接至‘%s’:%s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr ""
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "无法禁用核心内存转储:%s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, fuzzy, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "警告:扩展模块‘%s’所有权不安全\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, fuzzy, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "警告:扩展模块‘%s’权限不安全\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "更新失败:%s\n"
+ 
++#: common/sysutils.c:685
+ #, fuzzy, c-format
+ #| msgid "renaming `%s' to `%s' failed: %s\n"
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "将‘%s’重命名为‘%s’时失败:%s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "yes"
  
@@@ -1065,7 -838,6 +1074,7 @@@ msgstr "
  msgid "out of core while allocating %lu bytes"
  msgstr ""
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, fuzzy, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "建立钥匙环‘%s’时发生错误:%s\n"
@@@ -1085,37 -854,30 +1094,37 @@@ msgstr "警告:“%s”选项已不�
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr ""
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  #| msgid "can't do this in batch mode\n"
  msgid "connection to agent is in restricted mode\n"
  msgstr "在批处理模式中无法完成此操作\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr ""
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr ""
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr ""
  
@@@ -1196,8 -942,6 +1205,8 @@@ msgstr "%s:钥匙环已建立\n
  msgid "algorithm: %s"
  msgstr "有效性:%s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, fuzzy, c-format
  msgid "unsupported algorithm: %s"
  msgstr ""
@@@ -1282,12 -1010,10 +1291,12 @@@ msgstr "这把密钥已经过期!
  msgid "Root certificate trustworthy"
  msgstr "证书已损坏"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  #, fuzzy
  msgid "no CRL found for certificate"
  msgstr "证书已损坏"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  #, fuzzy
  msgid "the available CRL is too old"
  msgstr "可用的密钥在:"
@@@ -1329,7 -1047,6 +1338,7 @@@ msgstr "‘%s’没有可用的帮助
  msgid "ignoring garbage line"
  msgstr "结尾行有问题\n"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  #, fuzzy
  msgid "[none]"
  msgstr "[未设定]"
@@@ -1410,7 -1112,6 +1419,7 @@@ msgstr "
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr ""
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  #, fuzzy
  msgid "out of core\n"
  msgstr "可选"
@@@ -1469,8 -1159,6 +1478,8 @@@ msgstr "找不到公钥 %s:%s\n
  msgid "waiting for lock %s...\n"
  msgstr "等待‘%s’上的锁\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr ""
@@@ -1553,81 -1223,63 +1562,80 @@@ msgid "
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, c-format
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr ""
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr ""
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr ""
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr ""
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr ""
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  msgid "a notation name may not contain an '=' character\n"
  msgstr ""
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr ""
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  #, fuzzy
  msgid "WARNING: invalid notation data found\n"
  msgstr "找不到有效的 OpenPGP 数据。\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr ""
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "请输入密码:"
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "建立钥匙环‘%s’时发生错误:%s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: "
  msgid "WARNING: %s\n"
  msgstr "警告:"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "OpenPGP 卡不可用:%s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "检测到 OpenPGP 卡号 %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "在批处理模式中无法完成此操作\n"
  
@@@ -1636,15 -1287,10 +1644,15 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "在 %s 模式中不允许使用这个指令。\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  #, fuzzy
  msgid "Reset Code not or not anymore available\n"
  msgstr "私钥部分不可用\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "您的选择? "
  
@@@ -1672,176 -1312,134 +1680,176 @@@ msgstr "可选
  msgid "forced"
  msgstr "必须"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr "错误:目前只允许使用 ASCII 字符。\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "错误:不能使用字符“<”。\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "错误:不允许出现两个空格。\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "卡持有人的姓:"
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "卡持有人的名:"
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr "错误:合成的姓名太长(至多 %d 个字符)。\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "获取公钥的 URL:"
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "错误:URL 太长(至多 %d 个字符)\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, fuzzy, c-format
  #| msgid "error reading `%s': %s\n"
  msgid "error reading '%s': %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, fuzzy, c-format
  msgid "error writing '%s': %s\n"
  msgstr "写入钥匙环‘%s’时出错: %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "登录数据(帐号名):"
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr "错误:登录数据太长(至多 %d 个字符)。\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "个人 DO 数据:"
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr "错误:个人 DO 太长(至多 %d 个字符)。\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "首选语言:"
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
  msgstr "错误:首选项字符串长度无效。\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
  msgstr "错误:首选项字符串里有无效字符。\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "性别(男性输入 M,女性输入 F,不指定输入空格):"
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
  msgstr "错误:无效的响应。\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "CA 指纹:"
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "错误:指纹格式无效。\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "针对密钥的操作无法实现:%s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "不是一个 OpenPGP 卡"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr "替换已有的密钥?(y/N)"
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
  "      documentation of your card to see what sizes are allowed.\n"
  msgstr ""
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, fuzzy, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "您想要用多大的密钥尺寸?(%u)"
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, fuzzy, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "您想要用多大的密钥尺寸?(%u)"
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, fuzzy, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "您想要用多大的密钥尺寸?(%u)"
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "舍入到 %u 位\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr ""
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, fuzzy, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr "是否为加密密钥创建卡外的备份?(Y/n)"
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  #, fuzzy
  msgid "Note: keys are already stored on the card!\n"
  msgstr "私钥已存储在卡上\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr "替换已有的密钥?(y/N)"
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, fuzzy, c-format
  #| msgid ""
  #| "Please note that the factory settings of the PINs are\n"
@@@ -1856,143 -1454,108 +1864,143 @@@ msgstr "
  "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
  "您应当使用 --change-pin 命令来更改它们\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "请选择您要使用的密钥种类:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "  (1) 签名密钥\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "  (2) 加密密钥\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "  (3) 认证密钥\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "无效的选择。\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "请选择在哪里存储密钥:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, fuzzy, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "更新失败:%s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
  msgstr "在 %s 模式中不允许使用这个指令。\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "私钥已存储在卡上\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  #| msgid "Sign it? (y/N) "
  msgid "Continue? (y/N) "
  msgstr "为其添加签名吗?(y/N)"
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "离开这个菜单"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
  msgstr "显示管理员命令"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "显示这份在线说明"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "列出所有可用数据"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "更改卡持有人的姓名"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "更改获取密钥的 URL"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "根据卡中指定的 URL 获取密钥"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "更改登录名"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "更改首选语言首选"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "更改卡持有人的性别"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "更改一个 CA 指纹"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr "设定 PIN 签名是否必须"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "生成新的密钥"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "更改或解锁 PIN 的菜单"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "验证 PIN 并列出所有数据"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr ""
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr ""
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "仅供管理员使用的命令\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "允许使用管理员命令\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "不允许使用管理员命令\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "无效的指令(尝试“help”)\n"
  
@@@ -2000,23 -1562,15 +2008,23 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output 在这个命令中不起作用\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, fuzzy, c-format
  #| msgid "can't open `%s'\n"
  msgid "can't open '%s'\n"
  msgstr "无法打开‘%s’\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "密钥‘%s’找不到:%s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "读取密钥区块时发生错误:%s\n"
@@@ -2133,7 -1665,6 +2141,7 @@@ msgstr "强行使用的 %s (%d)对称�
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s 已经加密给:“%s”\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "您不该将 %s 用于 %s 模式中\n"
@@@ -2212,59 -1728,45 +2220,59 @@@ msgstr "警告:无法删除临时文�
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "警告:无法删除临时目录‘%s’:%s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
  msgstr "导出被标记为局部的密名"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr "导出属性用户标识(一般为照片标识)"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "导出被标记为“敏感”的吊销密钥"
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "导出时清除密钥中的不可用部分"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "导出时尽可能清除密钥中的可选部分"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  #, fuzzy
  #| msgid "%s: skipped: %s\n"
  msgid " - skipped"
  msgstr "%s:已跳过:%s\n"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, fuzzy, c-format
  #| msgid "writing to `%s'\n"
  msgid "writing to '%s'\n"
  msgstr "正在写入‘%s’\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "密钥 %s:密钥在卡上——已跳过\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "不允许导出私钥\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "密钥 %s:PGP 2.x 样式的密钥――已跳过\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "警告:没有导出任何东西\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, fuzzy, c-format
  #| msgid "error creating `%s': %s\n"
  msgid "error creating '%s': %s\n"
@@@ -2274,8 -1775,6 +2282,8 @@@ msgstr "建立‘%s’时发生错误�
  msgid "[User ID not found]"
  msgstr "[找不到用户标识]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  msgid "(check argument of option '%s')\n"
  msgstr "无效的列表选项\n"
@@@ -2296,266 -1792,207 +2304,266 @@@ msgstr "‘%s’中出错:%s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "建立钥匙环‘%s’时发生错误:%s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, fuzzy, c-format
  #| msgid "automatically retrieved `%s' via %s\n"
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "自动获取‘%s’,通过 %s\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, fuzzy, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "建立‘%s’时发生错误:%s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  #, fuzzy
  msgid "No fingerprint"
  msgstr "CA 指纹:"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "找不到私钥“%s”:%s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "unusable secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "不可用的私钥"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "unusable secret key"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "不可用的私钥"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "使用子钥 %s 而非主钥 %s\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  #, fuzzy
  msgid "make a signature"
  msgstr "|[文件名]|生成一份签名"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  #, fuzzy
  msgid "make a clear text signature"
  msgstr "|[文件名]|生成一份明文签名"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "生成一份分离的签名"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "加密数据"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "仅使用对称加密"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "解密数据(默认)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "验证签名"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "列出密钥"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "列出密钥和签名"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "列出并检查密钥签名"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "列出密钥和指纹"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "列出私钥"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "生成一副新的密钥对"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly generate a new key pair"
  msgstr "生成一副新的密钥对"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "生成一副新的密钥对"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "生成一副新的密钥对"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr ""
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "生成一份吊销证书"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "从公钥钥匙环里删除密钥"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "从私钥钥匙环里删除密钥"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  #, fuzzy
  #| msgid "sign a key"
  msgid "quickly sign a key"
  msgstr "为某把密钥添加签名"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  #, fuzzy
  #| msgid "sign a key locally"
  msgid "quickly sign a key locally"
  msgstr "为某把密钥添加本地签名"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "为某把密钥添加签名"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "为某把密钥添加本地签名"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "编辑某把密钥或为其添加签名"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  #, fuzzy
  msgid "change a passphrase"
  msgstr "更改密码"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "导出密钥"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "把密钥导出到某个公钥服务器上"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "从公钥服务器上导入密钥"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "在公钥服务器上搜寻密钥"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "从公钥服务器更新所有的本地密钥"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "导入/合并密钥"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "打印卡状态"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "更改卡上的数据"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "更改卡的 PIN"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "更新信任度数据库"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  #, fuzzy
  msgid "print message digests"
  msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr ""
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "输出经 ASCII 封装"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  #, fuzzy
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|某甲|为收件者“某甲”加密"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  #, fuzzy
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "使用这个用户标识来签名或解密"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  #, fuzzy
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "使用标准的文本模式"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  #, fuzzy
  msgid "|FILE|write output to FILE"
  msgstr "从‘%s’读取选项\n"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "不做任何改变"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "覆盖前先询问"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr "行为严格遵循 OpenPGP 定义"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2563,7 -2000,6 +2571,7 @@@ msgstr "
  "@\n"
  "(请参考在线说明以获得所有命令和选项的完整清单)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2583,13 -2019,11 +2591,13 @@@ msgstr "
  " --list-keys [某甲]           显示密钥\n"
  " --fingerprint [某甲]         显示指纹\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  #, fuzzy
  #| msgid ""
  #| "Syntax: gpg [options] [files]\n"
@@@ -2604,7 -2038,6 +2612,7 @@@ msgstr "
  "签名、检查、加密或解密\n"
  "默认的操作依输入数据而定\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2612,80 -2045,65 +2620,80 @@@ msgstr "
  "\n"
  "支持的算法:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "公钥:"
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "对称加密:"
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "散列:"
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "压缩:"
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, fuzzy, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "用法:gpg [选项] "
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "冲突的指令\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, fuzzy, c-format
  #| msgid "no = sign found in group definition `%s'\n"
  msgid "no = sign found in group definition '%s'\n"
  msgstr "在‘%s’组定义里找不到等号(=)\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "警告:用户目录‘%s’所有权不安全\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "警告:配置文件‘%s’所有权不安全\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe ownership on extension `%s'\n"
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "警告:扩展模块‘%s’所有权不安全\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "警告:用户目录‘%s’权限不安全\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "警告:配置文件‘%s’权限不安全\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe permissions on extension `%s'\n"
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "警告:扩展模块‘%s’权限不安全\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "警告:用户目录‘%s’的关闭目录所有权不安全\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2693,19 -2111,16 +2701,19 @@@ msgid "
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "警告:扩展模块‘%s’的关闭目录所有权不安全\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "警告:用户目录‘%s’的关闭目录权限不安全\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, fuzzy, c-format
  #| msgid ""
  #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2714,533 -2129,420 +2722,538 @@@ msgid "
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
  msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, fuzzy, c-format
  #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "警告:扩展模块‘%s’的关闭目录权限不安全\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, fuzzy, c-format
  #| msgid "unknown configuration item `%s'\n"
  msgid "unknown configuration item '%s'\n"
  msgstr "未知的配置项‘%s’\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "列出密钥时显示用户标识"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  #, fuzzy
  #| msgid "show user ID validity during key listings"
  msgid "show key usage information during key listings"
  msgstr "列出密钥时显示用户标识的有效性"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr "列出签名时显示策略 URL"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "列出签名时显示 IETF 标准注记"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr "列出签名时显示 IETF 标准注记"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr "列出签名时显示用户提供的注记"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "列出密钥时显示首选公钥服务器 URL"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr "列出密钥时显示用户标识的有效性"
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr "列出密钥时显示已吊销或已过期的用户标识"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr "列出密钥时显示已吊销或已过期的子钥"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "列出密钥时显示钥匙环的名称"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "列出签名时显示过期日期"
  
- #: g10/gpg.c:2011
- #, fuzzy
- msgid "available TOFU policies:\n"
- msgstr "禁用密钥"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ msgid "valid values for option '%s':\n"
+ msgstr "无效的列表选项\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "未知的选项 '%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ msgid "invalid value for option '%s'\n"
+ msgstr "无效的列表选项\n"
+ 
++#: g10/gpg.c:2203
  #, fuzzy, c-format
  #| msgid "NOTE: old default options file `%s' ignored\n"
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "注意:旧式的默认配置文件‘%s’已被忽略\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, fuzzy, c-format
  #| msgid "NOTE: %s is not for normal use!\n"
  msgid "Note: %s is not for normal use!\n"
  msgstr "注意:一般情况下不会用到 %s!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid signature expiration\n"
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "‘%s’不是一个有效的签名过期日期\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "电子邮件地址无效\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, fuzzy, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "无效的‘%s’散列算法\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid character set\n"
  msgid "'%s' is not a valid character set\n"
  msgstr "‘%s’不是一个有效的字符集\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "无法解析公钥服务器 URL\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d:无效的公钥服务器选项\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "无效的公钥服务器选项\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d:无效的导入选项\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "无效的导入选项\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "无效的列表选项\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d:无效的导出选项\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "无效的导出选项\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d:无效的列表选项\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "无效的列表选项\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "验证签名时显示照片标识"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr "验证签名时显示策略 URL"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "验证签名时显示所有注记"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr "验证签名时显示 IETF 标准注记"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr "验证签名时显示用户提供的注记"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "验证签名时显示首选公钥服务器 URL"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
  msgstr "验证签名时显示用户标识的有效性"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "验证密钥时显示已吊销或已过期的子钥"
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  #, fuzzy
  msgid "show only the primary user ID in signature verification"
  msgstr "验证密钥时显示已吊销或已过期的子钥"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "使用 PKA 数据验证签名的有效性"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "提升带有有效 PKA 数据的签名的信任度"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d:无效的校验选项\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "无效的校验选项\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "无法把运行路径设成 %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d:无效的 auto-key-locate 清单\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr "无效的 auto-key-locate 清单\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "警告:程序可能会创建核心内存转储!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "警告:%s 会使得 %s 失效\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s 不可与 %s 并用\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s 与 %s 并用无意义!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr ""
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "所选的对称加密算法无效\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "所选的散列算法无效\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "所选的压缩算法无效\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "所选的证书散列算法无效\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "需要的完全可信签名数一定要大于 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "需要的勉强可信签名数一定要大于 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "最大验证深度一定要介于 1 和 255 之间\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
  msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
  
- #: g10/gpg.c:3590
++#: g10/gpg.c:3688
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  #, fuzzy
  #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "注意:强烈不建议使用简单的 S2K 模式(0)\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "无效的默认首选项\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "无效的个人对称加密算法首选项\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "无效的个人散列算法首选项\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "无效的个人压缩算法首选项\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s 尚不能和 %s 并用\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, fuzzy, c-format
  #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, fuzzy, c-format
  #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, fuzzy, c-format
  #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "初始化信任度数据库失败:%s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [文件名]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [文件名]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, fuzzy, c-format
  #| msgid "symmetric encryption of `%s' failed: %s\n"
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "对称加密‘%s’失败:%s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [文件名]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [文件名]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [文件名]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [文件名]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [文件名]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [文件名]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [文件名]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [文件名]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key 用户标识"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key 用户标识"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key 用户标识 [指令]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  #, fuzzy
  msgid "--passwd <user-id>"
  msgstr "--sign-key 用户标识"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "上传至公钥服务器失败:%s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "从公钥服务器接收失败:%s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "导出密钥失败:%s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "导出密钥失败:%s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "搜寻公钥服务器失败:%s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "从公钥服务器更新失败:%s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "解开 ASCII 封装失败:%s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "进行 ASCII 封装失败:%s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, fuzzy, c-format
  #| msgid "invalid hash algorithm `%s'\n"
  msgid "invalid hash algorithm '%s'\n"
  msgstr "无效的‘%s’散列算法\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  msgid "error parsing key specification '%s': %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[文件名]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "请开始键入您的报文……\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "给定的的验证策略 URL 无效\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "给定的签名策略 URL 无效\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "给定的首选公钥服务器 URL 无效\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  #, fuzzy
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "从这个钥匙环里取用密钥"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "把时间戳矛盾仅视为警告"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|FD|把状态信息写入文件描述符 FD"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "用法:gpgv [选项] [文件] (用 -h 求助)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  #, fuzzy
  msgid ""
  "Syntax: gpgv [options] [files]\n"
@@@ -3259,329 -2559,263 +3272,329 @@@ msgstr "没有可用的帮助
  msgid "No help available for '%s'"
  msgstr "‘%s’没有可用的帮助"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr "导入被标记为局部的签名"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr "导入时修复 PKS 公钥服务器导致的损坏"
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "导入后不更新信任度数据库"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "导入后不更新信任度数据库"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "显示密钥指纹"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr "只接受对已有密钥的更新"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
  msgstr "导入后清除密钥中无用的部分"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "导入后尽可能清除密钥中的可选部分"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "跳过 %d 样式的区块\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "目前已处理 %lu 把密钥\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "合计被处理的数量:%lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "  已跳过的新密钥:%lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "  已跳过的新密钥:%lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "    遗失用户标识:%lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "          已导入:%lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "          未改变:%lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "      新用户标识:%lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "        新的子钥:%lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "        新的签名:%lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "    新的密钥吊销:%lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "      读取的私钥:%lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "      导入的私钥:%lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "    未改变的私钥:%lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "        未被导入:%lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "      清除的签名:%lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr "  清除的用户标识:%lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, fuzzy, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr "警告:密钥 %s 下列用户标识的首选项中包含不可用的算法:\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         “%s”:对称加密算法 %s 对应首选项\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         “%s”:散列算法 %s 对应首选项\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         “%s”:压缩算法 %s 对应首选项\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "强烈建议您更新您的首选项并重新分发这把密钥,\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr "以避免可能的算法不匹配问题\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr "您可以这样更新您的首选项:gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "密钥 %s:没有用户标识\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s: %s\n"
  msgstr "“%s”已跳过:%s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr ""
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "密钥 %s:PKS 子钥破损已修复\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "密钥 %s:已接受不含自身签名的用户标识“%s”\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "密钥 %s:没有有效的用户标识\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "这可能由于遗失自身签名所致\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "密钥 %s:找不到公钥:%s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "密钥 %s:新密钥――已跳过\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "找不到可写的钥匙环:%s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, fuzzy, c-format
  #| msgid "error writing keyring `%s': %s\n"
  msgid "error writing keyring '%s': %s\n"
  msgstr "写入钥匙环‘%s’时出错: %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "密钥 %s:公钥“%s”已导入\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "密钥 %s:与我们的副本不吻合\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "密钥 %s:无法定位原始的密钥区块:%s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "密钥 %s:无法读取原始的密钥区块: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "密钥 %s:“%s”一个新的用户标识\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "密钥 %s:“%s”%d 个新的用户标识\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "密钥 %s:“%s”1 个新的签名\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "密钥 %s:“%s”%d 个新的签名\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "密钥 %s:“%s”1 个新的子钥\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "密钥 %s:“%s”%d 个新的子钥\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "密钥 %s:“%s”%d 个签名被清除\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "密钥 %s:“%s”%d 个签名被清除\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "密钥 %s:“%s”%d 个用户标识被清除\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "密钥 %s:“%s”%d 个用户标识被清除\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "密钥 %s:“%s”未改变\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "密钥 %s:私钥已导入\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, fuzzy, c-format
  #| msgid "skipped: secret key already present\n"
  msgid "key %s: secret key already exists\n"
  msgstr "已跳过:私钥已存在\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, fuzzy, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, fuzzy, c-format
  #| msgid "secret key \"%s\" not found: %s\n"
  msgid "secret key %s: %s\n"
  msgstr "找不到私钥“%s”:%s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "不允许导入私钥\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "密钥 %s:私钥使用了无效的加密算法 %d――已跳过\n"
@@@ -3596,87 -2830,70 +3609,87 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "密钥 %s:没有公钥――无法应用吊销证书\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "密钥 %s:无效的吊销证书:%s――已拒绝\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "密钥 %s:“%s”吊销证书已被导入\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "密钥 %s:签名没有用户标识\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "密钥 %s:用户标识“%s”使用了不支持的公钥算法\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "密钥 %s:用户标识“%s”自身签名无效\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "密钥 %s:不支持的公钥算法\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, fuzzy, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "密钥 %s:已新增直接密钥签名\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "密钥 %s:没有可供绑定的子钥\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "密钥 %s:无效的子钥绑定\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "密钥 %s:已删除多重子钥绑定\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "密钥 %s:没有用于密钥吊销的子钥\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "密钥 %s:无效的子钥吊销\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "密钥 %s:已删除多重子钥吊销\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "密钥 %s:已跳过用户标识“%s”\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "密钥 %s:已跳过子钥\n"
@@@ -3685,90 -2902,73 +3698,90 @@@
  #  * to import non-exportable signature when we have the
  #  * the secret key used to create this signature - it
  #  * seems that this makes sense
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "密钥 %s:不可导出的签名(验证级别 0x%02X)――已跳过\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "密钥 %s:吊销证书位置错误――已跳过\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "密钥 %s:无效的吊销证书:%s――已跳过\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "密钥 %s:子钥签名位置错误――已跳过\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "密钥 %s:与预期不符的签名验证级别(0x%02X)――已跳过\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "密钥 %s:检测到重复的用户标识――已合并\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "警告:密钥 %s 可能已被吊销:正在取回吊销密钥 %s\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "警告:密钥 %s 可能已被吊销:吊销密钥 %s 不存在。\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "密钥 %s:已新增吊销证书“%s”\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "密钥 %s:已新增直接密钥签名\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, fuzzy, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "建立钥匙环‘%s’时发生错误:%s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, fuzzy, c-format
  #| msgid "error creating keyring `%s': %s\n"
  msgid "error creating keyring '%s': %s\n"
  msgstr "建立钥匙环‘%s’时发生错误:%s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, fuzzy, c-format
  msgid "keybox '%s' created\n"
  msgstr "钥匙环‘%s’已建立\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, fuzzy, c-format
  #| msgid "keyring `%s' created\n"
  msgid "keyring '%s' created\n"
  msgstr "钥匙环‘%s’已建立\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, fuzzy, c-format
  #| msgid "keyblock resource `%s': %s\n"
  msgid "keyblock resource '%s': %s\n"
  msgstr "密钥块资源‘%s’:%s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  msgid "error opening key DB: %s\n"
  msgstr "‘%s’中出错:%s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "重新建立钥匙环缓存失败: %s\n"
@@@ -3781,38 -2979,36 +3794,44 @@@ msgstr "[吊销]
  msgid "[self-signature]"
  msgstr "[自身签名]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, fuzzy, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "建立钥匙环‘%s’时发生错误:%s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "密钥 %s:不支持的公钥算法\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "卡不支持散列算法 %s\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  msgid " (reordered signatures follow)"
  msgstr "完好的签名,来自于“%s”"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  #| msgid "skipped \"%s\": %s\n"
  msgid "key %s:\n"
  msgstr "“%s”已跳过:%s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "密钥 %s:“%s”%d 个签名被清除\n"
  msgstr[1] "密钥 %s:“%s”%d 个签名被清除\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
@@@ -3820,7 -3016,6 +3839,7 @@@ msgid_plural "%d signatures not checke
  msgstr[0] "有 1 份签名因为遗失密钥而未被检查\n"
  msgstr[1] "有 1 份签名因为遗失密钥而未被检查\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
@@@ -3828,21 -3023,18 +3847,21 @@@ msgid_plural "%d bad signatures\n
  msgstr[0] "%d 个损坏的签名\n"
  msgstr[1] "%d 个损坏的签名\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "完好的签名,来自于“%s”"
  msgstr[1] "完好的签名,来自于“%s”"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3853,17 -3045,14 +3872,17 @@@ msgstr "
  "查\n"
  "指纹等)?\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = 我勉强相信\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = 我完全相信\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3872,50 -3061,38 +3891,50 @@@ msgstr "
  "请输入这份信任签名的深度。\n"
  "深度若大于 1 则您将签名的这把密钥将可以以您的名义做出信任签名。\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr "请输入这份签名的限制域,如果没有请按回车。\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "用户标识“%s”已被吊销。"
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "您仍然想要为它签名吗?(y/N)"
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  无法添加签名。\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "用户标识“%s”已过期。"
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "警告:用户标识“%s”不含自身签名。"
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "可以为用户标识“%s”添加签名。"
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
  msgstr "为其添加签名吗?(y/N)"
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3924,65 -3101,52 +3943,65 @@@ msgstr "
  "“%s”的自身签名是 PGP 2.x 样\n"
  "式的签名。\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "您是否想要将它升级成 OpenPGP 的自身签名?(y/N)"
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "has expired.\n"
  msgstr "您目前为“%s”的签名已经过期了。\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "您想要发布一份新的签名来取代已过期的那一个吗?(y/N)"
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
  "is a local signature.\n"
  msgstr "您目前为“%s”的签名是一份本地签名。\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "您是否想要把它升级成可以完全导出的签名?(y/N)"
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "“%s”已由密钥 %s 在本地签名\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "“%s”已由密钥 %s 签名\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "您仍然想要为它再次签名吗?(y/N)"
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "没有东西可以让密钥 %s 签名\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "这把密钥已经过期!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "这把密钥将在 %s 过期。\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "您想要让您的签名也同时过期吗? (Y/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3991,33 -3155,27 +4010,33 @@@ msgstr "
  "您是否谨慎地检查过,确认正要签名的密钥的确属于以上它所声称的所有者呢?\n"
  "如果您不知道这个问题的答案,请输入“0”。\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) 我不作答。 %s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) 我根本没有检查过。 %s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) 我随意检查过。 %s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) 我非常小心地检查过。 %s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  #, fuzzy
  #| msgid "Your selection? (enter `?' for more information): "
  msgid "Your selection? (enter '?' for more information): "
  msgstr "您的选择?(输入‘?’以获得更多的信息):"
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -4026,220 -3184,166 +4045,220 @@@ msgstr "
  "您真的确定要签名这把密钥,使用您的密钥\n"
  "“%s”(%s)\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
  msgstr "这将是一个自身签名。\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "警告:这份签名不会被标记为不可导出。\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "警告:这份签名不会被标记成不可吊销。\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "这份签名会被标记成不可导出。\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "这份签名会被标记成不可吊销。\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "我根本没有检查过这把密钥。\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "我随意检查过这把密钥。\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "我非常小心地检查过这把密钥。\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
  msgstr "真的要签名吗?(y/N)"
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "签名时失败: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr "只有占位密钥,或者密钥存储在卡上——没有密码可以更改。\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, fuzzy, c-format
  #| msgid "error creating passphrase: %s\n"
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "保存并离开"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "显示密钥指纹"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  msgid "show the keygrip"
  msgstr "输入注记:"
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "列出密钥和用户标识"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "选择用户标识 N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "选择子钥 N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "检查签名"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "为所选用户标识添加本地签名"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "为所选用户标识添加信任签名"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "为所选用户标识添加不可吊销签名"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "增加一个用户标识"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "增加一个照片标识"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "删除选定的用户标识"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "添加一个子钥"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "在智能卡上添加一把密钥"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "将一把密钥移动到智能卡上"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "将备份密钥转移到卡上"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "删除选定的子钥"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "增加一把吊销密钥"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "删除所选用户标识上的签名"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "变更密钥或所选子钥的使用期限"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "将所选的用户标识设为首选用户标识"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "列出首选项(专家模式)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "列出首选项(详细模式)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "设定所选用户标识的首选项"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "设定所选用户标识的首选公钥服务器的 URL"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
  msgstr "为所选用户标识的设定注记"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "更改密码"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "更改信任度"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "吊销所选用户标识上的签名"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "吊销选定的用户标识"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "吊销密钥或选定的子钥"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "启用密钥"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "禁用密钥"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "显示选定的照片标识"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr "压缩不可用的用户标识并删除不可用的签名"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr "压缩不可用的用户标识并删除所有签名"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "私钥可用。\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "要有私钥才能这么做。\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  #, fuzzy
  #| msgid ""
  #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4257,300 -3361,233 +4276,301 @@@ msgstr "
  "  信任签名,或‘nr’前缀(nrsign)以添加不可吊销签名,或者以上三种前缀的任何组\n"
  "  合(ltsign、tnrsign 等)。\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "密钥已被吊销。"
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
  msgstr "真的为所有的用户标识签名吗?(y/N)"
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "真的为所有的用户标识签名吗?(y/N)"
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "提示:选择要添加签名的用户标识\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "Unknown signature type '%s'\n"
  msgstr "未知的签名类型‘%s’\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "在 %s 模式中不允许使用这个指令。\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "您至少得选择一个用户标识。\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "您不能删除最后一个用户标识!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "真的要删除所有选定的用户标识吗?(y/N)"
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
  msgstr "真的要删除这个用户标识吗?(y/N)"
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  #, fuzzy
  msgid "Really move the primary key? (y/N) "
  msgstr "真的要删除主钥吗?(y/N)"
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "您必须指定一把密钥。\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "命令需要一个文件名作为参数\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, fuzzy, c-format
  #| msgid "Can't open `%s': %s\n"
  msgid "Can't open '%s': %s\n"
  msgstr "无法打开‘%s’:%s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, fuzzy, c-format
  #| msgid "Error reading backup key from `%s': %s\n"
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "从‘%s’读取备份密钥时出错:%s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "您必须选择至少一把密钥。\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "您真的想要删除选定的密钥吗?(y/N)"
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "您真的要删除这把密钥吗?(y/N)"
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "真的要吊销所有选定的用户标识吗?(y/N)"
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
  msgstr "真的要吊销这个用户标识吗?(y/N)"
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "您真的要吊销整把密钥吗?(y/N)"
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "您真的要吊销选定的子钥吗?(y/N)"
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "您真的要吊销这把子钥吗?(y/N)"
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "设为首选项列表为:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "真的要更新所选用户标识的首选项吗?(y/N)"
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
  msgstr "真的要更新首选项吗?(y/N)"
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
  msgstr "要保存变动吗?(y/N)"
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
  msgstr "要不保存而离开吗?(y/N)"
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "更新失败:%s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "密钥没有变动所以不需要更新。\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "生成密钥失败:%s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "指纹无效"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, fuzzy, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "无法存储指纹:%s\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "无效的数值\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "No such user ID.\n"
  msgid "No matching user IDs."
  msgstr "没有这个用户标识。\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  #, fuzzy
  #| msgid "Nothing to sign with key %s\n"
  msgid "Nothing to sign.\n"
  msgstr "没有东西可以让密钥 %s 签名\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "散列:"
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "特点:"
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "公钥服务器不可变造"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "首选公钥服务器:"
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "注记:"
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, fuzzy, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "这把密钥可被 %s 密钥 %s 吊销"
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr " (敏感的)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "创建于:%s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "已吊销:%s"
  
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "已过期:%s"
  
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "有效至:%s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "可用于:%s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "卡号:"
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "信任度:%s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "有效性:%s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "这把密钥已经被禁用"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
  msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "已吊销"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "已过期"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr ""
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  #, fuzzy
  #| msgid "You can't change the expiration date of a v3 key\n"
  msgid "You may want to change its expiration date too.\n"
  msgstr "您不能变更 v3 密钥的使用期限\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4559,35 -3596,27 +4579,35 @@@ msgstr "
  "警告:这是一把 PGP2 样式的密钥。\n"
  "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "您确定仍然想要增加吗?(y/N)"
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr ""
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "删除这个完好的签名吗?(y/N/q)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "删除这个无效的签名吗?(y/N/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "删除这个未知的签名吗?(y/N/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "真的要删除这个自身签名吗?(y/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
@@@ -4595,37 -3624,30 +4615,37 @@@ msgid_plural "Deleted %d signatures.\n
  msgstr[0] "已经删除了 %d 个签名。\n"
  msgstr[1] "已经删除了 %d 个签名。\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "没有东西被删除。\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "无效"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, fuzzy, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "用户标识“%s”:无用部分已清除\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
  msgstr[0] "密钥 %s:“%s”%d 个签名被清除\n"
  msgstr[1] "密钥 %s:“%s”%d 个签名被清除\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, fuzzy, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "用户标识“%s”:无用部分已清除\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "用户标识“%s”:无用部分已清除\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4634,42 -3656,34 +4654,42 @@@ msgstr "
  "警告:这是一把 PGP2 样式的密钥。\n"
  "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "输入指定吊销者的用户标识:"
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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:4642
++#: g10/keyedit.c:4658
  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:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
  msgstr "这把密钥已被指定为一个吊销者\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr "警告:将某把密钥指派为指定吊销者的操作无法撤销!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr "您确定要将这把密钥设为指定吊销者吗?(y/N):"
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4678,230 -3692,179 +4698,230 @@@ msgid "
  "N) "
  msgstr "您确定要将这把密钥设为指定吊销者吗?(y/N):"
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "将要变更子钥的使用期限。\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "将要变更主钥的使用期限。\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "您不能变更 v3 密钥的使用期限\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "签名的子钥 %s 已经交叉验证\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr "子钥 %s 不签名,因此不需要交叉验证\n"
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "请精确地选择一个用户标识。\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "跳过用户标识“%s”的 v3 自身签名\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "输入您首选的公钥服务器的 URL:"
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "您确定要替换它吗?(y/N)"
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "您确定要删除它吗?(y/N)"
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "输入注记:"
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
  msgstr "继续?(y/N)"
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "没有索引为 %d 的用户标识\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "没有散列值为 %s 的用户标识\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
  msgstr "没有索引为 %d 的子钥\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "没有索引为 %d 的子钥\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "用户标识:“%s”\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (不可导出)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "这份签名已在 %s 过期。\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "您确定您仍然想要吊销它吗?(y/N)"
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "要为这份签名生成一份吊销证书吗?(y/N)"
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr ""
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (不可吊销)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "由您的密钥 %s 于 %s 吊销\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "您正在吊销这些签名:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "真的要生成吊销证书吗?(y/N)"
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "没有私钥\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "用户标识“%s”已经被吊销。\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr "警告:有一份用户标识签名的日期标记为 %d 秒后的未来\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "密钥 %s 已被吊销。\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "子钥 %s 已被吊销。\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "正在显示 %s 照片标识(大小为 %ld,属于密钥 %s,用户标识 %d)\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, fuzzy, c-format
  #| msgid "preference `%s' duplicated\n"
  msgid "preference '%s' duplicated\n"
  msgstr "首选项‘%s’重复\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "太多对称加密算法首选项\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "太多散列算法首选项\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
  msgstr "太多首选压缩算法\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, fuzzy, c-format
  #| msgid "invalid item `%s' in preference string\n"
  msgid "invalid item '%s' in preference string\n"
  msgstr "首选项字符串里有无效项‘%s’\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "正在写入直接签名\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "正在写入自身签名\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "正在写入密钥绑定签名\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "密钥尺寸无效:改用 %u 位\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "密钥尺寸舍入到 %u 位\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr ""
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "签名"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "验证"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "加密"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "认证"
  
@@@ -4915,158 -3878,127 +4935,158 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "%s 密钥可能的操作:"
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "目前允许的操作:"
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) 选择是否用于签名\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) 选择是否用于加密\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) 选择是否用于认证\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) 已完成\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "请选择您要使用的密钥种类:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, fuzzy, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) DSA 和 ElGamal (默认)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, fuzzy, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA 和 ElGamal (默认)\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (仅用于签名)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (仅用于签名)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) ElGamal (仅用于加密)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (仅用于加密)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (自定义用途)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (自定义用途)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, fuzzy, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) DSA 和 ElGamal (默认)\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (sign only)\n"
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) DSA (仅用于签名)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, fuzzy, c-format
  #| msgid "   (%d) DSA (set your own capabilities)\n"
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) DSA (自定义用途)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, fuzzy, c-format
  #| msgid "   (%d) RSA (encrypt only)\n"
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) RSA (仅用于加密)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, fuzzy, c-format
  msgid "  (%d) Existing key\n"
  msgstr "  (2) 加密密钥\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  #, fuzzy
  msgid "Enter the keygrip: "
  msgstr "输入注记:"
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr ""
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  #, fuzzy
  msgid "No key with this keygrip\n"
  msgstr "没有索引为 %d 的子钥\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, fuzzy, c-format
  #| msgid "rounded up to %u bits\n"
  msgid "rounded to %u bits\n"
  msgstr "舍入到 %u 位\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, fuzzy, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "您想要用多大的密钥尺寸?(%u)"
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "您想要用多大的密钥尺寸?(%u)"
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "您所要求的密钥尺寸是 %u 位\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  #, fuzzy
  #| msgid "Please select what kind of key you want:\n"
  msgid "Please select which elliptic curve you want:\n"
  msgstr "请选择您要使用的密钥种类:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -5082,7 -4014,6 +5102,7 @@@ msgstr "
  "      <n>m = 密钥在 n 月后过期\n"
  "      <n>y = 密钥在 n 年后过期\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -5098,38 -4029,30 +5118,38 @@@ msgstr "
  "      <n>m = 签名在 n 月后过期\n"
  "      <n>y = 签名在 n 年后过期\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "密钥的有效期限是?(0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "签名的有效期限是多久?(%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "无效的数值\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "密钥永远不会过期\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "签名永远不会过期\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "密钥于 %s 过期\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "签名于 %s 过期\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -5137,11 -4060,9 +5157,11 @@@ msgstr "
  "您的系统无法显示 2038 年以后的日期。\n"
  "不过,它可以正确处理 2106 年之前的年份。\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "以上正确吗?(y/n)"
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -5152,7 -4073,6 +5172,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -5168,50 -4088,39 +5188,50 @@@ msgstr "
  "    “Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>”\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "真实姓名:"
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "姓名含有无效的字符\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "姓名不可以用数字开头\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "姓名至少要有五个字符长\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "电子邮件地址:"
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "电子邮件地址无效\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "注释:"
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "注释含有无效的字符\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, fuzzy, c-format
  #| msgid "You are using the `%s' character set.\n"
  msgid "You are using the '%s' character set.\n"
  msgstr "您正在使用‘%s’字符集。\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5222,7 -4131,6 +5242,7 @@@ msgstr "
  "    “%s”\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
  
@@@ -5237,35 -4145,28 +5257,35 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)?"
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)?"
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)?"
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  #, fuzzy
  #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)?"
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "请先改正错误\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5275,13 -4176,10 +5295,13 @@@ msgstr "
  "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
  "鼠标、读写硬盘之类的),这会让随机数字发生器有更好的机会获得足够的熵数。\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "生成密钥失败:%s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5289,71 -4187,58 +5309,71 @@@
  "\n"
  msgstr ""
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr ""
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, fuzzy, c-format
  #| msgid "key already exists\n"
  msgid "A key for \"%s\" already exists\n"
  msgstr "密钥已存在\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  #, fuzzy
  #| msgid "Use this key anyway? (y/N) "
  msgid "Create anyway? (y/N) "
  msgstr "无论如何还是使用这把密钥吗?(y/N)"
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  #, fuzzy
  #| msgid "generating new key\n"
  msgid "creating anyway\n"
  msgstr "生成新密钥\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr ""
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "密钥生成已取消。\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, fuzzy, c-format
  #| msgid "can't create backup file `%s': %s\n"
  msgid "can't create backup file '%s': %s\n"
  msgstr "不能创建备份文件‘%s’:%s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, fuzzy, c-format
  #| msgid "NOTE: backup of card key saved to `%s'\n"
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "注意:卡密钥的备份已保存到‘%s’\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, fuzzy, c-format
  #| msgid "writing public key to `%s'\n"
  msgid "writing public key to '%s'\n"
  msgstr "正在将公钥写至`%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "找不到可写的公钥钥匙环:%s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, fuzzy, c-format
  #| msgid "error writing public keyring `%s': %s\n"
  msgid "error writing public keyring '%s': %s\n"
  msgstr "写入公钥钥匙环‘%s’时发生错误: %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "公钥和私钥已经生成并经签名。\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5361,37 -4246,30 +5381,37 @@@ msgstr "
  "请注意这把密钥还不能用来加密,您必须先用“--edit-key”指令\n"
  "生成用于加密的子钥。\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  #, fuzzy
  #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "注意:为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "主钥的私钥部分无法取用。\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "主钥的私钥部分存储在卡上。\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
  msgstr "真的要建立吗?(y/N)"
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "永不过期"
  
@@@ -5442,30 -4311,24 +5462,30 @@@ msgstr[1] "
  msgid "Keyring"
  msgstr "钥匙环"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "主钥指纹:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "子钥指纹:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr " 主钥指纹:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr " 子钥指纹:"
  
  #  use tty
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "密钥指纹 ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr "卡序列号 ="
  
@@@ -5503,53 -4361,41 +5523,53 @@@ msgstr[1] "1 个损坏的签名\n
  msgid "%s: keyring created\n"
  msgstr "%s:钥匙环已建立\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr "在搜索结果中包含已吊销的密钥"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr "按钥匙号搜索时包含子钥"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr "验证签名时自动下载密钥"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "使用密钥中指定的首选公钥服务器 URL"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr "获取密钥时使用密钥上的 PKA 记录"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "已禁用"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr "输入数字以选择,输入 N 翻页,输入 Q 退出 >"
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "“%s”不是一个用户标识:跳过\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  #| msgid "refreshing %d keys from %s\n"
  msgid "refreshing %d key from %s\n"
@@@ -5557,57 -4403,46 +5577,57 @@@ msgid_plural "refreshing %d keys from %
  msgstr[0] "%d 个密钥正从 %s 得到更新\n"
  msgstr[1] "%d 个密钥正从 %s 得到更新\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "在公钥服务器上找不到密钥“%s”\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "在公钥服务器上找不到密钥\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "下载密钥‘%s’,从 %s 服务器 %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "下载密钥 %s,从 %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  #| msgid "no keyserver action!\n"
  msgid "no keyserver known\n"
  msgstr "公钥服务器无动作!\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "“%s”已跳过:%s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "将密钥‘%s’上传到 %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, fuzzy, c-format
  #| msgid "requesting key %s from %s\n"
  msgid "requesting key from '%s'\n"
  msgstr "下载密钥 %s,从 %s\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "警告:无法获取 URI %s:%s\n"
@@@ -5707,130 -4522,103 +5727,130 @@@ msgstr "原始文件名 =‘%.*s’\n
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr ""
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "未找到签名\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "已损坏的签名,来自于“%s”"
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "过期的签名,来自于“%s”"
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "完好的签名,来自于“%s”"
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "签名验证已被抑制\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "无法处理这些有歧义的签名\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "签名建立于 %s\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "              使用 %s 密钥 %s\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "于 %s 创建的签名,使用 %s,钥匙号 %s\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "              亦即“%s”"
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "可用的密钥在:"
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[不确定]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "              亦即“%s”"
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "这份签名已于 %s 过期。\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "这份签名在 %s 过期。\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, fuzzy, c-format
  #| msgid "%s signature, digest algorithm %s\n"
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s 签名,散列算法 %s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "二进制"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "文本模式"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "未知"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  #, fuzzy
  #| msgid "unknown pubkey algorithm"
  msgid ", key algorithm "
  msgstr "未知的公钥算法"
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "无法检查签名:%s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "不是一份分离的签名\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "警告:检测到多重签名。只检查第一个签名。\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "等级 0x%02x 的独立签名\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "旧式(PGP 2.x)签名\n"
  
@@@ -5932,30 -4701,25 +5952,30 @@@ msgstr "不压缩
  msgid "uncompressed|none"
  msgstr "未压缩|无"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "%s 也许不能使用这个报文\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, fuzzy, c-format
  #| msgid "ambiguous option `%s'\n"
  msgid "ambiguous option '%s'\n"
  msgstr "有歧义的选项‘%s’\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, fuzzy, c-format
  #| msgid "unknown option `%s'\n"
  msgid "unknown option '%s'\n"
  msgstr "未知的选项 '%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  #, fuzzy
  #| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr "DSA 需要散列值长度为 8 位的倍数\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  #| msgid "Unknown signature type `%s'\n"
  msgid "unknown weak digest '%s'\n"
@@@ -6246,7 -4955,23 +6266,26 @@@ msgstr "这把密钥有可能属于它�
  msgid "This key belongs to us\n"
  msgstr "这把密钥是属于我们的\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, c-format
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr ""
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n"
+ "己在做什么,您可以在下一个问题回答 yes。\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6255,128 -4980,100 +6294,128 @@@ msgstr "
  "这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n"
  "己在做什么,您可以在下一个问题回答 yes。\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "无论如何还是使用这把密钥吗?(y/N)"
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "警告:正在使用不被信任的密钥!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr "警告:此密钥可能已被吊销(吊销密钥不存在)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "警告:这把密钥已经被它的指定吊销者吊销了!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "警告:这把密钥已经被它的持有者吊销了!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
  msgstr "      这表明这个签名有可能是伪造的。\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "警告:这把子钥已经被它的持有者吊销了!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "注意:这把密钥已经被禁用了。\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, fuzzy, c-format
  #| msgid "Note: Verified signer's address is `%s'\n"
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr "注意:验证过的签名者的地址是‘%s’\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, fuzzy, c-format
  #| msgid "Note: Signer's address `%s' does not match DNS entry\n"
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr "注意:签名者的地址‘%s’不匹配任何 DNS 记录\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr "PKA 信息有效,信任级别调整到“完全”\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr "PKA 信息无效,信任级别调整到“从不”\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "注意:这把密钥已经过期了!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr "警告:这把密钥未经受信任的签名认证!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr "      没有证据表明这个签名属于它所声称的持有者。\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "警告:我们不信任这把密钥!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "      这个签名很有可能是伪造的。\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr "警告:这把密钥未经有足够信任度的签名所认证。\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "      这份签名并不一定属于它所声称的持有者\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s:已跳过:%s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s:已跳过:公钥已被禁用\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: 已跳过:公钥已存在\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to `%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "无法连接至‘%s’:%s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "无效的‘%s’散列算法\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "无效的‘%s’散列算法\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "当前收件人:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6384,37 -5081,29 +6423,37 @@@ msgstr "
  "\n"
  "输入用户标识。以空白行结束:"
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "没有这个用户标识。\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr "已跳过:公钥已被设为默认收件者\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "公钥被禁用。\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "已跳过:公钥已被设定\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "未知的默认收件者“%s”\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "没有有效的地址\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, fuzzy, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "密钥 %s:没有有效的用户标识\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, fuzzy, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "密钥 %s:没有有效的用户标识\n"
@@@ -6659,26 -5302,21 +6698,26 @@@ msgstr "DSA 密钥 %s 使用不安全�
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr "DSA 密钥 %s 需要 %u 位或更长的散列\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "警告:签名散列值与报文不一致\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "警告:签名的子钥 %s 未经交叉验证\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
  msgstr "请参见 %s 以得到更多信息。\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr "警告:签名的子钥 %s 交叉验证无效\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu second newer than the signature\n"
@@@ -6686,7 -5324,6 +6725,7 @@@ msgid_plural "public key %s is %lu seco
  msgstr[0] "公钥 %s 在其签名后 %lu 秒生成\n"
  msgstr[1] "公钥 %s 在其签名后 %lu 秒生成\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu day newer than the signature\n"
@@@ -6694,7 -5331,6 +6733,7 @@@ msgid_plural "public key %s is %lu day
  msgstr[0] "公钥 %s 在其签名后 %lu 秒生成\n"
  msgstr[1] "公钥 %s 在其签名后 %lu 秒生成\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6705,7 -5341,6 +6744,7 @@@ msgid_plural "
  msgstr[0] "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
  msgstr[1] "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6715,28 -5350,23 +6754,28 @@@ msgid_plural "
  msgstr[0] "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
  msgstr[1] "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, fuzzy, c-format
  #| msgid "NOTE: signature key %s expired %s\n"
  msgid "Note: signature key %s expired %s\n"
  msgstr "注意:签名密钥 %s 已于 %s 过期\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, fuzzy, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "注意:密钥已被吊销"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr "密钥 %s:没有子钥吊销签名所需的子钥\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "密钥 %s:没有子钥绑定签名所需的子钥\n"
@@@ -6796,7 -5415,6 +6835,7 @@@ msgstr "已跳过:私钥已存在\n
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr "这是一把由 PGP 生成的 ElGamal 密钥,用于签名不安全!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "信任记录 %lu,类别 %d:写入失败:%s\n"
@@@ -6844,12 -5454,10 +6883,12 @@@ msgstr "在‘%s’中寻找信任度�
  msgid "read error in '%s': %s\n"
  msgstr "读取‘%s’错误:%s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "信任度数据库:同步失败:%s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, fuzzy, c-format
  #| msgid "can't create lock for `%s'\n"
  msgid "can't create lock for '%s'\n"
@@@ -6880,7 -5483,6 +6919,7 @@@ msgstr "信任度数据库处理量过�
  msgid "%s: directory does not exist!\n"
  msgstr "%s:目录不存在!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, fuzzy, c-format
  #| msgid "can't access `%s': %s\n"
  msgid "can't access '%s': %s\n"
@@@ -6993,266 -5573,248 +7032,302 @@@ msgstr "无法处理长于 %d 字符的
  msgid "input line longer than %d characters\n"
  msgstr "输入行长度超过 %d 字符\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  msgid "unsupported TOFU database version: %s\n"
  msgstr ""
  "\n"
  "支持的算法:\n"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  msgid "error reading TOFU database: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing secret keyring `%s': %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "写入私钥钥匙环‘%s’时发生错误: %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "%s: error writing dir record: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "%s:写入目录记录时出错:%s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "‘%s’中出错:%s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  msgid "error updating TOFU database: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
+ msgstr ""
+ 
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  #| msgid "error getting new PIN: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "列出密钥和用户标识"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "有效性:%s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  msgid "error gathering signature stats: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "列出密钥"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
  msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
+ #, c-format
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
+ msgstr[1] ""
+ 
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  msgstr[1] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ msgid "resetting keydb: %s\n"
+ msgstr "写入钥匙环‘%s’时出错: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  msgid "error changing TOFU policy: %s\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "已经删除了 %d 个签名。\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
+ msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "以 %lu 个密码加密\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
+ msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
- msgstr[1] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7266,100 -5828,89 +7341,112 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  msgid "error opening TOFU database: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring `%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "写入公钥钥匙环‘%s’时发生错误: %s\n"
+ 
++#: g10/trustdb.c:216
  #, fuzzy, c-format
  #| msgid "`%s' is not a valid long keyID\n"
  msgid "'%s' is not a valid long keyID\n"
  msgstr "‘%s’不是一个有效的长式钥匙号\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "密钥 %s:受信任,已接受\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "密钥 %s 在信任度数据库中重复出现\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr "密钥 %s:受信任的密钥没有公钥――已跳过\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "密钥 %s 被标记为绝对信任\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "信任记录 %lu,请求类别 %d:读取失败:%s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr ""
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr ""
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "使用 %s 信任模型\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "不需要检查信任度数据库\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "下次信任度数据库检查将于 %s 进行\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, fuzzy, c-format
  #| msgid "no need for a trustdb check with `%s' trust model\n"
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, fuzzy, c-format
  #| msgid "no need for a trustdb update with `%s' trust model\n"
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "找不到公钥 %s:%s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "请执行一次 --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "正在检查信任度数据库\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
@@@ -7367,7 -5918,6 +7454,7 @@@ msgid_plural "%d keys processed
  msgstr[0] "目前已处理 %lu 把密钥\n"
  msgstr[1] "目前已处理 %lu 把密钥\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
@@@ -7375,23 -5925,19 +7462,23 @@@ msgid_plural " (%d validity counts clea
  msgstr[0] "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
  msgstr[1] "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "没有找到任何绝对信任的密钥\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr ""
  "深度:%d 有效性:%3d 已签名:%3d 信任度:%d-,%dq,%dn,%dm,%df,%du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "无法更新信任度数据库版本记录:写入失败:%s\n"
@@@ -7504,145 -6029,113 +7591,145 @@@ msgid "
  "List, export, import Keybox data\n"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSA 余数缺失或者不是 %d 位长\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "RSA 公钥指数缺失或长于 %d 位\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "PIN 回调返回错误:%s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr ""
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  #, fuzzy
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  #, fuzzy
  msgid "||Please enter the PIN for the standard keys."
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  #, fuzzy
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  #, fuzzy
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr ""
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "无法存储指纹:%s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "无法存储创建日期:%s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "无法读出公钥:%s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "响应未包含公钥数据\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr "响应未包含 RSA 余数\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr "响应未包含 RSA 公钥指数\n"
  
- #: scd/app-openpgp.c:1322
++#: scd/app-openpgp.c:1353
  #, fuzzy
  #| msgid "response does not contain the RSA public exponent\n"
- msgid "response does not contain the EC public point\n"
+ msgid "response does not contain the EC public key\n"
  msgstr "响应未包含 RSA 公钥指数\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "响应未包含公钥数据\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "无法读出公钥:%s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr ""
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  #, fuzzy
  msgid "||Please enter the PIN"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "CHV%d 的 PIN 太短;最小长度为 %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "验证 CHV%d 失败:%s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "从卡中获取 CHV 状态时出错\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr "卡被永久锁定!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7653,26 -6146,21 +7740,26 @@@ msgstr[1] "尝试管理员 PIN %d 次�
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, fuzzy, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  #, fuzzy
  msgid "|A|Please enter the Admin PIN"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr "尚未配置管理员命令的权限\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  #, fuzzy
  msgid "||Please enter the Reset Code for the card"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, fuzzy, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "CHV%d 的 PIN 太短;最小长度为 %d\n"
@@@ -7680,82 -6168,64 +7767,82 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr ""
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|新的管理员 PIN"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "新的 PIN"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  #, fuzzy
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  #, fuzzy
  msgid "||Please enter the PIN and New PIN"
  msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
  msgstr "读取应用程序数据时出错\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "读取指纹 D0 出错\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "密钥已存在\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr "现有的密钥将被替换\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "生成新密钥\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  #, fuzzy
  msgid "writing new key\n"
  msgstr "生成新密钥\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "缺少创建时间戳\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "无法存储密钥:%s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported URI"
  msgid "unsupported curve\n"
  msgstr "未被支持的 URI"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "请稍候,正在生成密钥……\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
  msgstr "生成密钥失败\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
@@@ -7763,30 -6233,24 +7850,30 @@@ msgid_plural "key generation completed 
  msgstr[0] "密钥已生成(耗时 %d 秒)\n"
  msgstr[1] "密钥已生成(耗时 %d 秒)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr ""
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "卡不支持散列算法 %s\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "目前已创建的签名:%lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "目前禁止通过此命令验证管理员 PIN\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
@@@ -7808,7 -6269,6 +7895,7 @@@ msgstr "新的 PIN
  msgid "run in multi server mode (foreground)"
  msgstr ""
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr ""
  
@@@ -7861,16 -6310,13 +7948,16 @@@ msgid "
  "Smartcard daemon for @GNUPG@\n"
  msgstr ""
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr ""
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr ""
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr ""
@@@ -7890,11 -6333,9 +7977,11 @@@ msgstr "gpg-agent 在此次舍话中无
  msgid "validation model requested by certificate: %s"
  msgstr ""
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr ""
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr ""
  
@@@ -7926,210 -6361,163 +8013,210 @@@ msgstr "不允许导出私钥\n
  msgid "certificate policy not allowed"
  msgstr "不允许导出私钥\n"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr ""
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr ""
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr ""
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, fuzzy, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, fuzzy, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "无法读出公钥:%s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  #, fuzzy
  msgid "failed to allocate keyDB handle\n"
  msgstr "无法存储密钥:%s\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  #, fuzzy
  msgid "certificate has been revoked"
  msgstr "注意:密钥已被吊销"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr ""
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr ""
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, fuzzy, c-format
  msgid "checking the CRL failed: %s"
  msgstr "检查已建立的签名时发生错误: %s\n"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr ""
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  #, fuzzy
  msgid "root certificate not yet valid"
  msgstr "不允许导出私钥\n"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr ""
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  #, fuzzy
  msgid "certificate has expired"
  msgstr "这把密钥已经过期!"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  #, fuzzy
  msgid "root certificate has expired"
  msgstr "这把密钥已经过期!"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  #, fuzzy
  msgid "intermediate certificate has expired"
  msgstr "这把密钥已经过期!"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr ""
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  #, fuzzy
  msgid "certificate with invalid validity"
  msgstr "这把密钥已经过期!"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr ""
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr ""
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  #, fuzzy
  msgid "  (  signature created at "
  msgstr "      清除的签名:%lu\n"
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  #, fuzzy
  msgid "  (certificate created at "
  msgstr "已建立吊销证书。\n"
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  #, fuzzy
  msgid "  (certificate valid from "
  msgstr "证书已损坏"
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  #, fuzzy
  msgid "  (     issuer valid from "
  msgstr "卡序列号 ="
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, fuzzy, c-format
  msgid "fingerprint=%s\n"
  msgstr "CA 指纹:"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr ""
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr ""
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr ""
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr ""
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  #, fuzzy
  msgid "no issuer found in certificate"
  msgstr "生成一份吊销证书"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr ""
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr ""
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, fuzzy, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "检查已建立的签名时发生错误: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr ""
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr ""
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  #, fuzzy
  msgid "certificate has a BAD signature"
  msgstr "验证签名"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr ""
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr ""
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  #, fuzzy
  msgid "certificate is good\n"
  msgstr "首选项‘%s’重复\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  #, fuzzy
  msgid "intermediate certificate is good\n"
  msgstr "已建立吊销证书。\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  #, fuzzy
  msgid "root certificate is good\n"
  msgstr "证书已损坏"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr ""
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr ""
@@@ -8463,7 -6785,6 +8550,7 @@@ msgstr "
  msgid "certificate '%s' not found: %s\n"
  msgstr "找不到私钥“%s”:%s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, fuzzy, c-format
  msgid "error locking keybox: %s\n"
  msgstr "读取密钥区块时发生错误:%s\n"
@@@ -8488,135 -6805,105 +8575,135 @@@ msgstr "删除密钥区块时失败:%
  msgid "no valid recipients given\n"
  msgstr "(不给定描述)\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  #, fuzzy
  msgid "list external keys"
  msgstr "列出私钥"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  #, fuzzy
  msgid "list certificate chain"
  msgstr "证书已损坏"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  #, fuzzy
  msgid "import certificates"
  msgstr "证书已损坏"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  #, fuzzy
  msgid "export certificates"
  msgstr "证书已损坏"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  #, fuzzy
  msgid "register a smartcard"
  msgstr "在智能卡上添加一把密钥"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr ""
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr ""
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  #, fuzzy
  msgid "create base-64 encoded output"
  msgstr "输出经 ASCII 封装"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr ""
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr ""
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr ""
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr ""
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr ""
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr ""
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr ""
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr ""
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr ""
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr ""
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr ""
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  #, fuzzy
  msgid "|FILE|write an audit log to FILE"
  msgstr "从‘%s’读取选项\n"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr ""
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr ""
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr ""
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  #, fuzzy
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "从这个钥匙环里取用密钥"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr ""
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr ""
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  #, fuzzy
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "未知的对称加密算法"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  #, fuzzy
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "%s 签名,散列算法 %s\n"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  #, fuzzy
  #| msgid "Usage: gpg [options] [files] (-h for help)"
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  #, fuzzy
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
@@@ -8627,47 -6914,38 +8714,47 @@@ msgstr "
  "签名、检查、加密或解密\n"
  "默认的操作依输入数据而定\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, fuzzy, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "无法连接至‘%s’:%s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, fuzzy, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "未知的选项 '%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, fuzzy, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "(不给定描述)\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr ""
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, fuzzy, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "  s = 跳过这把密钥\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  #, fuzzy
  msgid "could not parse keyserver\n"
  msgstr "无法解析公钥服务器 URL\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, fuzzy, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "生成密码的时候发生错误:%s\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, fuzzy, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "无法存取‘%s’:%s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr ""
  
@@@ -8685,7 -6960,6 +8772,7 @@@ msgstr "生成一份吊销证书
  msgid "basic certificate checks failed - not imported\n"
  msgstr ""
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, fuzzy, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "获取新 PIN 时出错:%s\n"
@@@ -8700,32 -6972,26 +8787,32 @@@ msgstr "生成密码的时候发生错�
  msgid "error reading input: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  #, fuzzy
  msgid "failed to get the fingerprint\n"
  msgstr "无法存储指纹:%s\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, fuzzy, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, fuzzy, c-format
  msgid "error storing certificate: %s\n"
  msgstr "取得当前密钥信息时出错:%s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr ""
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, fuzzy, c-format
  msgid "error storing flags: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
@@@ -9618,113 -7707,89 +9705,117 @@@ msgstr "
  msgid "looking up '%s'\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  #, fuzzy
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "从‘%s’读取选项\n"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr ""
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr ""
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr ""
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  #, fuzzy
  #| msgid "Quit without saving? (y/N) "
  msgid "run without asking a user"
  msgstr "要不保存而离开吗?(y/N)"
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr ""
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr ""
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr ""
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr ""
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr ""
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr ""
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr ""
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  #, fuzzy
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "从‘%s’读取选项\n"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr ""
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr ""
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  #, fuzzy
  msgid "|URL|use OCSP responder at URL"
  msgstr "无法解析公钥服务器 URL\n"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr ""
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr ""
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr ""
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  #, fuzzy
  #| msgid ""
  #| "@\n"
@@@ -9737,95 -7802,76 +9828,95 @@@ msgstr "
  "@\n"
  "(请参考在线说明以获得所有命令和选项的完整清单)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  #, fuzzy
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, fuzzy, c-format
  msgid "usage: %s [options] "
  msgstr "用法:gpg [选项] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  #, fuzzy
  #| msgid "%s not allowed with %s!\n"
  msgid "colons are not allowed in the socket name\n"
  msgstr "%s 不可与 %s 并用\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, fuzzy, c-format
  #| msgid "renaming `%s' to `%s' failed: %s\n"
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "将‘%s’重命名为‘%s’时失败:%s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, fuzzy, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "将‘%s’重命名为‘%s’时失败:%s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, fuzzy, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "列太长"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, fuzzy, c-format
  #| msgid "invalid fingerprint"
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "指纹无效"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, fuzzy, c-format
  #| msgid "read error in `%s': %s\n"
  msgid "%s:%u: read error: %s\n"
  msgstr "读取‘%s’错误:%s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  #, fuzzy
  #| msgid "not forced"
  msgid "shutdown forced\n"
  msgstr "可选"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr ""
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr ""
@@@ -10009,13 -8019,6 +10100,7 @@@ msgstr "“%s”不是一个 JPEG 文�
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr ""
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
- msgid "error allocating memory: %s\n"
- msgstr "建立钥匙环‘%s’时发生错误:%s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, fuzzy, c-format
  msgid "error printing log line: %s\n"
  msgstr "写入钥匙环‘%s’时出错: %s\n"
@@@ -10277,78 -8228,62 +10362,78 @@@ msgstr "
  msgid "OCSP responder returned an too old status\n"
  msgstr ""
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, fuzzy, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "签名时失败: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr ""
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr ""
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, fuzzy, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "签名时失败: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, fuzzy, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "删除密钥区块时失败:%s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, fuzzy, c-format
  msgid "error sending data: %s\n"
  msgstr "读取‘%s’时出错:%s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, fuzzy, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "删除密钥区块时失败:%s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, fuzzy, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "删除密钥区块时失败:%s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr ""
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, fuzzy, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "不能创建备份文件‘%s’:%s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, fuzzy, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "%s:建立散列表失败:%s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, fuzzy, c-format
  #| msgid "failed to initialize the TrustDB: %s\n"
  msgid "failed to initialize the server: %s\n"
  msgstr "初始化信任度数据库失败:%s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, fuzzy, c-format
  #| msgid "failed to store the creation date: %s\n"
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "无法存储创建日期:%s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr ""
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, fuzzy, c-format
  #| msgid "signing failed: %s\n"
  msgid "Assuan processing failed: %s\n"
@@@ -10396,7 -8322,6 +10481,7 @@@ msgstr "DSA 要求使用 160 位的散�
  msgid "certificate should not have been used for CRL signing\n"
  msgstr ""
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  #, fuzzy
  msgid "quiet"
  msgstr "quit"
@@@ -10567,11 -8451,9 +10652,11 @@@ msgstr "|某甲|为收件者“某甲�
  msgid "|SPEC|set up email aliases"
  msgstr ""
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  #, fuzzy
  msgid "|URL|use keyserver at URL"
  msgstr "无法解析公钥服务器 URL\n"
@@@ -10604,148 -8479,121 +10689,156 @@@ msgstr "
  msgid "Options controlling the interactivity and enforcement"
  msgstr ""
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  msgid "Options controlling the use of Tor"
  msgstr ""
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr ""
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr ""
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr ""
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr ""
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ msgid "OpenPGP"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ msgid "Smartcards"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ msgid "S/MIME"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
- msgstr ""
++#: tools/gpgconf-comp.c:1070
+ #, fuzzy
+ #| msgid "network error"
+ msgid "Network"
+ msgstr "网络错误"
  
- #: tools/gpgconf-comp.c:1068
++#: tools/gpgconf-comp.c:1071
  #, fuzzy
- msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "错误的密码"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  #, fuzzy
  msgid "Component not suitable for launching"
  msgstr "找不到公钥"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr ""
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr ""
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr ""
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr ""
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr ""
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr ""
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr ""
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr ""
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr ""
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  #, fuzzy
  msgid "list global configuration file"
  msgstr "未知的配置项‘%s’\n"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  #, fuzzy
  msgid "check global configuration file"
  msgstr "未知的配置项‘%s’\n"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "更新信任度数据库"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr ""
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr ""
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr ""
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "指定输出文件"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr ""
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  #, fuzzy
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
  msgstr ""
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr ""
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  #, fuzzy
  msgid "Component not found"
  msgstr "找不到公钥"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  #, fuzzy
  msgid "No argument allowed"
  msgstr "不允许使用管理员命令\n"
diff --cc po/zh_TW.po
index a065269,e4a9afb..9964289
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: GNU gnupg 2.1.0\n"
  "Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-08-18 17:17+0200\n"
++"POT-Creation-Date: 2016-11-18 16:54+0100\n"
  "PO-Revision-Date: 2014-11-22 20:56+0800\n"
  "Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
  "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@@ -21,7 -20,6 +21,7 @@@
  "Plural-Forms: nplurals=1; plural=0;\n"
  "X-Generator: Poedit 1.5.7\n"
  
- #: agent/call-pinentry.c:257
++#: agent/call-pinentry.c:259
  #, c-format
  msgid "failed to acquire the pinentry lock: %s\n"
  msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
@@@ -32,47 -30,38 +32,47 @@@
  #. a literal one.  The actual to be translated text starts after
  #. the second vertical bar.  Note that gpg-agent has been set to
  #. utf-8 so that the strings are in the expected encoding.
- #: agent/call-pinentry.c:447
++#: agent/call-pinentry.c:462
  msgid "|pinentry-label|_OK"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:448
++#: agent/call-pinentry.c:463
  msgid "|pinentry-label|_Cancel"
  msgstr "|pinentry-label|取消 (_C)"
  
- #: agent/call-pinentry.c:449
++#: agent/call-pinentry.c:464
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_Yes"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:450
++#: agent/call-pinentry.c:465
  #, fuzzy
  #| msgid "|pinentry-label|_OK"
  msgid "|pinentry-label|_No"
  msgstr "|pinentry-label|_OK"
  
- #: agent/call-pinentry.c:451
++#: agent/call-pinentry.c:466
  msgid "|pinentry-label|PIN:"
  msgstr "|pinentry-label|個人識別碼 (PIN):"
  
- #: agent/call-pinentry.c:452
++#: agent/call-pinentry.c:467
  #, fuzzy
  #| msgid "|pinentry-label|_Cancel"
  msgid "|pinentry-label|_Save in password manager"
  msgstr "|pinentry-label|取消 (_C)"
  
- #: agent/call-pinentry.c:453
++#: agent/call-pinentry.c:468
  #, fuzzy
  #| msgid "Do you really want to permanently delete the OpenPGP secret key:"
  msgid "Do you really want to make your passphrase visible on the screen?"
  msgstr "你是否真的想要永久刪除 OpenPGP 私鑰:"
  
- #: agent/call-pinentry.c:455
++#: agent/call-pinentry.c:470
  msgid "|pinentry-tt|Make passphrase visible"
  msgstr ""
  
- #: agent/call-pinentry.c:456
++#: agent/call-pinentry.c:471
  #, fuzzy
  #| msgid "Enter new passphrase"
  msgid "|pinentry-tt|Hide passphrase"
@@@ -80,7 -69,6 +80,7 @@@ msgstr "請輸入新密語
  
  #. TRANSLATORS: This string is displayed by Pinentry as the label
  #. for the quality bar.
- #: agent/call-pinentry.c:736
++#: agent/call-pinentry.c:772
  msgid "Quality:"
  msgstr "優劣程度: %s"
  
@@@ -90,71 -78,55 +90,71 @@@
  #. 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:758
++#: agent/call-pinentry.c:793
  msgid "pinentry.qualitybar.tooltip"
  msgstr ""
  "上列輸入文字的優劣程度.\n"
  "關於此規範的細節, 請洽你的系統管理者."
  
- #: agent/call-pinentry.c:868
++#: agent/call-pinentry.c:902
  msgid ""
  "Please enter your PIN, so that the secret key can be unlocked for this "
  "session"
  msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開私鑰"
  
- #: agent/call-pinentry.c:871
++#: agent/call-pinentry.c:905
  msgid ""
  "Please enter your passphrase, so that the secret key can be unlocked for "
  "this session"
  msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
  msgid "PIN:"
  msgstr ""
  
- #: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
++#: agent/call-pinentry.c:942 agent/call-pinentry.c:1121
 +#: agent/protect-tool.c:714 tools/symcryptrun.c:440
  msgid "Passphrase:"
  msgstr "密語:"
  
- #: agent/call-pinentry.c:938 agent/command-ssh.c:3066 agent/genkey.c:416
++#: agent/call-pinentry.c:969 agent/command-ssh.c:3036 agent/genkey.c:416
 +#: tools/symcryptrun.c:439
  msgid "does not match - try again"
  msgstr "前後不一致 - 請再試一次"
  
  #. TRANSLATORS: The string is appended to an error message in
  #. the pinentry.  The %s is the actual error message, the
  #. two %d give the current and maximum number of tries.
- #: agent/call-pinentry.c:959
++#: agent/call-pinentry.c:989
  #, c-format
  msgid "SETERROR %s (try %d of %d)"
  msgstr "設定錯誤: %s (第 %d 次嘗試, 最多 %d 次)"
  
- #: agent/call-pinentry.c:971
++#: agent/call-pinentry.c:1000
  msgid "Repeat:"
  msgstr "重複:"
  
- #: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
++#: agent/call-pinentry.c:1029 agent/call-pinentry.c:1041
  msgid "PIN too long"
  msgstr "個人識別碼 (PIN) 太長"
  
- #: agent/call-pinentry.c:1002
++#: agent/call-pinentry.c:1030
  msgid "Passphrase too long"
  msgstr "密語太長"
  
- #: agent/call-pinentry.c:1010
++#: agent/call-pinentry.c:1038
  msgid "Invalid characters in PIN"
  msgstr "個人識別碼 (PIN) 含有無效的字符"
  
- #: agent/call-pinentry.c:1015
++#: agent/call-pinentry.c:1043
  msgid "PIN too short"
  msgstr "個人識別碼 (PIN) 太短"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad PIN"
  msgstr "不良的個人識別碼 (PIN)"
  
- #: agent/call-pinentry.c:1028
++#: agent/call-pinentry.c:1056
  msgid "Bad Passphrase"
  msgstr "不良的密語"
  
@@@ -163,24 -134,10 +163,24 @@@
  msgid "ssh keys greater than %d bits are not supported\n"
  msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
  
- #: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:828
- #: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1277 g10/keygen.c:4155
++#: agent/command-ssh.c:838 common/dotlock.c:839 g10/card-util.c:839
++#: g10/exec.c:484 g10/export.c:1247 g10/gpg.c:1285 g10/keygen.c:4232
 +#: g10/keyring.c:1326 g10/keyring.c:1661 g10/openfile.c:297 g10/openfile.c:424
 +#: g10/sign.c:841 g10/sign.c:1144 g10/tdbio.c:715
  #, c-format
  msgid "can't create '%s': %s\n"
  msgstr "無法建立 '%s': %s\n"
  
- #: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:782
++#: agent/command-ssh.c:850 common/helpfile.c:57 g10/card-util.c:793
 +#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1278
- #: g10/import.c:261 g10/import.c:404 g10/import.c:577 g10/keygen.c:3336
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:551 g10/gpg.c:1286
++#: g10/import.c:304 g10/import.c:447 g10/import.c:620 g10/keygen.c:3357
 +#: g10/keyring.c:1687 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
 +#: g10/plaintext.c:632 g10/sign.c:823 g10/sign.c:1023 g10/sign.c:1128
 +#: g10/sign.c:1273 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
- #: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2142
- #: sm/gpgsm.c:2172 sm/gpgsm.c:2210 sm/qualified.c:66 dirmngr/certcache.c:368
- #: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1495
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2149
++#: sm/gpgsm.c:2179 sm/gpgsm.c:2217 sm/qualified.c:66 dirmngr/certcache.c:368
++#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1561
  #, c-format
  msgid "can't open '%s': %s\n"
  msgstr "無法開啟 '%s': %s\n"
@@@ -205,17 -158,6 +205,7 @@@ msgstr "卡片上沒有 ssh 用的認�
  msgid "no suitable card key found: %s\n"
  msgstr "找不到合適的卡片金鑰: %s\n"
  
- #: agent/command-ssh.c:2494
- #, c-format
- msgid "shadowing the key failed: %s\n"
- msgstr "遮蔽金鑰時失敗: %s\n"
- 
- #: agent/command-ssh.c:2509
- #, c-format
- msgid "error writing key: %s\n"
- msgstr "寫入金鑰時出錯: %s\n"
- 
- #: agent/command-ssh.c:2739
++#: agent/command-ssh.c:2709
  #, c-format
  msgid ""
  "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@@ -223,24 -165,19 +213,24 @@@
  msgstr ""
  "有某個 ssh 程序提出使用金鑰 %%0A  %s%%0A  (%s)%%0A 之請求, 請問是否允許?"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Allow"
  msgstr "允許"
  
- #: agent/command-ssh.c:2746
++#: agent/command-ssh.c:2716
  msgid "Deny"
  msgstr "拒絕"
  
- #: agent/command-ssh.c:2755
++#: agent/command-ssh.c:2725
  #, c-format
  msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
  msgstr "請輸入此 ssh 金鑰的密語 %%0A  %F%%0A  (%c)"
  
- #: agent/command-ssh.c:2994 agent/genkey.c:351
++#: agent/command-ssh.c:2964 agent/genkey.c:351
  msgid "Please re-enter this passphrase"
  msgstr "請再次輸入密語"
  
- #: agent/command-ssh.c:3021
++#: agent/command-ssh.c:2991
  #, c-format
  msgid ""
  "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@@ -248,16 -185,13 +238,16 @@@
  msgstr ""
  "請輸入密語以保護收到的私鑰 %%0A   %s%%0A   %s%%0A 於 gpg-agent 的金鑰存放處"
  
- #: agent/command-ssh.c:3541
++#: agent/command-ssh.c:3511
  #, c-format
  msgid "failed to create stream from socket: %s\n"
  msgstr "從 socket 建立串流失敗: %s\n"
  
- #: agent/divert-scd.c:92 g10/call-agent.c:1268
++#: agent/divert-scd.c:92 g10/call-agent.c:1100
  msgid "Please insert the card with serial number"
  msgstr "請插入下列序號的卡片:"
  
- #: agent/divert-scd.c:93 g10/call-agent.c:1269
++#: agent/divert-scd.c:93 g10/call-agent.c:1101
  msgid "Please remove the current card and insert the one with serial number"
  msgstr "請移除現用中的卡片並插入下列序號的卡片:"
  
@@@ -378,8 -288,6 +368,8 @@@ msgstr "請輸入密語至%0A以保護�
  msgid "Please enter the new passphrase"
  msgstr "請輸入新的密語"
  
- #: agent/gpg-agent.c:148 agent/preset-passphrase.c:73 scd/scdaemon.c:110
++#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
 +#: tools/gpg-check-pattern.c:69
  msgid ""
  "@Options:\n"
  " "
@@@ -387,132 -295,99 +377,138 @@@ msgstr "
  "@選項:\n"
  " "
  
- #: agent/gpg-agent.c:150 scd/scdaemon.c:115 dirmngr/dirmngr.c:147
++#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:153
  msgid "run in daemon mode (background)"
  msgstr "以服務模式執行 (背景)"
  
- #: agent/gpg-agent.c:151 scd/scdaemon.c:112 dirmngr/dirmngr.c:146
++#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:152
  msgid "run in server mode (foreground)"
  msgstr "以伺服器模式執行 (前景)"
  
- #: agent/gpg-agent.c:152 g10/gpg.c:563 g10/gpgv.c:72 kbx/kbxutil.c:88
- #: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
- #: dirmngr/dirmngr.c:158 dirmngr/dirmngr_ldap.c:135
- #: tools/gpg-connect-agent.c:77 tools/gpgconf.c:91 tools/symcryptrun.c:166
++#: agent/gpg-agent.c:154 dirmngr/dirmngr.c:155
+ #, fuzzy
+ #| msgid "run in server mode"
+ msgid "run in supervised mode"
+ msgstr "以伺服器模式執行"
+ 
++#: agent/gpg-agent.c:156 g10/gpg.c:567 g10/gpgv.c:74 kbx/kbxutil.c:88
++#: scd/scdaemon.c:116 sm/gpgsm.c:301 dirmngr/dirmngr-client.c:69
++#: dirmngr/dirmngr.c:167 dirmngr/dirmngr_ldap.c:135
++#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:95 tools/symcryptrun.c:166
  msgid "verbose"
  msgstr "囉唆模式"
  
- #: agent/gpg-agent.c:153 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
- #: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:159
++#: agent/gpg-agent.c:157 g10/gpgv.c:75 kbx/kbxutil.c:89 scd/scdaemon.c:117
++#: sm/gpgsm.c:302 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:168
 +#: dirmngr/dirmngr_ldap.c:136
  msgid "be somewhat more quiet"
  msgstr "盡量安靜些"
  
- #: agent/gpg-agent.c:154 scd/scdaemon.c:118 dirmngr/dirmngr.c:160
++#: agent/gpg-agent.c:158 scd/scdaemon.c:118 dirmngr/dirmngr.c:169
  msgid "sh-style command output"
  msgstr "sh 樣式的指令輸出"
  
- #: agent/gpg-agent.c:155 scd/scdaemon.c:119 dirmngr/dirmngr.c:161
++#: agent/gpg-agent.c:159 scd/scdaemon.c:119 dirmngr/dirmngr.c:170
  msgid "csh-style command output"
  msgstr "csh 樣式的指令輸出"
  
- #: agent/gpg-agent.c:156 scd/scdaemon.c:120 sm/gpgsm.c:330
- #: dirmngr/dirmngr.c:162 tools/symcryptrun.c:169
++#: agent/gpg-agent.c:160 scd/scdaemon.c:120 sm/gpgsm.c:332
++#: dirmngr/dirmngr.c:171 tools/symcryptrun.c:169
  msgid "|FILE|read options from FILE"
  msgstr "|檔案|從指定檔案中讀取選項"
  
- #: agent/gpg-agent.c:165 scd/scdaemon.c:131 dirmngr/dirmngr.c:165
++#: agent/gpg-agent.c:169 scd/scdaemon.c:131 dirmngr/dirmngr.c:174
  msgid "do not detach from the console"
  msgstr "不要從 console 分離"
  
- #: agent/gpg-agent.c:166
++#: agent/gpg-agent.c:170
  msgid "do not grab keyboard and mouse"
  msgstr "不要奪取鍵盤及滑鼠"
  
- #: agent/gpg-agent.c:167 tools/symcryptrun.c:168
++#: agent/gpg-agent.c:171 tools/symcryptrun.c:168
  msgid "use a log file for the server"
  msgstr "為伺服器使用日誌檔"
  
- #: agent/gpg-agent.c:169
++#: agent/gpg-agent.c:173
  msgid "|PGM|use PGM as the PIN-Entry program"
  msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
  
- #: agent/gpg-agent.c:174
++#: agent/gpg-agent.c:178
  msgid "|PGM|use PGM as the SCdaemon program"
  msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
  
- #: agent/gpg-agent.c:176
++#: agent/gpg-agent.c:180
  msgid "do not use the SCdaemon"
  msgstr "不要使用 SCdaemon"
  
- #: agent/gpg-agent.c:180
++#: agent/gpg-agent.c:184
  #, fuzzy
  #| msgid "|NAME|connect to host NAME"
  msgid "|NAME|accept some commands via NAME"
  msgstr "|名稱|連線至位於指定名稱的主機"
  
- #: agent/gpg-agent.c:196
++#: agent/gpg-agent.c:200
  msgid "ignore requests to change the TTY"
  msgstr "忽略變更 TTY 的要求"
  
- #: agent/gpg-agent.c:198
++#: agent/gpg-agent.c:202
  msgid "ignore requests to change the X display"
  msgstr "忽略變更 X display 的要求"
  
- #: agent/gpg-agent.c:201
++#: agent/gpg-agent.c:205
  msgid "|N|expire cached PINs after N seconds"
  msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
  
- #: agent/gpg-agent.c:215
++#: agent/gpg-agent.c:219
  msgid "do not use the PIN cache when signing"
  msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
  
- #: agent/gpg-agent.c:217
++#: agent/gpg-agent.c:221
  #, fuzzy
  #| msgid "do not allow the reuse of old passphrases"
  msgid "disallow the use of an external password cache"
  msgstr "不允許重複使用舊密語"
  
- #: agent/gpg-agent.c:219
++#: agent/gpg-agent.c:223
  msgid "disallow clients to mark keys as \"trusted\""
  msgstr "不允許用戶端將金鑰標記為 \"已信任\""
  
- #: agent/gpg-agent.c:222
++#: agent/gpg-agent.c:226
  msgid "allow presetting passphrase"
  msgstr "允許預先設定密語"
  
- #: agent/gpg-agent.c:224
++#: agent/gpg-agent.c:228
  msgid "disallow caller to override the pinentry"
  msgstr ""
  
- #: agent/gpg-agent.c:227
++#: agent/gpg-agent.c:231
  msgid "allow passphrase to be prompted through Emacs"
  msgstr ""
  
- #: agent/gpg-agent.c:229
++#: agent/gpg-agent.c:233
  msgid "enable ssh support"
  msgstr "啟用 ssh 支援"
  
- #: agent/gpg-agent.c:232
++#: agent/gpg-agent.c:236
  msgid "enable putty support"
  msgstr "啟用 putty 支援"
  
  #. 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:472 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:996 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
- #: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:337
++#: agent/gpg-agent.c:482 agent/preset-passphrase.c:95 agent/protect-tool.c:151
++#: g10/gpg.c:1004 g10/gpgv.c:121 kbx/kbxutil.c:113 scd/scdaemon.c:274
++#: sm/gpgsm.c:564 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
 +#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
- #: tools/gpgconf.c:115 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
++#: tools/gpgconf.c:119 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
  msgid "Please report bugs to <@EMAIL@>.\n"
  msgstr "翻譯瑕疵請回報給 <Jedi at Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
  
- #: agent/gpg-agent.c:481
++#: agent/gpg-agent.c:491
  msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
  msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
  
- #: agent/gpg-agent.c:483
++#: agent/gpg-agent.c:493
  msgid ""
  "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
  "Secret key management for @GNUPG@\n"
@@@ -520,136 -395,101 +516,136 @@@ msgstr "
  "語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
  "@GNUPG@ 私鑰管理\n"
  
- #: agent/gpg-agent.c:529 g10/gpg.c:1187 scd/scdaemon.c:347 sm/gpgsm.c:709
- #: dirmngr/dirmngr.c:421
++#: agent/gpg-agent.c:539 g10/gpg.c:1195 scd/scdaemon.c:347 sm/gpgsm.c:712
++#: dirmngr/dirmngr.c:434
  #, c-format
  msgid "invalid debug-level '%s' given\n"
  msgstr "給定的除錯等級 '%s' 無效\n"
  
- #: agent/gpg-agent.c:879 g10/gpg.c:2358 scd/scdaemon.c:502 sm/gpgsm.c:1042
- #: dirmngr/dirmngr.c:775
++#: agent/gpg-agent.c:1084 g10/gpg.c:2474 scd/scdaemon.c:500 sm/gpgsm.c:1045
++#: dirmngr/dirmngr.c:793
  #, c-format
  msgid "Note: no default option file '%s'\n"
  msgstr "請注意: 沒有預設選項檔 '%s'\n"
  
- #: agent/gpg-agent.c:890 agent/gpg-agent.c:1643 g10/gpg.c:2362
- #: scd/scdaemon.c:507 sm/gpgsm.c:1046 dirmngr/dirmngr.c:780
- #: dirmngr/dirmngr.c:1601 tools/symcryptrun.c:932
++#: agent/gpg-agent.c:1095 agent/gpg-agent.c:1934 g10/gpg.c:2478
++#: scd/scdaemon.c:505 sm/gpgsm.c:1049 dirmngr/dirmngr.c:798
++#: dirmngr/dirmngr.c:1667 tools/symcryptrun.c:932
  #, c-format
  msgid "option file '%s': %s\n"
  msgstr "選項檔 '%s': %s\n"
  
- #: agent/gpg-agent.c:898 g10/gpg.c:2369 scd/scdaemon.c:515 sm/gpgsm.c:1053
- #: dirmngr/dirmngr.c:788
++#: agent/gpg-agent.c:1103 g10/gpg.c:2485 scd/scdaemon.c:513 sm/gpgsm.c:1056
++#: dirmngr/dirmngr.c:806
  #, c-format
  msgid "reading options from '%s'\n"
  msgstr "從 '%s' 讀取選項中\n"
  
- #: agent/gpg-agent.c:1019 g10/gpg.c:3506 scd/scdaemon.c:635 sm/gpgsm.c:1530
- #: dirmngr/dirmngr.c:898 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:272
++#: agent/gpg-agent.c:1225 g10/gpg.c:3604 scd/scdaemon.c:633 sm/gpgsm.c:1537
++#: dirmngr/dirmngr.c:917 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:520
  #, c-format
  msgid "Note: '%s' is not considered an option\n"
  msgstr "請注意: '%s' 並不當成選項\n"
  
- #: agent/gpg-agent.c:1788 scd/scdaemon.c:1061 dirmngr/dirmngr.c:1008
++#: agent/gpg-agent.c:2079 scd/scdaemon.c:1075 dirmngr/dirmngr.c:1069
  #, c-format
  msgid "can't create socket: %s\n"
  msgstr "無法建立 socket: %s\n"
  
- #: agent/gpg-agent.c:1805 scd/scdaemon.c:1074 dirmngr/dirmngr.c:1021
++#: agent/gpg-agent.c:2096 scd/scdaemon.c:1088 dirmngr/dirmngr.c:1082
  #, c-format
  msgid "socket name '%s' is too long\n"
  msgstr "socket 名稱 '%s' 太長\n"
  
- #: agent/gpg-agent.c:1843
++#: agent/gpg-agent.c:2134
  msgid "a gpg-agent is already running - not starting a new one\n"
  msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
  
- #: agent/gpg-agent.c:1853 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1053
++#: agent/gpg-agent.c:2144 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1114
  msgid "error getting nonce for the socket\n"
  msgstr "為 socket 取得 nonce 時出錯\n"
  
- #: agent/gpg-agent.c:1858 scd/scdaemon.c:1101 dirmngr/dirmngr.c:1056
++#: agent/gpg-agent.c:2149 scd/scdaemon.c:1115 dirmngr/dirmngr.c:1117
  #, c-format
  msgid "error binding socket to '%s': %s\n"
  msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
  
- #: agent/gpg-agent.c:1868 agent/gpg-agent.c:1905 scd/scdaemon.c:1109
- #: dirmngr/dirmngr.c:1065
++#: agent/gpg-agent.c:2159 agent/gpg-agent.c:2196 scd/scdaemon.c:1123
++#: dirmngr/dirmngr.c:1126
  #, fuzzy, c-format
  #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgid "can't set permissions of '%s': %s\n"
  msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
  
- #: agent/gpg-agent.c:1873 scd/scdaemon.c:1114 dirmngr/dirmngr.c:1070
++#: agent/gpg-agent.c:2164 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1131
  #, c-format
  msgid "listen() failed: %s\n"
  msgstr "listen() 失敗: %s\n"
  
- #: agent/gpg-agent.c:1880 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1076
++#: agent/gpg-agent.c:2171 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1137
  #, c-format
  msgid "listening on socket '%s'\n"
  msgstr "正在候聽 socket '%s'\n"
  
- #: agent/gpg-agent.c:1899 agent/gpg-agent.c:1942 g10/exec.c:199
- #: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:97
++#: agent/gpg-agent.c:2190 agent/gpg-agent.c:2233 g10/exec.c:199
++#: g10/openfile.c:488 g10/openfile.c:517 sm/keydb.c:100
  #, c-format
  msgid "can't create directory '%s': %s\n"
  msgstr "無法建立目錄 '%s': %s\n"
  
- #: agent/gpg-agent.c:1902 agent/gpg-agent.c:1947 g10/openfile.c:491
- #: g10/openfile.c:520 sm/keydb.c:100
++#: agent/gpg-agent.c:2193 agent/gpg-agent.c:2238 g10/openfile.c:491
++#: g10/openfile.c:520 sm/keydb.c:103
  #, c-format
  msgid "directory '%s' created\n"
  msgstr "目錄 '%s' 已建立\n"
  
- #: agent/gpg-agent.c:1953
++#: agent/gpg-agent.c:2244
  #, c-format
  msgid "stat() failed for '%s': %s\n"
  msgstr "'%s' 的 stat() 失敗: %s\n"
  
- #: agent/gpg-agent.c:1957
++#: agent/gpg-agent.c:2248
  #, c-format
  msgid "can't use '%s' as home directory\n"
  msgstr "無法使用 '%s' 做為家目錄\n"
  
- #: agent/gpg-agent.c:2100 scd/scdaemon.c:1137 dirmngr/dirmngr.c:1793
++#: agent/gpg-agent.c:2391 scd/scdaemon.c:1151 dirmngr/dirmngr.c:1867
  #, c-format
  msgid "error reading nonce on fd %d: %s\n"
  msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
  
- #: agent/gpg-agent.c:2307
++#: agent/gpg-agent.c:2598
  #, c-format
  msgid "handler 0x%lx for fd %d started\n"
  msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
  
- #: agent/gpg-agent.c:2312
++#: agent/gpg-agent.c:2603
  #, c-format
  msgid "handler 0x%lx for fd %d terminated\n"
  msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
  
- #: agent/gpg-agent.c:2387
++#: agent/gpg-agent.c:2678
  #, c-format
  msgid "ssh handler 0x%lx for fd %d started\n"
  msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
  
- #: agent/gpg-agent.c:2392
++#: agent/gpg-agent.c:2683
  #, c-format
  msgid "ssh handler 0x%lx for fd %d terminated\n"
  msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
  
- #: agent/gpg-agent.c:2561 scd/scdaemon.c:1260 dirmngr/dirmngr.c:1924
++#: agent/gpg-agent.c:2869 scd/scdaemon.c:1274 dirmngr/dirmngr.c:2061
  #, c-format
  msgid "npth_pselect failed: %s - waiting 1s\n"
  msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
  
- #: agent/gpg-agent.c:2624 scd/scdaemon.c:1310
++#: agent/gpg-agent.c:2942 scd/scdaemon.c:1323
  #, c-format
  msgid "%s %s stopped\n"
  msgstr "%s %s 已停止\n"
  
- #: agent/gpg-agent.c:2764 common/simple-pwquery.c:255 g10/call-agent.c:318
++#: agent/gpg-agent.c:3080 common/simple-pwquery.c:247 g10/call-agent.c:248
 +#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
  msgid "no gpg-agent running in this session\n"
  msgstr "在此階段中沒有執行中的 gpg-agent\n"
  
@@@ -665,8 -503,6 +661,8 @@@ msgstr "
  "語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
  "密碼快取維護\n"
  
- #: agent/protect-tool.c:106 g10/gpg.c:418 kbx/kbxutil.c:71 sm/gpgsm.c:196
- #: dirmngr/dirmngr.c:144 tools/gpgconf.c:67
++#: agent/protect-tool.c:106 g10/gpg.c:422 kbx/kbxutil.c:71 sm/gpgsm.c:198
++#: dirmngr/dirmngr.c:150 tools/gpgconf.c:69
  msgid ""
  "@Commands:\n"
  " "
@@@ -674,9 -510,6 +670,9 @@@ msgstr "
  "@指令:\n"
  " "
  
- #: agent/protect-tool.c:115 g10/gpg.c:508 g10/gpgv.c:70 kbx/kbxutil.c:81
- #: sm/gpgsm.c:242 dirmngr/dirmngr.c:156 tools/gpg-connect-agent.c:75
- #: tools/gpgconf.c:88 tools/symcryptrun.c:159
++#: agent/protect-tool.c:115 g10/gpg.c:512 g10/gpgv.c:72 kbx/kbxutil.c:81
++#: sm/gpgsm.c:244 dirmngr/dirmngr.c:165 tools/gpg-connect-agent.c:75
++#: tools/gpgconf.c:92 tools/symcryptrun.c:159
  msgid ""
  "@\n"
  "Options:\n"
@@@ -729,7 -554,6 +725,8 @@@ msgstr "已取消\n
  msgid "error while asking for the passphrase: %s\n"
  msgstr "詢問密語時出錯: %s\n"
  
- #: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1403
++#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1469
++#: tools/gpgconf.c:323
  #, c-format
  msgid "error opening '%s': %s\n"
  msgstr "開啟 '%s' 時出錯: %s\n"
@@@ -787,8 -602,6 +784,8 @@@ msgstr "請問你是否徹底信任%%0
  msgid "Yes"
  msgstr "Yes"
  
- #: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/trustlist.c:673 agent/findkey.c:1462 agent/findkey.c:1476
 +#: common/audit.c:469
  msgid "No"
  msgstr "No"
  
@@@ -818,27 -628,22 +815,27 @@@ msgstr "正確
  msgid "Wrong"
  msgstr "錯了"
  
- #: agent/findkey.c:252
++#: agent/findkey.c:261
  #, c-format
  msgid "Note: This passphrase has never been changed.%0APlease change it now."
  msgstr "請注意: 密語從未變更過.%0A請現在就變更."
  
- #: agent/findkey.c:268
++#: agent/findkey.c:277
  #, c-format
  msgid ""
  "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
  "it now."
  msgstr "密語從下列時刻起就沒有變更過:%%0A%.4s-%.2s-%.2s.  請現在就變更."
  
- #: agent/findkey.c:282 agent/findkey.c:289
++#: agent/findkey.c:291 agent/findkey.c:298
  msgid "Change passphrase"
  msgstr "更改密語"
  
- #: agent/findkey.c:290
++#: agent/findkey.c:299
  msgid "I'll change it later"
  msgstr "我稍後再變更"
  
- #: agent/findkey.c:1429
++#: agent/findkey.c:1438
  #, fuzzy, c-format
  #| msgid "Do you really want to delete the selected keys? (y/N) "
  msgid ""
@@@ -846,11 -651,9 +843,11 @@@
  "%%0A?"
  msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
  
- #: agent/findkey.c:1453 agent/findkey.c:1467
++#: agent/findkey.c:1462 agent/findkey.c:1476
  msgid "Delete key"
  msgstr "刪除金鑰"
  
- #: agent/findkey.c:1464
++#: agent/findkey.c:1473
  msgid ""
  "Warning: This key is also listed for use with SSH!\n"
  "Deleting the key might remove your ability to access remote machines."
@@@ -867,12 -668,10 +864,12 @@@ msgstr "DSA 需要 8 位元倍數的雜
  msgid "%s key uses an unsafe (%u bit) hash\n"
  msgstr "金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
  
- #: agent/pksign.c:204
++#: agent/pksign.c:202
  #, c-format
  msgid "a %zu bit hash is not valid for a %u bit %s key\n"
  msgstr "%zu 位元的雜湊對 %u 位元的 %s 金鑰無效\n"
  
- #: agent/pksign.c:512
++#: agent/pksign.c:508
  #, c-format
  msgid "checking created signature failed: %s\n"
  msgstr "檢查已建立的簽章時出錯: %s\n"
@@@ -896,83 -691,72 +893,95 @@@ msgstr "保護演算法 %d (%s) 未支�
  msgid "protection hash algorithm %d (%s) is not supported\n"
  msgstr "保護雜湊演算法 %d (%s) 未支援\n"
  
- #: common/exechelp-posix.c:359 common/exechelp-w32.c:406
- #: common/exechelp-w32.c:430 common/exechelp-w32.c:460
++#: common/exechelp-posix.c:359 common/exechelp-w32.c:438
++#: common/exechelp-w32.c:462 common/exechelp-w32.c:492
 +#: dirmngr/ldap-wrapper.c:710
  #, c-format
  msgid "error creating a pipe: %s\n"
  msgstr "建立管道時出錯: %s\n"
  
- #: common/exechelp-posix.c:372 common/exechelp-w32.c:416
- #: common/exechelp-w32.c:440 common/exechelp-w32.c:470
++#: common/exechelp-posix.c:372 common/exechelp-w32.c:344
++#: common/exechelp-w32.c:448 common/exechelp-w32.c:472
++#: common/exechelp-w32.c:502
  #, c-format
  msgid "error creating a stream for a pipe: %s\n"
  msgstr "建立管道串流時出錯: %s\n"
  
 +#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
- #: common/exechelp-posix.c:710 dirmngr/dirmngr.c:1094
++#: common/exechelp-posix.c:848 dirmngr/dirmngr.c:1155
  #, c-format
  msgid "error forking process: %s\n"
  msgstr "衍生執行程序時出錯: %s\n"
  
- #: common/exechelp-posix.c:626 common/exechelp-w32.c:734
- #, fuzzy, c-format
- #| msgid "waiting for process %d to terminate failed: %s\n"
- msgid "waiting for processes to terminate failed: %s\n"
++#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+ #, c-format
+ msgid "waiting for process %d to terminate failed: %s\n"
  msgstr "等候 %d 處理程序終止時失敗: %s\n"
  
- #: common/exechelp-posix.c:650
++#: common/exechelp-posix.c:678 common/exechelp-posix.c:792
  #, c-format
  msgid "error running '%s': probably not installed\n"
  msgstr "執行 '%s' 時出錯: 可能尚未安裝\n"
  
- #: common/exechelp-posix.c:657 common/exechelp-w32.c:753
- #: common/exechelp-w32ce.c:781
++#: common/exechelp-posix.c:684 common/exechelp-posix.c:799
++#: common/exechelp-w32.c:785 common/exechelp-w32ce.c:781
  #, c-format
  msgid "error running '%s': exit status %d\n"
  msgstr "執行 '%s' 時出錯: 結束狀態 %d\n"
  
- #: common/exechelp-posix.c:665
++#: common/exechelp-posix.c:692 common/exechelp-posix.c:807
  #, c-format
  msgid "error running '%s': terminated\n"
  msgstr "執行 '%s' 時出錯: 已終止\n"
  
- #: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
++#: common/exechelp-posix.c:750 common/exechelp-w32.c:766
+ #, fuzzy, c-format
+ #| msgid "waiting for process %d to terminate failed: %s\n"
+ msgid "waiting for processes to terminate failed: %s\n"
+ msgstr "等候 %d 處理程序終止時失敗: %s\n"
+ 
++#: common/exechelp-w32.c:778 common/exechelp-w32ce.c:775
  #, c-format
  msgid "error getting exit code of process %d: %s\n"
  msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
  
- #: common/exechelp-w32ce.c:767
- #, c-format
- msgid "waiting for process %d to terminate failed: %s\n"
- msgstr "等候 %d 處理程序終止時失敗: %s\n"
- 
- #: common/simple-pwquery.c:268
++#: common/simple-pwquery.c:260
  #, c-format
  msgid "can't connect to '%s': %s\n"
  msgstr "無法連接至 '%s': %s\n"
  
- #: common/simple-pwquery.c:278
++#: common/simple-pwquery.c:270
  msgid "problem setting the gpg-agent options\n"
  msgstr "設定 gpg-agent 選項時發生問題\n"
  
- #: common/sysutils.c:124
++#: common/sysutils.c:144
  #, c-format
  msgid "can't disable core dumps: %s\n"
  msgstr "無法讓系統停止傾印核心檔: %s\n"
  
- #: common/sysutils.c:219
++#: common/sysutils.c:239
  #, c-format
  msgid "Warning: unsafe ownership on %s \"%s\"\n"
  msgstr "警告: %s 的所有權 \"%s\" 並不安全\n"
  
- #: common/sysutils.c:251
++#: common/sysutils.c:271
  #, c-format
  msgid "Warning: unsafe permissions on %s \"%s\"\n"
  msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
  
++#: common/sysutils.c:659
+ #, fuzzy, c-format
+ #| msgid "waiting for the agent to come up ... (%ds)\n"
+ msgid "waiting for file '%s' to become accessible ...\n"
+ msgstr "正在等候代理程式出現 ... (%d 秒)\n"
+ 
++#: common/sysutils.c:685
+ #, c-format
+ msgid "renaming '%s' to '%s' failed: %s\n"
+ msgstr "把 '%s' 重新新命成 '%s' 時失敗: %s\n"
+ 
  #. TRANSLATORS: See doc/TRANSLATE about this string.
 +#: common/yesno.c:45 common/yesno.c:82
  msgid "yes"
  msgstr "yes"
  
@@@ -1026,7 -799,6 +1035,7 @@@ msgstr "在安全記憶體配置 %lu �
  msgid "out of core while allocating %lu bytes"
  msgstr "配置 %lu 位元組時超出核心"
  
- #: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:800 tools/no-libgcrypt.c:30
  #, c-format
  msgid "error allocating enough memory: %s\n"
  msgstr "配置足夠的記憶體時出錯: %s\n"
@@@ -1046,37 -815,30 +1055,37 @@@ msgstr "警告: \"%s%s\" 是已廢棄�
  msgid "unknown debug flag '%s' ignored\n"
  msgstr ""
  
- #: common/asshelp.c:417
++#: common/asshelp.c:380
  #, c-format
  msgid "no running gpg-agent - starting '%s'\n"
  msgstr "沒有執行中的 gpg-agent - 正在啟動 '%s'\n"
  
- #: common/asshelp.c:477
++#: common/asshelp.c:440
  #, c-format
  msgid "waiting for the agent to come up ... (%ds)\n"
  msgstr "正在等候代理程式出現 ... (%d 秒)\n"
  
- #: common/asshelp.c:485
++#: common/asshelp.c:448
  msgid "connection to agent established\n"
  msgstr "至代理程式的連線已建立\n"
  
- #: common/asshelp.c:525
++#: common/asshelp.c:488
  #, fuzzy
  #| msgid "connection to agent established\n"
  msgid "connection to agent is in restricted mode\n"
  msgstr "至代理程式的連線已建立\n"
  
- #: common/asshelp.c:582
++#: common/asshelp.c:545
  #, c-format
  msgid "no running Dirmngr - starting '%s'\n"
  msgstr "沒有執行中的 Dirmngr - 正在啟動 '%s'\n"
  
- #: common/asshelp.c:630
++#: common/asshelp.c:593
  #, c-format
  msgid "waiting for the dirmngr to come up ... (%ds)\n"
  msgstr "正在等候 dirmngr 出現 ... (%d 秒)\n"
  
- #: common/asshelp.c:639
++#: common/asshelp.c:602
  msgid "connection to the dirmngr established\n"
  msgstr "連線至 dirmngr 已建立\n"
  
@@@ -1147,8 -893,6 +1156,8 @@@ msgstr "階段金鑰已建立
  msgid "algorithm: %s"
  msgstr "演算法: %s"
  
 +#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
- #: scd/app-openpgp.c:2885
++#: scd/app-openpgp.c:3098
  #, c-format
  msgid "unsupported algorithm: %s"
  msgstr "未支援的演算法: %s"
@@@ -1223,11 -951,9 +1232,11 @@@ msgstr "憑證鏈有效
  msgid "Root certificate trustworthy"
  msgstr "根憑證可信賴"
  
- #: common/audit.c:1111 sm/certchain.c:991
++#: common/audit.c:1111 sm/certchain.c:1009
  msgid "no CRL found for certificate"
  msgstr "找不到用於憑證的 CRL"
  
- #: common/audit.c:1114 sm/certchain.c:1001
++#: common/audit.c:1114 sm/certchain.c:1019
  msgid "the available CRL is too old"
  msgstr "可用的 CRL 太舊了"
  
@@@ -1264,7 -982,6 +1273,7 @@@ msgstr "'%s' 沒有可用的說明.
  msgid "ignoring garbage line"
  msgstr "忽略垃圾列"
  
- #: common/gettime.c:893
++#: common/gettime.c:887
  msgid "[none]"
  msgstr "[ 無 ]"
  
@@@ -1334,7 -1036,6 +1343,7 @@@ msgstr "\"%.50s\" 選項不明確\n
  msgid "command \"%.50s\" is ambiguous\n"
  msgstr "\"%.50s\" 指令不明確\n"
  
- #: common/argparse.c:401 dirmngr/dirmngr.c:1112
++#: common/argparse.c:401 dirmngr/dirmngr.c:1173
  msgid "out of core\n"
  msgstr "超出核心\n"
  
@@@ -1392,8 -1082,6 +1401,8 @@@ msgstr "未鎖定 '%s': %s\n
  msgid "waiting for lock %s...\n"
  msgstr "正在等候 `%s' 鎖定...\n"
  
- #: common/init.c:193 sm/gpgsm.c:942 dirmngr/dirmngr.c:679
- #: dirmngr/dirmngr.c:688
++#: common/init.c:185 sm/gpgsm.c:945 dirmngr/dirmngr.c:706
++#: dirmngr/dirmngr.c:715
  #, c-format
  msgid "%s is too old (need %s, have %s)\n"
  msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
@@@ -1475,37 -1145,30 +1484,37 @@@ msgid "
  "quoted printable character in armor - probably a buggy MTA has been used\n"
  msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
  
- #: g10/build-packet.c:1115
++#: g10/build-packet.c:1110
  #, fuzzy, c-format
  #| msgid "not human readable"
  msgid "[ not human readable (%zu bytes: %s%s) ]"
  msgstr "不是人類能讀得懂的"
  
- #: g10/build-packet.c:1167
++#: g10/build-packet.c:1162
  msgid ""
  "a notation name must have only printable characters or spaces, and end with "
  "an '='\n"
  msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
  
- #: g10/build-packet.c:1179 g10/build-packet.c:1275
++#: g10/build-packet.c:1174 g10/build-packet.c:1270
  msgid "a user notation name must contain the '@' character\n"
  msgstr "使用者標記名稱一定要含有 '@' 字符\n"
  
- #: g10/build-packet.c:1185 g10/build-packet.c:1281
++#: g10/build-packet.c:1180 g10/build-packet.c:1276
  msgid "a notation name must not contain more than one '@' character\n"
  msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
  
- #: g10/build-packet.c:1203
++#: g10/build-packet.c:1198
  msgid "a notation value must not use any control characters\n"
  msgstr "標記值一定不能使用任何的控制字符\n"
  
- #: g10/build-packet.c:1259
++#: g10/build-packet.c:1254
  #, fuzzy
  #| msgid "a notation name must not contain more than one '@' character\n"
  msgid "a notation name may not contain an '=' character\n"
  msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
  
- #: g10/build-packet.c:1265
++#: g10/build-packet.c:1260
  #, fuzzy
  #| msgid ""
  #| "a notation name must have only printable characters or spaces, and end "
@@@ -1513,49 -1176,38 +1522,48 @@@
  msgid "a notation name must have only printable characters or spaces\n"
  msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
  
- #: g10/build-packet.c:1324 g10/build-packet.c:1335
++#: g10/build-packet.c:1319 g10/build-packet.c:1330
  msgid "WARNING: invalid notation data found\n"
  msgstr "警告: 找到無效的標記資料\n"
  
- #: g10/call-agent.c:151 sm/call-agent.c:199
++#: g10/call-agent.c:144 sm/call-agent.c:199
  #, c-format
  msgid "failed to proxy %s inquiry to client\n"
  msgstr "以 %s 代理伺服器查詢用戶端時失敗\n"
  
- #: g10/call-agent.c:176
++#: g10/call-agent.c:169
  msgid "Enter passphrase: "
  msgstr "請輸入密語: "
  
- #: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
++#: g10/call-agent.c:196 sm/call-agent.c:98 sm/call-dirmngr.c:165
  #, fuzzy, c-format
  #| msgid "error creating keyring '%s': %s\n"
  msgid "error getting version from '%s': %s\n"
  msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
  
- #: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
++#: g10/call-agent.c:202 sm/call-agent.c:104 sm/call-dirmngr.c:171
  #, c-format
  msgid "server '%s' is older than us (%s < %s)"
  msgstr ""
  
- #: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
++#: g10/call-agent.c:208 sm/call-agent.c:110 sm/call-dirmngr.c:177
  #, fuzzy, c-format
  #| msgid "WARNING: %s overrides %s\n"
  msgid "WARNING: %s\n"
  msgstr "警告: %s 會推翻 %s\n"
  
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
- #: g10/keygen.c:4883
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1705
  #, c-format
  msgid "OpenPGP card not available: %s\n"
  msgstr "沒有可用的 OpenPGP 卡片: %s\n"
  
- #: g10/card-util.c:91 g10/card-util.c:1694
++#: g10/card-util.c:91 g10/card-util.c:1711
  #, c-format
  msgid "OpenPGP card no. %s detected\n"
  msgstr "偵測到 OpenPGP 卡片編號 %s\n"
  
- #: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
- #: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1908 g10/delkey.c:128 g10/keyedit.c:2029
++#: g10/keygen.c:3758 g10/revoke.c:215 g10/revoke.c:617
  msgid "can't do this in batch mode\n"
  msgstr "無法在批次模式中這樣做\n"
  
@@@ -1563,14 -1214,9 +1571,14 @@@
  msgid "This command is only available for version 2 cards\n"
  msgstr "祇有第二版卡片纔能用這個指令\n"
  
- #: g10/card-util.c:109 scd/app-openpgp.c:2259
++#: g10/card-util.c:109 scd/app-openpgp.c:2454
  msgid "Reset Code not or not anymore available\n"
  msgstr "(再也) 沒有重設碼\n"
  
- #: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
- #: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
- #: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
++#: g10/card-util.c:142 g10/card-util.c:1471 g10/card-util.c:1587
++#: g10/keyedit.c:1002 g10/keyedit.c:1023 g10/keyedit.c:1037 g10/keygen.c:1756
++#: g10/keygen.c:1933 g10/keygen.c:2291 sm/certreqgen-ui.c:169
 +#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
  msgid "Your selection? "
  msgstr "你要選哪一個? "
  
@@@ -1598,119 -1238,89 +1606,119 @@@ msgstr "不強迫使用
  msgid "forced"
  msgstr "強迫使用"
  
- #: g10/card-util.c:636
++#: g10/card-util.c:647
  msgid "Error: Only plain ASCII is currently allowed.\n"
  msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
  
- #: g10/card-util.c:638
++#: g10/card-util.c:649
  msgid "Error: The \"<\" character may not be used.\n"
  msgstr "錯誤: 不能使用 \"<\" 字符.\n"
  
- #: g10/card-util.c:640
++#: g10/card-util.c:651
  msgid "Error: Double spaces are not allowed.\n"
  msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
  
- #: g10/card-util.c:657
++#: g10/card-util.c:668
  msgid "Cardholder's surname: "
  msgstr "卡片持有者的姓氏: "
  
- #: g10/card-util.c:659
++#: g10/card-util.c:670
  msgid "Cardholder's given name: "
  msgstr "卡片持有者的名字: "
  
- #: g10/card-util.c:677
++#: g10/card-util.c:688
  #, c-format
  msgid "Error: Combined name too long (limit is %d characters).\n"
  msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
  
- #: g10/card-util.c:698
++#: g10/card-util.c:709
  msgid "URL to retrieve public key: "
  msgstr "取回公鑰的 URL: "
  
- #: g10/card-util.c:706
++#: g10/card-util.c:717
  #, c-format
  msgid "Error: URL too long (limit is %d characters).\n"
  msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
  
- #: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:290
- #: g10/import.c:548 g10/import.c:596 dirmngr/crlcache.c:656
++#: g10/card-util.c:812 g10/decrypt-data.c:241 g10/import.c:333
++#: g10/import.c:591 g10/import.c:639 dirmngr/crlcache.c:656
 +#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
- #: dirmngr/dirmngr.c:1441
++#: dirmngr/dirmngr.c:1507 tools/gpgconf.c:336 tools/gpgconf.c:382
  #, c-format
  msgid "error reading '%s': %s\n"
  msgstr "讀取 '%s' 時出錯: %s\n"
  
- #: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
++#: g10/card-util.c:845 g10/decrypt-data.c:244 g10/export.c:2319
 +#: dirmngr/crlcache.c:926
  #, c-format
  msgid "error writing '%s': %s\n"
  msgstr "寫入 '%s' 時出錯: %s\n"
  
- #: g10/card-util.c:861
++#: g10/card-util.c:872
  msgid "Login data (account name): "
  msgstr "登入資料 (帳號名稱): "
  
- #: g10/card-util.c:871
++#: g10/card-util.c:882
  #, c-format
  msgid "Error: Login data too long (limit is %d characters).\n"
  msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
  
- #: g10/card-util.c:907
++#: g10/card-util.c:918
  msgid "Private DO data: "
  msgstr "私人的 DO 資料: "
  
- #: g10/card-util.c:917
++#: g10/card-util.c:928
  #, c-format
  msgid "Error: Private DO too long (limit is %d characters).\n"
  msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
  
- #: g10/card-util.c:1000
++#: g10/card-util.c:1011
  msgid "Language preferences: "
  msgstr "介面語言偏好設定: "
  
- #: g10/card-util.c:1008
++#: g10/card-util.c:1019
  msgid "Error: invalid length of preference string.\n"
  msgstr "錯誤: 無效的偏好設定字串長度\n"
  
- #: g10/card-util.c:1017
++#: g10/card-util.c:1028
  msgid "Error: invalid characters in preference string.\n"
  msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
  
- #: g10/card-util.c:1039
++#: g10/card-util.c:1050
  msgid "Sex ((M)ale, (F)emale or space): "
  msgstr "性別 ((M)男性, (F)女性或留空): "
  
- #: g10/card-util.c:1053
++#: g10/card-util.c:1064
  msgid "Error: invalid response.\n"
  msgstr "錯誤: 無效的回應.\n"
  
- #: g10/card-util.c:1075
++#: g10/card-util.c:1086
  msgid "CA fingerprint: "
  msgstr "憑證中心 (CA) 指紋: "
  
- #: g10/card-util.c:1098
++#: g10/card-util.c:1109
  msgid "Error: invalid formatted fingerprint.\n"
  msgstr "錯誤: 無效的格式化指紋.\n"
  
- #: g10/card-util.c:1148
++#: g10/card-util.c:1159
  #, c-format
  msgid "key operation not possible: %s\n"
  msgstr "不可能進行金鑰操作: %s\n"
  
- #: g10/card-util.c:1149
++#: g10/card-util.c:1160
  msgid "not an OpenPGP card"
  msgstr "這不是 OpenPGP 卡片"
  
- #: g10/card-util.c:1162
++#: g10/card-util.c:1173 g10/keygen.c:3778 g10/keygen.c:4805
  #, c-format
  msgid "error getting current key info: %s\n"
  msgstr "取得現用金鑰資訊時出錯: %s\n"
  
- #: g10/card-util.c:1249
++#: g10/card-util.c:1260
  msgid "Replace existing key? (y/N) "
  msgstr "是否要取代既有的金鑰? (y/N) "
  
- #: g10/card-util.c:1266
++#: g10/card-util.c:1277
  msgid ""
  "Note: There is no guarantee that the card supports the requested size.\n"
  "      If the key generation does not succeed, please check the\n"
@@@ -1720,55 -1330,43 +1728,55 @@@ msgstr "
  "      如果金鑰產生失敗了, 煩請查閱你卡片上的文件,\n"
  "      看看這張卡片支援哪些尺寸.\n"
  
- #: g10/card-util.c:1291
++#: g10/card-util.c:1302
  #, c-format
  msgid "What keysize do you want for the Signature key? (%u) "
  msgstr "你的簽署金鑰想要用多大的金鑰尺寸? (%u) "
  
- #: g10/card-util.c:1293
++#: g10/card-util.c:1304
  #, c-format
  msgid "What keysize do you want for the Encryption key? (%u) "
  msgstr "你的加密金鑰想要用多大的金鑰尺寸? (%u) "
  
- #: g10/card-util.c:1294
++#: g10/card-util.c:1305
  #, c-format
  msgid "What keysize do you want for the Authentication key? (%u) "
  msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
  
- #: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1316 g10/keygen.c:2100 g10/keygen.c:2132
 +#: sm/certreqgen-ui.c:198
  #, c-format
  msgid "rounded up to %u bits\n"
  msgstr "加大到 %u 位元\n"
  
- #: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1324 g10/keygen.c:2185 sm/certreqgen-ui.c:188
  #, c-format
  msgid "%s keysizes must be in the range %u-%u\n"
  msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
  
- #: g10/card-util.c:1318
++#: g10/card-util.c:1329
  #, c-format
  msgid "The card will now be re-configured to generate a key of %u bits\n"
  msgstr "這張卡片將重新加以組態, 以便產生 %u 位元的金鑰\n"
  
- #: g10/card-util.c:1338
++#: g10/card-util.c:1349
  #, c-format
  msgid "error changing size of key %d to %u bits: %s\n"
  msgstr "將金鑰 %d 尺寸變更至 %u 位元時出錯: %s\n"
  
- #: g10/card-util.c:1362
++#: g10/card-util.c:1373
  msgid "Make off-card backup of encryption key? (Y/n) "
  msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
  
- #: g10/card-util.c:1376
++#: g10/card-util.c:1387
  msgid "Note: keys are already stored on the card!\n"
  msgstr "請注意: 金鑰已經存放在卡片上了!\n"
  
- #: g10/card-util.c:1379
++#: g10/card-util.c:1390
  msgid "Replace existing keys? (y/N) "
  msgstr "是否要取代既有的金鑰? (y/N) "
  
- #: g10/card-util.c:1391
++#: g10/card-util.c:1402
  #, c-format
  msgid ""
  "Please note that the factory settings of the PINs are\n"
@@@ -1779,144 -1377,109 +1787,144 @@@ msgstr "
  "   PIN = '%s'     管理者 PIN = '%s'\n"
  "你應該用 --change-pin 指令來加以變更\n"
  
- #: g10/card-util.c:1448
++#: g10/card-util.c:1462
  msgid "Please select the type of key to generate:\n"
  msgstr "請選擇你要產生的金鑰種類:\n"
  
- #: g10/card-util.c:1450 g10/card-util.c:1561
++#: g10/card-util.c:1464 g10/card-util.c:1578
  msgid "   (1) Signature key\n"
  msgstr "   (1) 簽署用金鑰\n"
  
- #: g10/card-util.c:1451 g10/card-util.c:1563
++#: g10/card-util.c:1465 g10/card-util.c:1580
  msgid "   (2) Encryption key\n"
  msgstr "   (2) 加密用金鑰\n"
  
- #: g10/card-util.c:1452 g10/card-util.c:1565
++#: g10/card-util.c:1466 g10/card-util.c:1582
  msgid "   (3) Authentication key\n"
  msgstr "   (3) 憑證用金鑰\n"
  
- #: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
- #: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
- #: g10/revoke.c:819
++#: g10/card-util.c:1483 g10/card-util.c:1607 g10/keyedit.c:1507
++#: g10/keygen.c:1782 g10/keygen.c:1810 g10/keygen.c:1940 g10/keygen.c:2048
++#: g10/keygen.c:2314 g10/revoke.c:819
  msgid "Invalid selection.\n"
  msgstr "無效的選擇.\n"
  
- #: g10/card-util.c:1558
++#: g10/card-util.c:1575
  msgid "Please select where to store the key:\n"
  msgstr "請選擇要把金鑰存放在哪裡:\n"
  
- #: g10/card-util.c:1604
++#: g10/card-util.c:1621
  #, c-format
  msgid "KEYTOCARD failed: %s\n"
  msgstr "KEYTOCARD 失敗: %s\n"
  
- #: g10/card-util.c:1700
++#: g10/card-util.c:1717
  #, fuzzy
  #| msgid "This command is not allowed while in %s mode.\n"
  msgid "This command is not supported by this card\n"
  msgstr "在 %s 模式中不允許使用這個指令.\n"
  
- #: g10/card-util.c:1705
++#: g10/card-util.c:1722
  #, fuzzy
  #| msgid "Note: keys are already stored on the card!\n"
  msgid "Note: This command destroys all keys stored on the card!\n"
  msgstr "請注意: 金鑰已經存放在卡片上了!\n"
  
- #: g10/card-util.c:1708
++#: g10/card-util.c:1725
  #, fuzzy
  #| msgid "Continue? (Y/n) "
  msgid "Continue? (y/N) "
  msgstr "是否繼續? (Y/n) "
  
- #: g10/card-util.c:1713
++#: g10/card-util.c:1730
  msgid "Really do a factory reset? (enter \"yes\") "
  msgstr ""
  
- #: g10/card-util.c:1799 g10/keyedit.c:1856
++#: g10/card-util.c:1816 g10/keyedit.c:1867
  msgid "quit this menu"
  msgstr "離開這個選單"
  
- #: g10/card-util.c:1801
++#: g10/card-util.c:1818
  msgid "show admin commands"
  msgstr "顯示管理者指令"
  
- #: g10/card-util.c:1802 g10/keyedit.c:1859
++#: g10/card-util.c:1819 g10/keyedit.c:1870
  msgid "show this help"
  msgstr "顯示這份線上說明"
  
- #: g10/card-util.c:1804
++#: g10/card-util.c:1821
  msgid "list all available data"
  msgstr "列出所有可用的資料"
  
- #: g10/card-util.c:1807
++#: g10/card-util.c:1824
  msgid "change card holder's name"
  msgstr "變更卡片持有人的名字"
  
- #: g10/card-util.c:1808
++#: g10/card-util.c:1825
  msgid "change URL to retrieve key"
  msgstr "變更取回金鑰的 URL"
  
- #: g10/card-util.c:1809
++#: g10/card-util.c:1826
  msgid "fetch the key specified in the card URL"
  msgstr "從卡片 URL 取回指定的金鑰"
  
- #: g10/card-util.c:1810
++#: g10/card-util.c:1827
  msgid "change the login name"
  msgstr "變更登入名稱"
  
- #: g10/card-util.c:1811
++#: g10/card-util.c:1828
  msgid "change the language preferences"
  msgstr "變更介面語言偏好設定"
  
- #: g10/card-util.c:1812
++#: g10/card-util.c:1829
  msgid "change card holder's sex"
  msgstr "變更卡片持有者的性別"
  
- #: g10/card-util.c:1813
++#: g10/card-util.c:1830
  msgid "change a CA fingerprint"
  msgstr "變更某個憑證中心 (CA) 的指紋"
  
- #: g10/card-util.c:1814
++#: g10/card-util.c:1831
  msgid "toggle the signature force PIN flag"
  msgstr "切換簽章是否強制使用個人識別碼 (PIN) 的旗標"
  
- #: g10/card-util.c:1815
++#: g10/card-util.c:1832
  msgid "generate new keys"
  msgstr "產生新的金鑰"
  
- #: g10/card-util.c:1816
++#: g10/card-util.c:1833
  msgid "menu to change or unblock the PIN"
  msgstr "變更或重設個人識別碼 (PIN) 的選單"
  
- #: g10/card-util.c:1817
++#: g10/card-util.c:1834
  msgid "verify the PIN and list all data"
  msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
  
- #: g10/card-util.c:1818
++#: g10/card-util.c:1835
  msgid "unblock the PIN using a Reset Code"
  msgstr "用重設碼來解凍個人識別碼 (PIN)"
  
- #: g10/card-util.c:1819
++#: g10/card-util.c:1836
  msgid "destroy all keys and data"
  msgstr ""
  
- #: g10/card-util.c:1941
++#: g10/card-util.c:1958
  msgid "gpg/card> "
  msgstr "gpg/卡片> "
  
- #: g10/card-util.c:1982
++#: g10/card-util.c:1999
  msgid "Admin-only command\n"
  msgstr "限管理者使用的指令\n"
  
- #: g10/card-util.c:2013
++#: g10/card-util.c:2030
  msgid "Admin commands are allowed\n"
  msgstr "允許使用管理者指令\n"
  
- #: g10/card-util.c:2015
++#: g10/card-util.c:2032
  msgid "Admin commands are not allowed\n"
  msgstr "未允許使用管理者指令\n"
  
- #: g10/card-util.c:2110 g10/keyedit.c:2805
++#: g10/card-util.c:2127 g10/keyedit.c:2816
  msgid "Invalid command  (try \"help\")\n"
  msgstr "無效的指令  (試試看 \"help\")\n"
  
@@@ -1924,22 -1486,14 +1932,22 @@@
  msgid "--output doesn't work for this command\n"
  msgstr "--output 在這個指令中沒有作用\n"
  
- #: g10/decrypt.c:247 g10/gpg.c:4745 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4851 g10/keyring.c:398 g10/keyring.c:771
  #, c-format
  msgid "can't open '%s'\n"
  msgstr "無法開啟 '%s'\n"
  
- #: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
- #: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4702 g10/keyedit.c:2039
- #: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
- #: g10/keyserver.c:1240 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1844 g10/export.c:2121 g10/export.c:2200
++#: g10/getkey.c:503 g10/getkey.c:1896 g10/gpg.c:4807 g10/keyedit.c:2050
++#: g10/keyedit.c:3090 g10/keyedit.c:4632 g10/keylist.c:659
++#: g10/keyserver.c:1242 g10/revoke.c:231 g10/tofu.c:2014
  #, c-format
  msgid "key \"%s\" not found: %s\n"
  msgstr "找不到金鑰 \"%s\": %s\n"
  
- #: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
- #: g10/gpg.c:4710 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
- #: g10/revoke.c:237 g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1912 g10/getkey.c:1904 g10/getkey.c:4234
++#: g10/gpg.c:4815 g10/keyedit.c:2903 g10/keyedit.c:2990 g10/keyserver.c:1260
++#: g10/revoke.c:237 g10/revoke.c:644 g10/tofu.c:2022
  #, c-format
  msgid "error reading keyblock: %s\n"
  msgstr "讀取金鑰區塊時出錯: %s\n"
@@@ -2049,7 -1581,6 +2057,7 @@@ msgstr "強迫使用 %s (%d) 對稱式�
  msgid "%s/%s encrypted for: \"%s\"\n"
  msgstr "%s/%s 已加密給: \"%s\"\n"
  
- #: g10/encrypt.c:931 g10/pkclist.c:1015 g10/pkclist.c:1066
++#: g10/encrypt.c:931 g10/pkclist.c:1029 g10/pkclist.c:1080
  #, c-format
  msgid "you may not use %s while in %s mode\n"
  msgstr "你不能夠將 %s 用於 %s 模式中\n"
@@@ -2124,56 -1640,42 +2132,56 @@@ msgstr "警告: 無法移除暫存檔 (
  msgid "WARNING: unable to remove temp directory '%s': %s\n"
  msgstr "警告: 無法移除暫存目錄 '%s': %s\n"
  
- #: g10/export.c:102
++#: g10/export.c:106
  msgid "export signatures that are marked as local-only"
  msgstr "匯出標記為僅限本機使用的簽章"
  
- #: g10/export.c:104
++#: g10/export.c:108
  msgid "export attribute user IDs (generally photo IDs)"
  msgstr "匯出署名使用者 ID (通常是照片 ID)"
  
- #: g10/export.c:106
++#: g10/export.c:110
  msgid "export revocation keys marked as \"sensitive\""
  msgstr "匯出標記為 \"機密\" 的撤銷金鑰"
  
- #: g10/export.c:108
++#: g10/export.c:112
  msgid "remove unusable parts from key during export"
  msgstr "匯出時從金鑰中移除無法使用的部分"
  
- #: g10/export.c:110
++#: g10/export.c:114
  msgid "remove as much as possible from key during export"
  msgstr "匯出時盡可能地從金鑰中移除"
  
- #: g10/export.c:1204
++#: g10/export.c:1218
  msgid " - skipped"
  msgstr " - 已跳過"
  
- #: g10/export.c:1237 g10/import.c:1457 g10/openfile.c:206 g10/openfile.c:300
++#: g10/export.c:1251 g10/import.c:1542 g10/openfile.c:206 g10/openfile.c:300
 +#: g10/sign.c:845 g10/sign.c:1148
  #, c-format
  msgid "writing to '%s'\n"
  msgstr "正在寫入 '%s'\n"
  
- #: g10/export.c:1660
++#: g10/export.c:1675
  #, c-format
  msgid "key %s: key material on-card - skipped\n"
  msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
  
- #: g10/export.c:1846
++#: g10/export.c:1861
  msgid "exporting secret keys not allowed\n"
  msgstr "不允許匯出私鑰\n"
  
- #: g10/export.c:1923
++#: g10/export.c:1938
  #, c-format
  msgid "key %s: PGP 2.x style key - skipped\n"
  msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
  
- #: g10/export.c:2004
++#: g10/export.c:2026
  msgid "WARNING: nothing exported\n"
  msgstr "警告: 沒有匯出任何東西\n"
  
- #: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2283 g10/plaintext.c:136 g10/plaintext.c:145
 +#: g10/plaintext.c:151 g10/plaintext.c:174
  #, c-format
  msgid "error creating '%s': %s\n"
  msgstr "建立 '%s' 時出錯: %s\n"
@@@ -2182,8 -1683,6 +2190,8 @@@
  msgid "[User ID not found]"
  msgstr "[找不到使用者 ID]"
  
- #: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
- #: g10/pkclist.c:975
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1876
++#: g10/pkclist.c:989
  #, fuzzy, c-format
  #| msgid "missing argument for option \"%.50s\"\n"
  msgid "(check argument of option '%s')\n"
@@@ -2206,250 -1702,191 +2214,250 @@@ msgstr "關閉 %s 時出錯: %s\n
  msgid "Warning: %s appears in the keyring %d times\n"
  msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
  
- #: g10/getkey.c:1431
++#: g10/getkey.c:1437
  #, c-format
  msgid "automatically retrieved '%s' via %s\n"
  msgstr "已自動取回 '%s' (經由 %s )\n"
  
- #: g10/getkey.c:1437
++#: g10/getkey.c:1443
  #, c-format
  msgid "error retrieving '%s' via %s: %s\n"
  msgstr "取得 '%s' (經由 %s ) 時出錯: %s\n"
  
- #: g10/getkey.c:1439
++#: g10/getkey.c:1445
  msgid "No fingerprint"
  msgstr "沒有指紋"
  
- #: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/getkey.c:1873 g10/keyedit.c:2928 g10/keyedit.c:3015 g10/revoke.c:636
 +#: g10/revoke.c:701
  #, c-format
  msgid "secret key \"%s\" not found: %s\n"
  msgstr "找不到私鑰 \"%s\": %s\n"
  
- #: g10/getkey.c:1735
++#: g10/getkey.c:1956
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "Warning: not using '%s' as default key: %s\n"
  msgstr "|名字|使用指定名字做為預設私鑰"
  
- #: g10/getkey.c:1743
++#: g10/getkey.c:1964
  #, fuzzy, c-format
  #| msgid "|NAME|use NAME as default secret key"
  msgid "using \"%s\" as default secret key for signing\n"
  msgstr "|名字|使用指定名字做為預設私鑰"
  
- #: g10/getkey.c:1750
++#: g10/getkey.c:1971
  #, c-format
  msgid "all values passed to '%s' ignored\n"
  msgstr ""
  
- #: g10/getkey.c:2545
++#: g10/getkey.c:2777
  #, c-format
  msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
  msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
  
- #: g10/getkey.c:3377
++#: g10/getkey.c:3611
  #, c-format
  msgid "using subkey %s instead of primary key %s\n"
  msgstr "使用子鑰 %s 來替換主鑰 %s\n"
  
- #: g10/gpg.c:420 sm/gpgsm.c:198
++#: g10/gpg.c:424 sm/gpgsm.c:200
  msgid "make a signature"
  msgstr "建立簽章"
  
- #: g10/gpg.c:421
++#: g10/gpg.c:425
  msgid "make a clear text signature"
  msgstr "建立明文簽章"
  
- #: g10/gpg.c:422 sm/gpgsm.c:200
++#: g10/gpg.c:426 sm/gpgsm.c:202
  msgid "make a detached signature"
  msgstr "建立分離式簽章"
  
- #: g10/gpg.c:423 sm/gpgsm.c:201
++#: g10/gpg.c:427 sm/gpgsm.c:203
  msgid "encrypt data"
  msgstr "加密資料"
  
- #: g10/gpg.c:425
++#: g10/gpg.c:429
  msgid "encryption only with symmetric cipher"
  msgstr "僅使用對稱式編密法來加密"
  
- #: g10/gpg.c:427 sm/gpgsm.c:203
++#: g10/gpg.c:431 sm/gpgsm.c:205
  msgid "decrypt data (default)"
  msgstr "資料解密 (預設)"
  
- #: g10/gpg.c:429 sm/gpgsm.c:204
++#: g10/gpg.c:433 sm/gpgsm.c:206
  msgid "verify a signature"
  msgstr "驗證簽章"
  
- #: g10/gpg.c:431 sm/gpgsm.c:205
++#: g10/gpg.c:435 sm/gpgsm.c:207
  msgid "list keys"
  msgstr "列出金鑰"
  
- #: g10/gpg.c:433
++#: g10/gpg.c:437
  msgid "list keys and signatures"
  msgstr "列出金鑰和簽章"
  
- #: g10/gpg.c:434
++#: g10/gpg.c:438
  msgid "list and check key signatures"
  msgstr "列出並檢查金鑰簽章"
  
- #: g10/gpg.c:435 sm/gpgsm.c:210
++#: g10/gpg.c:439 sm/gpgsm.c:212
  msgid "list keys and fingerprints"
  msgstr "列出金鑰和指紋"
  
- #: g10/gpg.c:436 sm/gpgsm.c:208
++#: g10/gpg.c:440 sm/gpgsm.c:210
  msgid "list secret keys"
  msgstr "列出私鑰"
  
- #: g10/gpg.c:438 sm/gpgsm.c:211
++#: g10/gpg.c:442 sm/gpgsm.c:213
  msgid "generate a new key pair"
  msgstr "產生新的金鑰對"
  
- #: g10/gpg.c:440
++#: g10/gpg.c:444
  msgid "quickly generate a new key pair"
  msgstr "快速產生新的金鑰對"
  
- #: g10/gpg.c:442
++#: g10/gpg.c:446
  #, fuzzy
  #| msgid "quickly generate a new key pair"
  msgid "quickly add a new user-id"
  msgstr "快速產生新的金鑰對"
  
- #: g10/gpg.c:445
++#: g10/gpg.c:449
  #, fuzzy
  #| msgid "quickly generate a new key pair"
  msgid "quickly revoke a user-id"
  msgstr "快速產生新的金鑰對"
  
- #: g10/gpg.c:447
++#: g10/gpg.c:451
  msgid "full featured key pair generation"
  msgstr "全能金鑰對生成"
  
- #: g10/gpg.c:448
++#: g10/gpg.c:452
  msgid "generate a revocation certificate"
  msgstr "產生撤銷憑證"
  
- #: g10/gpg.c:450 sm/gpgsm.c:213
++#: g10/gpg.c:454 sm/gpgsm.c:215
  msgid "remove keys from the public keyring"
  msgstr "從公鑰鑰匙圈裡移除金鑰"
  
- #: g10/gpg.c:452
++#: g10/gpg.c:456
  msgid "remove keys from the secret keyring"
  msgstr "從私鑰鑰匙圈裡移除金鑰"
  
- #: g10/gpg.c:454
++#: g10/gpg.c:458
  msgid "quickly sign a key"
  msgstr "快速簽署金鑰"
  
- #: g10/gpg.c:456
++#: g10/gpg.c:460
  msgid "quickly sign a key locally"
  msgstr "快速在本機簽署金鑰"
  
- #: g10/gpg.c:457
++#: g10/gpg.c:461
  msgid "sign a key"
  msgstr "簽署金鑰"
  
- #: g10/gpg.c:458
++#: g10/gpg.c:462
  msgid "sign a key locally"
  msgstr "僅在本機簽署金鑰"
  
- #: g10/gpg.c:459
++#: g10/gpg.c:463
  msgid "sign or edit a key"
  msgstr "簽署或編輯金鑰"
  
- #: g10/gpg.c:461 sm/gpgsm.c:231
++#: g10/gpg.c:465 sm/gpgsm.c:233
  msgid "change a passphrase"
  msgstr "更改密語"
  
- #: g10/gpg.c:463
++#: g10/gpg.c:467
  msgid "export keys"
  msgstr "匯出金鑰"
  
- #: g10/gpg.c:464
++#: g10/gpg.c:468
  msgid "export keys to a keyserver"
  msgstr "把金鑰匯出至金鑰伺服器"
  
- #: g10/gpg.c:465
++#: g10/gpg.c:469
  msgid "import keys from a keyserver"
  msgstr "從金鑰伺服器匯入金鑰"
  
- #: g10/gpg.c:467
++#: g10/gpg.c:471
  msgid "search for keys on a keyserver"
  msgstr "在金鑰伺服器上搜尋金鑰"
  
- #: g10/gpg.c:469
++#: g10/gpg.c:473
  msgid "update all keys from a keyserver"
  msgstr "從金鑰伺服器更新所有的金鑰"
  
- #: g10/gpg.c:475
++#: g10/gpg.c:479
  msgid "import/merge keys"
  msgstr "匯入/合併金鑰"
  
- #: g10/gpg.c:478
++#: g10/gpg.c:482
  msgid "print the card status"
  msgstr "列印卡片狀態"
  
- #: g10/gpg.c:479
++#: g10/gpg.c:483
  msgid "change data on a card"
  msgstr "變更卡片上的資料"
  
- #: g10/gpg.c:480
++#: g10/gpg.c:484
  msgid "change a card's PIN"
  msgstr "變更卡片的個人識別碼 (PIN)"
  
- #: g10/gpg.c:492
++#: g10/gpg.c:496
  msgid "update the trust database"
  msgstr "更新信任資料庫"
  
- #: g10/gpg.c:501
++#: g10/gpg.c:505
  msgid "print message digests"
  msgstr "印出訊息摘要"
  
- #: g10/gpg.c:504 sm/gpgsm.c:226
++#: g10/gpg.c:508 sm/gpgsm.c:228
  msgid "run in server mode"
  msgstr "以伺服器模式執行"
  
- #: g10/gpg.c:506
++#: g10/gpg.c:510
  msgid "|VALUE|set the TOFU policy for a key"
  msgstr ""
  
- #: g10/gpg.c:510 sm/gpgsm.c:244
++#: g10/gpg.c:514 sm/gpgsm.c:246
  msgid "create ascii armored output"
  msgstr "建立以 ASCII 封裝過的輸出"
  
- #: g10/gpg.c:513 sm/gpgsm.c:260
++#: g10/gpg.c:517 sm/gpgsm.c:262
  msgid "|USER-ID|encrypt for USER-ID"
  msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
  
- #: g10/gpg.c:529 sm/gpgsm.c:296
++#: g10/gpg.c:533 sm/gpgsm.c:298
  msgid "|USER-ID|use USER-ID to sign or decrypt"
  msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
  
- #: g10/gpg.c:535
++#: g10/gpg.c:539
  msgid "|N|set compress level to N (0 disables)"
  msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
  
- #: g10/gpg.c:542
++#: g10/gpg.c:546
  msgid "use canonical text mode"
  msgstr "使用標準的文字模式"
  
- #: g10/gpg.c:559 sm/gpgsm.c:298
++#: g10/gpg.c:563 g10/gpgv.c:78 sm/gpgsm.c:300
  msgid "|FILE|write output to FILE"
  msgstr "|檔案|將輸出寫入至指定檔案"
  
- #: g10/gpg.c:574 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:93
++#: g10/gpg.c:578 kbx/kbxutil.c:90 sm/gpgsm.c:312 tools/gpgconf.c:97
  msgid "do not make any changes"
  msgstr "不要做任何改變"
  
- #: g10/gpg.c:575
++#: g10/gpg.c:579
  msgid "prompt before overwriting"
  msgstr "覆寫前先詢問"
  
- #: g10/gpg.c:623
++#: g10/gpg.c:628
  msgid "use strict OpenPGP behavior"
  msgstr "使用嚴謹的 OpenPGP 行為"
  
- #: g10/gpg.c:649 sm/gpgsm.c:353
++#: g10/gpg.c:654 sm/gpgsm.c:355
  msgid ""
  "@\n"
  "(See the man page for a complete listing of all commands and options)\n"
@@@ -2457,7 -1894,6 +2465,7 @@@ msgstr "
  "@\n"
  "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
  
- #: g10/gpg.c:652 sm/gpgsm.c:356
++#: g10/gpg.c:657 sm/gpgsm.c:358
  msgid ""
  "@\n"
  "Examples:\n"
@@@ -2477,11 -1913,9 +2485,11 @@@ msgstr "
  " --list-keys [名字]         顯示金鑰\n"
  " --fingerprint [名字]       顯示指紋\n"
  
- #: g10/gpg.c:1018
++#: g10/gpg.c:1026
  msgid "Usage: @GPG@ [options] [files] (-h for help)"
  msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
  
- #: g10/gpg.c:1021
++#: g10/gpg.c:1029
  msgid ""
  "Syntax: @GPG@ [options] [files]\n"
  "Sign, check, encrypt or decrypt\n"
@@@ -2491,7 -1925,6 +2499,7 @@@ msgstr "
  "簽署, 檢查, 加密, 解密\n"
  "預設的操作會依輸入資料而定\n"
  
- #: g10/gpg.c:1032 sm/gpgsm.c:585
++#: g10/gpg.c:1040 sm/gpgsm.c:588
  msgid ""
  "\n"
  "Supported algorithms:\n"
@@@ -2499,605 -1932,475 +2507,611 @@@ msgstr "
  "\n"
  "已支援的演算法:\n"
  
- #: g10/gpg.c:1035
++#: g10/gpg.c:1043
  msgid "Pubkey: "
  msgstr "公鑰: "
  
- #: g10/gpg.c:1042 g10/keyedit.c:3389
++#: g10/gpg.c:1050 g10/keyedit.c:3402
  msgid "Cipher: "
  msgstr "編密法: "
  
- #: g10/gpg.c:1049
++#: g10/gpg.c:1057
  msgid "Hash: "
  msgstr "雜湊: "
  
- #: g10/gpg.c:1056 g10/keyedit.c:3438
++#: g10/gpg.c:1064 g10/keyedit.c:3451
  msgid "Compression: "
  msgstr "壓縮: "
  
- #: g10/gpg.c:1125 sm/gpgsm.c:659
++#: g10/gpg.c:1133 sm/gpgsm.c:662
  #, c-format
  msgid "usage: %s [options] %s\n"
  msgstr "用法: %s [選項] %s\n"
  
- #: g10/gpg.c:1313 sm/gpgsm.c:748
++#: g10/gpg.c:1321 sm/gpgsm.c:751
  msgid "conflicting commands\n"
  msgstr "指令彼此矛盾\n"
  
- #: g10/gpg.c:1331
++#: g10/gpg.c:1339
  #, c-format
  msgid "no = sign found in group definition '%s'\n"
  msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
  
- #: g10/gpg.c:1529
++#: g10/gpg.c:1537
  #, c-format
  msgid "WARNING: unsafe ownership on homedir '%s'\n"
  msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
  
- #: g10/gpg.c:1532
++#: g10/gpg.c:1540
  #, c-format
  msgid "WARNING: unsafe ownership on configuration file '%s'\n"
  msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
  
- #: g10/gpg.c:1535
++#: g10/gpg.c:1543
  #, c-format
  msgid "WARNING: unsafe ownership on extension '%s'\n"
  msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
  
- #: g10/gpg.c:1541
++#: g10/gpg.c:1549
  #, c-format
  msgid "WARNING: unsafe permissions on homedir '%s'\n"
  msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
  
- #: g10/gpg.c:1544
++#: g10/gpg.c:1552
  #, c-format
  msgid "WARNING: unsafe permissions on configuration file '%s'\n"
  msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
  
- #: g10/gpg.c:1547
++#: g10/gpg.c:1555
  #, c-format
  msgid "WARNING: unsafe permissions on extension '%s'\n"
  msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
  
- #: g10/gpg.c:1553
++#: g10/gpg.c:1561
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
  msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
  
- #: g10/gpg.c:1556
++#: g10/gpg.c:1564
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
  msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
  
- #: g10/gpg.c:1559
++#: g10/gpg.c:1567
  #, c-format
  msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
  msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
  
- #: g10/gpg.c:1565
++#: g10/gpg.c:1573
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
  msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
  
- #: g10/gpg.c:1568
++#: g10/gpg.c:1576
  #, c-format
  msgid ""
  "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
  msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
  
- #: g10/gpg.c:1571
++#: g10/gpg.c:1579
  #, c-format
  msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
  msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
  
- #: g10/gpg.c:1778
++#: g10/gpg.c:1786
  #, c-format
  msgid "unknown configuration item '%s'\n"
  msgstr "未知的組態項目 '%s'\n"
  
- #: g10/gpg.c:1885
++#: g10/gpg.c:1893
  msgid "display photo IDs during key listings"
  msgstr "列出金鑰時顯示照片 ID"
  
- #: g10/gpg.c:1887
++#: g10/gpg.c:1895
  msgid "show key usage information during key listings"
  msgstr "列出金鑰時顯示金鑰用途資訊"
  
- #: g10/gpg.c:1889
++#: g10/gpg.c:1897
  msgid "show policy URLs during signature listings"
  msgstr "列出簽章時顯示原則 URL"
  
- #: g10/gpg.c:1891
++#: g10/gpg.c:1899
  msgid "show all notations during signature listings"
  msgstr "列出簽章時顯示所有的註記"
  
- #: g10/gpg.c:1893
++#: g10/gpg.c:1901
  msgid "show IETF standard notations during signature listings"
  msgstr "列出簽章時顯示 IETF 標準註記"
  
- #: g10/gpg.c:1897
++#: g10/gpg.c:1905
  msgid "show user-supplied notations during signature listings"
  msgstr "列出簽章時顯示使用者提供的註記"
  
- #: g10/gpg.c:1899
++#: g10/gpg.c:1907
  msgid "show preferred keyserver URLs during signature listings"
  msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
  
- #: g10/gpg.c:1901
++#: g10/gpg.c:1909
  msgid "show user ID validity during key listings"
  msgstr "列出金鑰時顯示使用者 ID 有效性"
  
- #: g10/gpg.c:1903
++#: g10/gpg.c:1911
  msgid "show revoked and expired user IDs in key listings"
  msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
  
- #: g10/gpg.c:1905
++#: g10/gpg.c:1913
  msgid "show revoked and expired subkeys in key listings"
  msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
  
- #: g10/gpg.c:1907
++#: g10/gpg.c:1915
  msgid "show the keyring name in key listings"
  msgstr "在金鑰清單中顯示鑰匙圈名稱"
  
- #: g10/gpg.c:1909
++#: g10/gpg.c:1917
  msgid "show expiration dates during signature listings"
  msgstr "列出簽章時顯示有效期限"
  
- #: g10/gpg.c:2011
- #, fuzzy
- #| msgid "Available keys:\n"
- msgid "available TOFU policies:\n"
- msgstr "可用金鑰:\n"
++#: g10/gpg.c:2019 g10/gpg.c:2056
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "valid values for option '%s':\n"
+ msgstr "選項 \"%.50s\" 的引數無效\n"
  
- #: g10/gpg.c:2022
++#: g10/gpg.c:2030
  #, fuzzy, c-format
  #| msgid "unknown option '%s'\n"
  msgid "unknown TOFU policy '%s'\n"
  msgstr "未知的選項 '%s'\n"
  
- #: g10/gpg.c:2024
++#: g10/gpg.c:2032 g10/gpg.c:2068
  msgid "(use \"help\" to list choices)\n"
  msgstr ""
  
- #: g10/gpg.c:2088
++#: g10/gpg.c:2066
+ #, fuzzy, c-format
+ #| msgid "invalid argument for option \"%.50s\"\n"
+ msgid "invalid value for option '%s'\n"
+ msgstr "選項 \"%.50s\" 的引數無效\n"
+ 
++#: g10/gpg.c:2203
  #, c-format
  msgid "Note: old default options file '%s' ignored\n"
  msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
  
- #: g10/gpg.c:2683 g10/gpg.c:3473 g10/gpg.c:3485
++#: g10/gpg.c:2806 g10/gpg.c:3571 g10/gpg.c:3583
  #, c-format
  msgid "Note: %s is not for normal use!\n"
  msgstr "請注意: 一般情況下不採用 %s!\n"
  
- #: g10/gpg.c:2883 g10/gpg.c:2895
++#: g10/gpg.c:2978 g10/gpg.c:2990
  #, c-format
  msgid "'%s' is not a valid signature expiration\n"
  msgstr "'%s' 不是有效的簽章使用期限\n"
  
- #: g10/gpg.c:2917
++#: g10/gpg.c:3012
  #, fuzzy, c-format
  #| msgid "line %d: not a valid email address\n"
  msgid "\"%s\" is not a proper mail address\n"
  msgstr "第 %d 列: 不是有效的電子郵件地址\n"
  
- #: g10/gpg.c:2949 sm/gpgsm.c:1163
++#: g10/gpg.c:3044 sm/gpgsm.c:1166
  #, c-format
  msgid "invalid pinentry mode '%s'\n"
  msgstr "無效的個人識別碼項目模式 '%s'\n"
  
- #: g10/gpg.c:3002
++#: g10/gpg.c:3097
  #, c-format
  msgid "'%s' is not a valid character set\n"
  msgstr "'%s' 不是有效的字元集\n"
  
- #: g10/gpg.c:3024 g10/gpg.c:3224 g10/keyedit.c:5322
++#: g10/gpg.c:3119 g10/gpg.c:3322 g10/keyedit.c:5338
  msgid "could not parse keyserver URL\n"
  msgstr "無法剖析金鑰伺服器 URL\n"
  
- #: g10/gpg.c:3042
++#: g10/gpg.c:3137
  #, c-format
  msgid "%s:%d: invalid keyserver options\n"
  msgstr "%s:%d: 無效的金鑰伺服器選項\n"
  
- #: g10/gpg.c:3045
++#: g10/gpg.c:3140
  msgid "invalid keyserver options\n"
  msgstr "無效的金鑰伺服器選項\n"
  
- #: g10/gpg.c:3052
++#: g10/gpg.c:3147
  #, c-format
  msgid "%s:%d: invalid import options\n"
  msgstr "%s:%d: 無效的匯入選項\n"
  
- #: g10/gpg.c:3055
++#: g10/gpg.c:3150
  msgid "invalid import options\n"
  msgstr "無效的匯入選項\n"
  
- #: g10/gpg.c:3061 g10/gpg.c:3076
++#: g10/gpg.c:3156 g10/gpg.c:3171
  #, fuzzy, c-format
  #| msgid "invalid list options\n"
  msgid "invalid filter option: %s\n"
  msgstr "無效的清單選項\n"
  
- #: g10/gpg.c:3067
++#: g10/gpg.c:3162
  #, c-format
  msgid "%s:%d: invalid export options\n"
  msgstr "%s:%d: 無效的匯出選項\n"
  
- #: g10/gpg.c:3070
++#: g10/gpg.c:3165
  msgid "invalid export options\n"
  msgstr "無效的匯出選項\n"
  
- #: g10/gpg.c:3082
++#: g10/gpg.c:3177
  #, c-format
  msgid "%s:%d: invalid list options\n"
  msgstr "%s:%d: 無效的清單選項\n"
  
- #: g10/gpg.c:3085
++#: g10/gpg.c:3180
  msgid "invalid list options\n"
  msgstr "無效的清單選項\n"
  
- #: g10/gpg.c:3093
++#: g10/gpg.c:3188
  msgid "display photo IDs during signature verification"
  msgstr "驗證簽章時顯示照片 ID"
  
- #: g10/gpg.c:3095
++#: g10/gpg.c:3190
  msgid "show policy URLs during signature verification"
  msgstr "驗證簽章時顯示原則 URL"
  
- #: g10/gpg.c:3097
++#: g10/gpg.c:3192
  msgid "show all notations during signature verification"
  msgstr "驗證簽章時顯示所有的註記"
  
- #: g10/gpg.c:3099
++#: g10/gpg.c:3194
  msgid "show IETF standard notations during signature verification"
  msgstr "驗證簽章時顯示 IETF 標準註記"
  
- #: g10/gpg.c:3103
++#: g10/gpg.c:3198
  msgid "show user-supplied notations during signature verification"
  msgstr "驗證簽章時顯示使用者提供的註記"
  
- #: g10/gpg.c:3105
++#: g10/gpg.c:3200
  msgid "show preferred keyserver URLs during signature verification"
  msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
  
- #: g10/gpg.c:3107
++#: g10/gpg.c:3202
  msgid "show user ID validity during signature verification"
  msgstr "驗證簽章時顯示使用者 ID 有效性"
  
- #: g10/gpg.c:3109
++#: g10/gpg.c:3204
  msgid "show revoked and expired user IDs in signature verification"
  msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
  
- #: g10/gpg.c:3111
++#: g10/gpg.c:3206
  msgid "show only the primary user ID in signature verification"
  msgstr "驗證簽章時祇顯示主要的使用者 ID"
  
- #: g10/gpg.c:3113
++#: g10/gpg.c:3208
  msgid "validate signatures with PKA data"
  msgstr "以 PKA 資料驗證簽章"
  
- #: g10/gpg.c:3115
++#: g10/gpg.c:3210
  msgid "elevate the trust of signatures with valid PKA data"
  msgstr "提高對持有有效 PKA 資料之簽章的信任"
  
- #: g10/gpg.c:3122
++#: g10/gpg.c:3217
  #, c-format
  msgid "%s:%d: invalid verify options\n"
  msgstr "%s:%d: 無效的驗證選項\n"
  
- #: g10/gpg.c:3125
++#: g10/gpg.c:3220
  msgid "invalid verify options\n"
  msgstr "無效的驗證選項\n"
  
- #: g10/gpg.c:3132
++#: g10/gpg.c:3227
  #, c-format
  msgid "unable to set exec-path to %s\n"
  msgstr "無法把執行檔路徑設成 %s\n"
  
- #: g10/gpg.c:3319
++#: g10/gpg.c:3417
  #, c-format
  msgid "%s:%d: invalid auto-key-locate list\n"
  msgstr "%s:%d: 無效的自動金鑰定址清單\n"
  
- #: g10/gpg.c:3322
++#: g10/gpg.c:3420
  msgid "invalid auto-key-locate list\n"
  msgstr "無效的自動金鑰定址清單\n"
  
- #: g10/gpg.c:3455 sm/gpgsm.c:1500
++#: g10/gpg.c:3553 sm/gpgsm.c:1507
  msgid "WARNING: program may create a core file!\n"
  msgstr "警告: 程式可能會傾印出核心檔!\n"
  
- #: g10/gpg.c:3466
++#: g10/gpg.c:3564
  #, c-format
  msgid "WARNING: %s overrides %s\n"
  msgstr "警告: %s 會推翻 %s\n"
  
- #: g10/gpg.c:3475
++#: g10/gpg.c:3573
  #, c-format
  msgid "%s not allowed with %s!\n"
  msgstr "%s 不允許跟 %s 併用!\n"
  
- #: g10/gpg.c:3478
++#: g10/gpg.c:3576
  #, c-format
  msgid "%s makes no sense with %s!\n"
  msgstr "%s 跟 %s 放在一起沒有意義!\n"
  
- #: g10/gpg.c:3493 sm/gpgsm.c:1517 dirmngr/dirmngr.c:913
++#: g10/gpg.c:3591 sm/gpgsm.c:1524 dirmngr/dirmngr.c:932
  msgid "WARNING: running with faked system time: "
  msgstr "警告: 正在偽造的系統時間中執行: "
  
- #: g10/gpg.c:3514
++#: g10/gpg.c:3612
  #, c-format
  msgid "will not run with insecure memory due to %s\n"
  msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
  
- #: g10/gpg.c:3549 g10/gpg.c:3573 sm/gpgsm.c:1584
++#: g10/gpg.c:3647 g10/gpg.c:3671 sm/gpgsm.c:1591
  msgid "selected cipher algorithm is invalid\n"
  msgstr "所選的編密演算法無效\n"
  
- #: g10/gpg.c:3555 g10/gpg.c:3579 sm/gpgsm.c:1590 sm/gpgsm.c:1596
++#: g10/gpg.c:3653 g10/gpg.c:3677 sm/gpgsm.c:1597 sm/gpgsm.c:1603
  msgid "selected digest algorithm is invalid\n"
  msgstr "所選的摘要演算法無效\n"
  
- #: g10/gpg.c:3561
++#: g10/gpg.c:3659
  msgid "selected compression algorithm is invalid\n"
  msgstr "所選的壓縮演算法無效\n"
  
- #: g10/gpg.c:3567
++#: g10/gpg.c:3665
  msgid "selected certification digest algorithm is invalid\n"
  msgstr "所選的憑證摘要演算法無效\n"
  
- #: g10/gpg.c:3582
++#: g10/gpg.c:3680
  msgid "completes-needed must be greater than 0\n"
  msgstr "completes-needed 一定要大於 0\n"
  
- #: g10/gpg.c:3584
++#: g10/gpg.c:3682
  msgid "marginals-needed must be greater than 1\n"
  msgstr "marginals-needed 一定要大於 1\n"
  
- #: g10/gpg.c:3586
++#: g10/gpg.c:3684
  msgid "max-cert-depth must be in the range from 1 to 255\n"
  msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
  
- #: g10/gpg.c:3588
++#: g10/gpg.c:3686
  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:3590
++#: g10/gpg.c:3688
  msgid "invalid min-cert-level; must be 1, 2, or 3\n"
  msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
  
- #: g10/gpg.c:3593
++#: g10/gpg.c:3691
  msgid "Note: simple S2K mode (0) is strongly discouraged\n"
  msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
  
- #: g10/gpg.c:3597
++#: g10/gpg.c:3695
  msgid "invalid S2K mode; must be 0, 1 or 3\n"
  msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
  
- #: g10/gpg.c:3604
++#: g10/gpg.c:3702
  msgid "invalid default preferences\n"
  msgstr "無效的預設偏好\n"
  
- #: g10/gpg.c:3608
++#: g10/gpg.c:3706
  msgid "invalid personal cipher preferences\n"
  msgstr "無效的個人編密法偏好\n"
  
- #: g10/gpg.c:3612
++#: g10/gpg.c:3710
  msgid "invalid personal digest preferences\n"
  msgstr "無效的個人摘要偏好\n"
  
- #: g10/gpg.c:3616
++#: g10/gpg.c:3714
  msgid "invalid personal compress preferences\n"
  msgstr "無效的個人壓縮偏好\n"
  
- #: g10/gpg.c:3652
++#: g10/gpg.c:3750
  #, c-format
  msgid "%s does not yet work with %s\n"
  msgstr "%s 還沒辦法跟 %s 一起運作\n"
  
- #: g10/gpg.c:3699
++#: g10/gpg.c:3797
  #, c-format
  msgid "you may not use cipher algorithm '%s' while in %s mode\n"
  msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
  
- #: g10/gpg.c:3704
++#: g10/gpg.c:3802
  #, c-format
  msgid "you may not use digest algorithm '%s' while in %s mode\n"
  msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
  
- #: g10/gpg.c:3709
++#: g10/gpg.c:3807
  #, c-format
  msgid "you may not use compression algorithm '%s' while in %s mode\n"
  msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
  
- #: g10/gpg.c:3803
++#: g10/gpg.c:3906
  #, c-format
  msgid "failed to initialize the TrustDB: %s\n"
  msgstr "信任資料庫啟始失敗: %s\n"
  
- #: g10/gpg.c:3815
++#: g10/gpg.c:3918
  msgid "WARNING: recipients (-r) given without using public key encryption\n"
  msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
  
- #: g10/gpg.c:3872
++#: g10/gpg.c:3975
  msgid "--store [filename]"
  msgstr "--store [檔名]"
  
- #: g10/gpg.c:3882
++#: g10/gpg.c:3985
  msgid "--symmetric [filename]"
  msgstr "--symmetric [檔名]"
  
- #: g10/gpg.c:3886
++#: g10/gpg.c:3989
  #, c-format
  msgid "symmetric encryption of '%s' failed: %s\n"
  msgstr "'%s' 對稱式加密失敗: %s\n"
  
- #: g10/gpg.c:3897
++#: g10/gpg.c:4000
  msgid "--encrypt [filename]"
  msgstr "--encrypt [檔名]"
  
- #: g10/gpg.c:3913
++#: g10/gpg.c:4016
  msgid "--symmetric --encrypt [filename]"
  msgstr "--symmetric --encrypt [檔名]"
  
- #: g10/gpg.c:3915
++#: g10/gpg.c:4018
  msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
  msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
  
- #: g10/gpg.c:3918
++#: g10/gpg.c:4021
  #, c-format
  msgid "you cannot use --symmetric --encrypt while in %s mode\n"
  msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
  
- #: g10/gpg.c:3939
++#: g10/gpg.c:4042
  msgid "--sign [filename]"
  msgstr "--sign [檔名]"
  
- #: g10/gpg.c:3955
++#: g10/gpg.c:4058
  msgid "--sign --encrypt [filename]"
  msgstr "--sign --encrypt [檔名]"
  
- #: g10/gpg.c:3973
++#: g10/gpg.c:4076
  msgid "--symmetric --sign --encrypt [filename]"
  msgstr "--symmetric --sign --encrypt [檔名]"
  
- #: g10/gpg.c:3975
++#: g10/gpg.c:4078
  msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
  msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
  
- #: g10/gpg.c:3978
++#: g10/gpg.c:4081
  #, c-format
  msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
  msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
  
- #: g10/gpg.c:4002
++#: g10/gpg.c:4105
  msgid "--sign --symmetric [filename]"
  msgstr "--sign --symmetric [檔名]"
  
- #: g10/gpg.c:4014
++#: g10/gpg.c:4117
  msgid "--clearsign [filename]"
  msgstr "--clearsign [檔名]"
  
- #: g10/gpg.c:4044
++#: g10/gpg.c:4147
  msgid "--decrypt [filename]"
  msgstr "--decrypt [檔名]"
  
- #: g10/gpg.c:4071
++#: g10/gpg.c:4174
  msgid "--sign-key user-id"
  msgstr "--sign-key 使用者ID"
  
- #: g10/gpg.c:4075
++#: g10/gpg.c:4178
  msgid "--lsign-key user-id"
  msgstr "--lsign-key 使用者ID"
  
- #: g10/gpg.c:4096
++#: g10/gpg.c:4199
  msgid "--edit-key user-id [commands]"
  msgstr "--edit-key 使用者ID [指令]"
  
- #: g10/gpg.c:4112
++#: g10/gpg.c:4215
  msgid "--passwd <user-id>"
  msgstr "--passwd 使用者ID"
  
- #: g10/gpg.c:4308 g10/keyserver.c:1833
++#: g10/gpg.c:4411 g10/keyserver.c:1837
  #, c-format
  msgid "keyserver send failed: %s\n"
  msgstr "送至金鑰伺服器失敗: %s\n"
  
- #: g10/gpg.c:4313
++#: g10/gpg.c:4416
  #, c-format
  msgid "keyserver receive failed: %s\n"
  msgstr "從金鑰伺服器接收失敗: %s\n"
  
- #: g10/gpg.c:4319
++#: g10/gpg.c:4422
  #, c-format
  msgid "key export failed: %s\n"
  msgstr "金鑰匯出失敗: %s\n"
  
- #: g10/gpg.c:4332
++#: g10/gpg.c:4435
  #, fuzzy, c-format
  #| msgid "key export failed: %s\n"
  msgid "export as ssh key failed: %s\n"
  msgstr "金鑰匯出失敗: %s\n"
  
- #: g10/gpg.c:4344
++#: g10/gpg.c:4447
  #, c-format
  msgid "keyserver search failed: %s\n"
  msgstr "用金鑰伺服器搜尋失敗: %s\n"
  
- #: g10/gpg.c:4357
++#: g10/gpg.c:4460
  #, c-format
  msgid "keyserver refresh failed: %s\n"
  msgstr "從金鑰伺服器更新失敗: %s\n"
  
- #: g10/gpg.c:4424
++#: g10/gpg.c:4527
  #, c-format
  msgid "dearmoring failed: %s\n"
  msgstr "解開封裝失敗: %s\n"
  
- #: g10/gpg.c:4435
++#: g10/gpg.c:4538
  #, c-format
  msgid "enarmoring failed: %s\n"
  msgstr "進行封裝失敗: %s\n"
  
- #: g10/gpg.c:4527
++#: g10/gpg.c:4630
  #, c-format
  msgid "invalid hash algorithm '%s'\n"
  msgstr "無效的雜湊演算法 '%s'\n"
  
- #: g10/gpg.c:4671
++#: g10/gpg.c:4776 g10/tofu.c:2002
  #, fuzzy, c-format
  #| msgid "error loading certificate '%s': %s\n"
  msgid "error parsing key specification '%s': %s\n"
  msgstr "載入憑證 '%s' 時出錯: %s\n"
  
- #: g10/gpg.c:4683
++#: g10/gpg.c:4788
  #, c-format
  msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
  msgstr ""
  
- #: g10/gpg.c:4729
++#: g10/gpg.c:4835
  msgid "[filename]"
  msgstr "[檔名]"
  
- #: g10/gpg.c:4735
++#: g10/gpg.c:4841
  msgid "Go ahead and type your message ...\n"
  msgstr "請開始輸入你的訊息 ...\n"
  
- #: g10/gpg.c:5073
++#: g10/gpg.c:5179
  msgid "the given certification policy URL is invalid\n"
  msgstr "給定的的憑證原則 URL 無效\n"
  
- #: g10/gpg.c:5075
++#: g10/gpg.c:5181
  msgid "the given signature policy URL is invalid\n"
  msgstr "給定的簽章原則 URL 無效\n"
  
- #: g10/gpg.c:5108
++#: g10/gpg.c:5214
  msgid "the given preferred keyserver URL is invalid\n"
  msgstr "給定的偏好金鑰伺服器 URL 無效\n"
  
- #: g10/gpgv.c:75
++#: g10/gpgv.c:77
  msgid "|FILE|take the keys from the keyring FILE"
  msgstr "|檔案|從指定鑰匙圈檔案裡取用金鑰"
  
- #: g10/gpgv.c:77
++#: g10/gpgv.c:80
  msgid "make timestamp conflicts only a warning"
  msgstr "僅把時間戳印矛盾視為警告"
  
- #: g10/gpgv.c:79 sm/gpgsm.c:343
++#: g10/gpgv.c:82 sm/gpgsm.c:345
  msgid "|FD|write status info to this FD"
  msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
  
- #: g10/gpgv.c:83
++#: g10/gpgv.c:86
  msgid "|ALGO|reject signatures made with ALGO"
  msgstr ""
  
- #: g10/gpgv.c:120
++#: g10/gpgv.c:124
  msgid "Usage: gpgv [options] [files] (-h for help)"
  msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
  
- #: g10/gpgv.c:122
++#: g10/gpgv.c:126
  msgid ""
  "Syntax: gpgv [options] [files]\n"
  "Check signatures against known trusted keys\n"
@@@ -3114,325 -2415,259 +3128,325 @@@ msgstr "沒有可用的說明
  msgid "No help available for '%s'"
  msgstr "'%s' 沒有可用的說明"
  
- #: g10/import.c:138
++#: g10/import.c:151
  msgid "import signatures that are marked as local-only"
  msgstr "匯入標記為僅限本機使用的簽章"
  
- #: g10/import.c:141
++#: g10/import.c:154
  msgid "repair damage from the pks keyserver during import"
  msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
  
- #: g10/import.c:144
++#: g10/import.c:157
  #, fuzzy
  #| msgid "do not update the trustdb after import"
  msgid "do not clear the ownertrust values during import"
  msgstr "匯入後不要更新信任資料庫"
  
- #: g10/import.c:147
++#: g10/import.c:160
  msgid "do not update the trustdb after import"
  msgstr "匯入後不要更新信任資料庫"
  
- #: g10/import.c:150
++#: g10/import.c:163
  #, fuzzy
  #| msgid "show key fingerprint"
  msgid "show key during import"
  msgstr "顯示金鑰指紋"
  
- #: g10/import.c:153
++#: g10/import.c:166
  msgid "only accept updates to existing keys"
  msgstr "祇接受既有金鑰的更新"
  
- #: g10/import.c:156
++#: g10/import.c:169
  msgid "remove unusable parts from key after import"
  msgstr "匯入後從金鑰中移除無法使用的部分"
  
- #: g10/import.c:159
++#: g10/import.c:172
  msgid "remove as much as possible from key after import"
  msgstr "匯入後盡可能地從金鑰中移除"
  
- #: g10/import.c:162
++#: g10/import.c:175
  msgid "run import filters and export key immediately"
  msgstr ""
  
- #: g10/import.c:283 g10/import.c:525
++#: g10/import.c:326 g10/import.c:568
  #, c-format
  msgid "skipping block of type %d\n"
  msgstr "正在跳過 %d 型態的區塊\n"
  
- #: g10/import.c:542
++#: g10/import.c:585
  #, c-format
  msgid "%lu keys processed so far\n"
  msgstr "目前已處理 %lu 把金鑰\n"
  
- #: g10/import.c:612
++#: g10/import.c:655
  #, c-format
  msgid "Total number processed: %lu\n"
  msgstr "處理總量: %lu\n"
  
- #: g10/import.c:615
++#: g10/import.c:658
  #, fuzzy, c-format
  #| msgid "      skipped new keys: %lu\n"
  msgid "    skipped PGP-2 keys: %lu\n"
  msgstr "        已跳過的新金鑰: %lu\n"
  
- #: g10/import.c:617
++#: g10/import.c:660
  #, c-format
  msgid "      skipped new keys: %lu\n"
  msgstr "        已跳過的新金鑰: %lu\n"
  
- #: g10/import.c:620
++#: g10/import.c:663
  #, c-format
  msgid "          w/o user IDs: %lu\n"
  msgstr "       沒有使用者的 ID: %lu\n"
  
- #: g10/import.c:623 sm/import.c:130
++#: g10/import.c:666 sm/import.c:130
  #, c-format
  msgid "              imported: %lu"
  msgstr "                已匯入: %lu"
  
- #: g10/import.c:627 sm/import.c:134
++#: g10/import.c:670 sm/import.c:134
  #, c-format
  msgid "             unchanged: %lu\n"
  msgstr "              未改變的: %lu\n"
  
- #: g10/import.c:629
++#: g10/import.c:672
  #, c-format
  msgid "          new user IDs: %lu\n"
  msgstr "         新的使用者 ID: %lu\n"
  
- #: g10/import.c:631
++#: g10/import.c:674
  #, c-format
  msgid "           new subkeys: %lu\n"
  msgstr "              新的子鑰: %lu\n"
  
- #: g10/import.c:633
++#: g10/import.c:676
  #, c-format
  msgid "        new signatures: %lu\n"
  msgstr "              新的簽章: %lu\n"
  
- #: g10/import.c:635
++#: g10/import.c:678
  #, c-format
  msgid "   new key revocations: %lu\n"
  msgstr "          新的金鑰撤銷: %lu\n"
  
- #: g10/import.c:637 sm/import.c:136
++#: g10/import.c:680 sm/import.c:136
  #, c-format
  msgid "      secret keys read: %lu\n"
  msgstr "          已讀取的私鑰: %lu\n"
  
- #: g10/import.c:639 sm/import.c:138
++#: g10/import.c:682 sm/import.c:138
  #, c-format
  msgid "  secret keys imported: %lu\n"
  msgstr "          已匯入的私鑰: %lu\n"
  
- #: g10/import.c:641 sm/import.c:140
++#: g10/import.c:684 sm/import.c:140
  #, c-format
  msgid " secret keys unchanged: %lu\n"
  msgstr "          未改變的私鑰: %lu\n"
  
- #: g10/import.c:643 sm/import.c:142
++#: g10/import.c:686 sm/import.c:142
  #, c-format
  msgid "          not imported: %lu\n"
  msgstr "              未被匯入: %lu\n"
  
- #: g10/import.c:645
++#: g10/import.c:688
  #, c-format
  msgid "    signatures cleaned: %lu\n"
  msgstr "      已清除的簽章: %lu\n"
  
- #: g10/import.c:647
++#: g10/import.c:690
  #, c-format
  msgid "      user IDs cleaned: %lu\n"
  msgstr " 已清除的使用者 ID: %lu\n"
  
- #: g10/import.c:991
++#: g10/import.c:1034
  #, c-format
  msgid ""
  "WARNING: key %s contains preferences for unavailable\n"
  "algorithms on these user IDs:\n"
  msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
  
- #: g10/import.c:1033
++#: g10/import.c:1076
  #, c-format
  msgid "         \"%s\": preference for cipher algorithm %s\n"
  msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
  
- #: g10/import.c:1048
++#: g10/import.c:1091
  #, c-format
  msgid "         \"%s\": preference for digest algorithm %s\n"
  msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
  
- #: g10/import.c:1060
++#: g10/import.c:1103
  #, c-format
  msgid "         \"%s\": preference for compression algorithm %s\n"
  msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
  
- #: g10/import.c:1073
++#: g10/import.c:1116
  msgid "it is strongly suggested that you update your preferences and\n"
  msgstr "我們強烈建議你更新偏好設定, 並重新\n"
  
- #: g10/import.c:1075
++#: g10/import.c:1118
  msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
  msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
  
- #: g10/import.c:1100
++#: g10/import.c:1143
  #, c-format
  msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
  msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
  
- #: g10/import.c:1306 g10/import.c:2082
++#: g10/import.c:1379 g10/import.c:2167
  #, c-format
  msgid "key %s: no user ID\n"
  msgstr "金鑰 %s: 沒有使用者 ID\n"
  
- #: g10/import.c:1312
++#: g10/import.c:1385
  #, c-format
  msgid "key %s: %s\n"
  msgstr "金鑰 %s: %s\n"
  
- #: g10/import.c:1313 g10/import.c:2056
++#: g10/import.c:1386 g10/import.c:2141
  msgid "rejected by import screener"
  msgstr "遭到匯入篩選程式駁回"
  
- #: g10/import.c:1343
++#: g10/import.c:1416
  #, c-format
  msgid "key %s: PKS subkey corruption repaired\n"
  msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
  
- #: g10/import.c:1361
++#: g10/import.c:1434
  #, c-format
  msgid "key %s: accepted non self-signed user ID \"%s\"\n"
  msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
  
- #: g10/import.c:1371
++#: g10/import.c:1444 g10/import.c:1475
  #, c-format
  msgid "key %s: no valid user IDs\n"
  msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
  
- #: g10/import.c:1373
++#: g10/import.c:1446
  msgid "this may be caused by a missing self-signature\n"
  msgstr "這可能肇因於遺失自我簽章所致\n"
  
- #: g10/import.c:1431 g10/import.c:2233
++#: g10/import.c:1516 g10/import.c:2318
  #, c-format
  msgid "key %s: public key not found: %s\n"
  msgstr "金鑰 %s: 找不到公鑰: %s\n"
  
- #: g10/import.c:1437
++#: g10/import.c:1522
  #, c-format
  msgid "key %s: new key - skipped\n"
  msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
  
- #: g10/import.c:1452
++#: g10/import.c:1537
  #, c-format
  msgid "no writable keyring found: %s\n"
  msgstr "找不到可寫入的鑰匙圈: %s\n"
  
- #: g10/import.c:1461 g10/import.c:1562 g10/import.c:2299
++#: g10/import.c:1546 g10/import.c:1647 g10/import.c:2384
  #, c-format
  msgid "error writing keyring '%s': %s\n"
  msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
  
- #: g10/import.c:1481
++#: g10/import.c:1566
  #, c-format
  msgid "key %s: public key \"%s\" imported\n"
  msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
  
- #: g10/import.c:1505
++#: g10/import.c:1590
  #, c-format
  msgid "key %s: doesn't match our copy\n"
  msgstr "金鑰 %s: 跟我們的副本不吻合\n"
  
- #: g10/import.c:1521 g10/import.c:2257
++#: g10/import.c:1606 g10/import.c:2342
  #, c-format
  msgid "key %s: can't locate original keyblock: %s\n"
  msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
  
- #: g10/import.c:1529 g10/import.c:2264
++#: g10/import.c:1614 g10/import.c:2349
  #, c-format
  msgid "key %s: can't read original keyblock: %s\n"
  msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
  
- #: g10/import.c:1572
++#: g10/import.c:1657
  #, c-format
  msgid "key %s: \"%s\" 1 new user ID\n"
  msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
  
- #: g10/import.c:1575
++#: g10/import.c:1660
  #, c-format
  msgid "key %s: \"%s\" %d new user IDs\n"
  msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
  
- #: g10/import.c:1578
++#: g10/import.c:1663
  #, c-format
  msgid "key %s: \"%s\" 1 new signature\n"
  msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
  
- #: g10/import.c:1581
++#: g10/import.c:1666
  #, c-format
  msgid "key %s: \"%s\" %d new signatures\n"
  msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
  
- #: g10/import.c:1584
++#: g10/import.c:1669
  #, c-format
  msgid "key %s: \"%s\" 1 new subkey\n"
  msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
  
- #: g10/import.c:1587
++#: g10/import.c:1672
  #, c-format
  msgid "key %s: \"%s\" %d new subkeys\n"
  msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
  
- #: g10/import.c:1590
++#: g10/import.c:1675
  #, c-format
  msgid "key %s: \"%s\" %d signature cleaned\n"
  msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
  
- #: g10/import.c:1593
++#: g10/import.c:1678
  #, c-format
  msgid "key %s: \"%s\" %d signatures cleaned\n"
  msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
  
- #: g10/import.c:1596
++#: g10/import.c:1681
  #, c-format
  msgid "key %s: \"%s\" %d user ID cleaned\n"
  msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
  
- #: g10/import.c:1599
++#: g10/import.c:1684
  #, c-format
  msgid "key %s: \"%s\" %d user IDs cleaned\n"
  msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
  
- #: g10/import.c:1622
++#: g10/import.c:1707
  #, c-format
  msgid "key %s: \"%s\" not changed\n"
  msgstr "金鑰 %s: \"%s\" 未改變\n"
  
- #: g10/import.c:1934 g10/import.c:2179
++#: g10/import.c:2019 g10/import.c:2264
  #, c-format
  msgid "key %s: secret key imported\n"
  msgstr "金鑰 %s: 私鑰已匯入\n"
  
- #: g10/import.c:1942
++#: g10/import.c:2027
  #, c-format
  msgid "key %s: secret key already exists\n"
  msgstr "金鑰 %s: 私鑰已存在\n"
  
- #: g10/import.c:1950
++#: g10/import.c:2035
  #, c-format
  msgid "key %s: error sending to agent: %s\n"
  msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
  
- #: g10/import.c:2055
++#: g10/import.c:2140
  #, c-format
  msgid "secret key %s: %s\n"
  msgstr "私鑰 %s: %s\n"
  
- #: g10/import.c:2075 g10/import.c:2110
++#: g10/import.c:2160 g10/import.c:2195
  msgid "importing secret keys not allowed\n"
  msgstr "未允許匯入私鑰\n"
  
- #: g10/import.c:2099
++#: g10/import.c:2184
  #, c-format
  msgid "key %s: secret key with invalid cipher %d - skipped\n"
  msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
@@@ -3447,87 -2682,70 +3461,87 @@@
  #. suggested to run 'gpg --card-status', then,
  #. references to a card will be automatically
  #. created again.
- #: g10/import.c:2171
++#: g10/import.c:2256
  #, c-format
  msgid "To migrate '%s', with each smartcard, run: %s\n"
  msgstr ""
  
- #: g10/import.c:2226
++#: g10/import.c:2311
  #, c-format
  msgid "key %s: no public key - can't apply revocation certificate\n"
  msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
  
- #: g10/import.c:2275
++#: g10/import.c:2360
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - rejected\n"
  msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
  
- #: g10/import.c:2308
++#: g10/import.c:2393
  #, c-format
  msgid "key %s: \"%s\" revocation certificate imported\n"
  msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
  
- #: g10/import.c:2384
++#: g10/import.c:2469
  #, c-format
  msgid "key %s: no user ID for signature\n"
  msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
  
- #: g10/import.c:2401
++#: g10/import.c:2486
  #, c-format
  msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
  msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
  
- #: g10/import.c:2403
++#: g10/import.c:2488
  #, c-format
  msgid "key %s: invalid self-signature on user ID \"%s\"\n"
  msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
  
- #: g10/import.c:2420 g10/import.c:2446 g10/import.c:2497
++#: g10/import.c:2505 g10/import.c:2531 g10/import.c:2582
  #, c-format
  msgid "key %s: unsupported public key algorithm\n"
  msgstr "金鑰 %s: 未支援的公鑰演算法\n"
  
- #: g10/import.c:2421
++#: g10/import.c:2506
  #, c-format
  msgid "key %s: invalid direct key signature\n"
  msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
  
- #: g10/import.c:2435
++#: g10/import.c:2520
  #, c-format
  msgid "key %s: no subkey for key binding\n"
  msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
  
- #: g10/import.c:2448
++#: g10/import.c:2533
  #, c-format
  msgid "key %s: invalid subkey binding\n"
  msgstr "金鑰 %s: 無效的附帶子鑰\n"
  
- #: g10/import.c:2464
++#: g10/import.c:2549
  #, c-format
  msgid "key %s: removed multiple subkey binding\n"
  msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
  
- #: g10/import.c:2486
++#: g10/import.c:2571
  #, c-format
  msgid "key %s: no subkey for key revocation\n"
  msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
  
- #: g10/import.c:2499
++#: g10/import.c:2584
  #, c-format
  msgid "key %s: invalid subkey revocation\n"
  msgstr "金鑰 %s: 無效的子鑰撤銷\n"
  
- #: g10/import.c:2514
++#: g10/import.c:2599
  #, c-format
  msgid "key %s: removed multiple subkey revocation\n"
  msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
  
- #: g10/import.c:2556
++#: g10/import.c:2641
  #, c-format
  msgid "key %s: skipped user ID \"%s\"\n"
  msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
  
- #: g10/import.c:2580
++#: g10/import.c:2665
  #, c-format
  msgid "key %s: skipped subkey\n"
  msgstr "金鑰 %s: 子鑰已跳過\n"
@@@ -3536,88 -2754,71 +3550,88 @@@
  #  * to import non-exportable signature when we have the
  #  * the secret key used to create this signature - it
  #  * seems that this makes sense
- #: g10/import.c:2609
++#: g10/import.c:2694
  #, c-format
  msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
  msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
  
- #: g10/import.c:2620
++#: g10/import.c:2705
  #, c-format
  msgid "key %s: revocation certificate at wrong place - skipped\n"
  msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
  
- #: g10/import.c:2638
++#: g10/import.c:2723
  #, c-format
  msgid "key %s: invalid revocation certificate: %s - skipped\n"
  msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
  
- #: g10/import.c:2652
++#: g10/import.c:2737
  #, c-format
  msgid "key %s: subkey signature in wrong place - skipped\n"
  msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
  
- #: g10/import.c:2660
++#: g10/import.c:2745
  #, c-format
  msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
  msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
  
- #: g10/import.c:2789
++#: g10/import.c:2887
  #, c-format
  msgid "key %s: duplicated user ID detected - merged\n"
  msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
  
- #: g10/import.c:2853
++#: g10/import.c:2951
  #, c-format
  msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
  msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
  
- #: g10/import.c:2869
++#: g10/import.c:2967
  #, c-format
  msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
  msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
  
- #: g10/import.c:2933
++#: g10/import.c:3031
  #, c-format
  msgid "key %s: \"%s\" revocation certificate added\n"
  msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
  
- #: g10/import.c:2971
++#: g10/import.c:3069
  #, c-format
  msgid "key %s: direct key signature added\n"
  msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
  
- #: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
++#: g10/keydb.c:404 g10/keydb.c:431 sm/keydb.c:213 sm/keydb.c:226
  #, c-format
  msgid "error creating keybox '%s': %s\n"
  msgstr "建立金鑰鑰匙盒 '%s' 時出錯: %s\n"
  
- #: g10/keydb.c:405 g10/keydb.c:432
++#: g10/keydb.c:407 g10/keydb.c:434
  #, c-format
  msgid "error creating keyring '%s': %s\n"
  msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
  
- #: g10/keydb.c:441 sm/keydb.c:229
++#: g10/keydb.c:443 sm/keydb.c:232
  #, c-format
  msgid "keybox '%s' created\n"
  msgstr "鑰匙盒 '%s' 已建立\n"
  
- #: g10/keydb.c:443
++#: g10/keydb.c:445
  #, c-format
  msgid "keyring '%s' created\n"
  msgstr "鑰匙圈 '%s' 已建立\n"
  
- #: g10/keydb.c:822
++#: g10/keydb.c:823
  #, c-format
  msgid "keyblock resource '%s': %s\n"
  msgstr "金鑰區塊資源 '%s': %s\n"
  
- #: g10/keydb.c:907
++#: g10/keydb.c:911
  #, fuzzy, c-format
  #| msgid "error opening '%s': %s\n"
  msgid "error opening key DB: %s\n"
  msgstr "開啟 '%s' 時出錯: %s\n"
  
- #: g10/keydb.c:1778
++#: g10/keydb.c:1782
  #, c-format
  msgid "failed to rebuild keyring cache: %s\n"
  msgstr "重新建立鑰匙圈快取失敗: %s\n"
@@@ -3630,67 -2829,61 +3644,73 @@@ msgstr "[撤銷]
  msgid "[self-signature]"
  msgstr "[自我簽章]"
  
- #: g10/keyedit.c:618
++#: g10/keyedit.c:432 dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
++#: dirmngr/ldap-wrapper.c:693
+ #, c-format
+ msgid "error allocating memory: %s\n"
+ msgstr "配置記憶體時出錯: %s\n"
+ 
++#: g10/keyedit.c:629
  #, fuzzy, c-format
  #| msgid "key %s: unsupported public key algorithm\n"
  msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
  msgstr "金鑰 %s: 未支援的公鑰演算法\n"
  
- #: g10/keyedit.c:627
++#: g10/keyedit.c:638
  #, fuzzy, c-format
  #| msgid "card does not support digest algorithm %s\n"
  msgid ""
  "can't check signature with unsupported message-digest algorithm %d: %s.\n"
  msgstr "卡片不支援 %s 摘要演算法\n"
  
- #: g10/keyedit.c:789
++#: g10/keyedit.c:800
  #, fuzzy
  #| msgid "Good signature from"
  msgid " (reordered signatures follow)"
  msgstr "完好的簽章來自於"
  
- #: g10/keyedit.c:902
++#: g10/keyedit.c:913
  #, fuzzy, c-format
  #| msgid "key %s: %s\n"
  msgid "key %s:\n"
  msgstr "金鑰 %s: %s\n"
  
- #: g10/keyedit.c:905
++#: g10/keyedit.c:916
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "%d duplicate signature removed\n"
  msgid_plural "%d duplicate signatures removed\n"
  msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
  
- #: g10/keyedit.c:908 g10/keylist.c:480
++#: g10/keyedit.c:919 g10/keylist.c:480
  #, fuzzy, c-format
  #| msgid "1 signature not checked due to a missing key\n"
  msgid "%d signature not checked due to a missing key\n"
  msgid_plural "%d signatures not checked due to missing keys\n"
  msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
  
- #: g10/keyedit.c:912 g10/keylist.c:476
++#: g10/keyedit.c:923 g10/keylist.c:476
  #, fuzzy, c-format
  #| msgid "%d bad signatures\n"
  msgid "%d bad signature\n"
  msgid_plural "%d bad signatures\n"
  msgstr[0] "%d 份損壞的簽章\n"
  
- #: g10/keyedit.c:916
++#: g10/keyedit.c:927
  #, fuzzy, c-format
  #| msgid "Good signature from"
  msgid "%d signature reordered\n"
  msgid_plural "%d signatures reordered\n"
  msgstr[0] "完好的簽章來自於"
  
- #: g10/keyedit.c:921
++#: g10/keyedit.c:932
  #, c-format
  msgid ""
  "Warning: errors found and only checked self-signatures, run '%s' to check "
  "all signatures.\n"
  msgstr ""
  
- #: g10/keyedit.c:981 g10/pkclist.c:274
++#: g10/keyedit.c:992 g10/pkclist.c:274
  msgid ""
  "Please decide how far you trust this user to correctly verify other users' "
  "keys\n"
@@@ -3700,17 -2893,14 +3720,17 @@@ msgstr "
  "請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
  "(像是查對身份證, 或從不同的來源檢查指紋等...)的能力\n"
  
- #: g10/keyedit.c:985 g10/pkclist.c:286
++#: g10/keyedit.c:996 g10/pkclist.c:286
  #, c-format
  msgid "  %d = I trust marginally\n"
  msgstr "  %d = 我勉強信任\n"
  
- #: g10/keyedit.c:986 g10/pkclist.c:288
++#: g10/keyedit.c:997 g10/pkclist.c:288
  #, c-format
  msgid "  %d = I trust fully\n"
  msgstr "  %d = 我完全信任\n"
  
- #: g10/keyedit.c:1004
++#: g10/keyedit.c:1015
  msgid ""
  "Please enter the depth of this trust signature.\n"
  "A depth greater than 1 allows the key you are signing to make\n"
@@@ -3720,50 -2910,38 +3740,50 @@@ msgstr "
  "深度大於 1 的話就表示你信任這把正被簽署的金鑰,\n"
  "同時也信任這把金鑰所簽署的信任簽章.\n"
  
- #: g10/keyedit.c:1021
++#: g10/keyedit.c:1032
  msgid "Please enter a domain to restrict this signature, or enter for none.\n"
  msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
  
- #: g10/keyedit.c:1149
++#: g10/keyedit.c:1160
  #, c-format
  msgid "Skipping user ID \"%s\", which is not a text ID.\n"
  msgstr ""
  
- #: g10/keyedit.c:1157
++#: g10/keyedit.c:1168
  #, c-format
  msgid "User ID \"%s\" is revoked."
  msgstr "使用者 ID \"%s\" 已撤銷."
  
- #: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
- #: g10/keyedit.c:2235
++#: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1416
++#: g10/keyedit.c:2246
  msgid "Are you sure you still want to sign it? (y/N) "
  msgstr "你仍然想要簽署它嗎? (y/N) "
  
- #: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
- #: g10/keyedit.c:2240 g10/keyedit.c:3164
++#: g10/keyedit.c:1191 g10/keyedit.c:1219 g10/keyedit.c:1246 g10/keyedit.c:1422
++#: g10/keyedit.c:2251 g10/keyedit.c:3177
  msgid "  Unable to sign.\n"
  msgstr "  無法簽署.\n"
  
- #: g10/keyedit.c:1185
++#: g10/keyedit.c:1196
  #, c-format
  msgid "User ID \"%s\" is expired."
  msgstr "使用者 ID \"%s\" 已過期."
  
- #: g10/keyedit.c:1213
++#: g10/keyedit.c:1224
  #, c-format
  msgid "User ID \"%s\" is not self-signed."
  msgstr "使用者 ID \"%s\" 未經自我簽署."
  
- #: g10/keyedit.c:1242
++#: g10/keyedit.c:1253
  #, c-format
  msgid "User ID \"%s\" is signable.  "
  msgstr "使用者 ID \"%s\" 可被簽署."
  
- #: g10/keyedit.c:1244
++#: g10/keyedit.c:1255
  msgid "Sign it? (y/N) "
  msgstr "是否要簽署? (y/N) "
  
- #: g10/keyedit.c:1271
++#: g10/keyedit.c:1282
  #, c-format
  msgid ""
  "The self-signature on \"%s\"\n"
@@@ -3772,11 -2950,9 +3792,11 @@@ msgstr "
  "\"%s\" 裡的自我簽章\n"
  "是 PGP 2.x 型態的簽章.\n"
  
- #: g10/keyedit.c:1280
++#: g10/keyedit.c:1291
  msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
  msgstr "你是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
  
- #: g10/keyedit.c:1293
++#: g10/keyedit.c:1304
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3785,11 -2961,9 +3805,11 @@@ msgstr "
  "你目前在 \"%s\" 的簽章\n"
  "已經過期了.\n"
  
- #: g10/keyedit.c:1298
++#: g10/keyedit.c:1309
  msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
  msgstr "你想要發佈一份新的簽章來取代已過期的那個嗎? (y/N) "
  
- #: g10/keyedit.c:1319
++#: g10/keyedit.c:1330
  #, c-format
  msgid ""
  "Your current signature on \"%s\"\n"
@@@ -3798,43 -2972,34 +3818,43 @@@ msgstr "
  "你目前在 \"%s\" 的簽章\n"
  "是一份本機簽章.\n"
  
- #: g10/keyedit.c:1324
++#: g10/keyedit.c:1335
  msgid "Do you want to promote it to a full exportable signature? (y/N) "
  msgstr "你是否想要把他升級成可以完全匯出的簽章? (y/N) "
  
- #: g10/keyedit.c:1344
++#: g10/keyedit.c:1355
  #, c-format
  msgid "\"%s\" was already locally signed by key %s\n"
  msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
  
- #: g10/keyedit.c:1348
++#: g10/keyedit.c:1359
  #, c-format
  msgid "\"%s\" was already signed by key %s\n"
  msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
  
- #: g10/keyedit.c:1353
++#: g10/keyedit.c:1364
  msgid "Do you want to sign it again anyway? (y/N) "
  msgstr "你仍然想要再次簽署它嗎? (y/N) "
  
- #: g10/keyedit.c:1375
++#: g10/keyedit.c:1386
  #, c-format
  msgid "Nothing to sign with key %s\n"
  msgstr "沒有東西可以讓金鑰 %s 簽署\n"
  
- #: g10/keyedit.c:1399
++#: g10/keyedit.c:1410
  msgid "This key has expired!"
  msgstr "這把金鑰已經過期了!"
  
- #: g10/keyedit.c:1417
++#: g10/keyedit.c:1428
  #, c-format
  msgid "This key is due to expire on %s.\n"
  msgstr "這把金鑰將在 %s 過期.\n"
  
- #: g10/keyedit.c:1423
++#: g10/keyedit.c:1434
  msgid "Do you want your signature to expire at the same time? (Y/n) "
  msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
  
- #: g10/keyedit.c:1464
++#: g10/keyedit.c:1475
  msgid ""
  "How carefully have you verified the key you are about to sign actually "
  "belongs\n"
@@@ -3843,31 -3008,25 +3863,31 @@@ msgstr "
  "你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
  "如果你不知道這個問題的答案, 請輸入 \"0\".\n"
  
- #: g10/keyedit.c:1469
++#: g10/keyedit.c:1480
  #, c-format
  msgid "   (0) I will not answer.%s\n"
  msgstr "   (0) 我不作答.%s\n"
  
- #: g10/keyedit.c:1471
++#: g10/keyedit.c:1482
  #, c-format
  msgid "   (1) I have not checked at all.%s\n"
  msgstr "   (1) 我根本沒有檢查過.%s\n"
  
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1484
  #, c-format
  msgid "   (2) I have done casual checking.%s\n"
  msgstr "   (2) 我隨意檢查過了.%s\n"
  
- #: g10/keyedit.c:1476
++#: g10/keyedit.c:1487
  #, c-format
  msgid "   (3) I have done very careful checking.%s\n"
  msgstr "   (3) 我非常小心地檢查過了.%s\n"
  
- #: g10/keyedit.c:1483
++#: g10/keyedit.c:1494
  msgid "Your selection? (enter '?' for more information): "
  msgstr "你的選擇是? (輸入 '?' 以取得更多資訊): "
  
- #: g10/keyedit.c:1510
++#: g10/keyedit.c:1521
  #, c-format
  msgid ""
  "Are you sure that you want to sign this key with your\n"
@@@ -3876,220 -3035,166 +3896,220 @@@ msgstr "
  "你真的確定要用你的金鑰 \"%s\" (%s)\n"
  "來簽署這把金鑰嗎\n"
  
- #: g10/keyedit.c:1518
++#: g10/keyedit.c:1529
  msgid "This will be a self-signature.\n"
  msgstr "這將會是一份自我簽章.\n"
  
- #: g10/keyedit.c:1523
++#: g10/keyedit.c:1534
  msgid "WARNING: the signature will not be marked as non-exportable.\n"
  msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
  
- #: g10/keyedit.c:1530
++#: g10/keyedit.c:1541
  msgid "WARNING: the signature will not be marked as non-revocable.\n"
  msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
  
- #: g10/keyedit.c:1540
++#: g10/keyedit.c:1551
  msgid "The signature will be marked as non-exportable.\n"
  msgstr "這份簽章會被標記成不可匯出.\n"
  
- #: g10/keyedit.c:1547
++#: g10/keyedit.c:1558
  msgid "The signature will be marked as non-revocable.\n"
  msgstr "這份簽章會被標記成不可撤銷.\n"
  
- #: g10/keyedit.c:1554
++#: g10/keyedit.c:1565
  msgid "I have not checked this key at all.\n"
  msgstr "我根本沒有檢查過這把金鑰.\n"
  
- #: g10/keyedit.c:1559
++#: g10/keyedit.c:1570
  msgid "I have checked this key casually.\n"
  msgstr "我隨意檢查過這把金鑰了.\n"
  
- #: g10/keyedit.c:1564
++#: g10/keyedit.c:1575
  msgid "I have checked this key very carefully.\n"
  msgstr "我非常小心地檢查過這把金鑰了.\n"
  
- #: g10/keyedit.c:1576
++#: g10/keyedit.c:1587
  msgid "Really sign? (y/N) "
  msgstr "真的要簽署嗎? (y/N)"
  
- #: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
- #: g10/keyedit.c:6447 g10/sign.c:323
++#: g10/keyedit.c:1638 g10/keyedit.c:6210 g10/keyedit.c:6293 g10/keyedit.c:6401
++#: g10/keyedit.c:6463 g10/sign.c:323
  #, c-format
  msgid "signing failed: %s\n"
  msgstr "簽署時失敗: %s\n"
  
- #: g10/keyedit.c:1714
++#: g10/keyedit.c:1725
  msgid "Key has only stub or on-card key items - no passphrase to change.\n"
  msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
  
- #: g10/keyedit.c:1744
++#: g10/keyedit.c:1755
  #, c-format
  msgid "key %s: error changing passphrase: %s\n"
  msgstr "金鑰 %s: 變更密語時出錯: %s\n"
  
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1869
  msgid "save and quit"
  msgstr "儲存並離開"
  
- #: g10/keyedit.c:1861
++#: g10/keyedit.c:1872
  msgid "show key fingerprint"
  msgstr "顯示金鑰指紋"
  
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1873
  #, fuzzy
  #| msgid "Enter the keygrip: "
  msgid "show the keygrip"
  msgstr "請輸入金鑰鑰柄: "
  
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1874
  msgid "list key and user IDs"
  msgstr "列出金鑰和使用者 ID"
  
- #: g10/keyedit.c:1865
++#: g10/keyedit.c:1876
  msgid "select user ID N"
  msgstr "選擇使用者 ID N"
  
- #: g10/keyedit.c:1866
++#: g10/keyedit.c:1877
  msgid "select subkey N"
  msgstr "選擇子鑰 N"
  
- #: g10/keyedit.c:1867
++#: g10/keyedit.c:1878
  msgid "check signatures"
  msgstr "檢查簽章"
  
- #: g10/keyedit.c:1873
++#: g10/keyedit.c:1884
  msgid "sign selected user IDs [* see below for related commands]"
  msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
  
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1889
  msgid "sign selected user IDs locally"
  msgstr "僅在本機簽署所選的使用者 ID"
  
- #: g10/keyedit.c:1879
++#: g10/keyedit.c:1890
  msgid "sign selected user IDs with a trust signature"
  msgstr "用信任簽章來簽署所選的使用者 ID"
  
- #: g10/keyedit.c:1881
++#: g10/keyedit.c:1892
  msgid "sign selected user IDs with a non-revocable signature"
  msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
  
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1894
  msgid "add a user ID"
  msgstr "增加使用者 ID"
  
- #: g10/keyedit.c:1885
++#: g10/keyedit.c:1896
  msgid "add a photo ID"
  msgstr "增加照片 ID"
  
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1897
  msgid "delete selected user IDs"
  msgstr "刪除所選的使用者 ID"
  
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1900
  msgid "add a subkey"
  msgstr "增加子鑰"
  
- #: g10/keyedit.c:1892
++#: g10/keyedit.c:1903
  msgid "add a key to a smartcard"
  msgstr "將金鑰加到智慧卡"
  
- #: g10/keyedit.c:1894
++#: g10/keyedit.c:1905
  msgid "move a key to a smartcard"
  msgstr "將金鑰移動到智慧卡"
  
- #: g10/keyedit.c:1896
++#: g10/keyedit.c:1907
  msgid "move a backup key to a smartcard"
  msgstr "將備份金鑰移動到智慧卡"
  
- #: g10/keyedit.c:1898
++#: g10/keyedit.c:1909
  msgid "delete selected subkeys"
  msgstr "刪除所選的子鑰"
  
- #: g10/keyedit.c:1900
++#: g10/keyedit.c:1911
  msgid "add a revocation key"
  msgstr "增加撤銷金鑰"
  
- #: g10/keyedit.c:1902
++#: g10/keyedit.c:1913
  msgid "delete signatures from the selected user IDs"
  msgstr "從所選的使用者 ID 中刪除簽章"
  
- #: g10/keyedit.c:1904
++#: g10/keyedit.c:1915
  msgid "change the expiration date for the key or selected subkeys"
  msgstr "變更金鑰或所選子鑰的使用期限"
  
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1917
  msgid "flag the selected user ID as primary"
  msgstr "把所選的使用者 ID 標為主要"
  
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1920
  msgid "list preferences (expert)"
  msgstr "列出偏好 (專家模式)"
  
- #: g10/keyedit.c:1910
++#: g10/keyedit.c:1921
  msgid "list preferences (verbose)"
  msgstr "列出偏好 (囉唆模式)"
  
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1923
  msgid "set preference list for the selected user IDs"
  msgstr "設定所選使用者 ID 的偏好清單"
  
- #: g10/keyedit.c:1915
++#: g10/keyedit.c:1926
  msgid "set the preferred keyserver URL for the selected user IDs"
  msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
  
- #: g10/keyedit.c:1917
++#: g10/keyedit.c:1928
  msgid "set a notation for the selected user IDs"
  msgstr "為所選的使用者 ID 設定註記"
  
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1930
  msgid "change the passphrase"
  msgstr "更改密語"
  
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1933
  msgid "change the ownertrust"
  msgstr "更改主觀信任"
  
- #: g10/keyedit.c:1925
++#: g10/keyedit.c:1936
  msgid "revoke signatures on the selected user IDs"
  msgstr "撤銷所選使用者 ID 的簽章"
  
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1938
  msgid "revoke selected user IDs"
  msgstr "撤銷所選的使用者 ID"
  
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1941
  msgid "revoke key or selected subkeys"
  msgstr "撤銷金鑰或所選的子鑰"
  
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1943
  msgid "enable key"
  msgstr "啟用金鑰"
  
- #: g10/keyedit.c:1933
++#: g10/keyedit.c:1944
  msgid "disable key"
  msgstr "停用金鑰"
  
- #: g10/keyedit.c:1935
++#: g10/keyedit.c:1946
  msgid "show selected photo IDs"
  msgstr "顯示所選的照片 ID"
  
- #: g10/keyedit.c:1937
++#: g10/keyedit.c:1948
  msgid "compact unusable user IDs and remove unusable signatures from key"
  msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
  
- #: g10/keyedit.c:1939
++#: g10/keyedit.c:1950
  msgid "compact unusable user IDs and remove all signatures from key"
  msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
  
- #: g10/keyedit.c:2051
++#: g10/keyedit.c:2062
  msgid "Secret key is available.\n"
  msgstr "私鑰可用.\n"
  
- #: g10/keyedit.c:2151
++#: g10/keyedit.c:2162
  msgid "Need the secret key to do this.\n"
  msgstr "要有私鑰纔能這麼做.\n"
  
- #: g10/keyedit.c:2172
++#: g10/keyedit.c:2183
  msgid ""
  "* The 'sign' command may be prefixed with an 'l' for local signatures "
  "(lsign),\n"
@@@ -4100,260 -3205,201 +4120,260 @@@ msgstr "
  "  加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是不可撤銷簽章\n"
  "  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
  
- #: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
++#: g10/keyedit.c:2239 g10/keyedit.c:3177 g10/keyedit.c:3316
  msgid "Key is revoked."
  msgstr "金鑰已撤銷."
  
- #: g10/keyedit.c:2251
++#: g10/keyedit.c:2262
  msgid "Really sign all user IDs? (y/N) "
  msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
  
- #: g10/keyedit.c:2255
++#: g10/keyedit.c:2266
  #, fuzzy
  #| msgid "Really sign all user IDs? (y/N) "
  msgid "Really sign all text user IDs? (y/N) "
  msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
  
- #: g10/keyedit.c:2263
++#: g10/keyedit.c:2274
  msgid "Hint: Select the user IDs to sign\n"
  msgstr "提示: 選擇使用者 ID 來加以簽署\n"
  
- #: g10/keyedit.c:2274
++#: g10/keyedit.c:2285
  #, c-format
  msgid "Unknown signature type '%s'\n"
  msgstr "未知的簽章種類 '%s'\n"
  
- #: g10/keyedit.c:2298
++#: g10/keyedit.c:2309
  #, c-format
  msgid "This command is not allowed while in %s mode.\n"
  msgstr "在 %s 模式中不允許使用這個指令.\n"
  
- #: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
++#: g10/keyedit.c:2331 g10/keyedit.c:2355 g10/keyedit.c:2549
  msgid "You must select at least one user ID.\n"
  msgstr "你至少得選擇一個使用者 ID.\n"
  
- #: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
++#: g10/keyedit.c:2333 g10/keyedit.c:2357 g10/keyedit.c:2511 g10/keyedit.c:2551
  #, c-format
  msgid "(Use the '%s' command.)\n"
  msgstr ""
  
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2336
  msgid "You can't delete the last user ID!\n"
  msgstr "你不能刪除最後一個使用者 ID!\n"
  
- #: g10/keyedit.c:2328
++#: g10/keyedit.c:2339
  msgid "Really remove all selected user IDs? (y/N) "
  msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
  
- #: g10/keyedit.c:2329
++#: g10/keyedit.c:2340
  msgid "Really remove this user ID? (y/N) "
  msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
  
  #. TRANSLATORS: Please take care: This is about
  #. moving the key and not about removing it.
- #: g10/keyedit.c:2386
++#: g10/keyedit.c:2397
  msgid "Really move the primary key? (y/N) "
  msgstr "真的要移動主鑰嗎? (y/N) "
  
- #: g10/keyedit.c:2398 g10/keyedit.c:4850
++#: g10/keyedit.c:2409 g10/keyedit.c:4866
  msgid "You must select exactly one key.\n"
  msgstr "你一定祇得選擇一把金鑰.\n"
  
- #: g10/keyedit.c:2425
++#: g10/keyedit.c:2436
  msgid "Command expects a filename argument\n"
  msgstr "這項指令要拿一個檔名來當作引數\n"
  
- #: g10/keyedit.c:2446
++#: g10/keyedit.c:2457
  #, c-format
  msgid "Can't open '%s': %s\n"
  msgstr "無法開啟 '%s': %s\n"
  
- #: g10/keyedit.c:2463
++#: g10/keyedit.c:2474
  #, c-format
  msgid "Error reading backup key from '%s': %s\n"
  msgstr "從 '%s' 讀取備份金鑰時出錯: %s\n"
  
- #: g10/keyedit.c:2498
++#: g10/keyedit.c:2509
  msgid "You must select at least one key.\n"
  msgstr "你至少得選擇一把金鑰.\n"
  
- #: g10/keyedit.c:2504
++#: g10/keyedit.c:2515
  msgid "Do you really want to delete the selected keys? (y/N) "
  msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
  
- #: g10/keyedit.c:2506
++#: g10/keyedit.c:2517
  msgid "Do you really want to delete this key? (y/N) "
  msgstr "你真的想要刪除這把金鑰嗎? (y/N) "
  
- #: g10/keyedit.c:2544
++#: g10/keyedit.c:2555
  msgid "Really revoke all selected user IDs? (y/N) "
  msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
  
- #: g10/keyedit.c:2545
++#: g10/keyedit.c:2556
  msgid "Really revoke this user ID? (y/N) "
  msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
  
- #: g10/keyedit.c:2563
++#: g10/keyedit.c:2574
  msgid "Do you really want to revoke the entire key? (y/N) "
  msgstr "你真的想要撤銷這整把金鑰嗎? (y/N) "
  
- #: g10/keyedit.c:2574
++#: g10/keyedit.c:2585
  msgid "Do you really want to revoke the selected subkeys? (y/N) "
  msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
  
- #: g10/keyedit.c:2576
++#: g10/keyedit.c:2587
  msgid "Do you really want to revoke this subkey? (y/N) "
  msgstr "你真的想要撤銷這把子鑰嗎? (y/N) "
  
- #: g10/keyedit.c:2634
++#: g10/keyedit.c:2645
  msgid "Owner trust may not be set while using a user provided trust database\n"
  msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
  
- #: g10/keyedit.c:2679
++#: g10/keyedit.c:2690
  msgid "Set preference list to:\n"
  msgstr "設定偏好清單至:\n"
  
- #: g10/keyedit.c:2686
++#: g10/keyedit.c:2697
  msgid "Really update the preferences for the selected user IDs? (y/N) "
  msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
  
- #: g10/keyedit.c:2688
++#: g10/keyedit.c:2699
  msgid "Really update the preferences? (y/N) "
  msgstr "真的要更新偏好設定嗎? (y/N) "
  
- #: g10/keyedit.c:2762
++#: g10/keyedit.c:2773
  msgid "Save changes? (y/N) "
  msgstr "要儲存變更嗎? (y/N) "
  
- #: g10/keyedit.c:2766
++#: g10/keyedit.c:2777
  msgid "Quit without saving? (y/N) "
  msgstr "要不儲存就離開嗎? (y/N) "
  
- #: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
- #: g10/keyedit.c:3254 g10/keyedit.c:3319
++#: g10/keyedit.c:2788 g10/keyedit.c:2798 g10/keyedit.c:2942 g10/keyedit.c:3045
++#: g10/keyedit.c:3267 g10/keyedit.c:3332
  #, c-format
  msgid "update failed: %s\n"
  msgstr "更新失敗: %s\n"
  
- #: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
++#: g10/keyedit.c:2804 g10/keyedit.c:3272 g10/keyedit.c:3337
  msgid "Key not changed so no update needed.\n"
  msgstr "金鑰沒有變更所以不需要更新.\n"
  
- #: g10/keyedit.c:3025
++#: g10/keyedit.c:3038
  #, fuzzy, c-format
  #| msgid "Key generation failed: %s\n"
  msgid "User ID revocation failed: %s\n"
  msgstr "產生金鑰失敗: %s\n"
  
- #: g10/keyedit.c:3070
++#: g10/keyedit.c:3083
  #, c-format
  msgid "\"%s\" is not a fingerprint\n"
  msgstr "\"%s\" 不是指紋\n"
  
- #: g10/keyedit.c:3099
++#: g10/keyedit.c:3112
  #, c-format
  msgid "\"%s\" is not the primary fingerprint\n"
  msgstr "\"%s\" 不是主要指紋\n"
  
- #: g10/keyedit.c:3235 g10/keyedit.c:3238
++#: g10/keyedit.c:3248 g10/keyedit.c:3251
  #, fuzzy, c-format
  #| msgid "invalid value\n"
  msgid "Invalid user ID '%s': %s\n"
  msgstr "無效的數值\n"
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "No matching user IDs."
  msgstr "沒有相符的使用者 ID."
  
- #: g10/keyedit.c:3241
++#: g10/keyedit.c:3254
  msgid "Nothing to sign.\n"
  msgstr "沒有東西可以簽署.\n"
  
- #: g10/keyedit.c:3414
++#: g10/keyedit.c:3427
  msgid "Digest: "
  msgstr "摘要: "
  
- #: g10/keyedit.c:3471
++#: g10/keyedit.c:3484
  msgid "Features: "
  msgstr "特點: "
  
- #: g10/keyedit.c:3482
++#: g10/keyedit.c:3495
  msgid "Keyserver no-modify"
  msgstr "金鑰伺服器無修改"
  
- #: g10/keyedit.c:3497 g10/keylist.c:377
++#: g10/keyedit.c:3510 g10/keylist.c:377
  msgid "Preferred keyserver: "
  msgstr "偏好的金鑰伺服器: "
  
- #: g10/keyedit.c:3505 g10/keyedit.c:3506
++#: g10/keyedit.c:3518 g10/keyedit.c:3519
  msgid "Notations: "
  msgstr "註記: "
  
- #: g10/keyedit.c:3751
++#: g10/keyedit.c:3764
  msgid "There are no preferences on a PGP 2.x-style user ID.\n"
  msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
  
- #: g10/keyedit.c:3823
++#: g10/keyedit.c:3836
  #, c-format
  msgid "The following key was revoked on %s by %s key %s\n"
  msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
  
- #: g10/keyedit.c:3847
++#: g10/keyedit.c:3860
  #, c-format
  msgid "This key may be revoked by %s key %s"
  msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
  
- #: g10/keyedit.c:3853
++#: g10/keyedit.c:3866
  msgid "(sensitive)"
  msgstr "(機密)"
  
- #: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
++#: g10/keyedit.c:3908 g10/keyedit.c:4050 g10/keylist.c:262 g10/keyserver.c:538
  #, c-format
  msgid "created: %s"
  msgstr "建立: %s"
  
- #: g10/keyedit.c:3898 g10/keylist.c:1843
++#: g10/keyedit.c:3911 g10/keylist.c:1852
  #, c-format
  msgid "revoked: %s"
  msgstr "撤銷: %s"
  
  #  of subkey
- #: g10/keyedit.c:3900 g10/keylist.c:1849
++#: g10/keyedit.c:3913 g10/keylist.c:1858
  #, c-format
  msgid "expired: %s"
  msgstr "過期: %s"
  
  #  of subkey
- #: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
- #: g10/keyserver.c:542
++#: g10/keyedit.c:3915 g10/keyedit.c:4052 g10/keylist.c:264 g10/keylist.c:1864
++#: g10/keyserver.c:544
  #, c-format
  msgid "expires: %s"
  msgstr "到期: %s"
  
- #: g10/keyedit.c:3904
++#: g10/keyedit.c:3917
  #, c-format
  msgid "usage: %s"
  msgstr "用途: %s"
  
- #: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
++#: g10/keyedit.c:3925 g10/keyedit.c:3945 g10/keylist.c:267
  msgid "card-no: "
  msgstr "卡片編號: "
  
- #: g10/keyedit.c:3971
++#: g10/keyedit.c:3984
  #, c-format
  msgid "trust: %s"
  msgstr "信任: %s"
  
- #: g10/keyedit.c:3975
++#: g10/keyedit.c:3988
  #, c-format
  msgid "validity: %s"
  msgstr "有效性: %s"
  
- #: g10/keyedit.c:3982
++#: g10/keyedit.c:3995
  msgid "This key has been disabled"
  msgstr "這把金鑰已經停用了"
  
- #: g10/keyedit.c:4000
++#: g10/keyedit.c:4013
  msgid ""
  "Please note that the shown key validity is not necessarily correct\n"
  "unless you restart the program.\n"
@@@ -4361,17 -3407,12 +4381,18 @@@ msgstr "
  "請注意顯示出來的金鑰有效性不需要更正,\n"
  "除非你重新執行程式.\n"
  
- #: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
- #: g10/mainproc.c:2041 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:703
++#: g10/keyedit.c:4069 g10/keyedit.c:4500 g10/keyserver.c:548
++#: g10/mainproc.c:2070 g10/tofu.c:1683 g10/trust.c:384 g10/trust.c:689
++#: dirmngr/ocsp.c:703
  msgid "revoked"
  msgstr "已撤銷"
  
- #: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
- #: g10/mainproc.c:2043 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4071 g10/keyedit.c:4502 g10/keyserver.c:552
++#: g10/mainproc.c:2072 g10/tofu.c:1688 g10/trust.c:104 g10/trust.c:691
  msgid "expired"
  msgstr "已過期"
  
- #: g10/keyedit.c:4175
++#: g10/keyedit.c:4188
  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"
@@@ -4379,15 -3420,12 +4400,15 @@@ msgstr "
  "警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
  "      導致不同的使用者 ID 被當成主要 ID.\n"
  
- #: g10/keyedit.c:4227
++#: g10/keyedit.c:4240
  msgid "WARNING: Your encryption subkey expires soon.\n"
  msgstr "警告: 你的加密子鑰很快將到期.\n"
  
- #: g10/keyedit.c:4228
++#: g10/keyedit.c:4241
  msgid "You may want to change its expiration date too.\n"
  msgstr "你可能也會想變更其使用期限.\n"
  
- #: g10/keyedit.c:4287
++#: g10/keyedit.c:4300
  msgid ""
  "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
  "versions\n"
@@@ -4396,72 -3434,57 +4417,72 @@@ msgstr "
  "警告: 這是一把 PGP2 型態的金鑰.\n"
  "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
  
- #: g10/keyedit.c:4292 g10/keyedit.c:4579
++#: g10/keyedit.c:4305 g10/keyedit.c:4595
  msgid "Are you sure you still want to add it? (y/N) "
  msgstr "你確定仍然想要增加嗎? (y/N) "
  
- #: g10/keyedit.c:4298
++#: g10/keyedit.c:4311
  msgid "You may not add a photo ID to a PGP2-style key.\n"
  msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
  
- #: g10/keyedit.c:4311 g10/keygen.c:2676
++#: g10/keyedit.c:4326 g10/keygen.c:2697
  msgid "Such a user ID already exists on this key!\n"
  msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
  
- #: g10/keyedit.c:4412
++#: g10/keyedit.c:4428
  msgid "Delete this good signature? (y/N/q)"
  msgstr "刪除這份完好的簽章嗎? (y/N/q)"
  
- #: g10/keyedit.c:4422
++#: g10/keyedit.c:4438
  msgid "Delete this invalid signature? (y/N/q)"
  msgstr "刪除這份無效的簽章嗎? (y/N/q)"
  
- #: g10/keyedit.c:4426
++#: g10/keyedit.c:4442
  msgid "Delete this unknown signature? (y/N/q)"
  msgstr "刪除這份未知的簽章嗎? (y/N/q)"
  
- #: g10/keyedit.c:4433
++#: g10/keyedit.c:4449
  msgid "Really delete this self-signature? (y/N)"
  msgstr "真的要刪除這份自我簽章嗎? (y/N)"
  
- #: g10/keyedit.c:4449
++#: g10/keyedit.c:4465
  #, fuzzy, c-format
  #| msgid "Deleted %d signature.\n"
  msgid "Deleted %d signature.\n"
  msgid_plural "Deleted %d signatures.\n"
  msgstr[0] "已經刪除了 %d 份簽章.\n"
  
- #: g10/keyedit.c:4453
++#: g10/keyedit.c:4469
  msgid "Nothing deleted.\n"
  msgstr "沒有刪除任何東西.\n"
  
- #: g10/keyedit.c:4488 g10/trust.c:693
++#: g10/keyedit.c:4504 g10/trust.c:693
  msgid "invalid"
  msgstr "無效"
  
- #: g10/keyedit.c:4490
++#: g10/keyedit.c:4506
  #, c-format
  msgid "User ID \"%s\" compacted: %s\n"
  msgstr "使用者 ID \"%s\" 已精簡: %s\n"
  
- #: g10/keyedit.c:4496
++#: g10/keyedit.c:4512
  #, fuzzy, c-format
  #| msgid "User ID \"%s\": %d signature removed\n"
  msgid "User ID \"%s\": %d signature removed\n"
  msgid_plural "User ID \"%s\": %d signatures removed\n"
  msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
  
- #: g10/keyedit.c:4504
++#: g10/keyedit.c:4520
  #, c-format
  msgid "User ID \"%s\": already minimized\n"
  msgstr "使用者 ID \"%s\": 已經最小化了\n"
  
- #: g10/keyedit.c:4505
++#: g10/keyedit.c:4521
  #, c-format
  msgid "User ID \"%s\": already clean\n"
  msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
  
- #: g10/keyedit.c:4574
++#: g10/keyedit.c:4590
  msgid ""
  "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
  "cause\n"
@@@ -4470,39 -3493,31 +4491,39 @@@ msgstr "
  "警告: 這是一把 PGP2 型態的金鑰.\n"
  "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
  
- #: g10/keyedit.c:4585
++#: g10/keyedit.c:4601
  msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
  msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
  
- #: g10/keyedit.c:4602
++#: g10/keyedit.c:4618
  msgid "Enter the user ID of the designated revoker: "
  msgstr "輸入指定撤銷者的使用者 ID: "
  
- #: g10/keyedit.c:4627
++#: g10/keyedit.c:4643
  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:4642
++#: g10/keyedit.c:4658
  msgid "you cannot appoint a key as its own designated revoker\n"
  msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
  
- #: g10/keyedit.c:4664
++#: g10/keyedit.c:4680
  msgid "this key has already been designated as a revoker\n"
  msgstr "已指定這把金鑰為撤銷者了\n"
  
- #: g10/keyedit.c:4682
++#: g10/keyedit.c:4698
  msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
  msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
  
- #: g10/keyedit.c:4688
++#: g10/keyedit.c:4704
  msgid ""
  "Are you sure you want to appoint this key as a designated revoker? (y/N) "
  msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
  
- #: g10/keyedit.c:4739
++#: g10/keyedit.c:4755
  #, fuzzy
  #| msgid ""
  #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4511,228 -3526,177 +4532,228 @@@ msgid "
  "N) "
  msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
  
- #: g10/keyedit.c:4744
++#: g10/keyedit.c:4760
  msgid "Changing expiration time for a subkey.\n"
  msgstr "正在變更子鑰的使用期限.\n"
  
- #: g10/keyedit.c:4747
++#: g10/keyedit.c:4763
  msgid "Changing expiration time for the primary key.\n"
  msgstr "正在變更主鑰的使用期限.\n"
  
- #: g10/keyedit.c:4798
++#: g10/keyedit.c:4814
  msgid "You can't change the expiration date of a v3 key\n"
  msgstr "你不能變更 v3 金鑰的使用期限\n"
  
- #: g10/keyedit.c:4971
++#: g10/keyedit.c:4987
  #, c-format
  msgid "signing subkey %s is already cross-certified\n"
  msgstr "簽署子鑰 %s 已經交叉認證過了\n"
  
- #: g10/keyedit.c:4977
++#: g10/keyedit.c:4993
  #, c-format
  msgid "subkey %s does not sign and so does not need to be cross-certified\n"
  msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
  
- #: g10/keyedit.c:5092
++#: g10/keyedit.c:5108
  msgid "Please select exactly one user ID.\n"
  msgstr "請祇選擇一個使用者 ID.\n"
  
- #: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
++#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5513
  #, c-format
  msgid "skipping v3 self-signature on user ID \"%s\"\n"
  msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
  
- #: g10/keyedit.c:5304
++#: g10/keyedit.c:5320
  msgid "Enter your preferred keyserver URL: "
  msgstr "請輸入你的偏好金鑰伺服器 URL: "
  
- #: g10/keyedit.c:5383
++#: g10/keyedit.c:5399
  msgid "Are you sure you want to replace it? (y/N) "
  msgstr "你確定要取代它嗎? (y/N) "
  
- #: g10/keyedit.c:5384
++#: g10/keyedit.c:5400
  msgid "Are you sure you want to delete it? (y/N) "
  msgstr "你確定要刪除它嗎? (y/N) "
  
- #: g10/keyedit.c:5443
++#: g10/keyedit.c:5459
  msgid "Enter the notation: "
  msgstr "請輸入註記: "
  
- #: g10/keyedit.c:5590
++#: g10/keyedit.c:5606
  msgid "Proceed? (y/N) "
  msgstr "是否繼續? (y/N) "
  
- #: g10/keyedit.c:5660
++#: g10/keyedit.c:5676
  #, c-format
  msgid "No user ID with index %d\n"
  msgstr "索引 %d 沒有對應到使用者 ID\n"
  
- #: g10/keyedit.c:5722
++#: g10/keyedit.c:5738
  #, c-format
  msgid "No user ID with hash %s\n"
  msgstr "雜湊 %s 沒有對應到使用者 ID\n"
  
- #: g10/keyedit.c:5823
++#: g10/keyedit.c:5839
  #, fuzzy, c-format
  #| msgid "No subkey with index %d\n"
  msgid "No subkey with key ID '%s'.\n"
  msgstr "索引 %d 沒有對應到子鑰\n"
  
- #: g10/keyedit.c:5845
++#: g10/keyedit.c:5861
  #, c-format
  msgid "No subkey with index %d\n"
  msgstr "索引 %d 沒有對應到子鑰\n"
  
- #: g10/keyedit.c:5986
++#: g10/keyedit.c:6002
  #, c-format
  msgid "user ID: \"%s\"\n"
  msgstr "使用者 ID: \"%s\"\n"
  
- #: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
++#: g10/keyedit.c:6005 g10/keyedit.c:6107 g10/keyedit.c:6155
  #, c-format
  msgid "signed by your key %s on %s%s%s\n"
  msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
  
- #: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
++#: g10/keyedit.c:6007 g10/keyedit.c:6109 g10/keyedit.c:6157
  msgid " (non-exportable)"
  msgstr " (不可匯出)"
  
- #: g10/keyedit.c:5995
++#: g10/keyedit.c:6011
  #, c-format
  msgid "This signature expired on %s.\n"
  msgstr "這份簽章已經在 %s 過期了.\n"
  
- #: g10/keyedit.c:6000
++#: g10/keyedit.c:6016
  msgid "Are you sure you still want to revoke it? (y/N) "
  msgstr "你確定仍然想要撤銷它嗎? (y/N) "
  
- #: g10/keyedit.c:6005
++#: g10/keyedit.c:6021
  msgid "Create a revocation certificate for this signature? (y/N) "
  msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
  
- #: g10/keyedit.c:6059
++#: g10/keyedit.c:6075
  msgid "Not signed by you.\n"
  msgstr "並非由你所簽署.\n"
  
- #: g10/keyedit.c:6065
++#: g10/keyedit.c:6081
  #, c-format
  msgid "You have signed these user IDs on key %s:\n"
  msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
  
- #: g10/keyedit.c:6094
++#: g10/keyedit.c:6110
  msgid " (non-revocable)"
  msgstr " (不可撤銷)"
  
- #: g10/keyedit.c:6101
++#: g10/keyedit.c:6117
  #, c-format
  msgid "revoked by your key %s on %s\n"
  msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
  
- #: g10/keyedit.c:6126
++#: g10/keyedit.c:6142
  msgid "You are about to revoke these signatures:\n"
  msgstr "你正要撤銷這些簽章:\n"
  
- #: g10/keyedit.c:6149
++#: g10/keyedit.c:6165
  msgid "Really create the revocation certificates? (y/N) "
  msgstr "真的要建立撤銷憑證嗎? (y/N) "
  
- #: g10/keyedit.c:6182
++#: g10/keyedit.c:6198
  msgid "no secret key\n"
  msgstr "沒有私鑰\n"
  
- #: g10/keyedit.c:6230
++#: g10/keyedit.c:6246
  #, c-format
  msgid "tried to revoke a non-user ID: %s\n"
  msgstr ""
  
- #: g10/keyedit.c:6240
++#: g10/keyedit.c:6256
  #, c-format
  msgid "user ID \"%s\" is already revoked\n"
  msgstr "使用者 ID \"%s\" 已撤銷\n"
  
- #: g10/keyedit.c:6257
++#: g10/keyedit.c:6273
  #, c-format
  msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
  msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
  
- #: g10/keyedit.c:6370
++#: g10/keyedit.c:6386
  #, c-format
  msgid "Key %s is already revoked.\n"
  msgstr "金鑰 %s 已撤銷.\n"
  
- #: g10/keyedit.c:6432
++#: g10/keyedit.c:6448
  #, c-format
  msgid "Subkey %s is already revoked.\n"
  msgstr "子鑰 %s 已撤銷.\n"
  
- #: g10/keyedit.c:6529
++#: g10/keyedit.c:6545
  #, c-format
  msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
  msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
  
- #: g10/keygen.c:295
++#: g10/keygen.c:305
  #, c-format
  msgid "preference '%s' duplicated\n"
  msgstr "偏好設定 '%s' 重複了\n"
  
- #: g10/keygen.c:302
++#: g10/keygen.c:312
  msgid "too many cipher preferences\n"
  msgstr "編密偏好過多\n"
  
- #: g10/keygen.c:304
++#: g10/keygen.c:314
  msgid "too many digest preferences\n"
  msgstr "摘要偏好過多\n"
  
- #: g10/keygen.c:306
++#: g10/keygen.c:316
  msgid "too many compression preferences\n"
  msgstr "壓縮偏好過多\n"
  
- #: g10/keygen.c:447
++#: g10/keygen.c:457
  #, c-format
  msgid "invalid item '%s' in preference string\n"
  msgstr "偏好字串中含有無效的項目 '%s'\n"
  
- #: g10/keygen.c:926
++#: g10/keygen.c:936
  msgid "writing direct signature\n"
  msgstr "寫入直接簽章中\n"
  
- #: g10/keygen.c:972
++#: g10/keygen.c:982
  msgid "writing self signature\n"
  msgstr "寫入自我簽章中\n"
  
- #: g10/keygen.c:1028
++#: g10/keygen.c:1038
  msgid "writing key binding signature\n"
  msgstr "寫入附鑰簽章中\n"
  
- #: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
- #: g10/keygen.c:1600 g10/keygen.c:1605
++#: g10/keygen.c:1401 g10/keygen.c:1406 g10/keygen.c:1458 g10/keygen.c:1463
++#: g10/keygen.c:1610 g10/keygen.c:1615
  #, c-format
  msgid "keysize invalid; using %u bits\n"
  msgstr "金鑰尺寸無效; 改用 %u 位元\n"
  
- #: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
++#: g10/keygen.c:1412 g10/keygen.c:1469 g10/keygen.c:1477 g10/keygen.c:1621
  #, c-format
  msgid "keysize rounded up to %u bits\n"
  msgstr "金鑰尺寸增大到 %u 位元\n"
  
- #: g10/keygen.c:1493
++#: g10/keygen.c:1503
  msgid ""
  "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
  msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
  
- #: g10/keygen.c:1667
++#: g10/keygen.c:1677
  msgid "Sign"
  msgstr "簽署"
  
- #: g10/keygen.c:1670
++#: g10/keygen.c:1680
  msgid "Certify"
  msgstr "保證"
  
- #: g10/keygen.c:1673
++#: g10/keygen.c:1683
  msgid "Encrypt"
  msgstr "加密"
  
- #: g10/keygen.c:1676
++#: g10/keygen.c:1686
  msgid "Authenticate"
  msgstr "鑑定"
  
@@@ -4746,150 -3710,119 +4767,150 @@@
  #. a = Toggle authentication capability
  #. q = Finish
  #.
- #: g10/keygen.c:1695
++#: g10/keygen.c:1705
  msgid "SsEeAaQq"
  msgstr "SsEeAaQq"
  
- #: g10/keygen.c:1722
++#: g10/keygen.c:1732
  #, c-format
  msgid "Possible actions for a %s key: "
  msgstr "%s 金鑰可能的動作: "
  
- #: g10/keygen.c:1728
++#: g10/keygen.c:1738
  msgid "Current allowed actions: "
  msgstr "目前可進行的動作: "
  
- #: g10/keygen.c:1733
++#: g10/keygen.c:1743
  #, c-format
  msgid "   (%c) Toggle the sign capability\n"
  msgstr "   (%c) 切換簽署性能\n"
  
- #: g10/keygen.c:1736
++#: g10/keygen.c:1746
  #, c-format
  msgid "   (%c) Toggle the encrypt capability\n"
  msgstr "   (%c) 切換加密性能\n"
  
- #: g10/keygen.c:1739
++#: g10/keygen.c:1749
  #, c-format
  msgid "   (%c) Toggle the authenticate capability\n"
  msgstr "   (%c) 切換鑑定性能\n"
  
- #: g10/keygen.c:1742
++#: g10/keygen.c:1752
  #, c-format
  msgid "   (%c) Finished\n"
  msgstr "   (%c) 已完成\n"
  
- #: g10/keygen.c:1871 sm/certreqgen-ui.c:161
++#: g10/keygen.c:1881 sm/certreqgen-ui.c:161
  msgid "Please select what kind of key you want:\n"
  msgstr "請選擇你要使用的金鑰種類:\n"
  
- #: g10/keygen.c:1875
++#: g10/keygen.c:1885
  #, c-format
  msgid "   (%d) RSA and RSA (default)\n"
  msgstr "   (%d) RSA 和 RSA (預設)\n"
  
- #: g10/keygen.c:1879
++#: g10/keygen.c:1889
  #, c-format
  msgid "   (%d) DSA and Elgamal\n"
  msgstr "   (%d) DSA 和 Elgamal\n"
  
- #: g10/keygen.c:1881
++#: g10/keygen.c:1892
  #, c-format
  msgid "   (%d) DSA (sign only)\n"
  msgstr "   (%d) DSA (僅能用於簽署)\n"
  
- #: g10/keygen.c:1883
++#: g10/keygen.c:1894
  #, c-format
  msgid "   (%d) RSA (sign only)\n"
  msgstr "   (%d) RSA (僅能用於簽署)\n"
  
- #: g10/keygen.c:1888
++#: g10/keygen.c:1900
  #, c-format
  msgid "   (%d) Elgamal (encrypt only)\n"
  msgstr "   (%d) Elgamal (僅能用於加密)\n"
  
- #: g10/keygen.c:1890
++#: g10/keygen.c:1902
  #, c-format
  msgid "   (%d) RSA (encrypt only)\n"
  msgstr "   (%d) RSA (僅能用於加密)\n"
  
- #: g10/keygen.c:1895
++#: g10/keygen.c:1908
  #, c-format
  msgid "   (%d) DSA (set your own capabilities)\n"
  msgstr "   (%d) DSA (你能自己設定性能)\n"
  
- #: g10/keygen.c:1897
++#: g10/keygen.c:1910
  #, c-format
  msgid "   (%d) RSA (set your own capabilities)\n"
  msgstr "   (%d) RSA (你能自己設定性能)\n"
  
- #: g10/keygen.c:1903
++#: g10/keygen.c:1916
  #, c-format
  msgid "   (%d) ECC and ECC\n"
  msgstr "   (%d) ECC 和 ECC\n"
  
- #: g10/keygen.c:1905
++#: g10/keygen.c:1918
  #, c-format
  msgid "  (%d) ECC (sign only)\n"
  msgstr "   (%d) ECC (僅能用於簽署)\n"
  
- #: g10/keygen.c:1907
++#: g10/keygen.c:1920
  #, c-format
  msgid "  (%d) ECC (set your own capabilities)\n"
  msgstr "   (%d) ECC (你能自己設定性能)\n"
  
- #: g10/keygen.c:1909
++#: g10/keygen.c:1922
  #, c-format
  msgid "  (%d) ECC (encrypt only)\n"
  msgstr "   (%d) ECC (僅能用於加密)\n"
  
- #: g10/keygen.c:1913
++#: g10/keygen.c:1926
  #, c-format
  msgid "  (%d) Existing key\n"
  msgstr "   (%d) 現有的金鑰\n"
  
- #: g10/keygen.c:2003 sm/certreqgen-ui.c:206
++#: g10/keygen.c:2022 sm/certreqgen-ui.c:206
  msgid "Enter the keygrip: "
  msgstr "請輸入金鑰鑰柄: "
  
- #: g10/keygen.c:2016 sm/certreqgen-ui.c:214
++#: g10/keygen.c:2035 sm/certreqgen-ui.c:214
  msgid "Not a valid keygrip (expecting 40 hex digits)\n"
  msgstr "不是有效的金鑰鑰柄 (應該要是 40 位十六進制數值)\n"
  
- #: g10/keygen.c:2018 sm/certreqgen-ui.c:216
++#: g10/keygen.c:2037 sm/certreqgen-ui.c:216
  msgid "No key with this keygrip\n"
  msgstr "沒有金鑰有此金鑰鑰柄\n"
  
- #: g10/keygen.c:2092 g10/keygen.c:2106
++#: g10/keygen.c:2111 g10/keygen.c:2125
  #, c-format
  msgid "rounded to %u bits\n"
  msgstr "加大到 %u 位元\n"
  
- #: g10/keygen.c:2147
++#: g10/keygen.c:2166
  #, c-format
  msgid "%s keys may be between %u and %u bits long.\n"
  msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
  
- #: g10/keygen.c:2155
++#: g10/keygen.c:2174
  #, c-format
  msgid "What keysize do you want for the subkey? (%u) "
  msgstr "你的子鑰想要用多大的金鑰尺寸? (%u) "
  
- #: g10/keygen.c:2158 sm/certreqgen-ui.c:183
++#: g10/keygen.c:2177 sm/certreqgen-ui.c:183
  #, c-format
  msgid "What keysize do you want? (%u) "
  msgstr "你想要用多大的金鑰尺寸? (%u) "
  
- #: g10/keygen.c:2172 sm/certreqgen-ui.c:193
++#: g10/keygen.c:2191 sm/certreqgen-ui.c:193
  #, c-format
  msgid "Requested keysize is %u bits\n"
  msgstr "你所要求的金鑰尺寸是 %u 位元\n"
  
- #: g10/keygen.c:2217
++#: g10/keygen.c:2237
  msgid "Please select which elliptic curve you want:\n"
  msgstr "請選擇你要使用的橢圓曲線:\n"
  
- #: g10/keygen.c:2382
++#: g10/keygen.c:2409
  msgid ""
  "Please specify how long the key should be valid.\n"
  "         0 = key does not expire\n"
@@@ -4905,7 -3838,6 +4926,7 @@@ msgstr "
  "      <n>m = 金鑰在 n 月後會到期\n"
  "      <n>y = 金鑰在 n 年後會到期\n"
  
- #: g10/keygen.c:2393
++#: g10/keygen.c:2420
  msgid ""
  "Please specify how long the signature should be valid.\n"
  "         0 = signature does not expire\n"
@@@ -4921,38 -3853,30 +4942,38 @@@ msgstr "
  "      <n>m = 簽章在 n 月後會到期\n"
  "      <n>y = 簽章在 n 年後會到期\n"
  
- #: g10/keygen.c:2416
++#: g10/keygen.c:2443
  msgid "Key is valid for? (0) "
  msgstr "金鑰的有效期限是多久? (0) "
  
- #: g10/keygen.c:2421
++#: g10/keygen.c:2448
  #, c-format
  msgid "Signature is valid for? (%s) "
  msgstr "簽章的有效期限是多久? (%s) "
  
- #: g10/keygen.c:2440 g10/keygen.c:2465
++#: g10/keygen.c:2461 g10/keygen.c:2486
  msgid "invalid value\n"
  msgstr "無效的數值\n"
  
- #: g10/keygen.c:2447
++#: g10/keygen.c:2468
  msgid "Key does not expire at all\n"
  msgstr "金鑰完全不會過期\n"
  
- #: g10/keygen.c:2448
++#: g10/keygen.c:2469
  msgid "Signature does not expire at all\n"
  msgstr "簽章完全不會過期\n"
  
- #: g10/keygen.c:2453
++#: g10/keygen.c:2474
  #, c-format
  msgid "Key expires at %s\n"
  msgstr "金鑰將會在 %s 到期\n"
  
- #: g10/keygen.c:2454
++#: g10/keygen.c:2475
  #, c-format
  msgid "Signature expires at %s\n"
  msgstr "簽章將會在 %s 到期.\n"
  
- #: g10/keygen.c:2458
++#: g10/keygen.c:2479
  msgid ""
  "Your system can't display dates beyond 2038.\n"
  "However, it will be correctly handled up to 2106.\n"
@@@ -4960,11 -3884,9 +4981,11 @@@ msgstr "
  "你的系統無法顯示 2038 年以後的日期.\n"
  "不過, 它可以正確處理直到 2106 年之前的年份.\n"
  
- #: g10/keygen.c:2471
++#: g10/keygen.c:2492
  msgid "Is this correct? (y/N) "
  msgstr "以上正確嗎? (y/N) "
  
- #: g10/keygen.c:2539
++#: g10/keygen.c:2560
  msgid ""
  "\n"
  "GnuPG needs to construct a user ID to identify your key.\n"
@@@ -4978,7 -3900,6 +4999,7 @@@ msgstr "
  #. but you should keep your existing translation.  In case
  #. the new string is not translated this old string will
  #. be used.
- #: g10/keygen.c:2554
++#: g10/keygen.c:2575
  msgid ""
  "\n"
  "You need a user ID to identify your key; the software constructs the user "
@@@ -4993,49 -3914,38 +5014,49 @@@ msgstr "
  "    \"Ke-Huan Lin (Jedi) <Jedi at Jedi.org>\"\n"
  "\n"
  
- #: g10/keygen.c:2573
++#: g10/keygen.c:2594
  msgid "Real name: "
  msgstr "真實姓名: "
  
- #: g10/keygen.c:2582
++#: g10/keygen.c:2603
  msgid "Invalid character in name\n"
  msgstr "姓名含有無效的字符\n"
  
- #: g10/keygen.c:2583
++#: g10/keygen.c:2604
  #, c-format
  msgid "The characters '%s' and '%s' may not appear in name\n"
  msgstr ""
  
- #: g10/keygen.c:2587
++#: g10/keygen.c:2608
  msgid "Name may not start with a digit\n"
  msgstr "姓名不可以用數字開頭\n"
  
- #: g10/keygen.c:2590
++#: g10/keygen.c:2611
  msgid "Name must be at least 5 characters long\n"
  msgstr "姓名至少要有五個字符長\n"
  
- #: g10/keygen.c:2600
++#: g10/keygen.c:2621
  msgid "Email address: "
  msgstr "電子郵件地址: "
  
- #: g10/keygen.c:2606
++#: g10/keygen.c:2627
  msgid "Not a valid email address\n"
  msgstr "不是有效的電子郵件地址\n"
  
- #: g10/keygen.c:2615
++#: g10/keygen.c:2636
  msgid "Comment: "
  msgstr "註釋: "
  
- #: g10/keygen.c:2621
++#: g10/keygen.c:2642
  msgid "Invalid character in comment\n"
  msgstr "註釋含有無效的字符\n"
  
- #: g10/keygen.c:2657
++#: g10/keygen.c:2678
  #, c-format
  msgid "You are using the '%s' character set.\n"
  msgstr "你正在使用 '%s' 字元集.\n"
  
- #: g10/keygen.c:2663
++#: g10/keygen.c:2684
  #, c-format
  msgid ""
  "You selected this USER-ID:\n"
@@@ -5046,7 -3956,6 +5067,7 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:2668
++#: g10/keygen.c:2689
  msgid "Please don't put the email address into the real name or the comment\n"
  msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
  
@@@ -5061,31 -3970,24 +5082,31 @@@
  #. o = Okay (ready, continue)
  #. q = Quit
  #.
- #: g10/keygen.c:2693
++#: g10/keygen.c:2714
  msgid "NnCcEeOoQq"
  msgstr "NnCcEeOoQq"
  
- #: g10/keygen.c:2703
++#: g10/keygen.c:2724
  msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
  msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
  
- #: g10/keygen.c:2704
++#: g10/keygen.c:2725
  msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
  msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
  
- #: g10/keygen.c:2709
++#: g10/keygen.c:2730
  msgid "Change (N)ame, (E)mail, or (Q)uit? "
  msgstr "變更姓名(N), 電子郵件地址(E)或退出(Q)? "
  
- #: g10/keygen.c:2710
++#: g10/keygen.c:2731
  msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
  msgstr "變更姓名(N), 電子郵件地址(E)或確定(O)/退出(Q)? "
  
- #: g10/keygen.c:2729
++#: g10/keygen.c:2750
  msgid "Please correct the error first\n"
  msgstr "請先訂正錯誤\n"
  
- #: g10/keygen.c:2775
++#: g10/keygen.c:2796
  msgid ""
  "We need to generate a lot of random bytes. It is a good idea to perform\n"
  "some other action (type on the keyboard, move the mouse, utilize the\n"
@@@ -5096,13 -3998,10 +5117,13 @@@ msgstr "
  "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
  "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
  
- #: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
- #: g10/keygen.c:4791
++#: g10/keygen.c:3589 g10/keygen.c:3669 g10/keygen.c:3692 g10/keygen.c:4458
++#: g10/keygen.c:4777 g10/keygen.c:4882
  #, c-format
  msgid "Key generation failed: %s\n"
  msgstr "產生金鑰失敗: %s\n"
  
- #: g10/keygen.c:3577
++#: g10/keygen.c:3598
  #, c-format
  msgid ""
  "About to create a key for:\n"
@@@ -5113,62 -4012,49 +5134,62 @@@ msgstr "
  "    \"%s\"\n"
  "\n"
  
- #: g10/keygen.c:3579
++#: g10/keygen.c:3600
  msgid "Continue? (Y/n) "
  msgstr "是否繼續? (Y/n) "
  
- #: g10/keygen.c:3600
++#: g10/keygen.c:3621
  #, c-format
  msgid "A key for \"%s\" already exists\n"
  msgstr "\"%s\" 的金鑰已存在\n"
  
- #: g10/keygen.c:3605
++#: g10/keygen.c:3626
  msgid "Create anyway? (y/N) "
  msgstr "無論如何還是要建立嗎? (y/N) "
  
- #: g10/keygen.c:3610
++#: g10/keygen.c:3632
  msgid "creating anyway\n"
  msgstr "總之還是在建立\n"
  
- #: g10/keygen.c:3904
++#: g10/keygen.c:3981
  #, c-format
  msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
  msgstr "請注意: 如需全能金鑰產生對話框請用  \"%s %s\".\n"
  
- #: g10/keygen.c:3936
++#: g10/keygen.c:4013
  msgid "Key generation canceled.\n"
  msgstr "金鑰產生已取消.\n"
  
- #: g10/keygen.c:3996
++#: g10/keygen.c:4073
  #, c-format
  msgid "can't create backup file '%s': %s\n"
  msgstr "無法建立備份檔案 '%s': %s\n"
  
- #: g10/keygen.c:4016
++#: g10/keygen.c:4093
  #, c-format
  msgid "Note: backup of card key saved to '%s'\n"
  msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
  
- #: g10/keygen.c:4167 g10/keygen.c:4315
++#: g10/keygen.c:4244 g10/keygen.c:4393
  #, c-format
  msgid "writing public key to '%s'\n"
  msgstr "正在寫入公鑰至 '%s'\n"
  
- #: g10/keygen.c:4309
++#: g10/keygen.c:4387
  #, c-format
  msgid "no writable public keyring found: %s\n"
  msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
  
- #: g10/keygen.c:4323
++#: g10/keygen.c:4401
  #, c-format
  msgid "error writing public keyring '%s': %s\n"
  msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
  
- #: g10/keygen.c:4355
++#: g10/keygen.c:4433
  msgid "public and secret key created and signed.\n"
  msgstr "公鑰和私鑰已建立及簽署.\n"
  
- #: g10/keygen.c:4367
++#: g10/keygen.c:4445
  msgid ""
  "Note that this key cannot be used for encryption.  You may want to use\n"
  "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5176,35 -4062,28 +5197,35 @@@ msgstr "
  "請注意這把金鑰不能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
  "來產生加密用的子鑰.\n"
  
- #: g10/keygen.c:4567 g10/keygen.c:4741
++#: g10/keygen.c:4649 g10/keygen.c:4833
  #, c-format
  msgid ""
  "key has been created %lu second in future (time warp or clock problem)\n"
  msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
  
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4651 g10/keygen.c:4835
  #, c-format
  msgid ""
  "key has been created %lu seconds in future (time warp or clock problem)\n"
  msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
  
- #: g10/keygen.c:4580 g10/keygen.c:4754
++#: g10/keygen.c:4662 g10/keygen.c:4846
  msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
  msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
  
- #: g10/keygen.c:4592 g10/keygen.c:4594
++#: g10/keygen.c:4674 g10/keygen.c:4676
  msgid "Secret parts of primary key are not available.\n"
  msgstr "主鑰的私鑰部分無法取用.\n"
  
- #: g10/keygen.c:4601 g10/keygen.c:4603
++#: g10/keygen.c:4683 g10/keygen.c:4685
  msgid "Secret parts of primary key are stored on-card.\n"
  msgstr "主鑰的私鑰部分存放於卡上.\n"
  
- #: g10/keygen.c:4622 g10/keygen.c:4769
++#: g10/keygen.c:4704 g10/keygen.c:4860
  msgid "Really create? (y/N) "
  msgstr "真的要建立嗎? (y/N) "
  
- #: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
++#: g10/keyid.c:664 g10/keyid.c:677 g10/keyid.c:690
  msgid "never     "
  msgstr "永遠不過期"
  
@@@ -5253,30 -4123,24 +5274,30 @@@ msgstr[0] "警告: %lu 把金鑰因尺�
  msgid "Keyring"
  msgstr "鑰匙圈"
  
- #: g10/keylist.c:1710
++#: g10/keylist.c:1719
  msgid "Primary key fingerprint:"
  msgstr "               主鑰指紋:"
  
- #: g10/keylist.c:1712
++#: g10/keylist.c:1721
  msgid "     Subkey fingerprint:"
  msgstr "               子鑰指紋:"
  
  #. TRANSLATORS: this should fit into 24 bytes so that the
  #. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1720
++#: g10/keylist.c:1729
  msgid " Primary key fingerprint:"
  msgstr "                主鑰指紋:"
  
- #: g10/keylist.c:1722 g10/keylist.c:1732
++#: g10/keylist.c:1731 g10/keylist.c:1741
  msgid "      Subkey fingerprint:"
  msgstr "                子鑰指紋:"
  
  #  use tty
- #: g10/keylist.c:1727 g10/keylist.c:1743
++#: g10/keylist.c:1736 g10/keylist.c:1752
  msgid "      Key fingerprint ="
  msgstr "      金鑰指紋 ="
  
- #: g10/keylist.c:1794
++#: g10/keylist.c:1803
  msgid "      Card serial no. ="
  msgstr "      卡片序號 ="
  
@@@ -5311,109 -4170,86 +5332,109 @@@ msgstr[0] "1 份損壞的簽章\n
  msgid "%s: keyring created\n"
  msgstr "%s: 鑰匙圈已建立\n"
  
- #: g10/keyserver.c:90
++#: g10/keyserver.c:91
  msgid "override proxy options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:92
++#: g10/keyserver.c:93
  msgid "include revoked keys in search results"
  msgstr "在搜尋結果中也包含已撤銷的金鑰"
  
- #: g10/keyserver.c:93
++#: g10/keyserver.c:94
  msgid "include subkeys when searching by key ID"
  msgstr "以金鑰 ID 搜尋時也搜尋子鑰"
  
- #: g10/keyserver.c:95
++#: g10/keyserver.c:96
  msgid "override timeout options set for dirmngr"
  msgstr ""
  
- #: g10/keyserver.c:99
++#: g10/keyserver.c:100
  msgid "automatically retrieve keys when verifying signatures"
  msgstr "驗證簽章時自動取回金鑰"
  
- #: g10/keyserver.c:101
++#: g10/keyserver.c:102
  msgid "honor the preferred keyserver URL set on the key"
  msgstr "尊重金鑰上所設定的偏好金鑰伺服器 URL"
  
- #: g10/keyserver.c:103
++#: g10/keyserver.c:104
  msgid "honor the PKA record set on a key when retrieving keys"
  msgstr "取回金鑰時尊重金鑰所設定的 PKA 記錄"
  
- #: g10/keyserver.c:548
++#: g10/keyserver.c:550
  msgid "disabled"
  msgstr "已停用"
  
- #: g10/keyserver.c:752
++#: g10/keyserver.c:754
  msgid "Enter number(s), N)ext, or Q)uit > "
  msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
  
- #: g10/keyserver.c:858
++#: g10/keyserver.c:860
  #, c-format
  msgid "invalid keyserver protocol (us %d!=handler %d)\n"
  msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
  
- #: g10/keyserver.c:999 g10/keyserver.c:1114
++#: g10/keyserver.c:1001 g10/keyserver.c:1116
  #, c-format
  msgid "\"%s\" not a key ID: skipping\n"
  msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
  
- #: g10/keyserver.c:1419 g10/keyserver.c:1452
++#: g10/keyserver.c:1421 g10/keyserver.c:1454
  #, fuzzy, c-format
  #| msgid "refreshing %d keys from %s\n"
  msgid "refreshing %d key from %s\n"
  msgid_plural "refreshing %d keys from %s\n"
  msgstr[0] "更新 %d 份金鑰中 (從 %s )\n"
  
- #: g10/keyserver.c:1426
++#: g10/keyserver.c:1428
  #, c-format
  msgid "WARNING: unable to refresh key %s via %s: %s\n"
  msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
  
- #: g10/keyserver.c:1530
++#: g10/keyserver.c:1532
  #, c-format
  msgid "key \"%s\" not found on keyserver\n"
  msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
  
- #: g10/keyserver.c:1533
++#: g10/keyserver.c:1535
  msgid "key not found on keyserver\n"
  msgstr "在金鑰伺服器上找不到金鑰\n"
  
- #: g10/keyserver.c:1537
++#: g10/keyserver.c:1539
  msgid "no keyserver known (use option --keyserver)\n"
  msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
  
- #: g10/keyserver.c:1701
++#: g10/keyserver.c:1704
  #, c-format
  msgid "requesting key %s from %s server %s\n"
  msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
  
- #: g10/keyserver.c:1705
++#: g10/keyserver.c:1708
  #, c-format
  msgid "requesting key %s from %s\n"
  msgstr "正在請求金鑰 %s 自 %s\n"
  
- #: g10/keyserver.c:1805 g10/keyserver.c:1960
++#: g10/keyserver.c:1809 g10/keyserver.c:1965
  #, fuzzy
  #| msgid "invalid keyserver options\n"
  msgid "no keyserver known\n"
  msgstr "無效的金鑰伺服器選項\n"
  
- #: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#: g10/keyserver.c:1824 g10/skclist.c:196 g10/skclist.c:224
  #, c-format
  msgid "skipped \"%s\": %s\n"
  msgstr "已跳過 \"%s\": %s\n"
  
- #: g10/keyserver.c:1823
++#: g10/keyserver.c:1827
  #, c-format
  msgid "sending key %s to %s\n"
  msgstr "遞送金鑰 %s 至 %s\n"
  
- #: g10/keyserver.c:1864
++#: g10/keyserver.c:1868
  #, c-format
  msgid "requesting key from '%s'\n"
  msgstr "正在向 '%s' 請求金鑰\n"
  
- #: g10/keyserver.c:1880
++#: g10/keyserver.c:1884
  #, c-format
  msgid "WARNING: unable to fetch URI %s: %s\n"
  msgstr "警告: 無法抓取 URI %s: %s\n"
@@@ -5511,127 -4327,100 +5532,127 @@@ msgstr "原始的檔名 ='%.*s'\n
  msgid "WARNING: multiple plaintexts seen\n"
  msgstr "警告: 看到了多份明文\n"
  
- #: g10/mainproc.c:914
++#: g10/mainproc.c:923
  msgid "standalone revocation - use \"gpg --import\" to apply\n"
  msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
  
- #: g10/mainproc.c:1214 g10/mainproc.c:1257
++#: g10/mainproc.c:1233 g10/mainproc.c:1276
  msgid "no signature found\n"
  msgstr "找不到簽章\n"
  
- #: g10/mainproc.c:1588
++#: g10/mainproc.c:1607
  #, c-format
  msgid "BAD signature from \"%s\""
  msgstr "*損壞* 的簽章來自於 \"%s\""
  
- #: g10/mainproc.c:1590
++#: g10/mainproc.c:1609
  #, c-format
  msgid "Expired signature from \"%s\""
  msgstr "過期的簽章來自於 \"%s\""
  
- #: g10/mainproc.c:1592
++#: g10/mainproc.c:1611
  #, c-format
  msgid "Good signature from \"%s\""
  msgstr "完好的簽章來自於 \"%s\""
  
- #: g10/mainproc.c:1613
++#: g10/mainproc.c:1630
  msgid "signature verification suppressed\n"
  msgstr "簽章驗證已抑制\n"
  
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1739
  msgid "can't handle this ambiguous signature data\n"
  msgstr "無法處理這個不明確的簽章資料\n"
  
- #: g10/mainproc.c:1736 g10/mainproc.c:1744
++#: g10/mainproc.c:1753 g10/mainproc.c:1761
  #, c-format
  msgid "Signature made %s\n"
  msgstr "由 %s 建立的簽章\n"
  
- #: g10/mainproc.c:1737 g10/mainproc.c:1745
++#: g10/mainproc.c:1754 g10/mainproc.c:1762
  #, c-format
  msgid "               using %s key %s\n"
  msgstr "               使用 %s 金鑰 %s\n"
  
- #: g10/mainproc.c:1749
++#: g10/mainproc.c:1766
  #, c-format
  msgid "Signature made %s using %s key ID %s\n"
  msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
  
- #: g10/mainproc.c:1755
++#: g10/mainproc.c:1772
  #, fuzzy, c-format
  #| msgid "                aka \"%s\""
  msgid "               issuer \"%s\"\n"
  msgstr "                亦即 \"%s\""
  
- #: g10/mainproc.c:1772
++#: g10/mainproc.c:1789
  msgid "Key available at: "
  msgstr "可用的金鑰於: "
  
- #: g10/mainproc.c:1995
++#: g10/mainproc.c:2024
  msgid "[uncertain]"
  msgstr "[ 不確定 ]"
  
- #: g10/mainproc.c:2033
++#: g10/mainproc.c:2062
  #, c-format
  msgid "                aka \"%s\""
  msgstr "                亦即 \"%s\""
  
- #: g10/mainproc.c:2144
++#: g10/mainproc.c:2145
  #, c-format
  msgid "Signature expired %s\n"
  msgstr "這份簽署已經在 %s 過期了\n"
  
- #: g10/mainproc.c:2148
++#: g10/mainproc.c:2149
  #, c-format
  msgid "Signature expires %s\n"
  msgstr "這份簽署將在 %s 到期\n"
  
- #: g10/mainproc.c:2151
++#: g10/mainproc.c:2160
  #, c-format
  msgid "%s signature, digest algorithm %s%s%s\n"
  msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
  
- #: g10/mainproc.c:2152
++#: g10/mainproc.c:2161
  msgid "binary"
  msgstr "二進制"
  
- #: g10/mainproc.c:2153
++#: g10/mainproc.c:2162
  msgid "textmode"
  msgstr "文字模式"
  
- #: g10/mainproc.c:2153 g10/trust.c:103 dirmngr/ocsp.c:704
++#: g10/mainproc.c:2162 g10/trust.c:103 dirmngr/ocsp.c:704
  msgid "unknown"
  msgstr "未知"
  
- #: g10/mainproc.c:2155
++#: g10/mainproc.c:2164
  msgid ", key algorithm "
  msgstr ", 金鑰演算法 "
  
- #: g10/mainproc.c:2190
++#: g10/mainproc.c:2199
  #, c-format
  msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
  msgstr ""
  
- #: g10/mainproc.c:2217
++#: g10/mainproc.c:2229
  #, c-format
  msgid "Can't check signature: %s\n"
  msgstr "無法檢查簽章: %s\n"
  
- #: g10/mainproc.c:2310 g10/mainproc.c:2329 g10/mainproc.c:2435
++#: g10/mainproc.c:2322 g10/mainproc.c:2341 g10/mainproc.c:2465
  msgid "not a detached signature\n"
  msgstr "不是一份分離的簽章\n"
  
- #: g10/mainproc.c:2358
++#: g10/mainproc.c:2375
  msgid ""
  "WARNING: multiple signatures detected.  Only the first will be checked.\n"
  msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
  
- #: g10/mainproc.c:2367
++#: g10/mainproc.c:2384
  #, c-format
  msgid "standalone signature of class 0x%02x\n"
  msgstr "等級 0x%02x 的獨立簽章\n"
  
- #: g10/mainproc.c:2439
++#: g10/mainproc.c:2469
  msgid "old style (PGP 2.x) signature\n"
  msgstr "舊型 (PGP 2.x) 簽章\n"
  
@@@ -5730,26 -4500,21 +5751,26 @@@ msgstr "未壓縮
  msgid "uncompressed|none"
  msgstr "uncompressed|none|未壓縮|無"
  
- #: g10/misc.c:1292
++#: g10/misc.c:1297
  #, c-format
  msgid "this message may not be usable by %s\n"
  msgstr "這個訊息對 %s 來說無法使用\n"
  
- #: g10/misc.c:1467
++#: g10/misc.c:1472
  #, c-format
  msgid "ambiguous option '%s'\n"
  msgstr "不明確的選項 '%s'\n"
  
- #: g10/misc.c:1492
++#: g10/misc.c:1497
  #, c-format
  msgid "unknown option '%s'\n"
  msgstr "未知的選項 '%s'\n"
  
- #: g10/misc.c:1730
++#: g10/misc.c:1735
  msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
  msgstr "ECDSA 公鑰應該要是 8 位元倍數的 SEC 編碼\n"
  
- #: g10/misc.c:1752
++#: g10/misc.c:1757
  #, fuzzy, c-format
  #| msgid "Unknown signature type '%s'\n"
  msgid "unknown weak digest '%s'\n"
@@@ -6031,7 -4741,25 +6052,28 @@@ msgstr "這把金鑰很可能屬於叫�
  msgid "This key belongs to us\n"
  msgstr "這把金鑰是屬於我們自己的\n"
  
- #: g10/pkclist.c:476
++#: g10/pkclist.c:456
+ #, fuzzy, c-format
+ #| msgid "root certificate has now been marked as trusted\n"
+ msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+ msgstr "根憑證現在已標記為已信任\n"
+ 
++#: g10/pkclist.c:484
+ #, fuzzy
+ #| msgid ""
+ #| "It is NOT certain that the key belongs to the person named\n"
+ #| "in the user ID.  If you *really* know what you are doing,\n"
+ #| "you may answer the next question with yes.\n"
+ msgid ""
+ "This key has is bad!  It has been marked as untrusted!  If you\n"
+ "*really* know what you are doing, you may answer the next\n"
+ "question with yes.\n"
+ msgstr ""
+ "這把金鑰並 *不* 確定屬於使用者 ID 裡的那個人.\n"
+ "除非你 **真的** 知道自己在做甚麼,\n"
+ "否則你最好在下一個問題回答 no\n"
+ 
++#: g10/pkclist.c:489
  msgid ""
  "It is NOT certain that the key belongs to the person named\n"
  "in the user ID.  If you *really* know what you are doing,\n"
@@@ -6041,128 -4769,100 +6083,128 @@@ msgstr "
  "除非你 **真的** 知道自己在做甚麼,\n"
  "否則你最好在下一個問題回答 no\n"
  
- #: g10/pkclist.c:495
++#: g10/pkclist.c:508
  msgid "Use this key anyway? (y/N) "
  msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
  
- #: g10/pkclist.c:549
++#: g10/pkclist.c:562
  msgid "WARNING: Using untrusted key!\n"
  msgstr "警告: 正在使用不被信任的金鑰!\n"
  
- #: g10/pkclist.c:556
++#: g10/pkclist.c:569
  msgid "WARNING: this key might be revoked (revocation key not present)\n"
  msgstr "警告: 這把金鑰可能已撤銷 (撤銷金鑰未出現)\n"
  
- #: g10/pkclist.c:565
++#: g10/pkclist.c:578
  msgid "WARNING: This key has been revoked by its designated revoker!\n"
  msgstr "警告: 這把金鑰已被指定撤銷者所撤銷!\n"
  
- #: g10/pkclist.c:568
++#: g10/pkclist.c:581
  msgid "WARNING: This key has been revoked by its owner!\n"
  msgstr "警告: 這把金鑰已被其持有人所撤銷!\n"
  
- #: g10/pkclist.c:569
++#: g10/pkclist.c:582
  msgid "         This could mean that the signature is forged.\n"
  msgstr "         這很有可能表示此簽章是偽造的.\n"
  
- #: g10/pkclist.c:575
++#: g10/pkclist.c:588
  msgid "WARNING: This subkey has been revoked by its owner!\n"
  msgstr "警告: 這把子鑰已被其持有人所撤銷!\n"
  
- #: g10/pkclist.c:580
++#: g10/pkclist.c:593
  msgid "Note: This key has been disabled.\n"
  msgstr "請注意: 這把金鑰已停用.\n"
  
- #: g10/pkclist.c:600
++#: g10/pkclist.c:613
  #, c-format
  msgid "Note: Verified signer's address is '%s'\n"
  msgstr "請注意: 已驗證的簽署者地址為 '%s'\n"
  
- #: g10/pkclist.c:607
++#: g10/pkclist.c:620
  #, c-format
  msgid "Note: Signer's address '%s' does not match DNS entry\n"
  msgstr "請注意: 簽署者地址 '%s' 與 DNS 項目並不吻合\n"
  
- #: g10/pkclist.c:619
++#: g10/pkclist.c:632
  msgid "trustlevel adjusted to FULL due to valid PKA info\n"
  msgstr "信任等級因有效的 PKA 資訊而調整為 *完全*\n"
  
- #: g10/pkclist.c:627
++#: g10/pkclist.c:640
  msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
  msgstr "信任等級因不良的 PKA 資訊而調整為 *永遠不會*\n"
  
- #: g10/pkclist.c:638
++#: g10/pkclist.c:651
  msgid "Note: This key has expired!\n"
  msgstr "請注意: 這把金鑰已經過期了!\n"
  
- #: g10/pkclist.c:649
++#: g10/pkclist.c:662
  msgid "WARNING: This key is not certified with a trusted signature!\n"
  msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
  
- #: g10/pkclist.c:651
++#: g10/pkclist.c:664
  msgid ""
  "         There is no indication that the signature belongs to the owner.\n"
  msgstr "         沒有證據指出這個簽章屬於這個持有者.\n"
  
- #: g10/pkclist.c:659
++#: g10/pkclist.c:673
  msgid "WARNING: We do NOT trust this key!\n"
  msgstr "警告: 我們 *不* 信任這把金鑰!\n"
  
- #: g10/pkclist.c:660
++#: g10/pkclist.c:674
  msgid "         The signature is probably a FORGERY.\n"
  msgstr "         這個簽章很有可能是 *偽造的*.\n"
  
- #: g10/pkclist.c:668
++#: g10/pkclist.c:682
  msgid ""
  "WARNING: This key is not certified with sufficiently trusted signatures!\n"
  msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
  
- #: g10/pkclist.c:670
++#: g10/pkclist.c:684
  msgid "         It is not certain that the signature belongs to the owner.\n"
  msgstr "         這份簽章並不屬於這個持有者\n"
  
- #: g10/pkclist.c:833 g10/pkclist.c:851 g10/pkclist.c:1036 g10/pkclist.c:1078
++#: g10/pkclist.c:847 g10/pkclist.c:865 g10/pkclist.c:1050 g10/pkclist.c:1092
  #, c-format
  msgid "%s: skipped: %s\n"
  msgstr "%s: 已跳過: %s\n"
  
- #: g10/pkclist.c:866
++#: g10/pkclist.c:880
  #, c-format
  msgid "%s: skipped: public key is disabled\n"
  msgstr "%s: 已跳過: 公鑰已停用\n"
  
- #: g10/pkclist.c:885 g10/pkclist.c:1049
++#: g10/pkclist.c:899 g10/pkclist.c:1063
  #, c-format
  msgid "%s: skipped: public key already present\n"
  msgstr "%s: 已跳過: 公鑰已存在\n"
  
- #: g10/pkclist.c:973
++#: g10/pkclist.c:987
  #, fuzzy, c-format
  #| msgid "can't connect to '%s': %s\n"
  msgid "can't encrypt to '%s'\n"
  msgstr "無法連接至 '%s': %s\n"
  
- #: g10/pkclist.c:988
++#: g10/pkclist.c:1002
  #, fuzzy, c-format
  #| msgid "line %d: invalid date given\n"
  msgid "option '%s' given, but no valid default keys given\n"
  msgstr "第 %d 列: 無效的給定日期\n"
  
- #: g10/pkclist.c:995
++#: g10/pkclist.c:1009
  #, fuzzy, c-format
  #| msgid "line %d: invalid date given\n"
  msgid "option '%s' given, but option '%s' not given\n"
  msgstr "第 %d 列: 無效的給定日期\n"
  
- #: g10/pkclist.c:1098
++#: g10/pkclist.c:1112
  msgid "You did not specify a user ID. (you may use \"-r\")\n"
  msgstr "你沒有指定使用者 ID. (你可能得用 \"-r\")\n"
  
- #: g10/pkclist.c:1122
++#: g10/pkclist.c:1136
  msgid "Current recipients:\n"
  msgstr "目前的收件者:\n"
  
- #: g10/pkclist.c:1148
++#: g10/pkclist.c:1162
  msgid ""
  "\n"
  "Enter the user ID.  End with an empty line: "
@@@ -6170,37 -4870,29 +6212,37 @@@ msgstr "
  "\n"
  "請輸入使用者 ID. 以空白列結束: "
  
- #: g10/pkclist.c:1172
++#: g10/pkclist.c:1186
  msgid "No such user ID.\n"
  msgstr "沒有這個使用者 ID.\n"
  
- #: g10/pkclist.c:1183 g10/pkclist.c:1259
++#: g10/pkclist.c:1197 g10/pkclist.c:1273
  msgid "skipped: public key already set as default recipient\n"
  msgstr "已跳過: 公鑰已經被設成預設收件者\n"
  
- #: g10/pkclist.c:1204
++#: g10/pkclist.c:1218
  msgid "Public key is disabled.\n"
  msgstr "公鑰已停用.\n"
  
- #: g10/pkclist.c:1214
++#: g10/pkclist.c:1228
  msgid "skipped: public key already set\n"
  msgstr "已跳過: 公鑰已設過\n"
  
- #: g10/pkclist.c:1249
++#: g10/pkclist.c:1263
  #, c-format
  msgid "unknown default recipient \"%s\"\n"
  msgstr "未知的預設收件者 \"%s\"\n"
  
- #: g10/pkclist.c:1298
++#: g10/pkclist.c:1312
  msgid "no valid addressees\n"
  msgstr "沒有有效的地址\n"
  
- #: g10/pkclist.c:1628
++#: g10/pkclist.c:1665
  #, c-format
  msgid "Note: key %s has no %s feature\n"
  msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
  
- #: g10/pkclist.c:1653
++#: g10/pkclist.c:1690
  #, c-format
  msgid "Note: key %s has no preference for %s\n"
  msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
@@@ -6457,40 -5103,33 +6499,40 @@@ msgstr "%s 金鑰 %s 使用不安全 (%
  msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
  msgstr "%s 金鑰 %s 需要 %zu 位元以上的雜湊 (雜湊為 %s)\n"
  
- #: g10/sig-check.c:116
++#: g10/sig-check.c:122
  msgid "WARNING: signature digest conflict in message\n"
  msgstr "警告: 簽章摘要與訊息不一致\n"
  
- #: g10/sig-check.c:143
++#: g10/sig-check.c:149
  #, c-format
  msgid "WARNING: signing subkey %s is not cross-certified\n"
  msgstr "警告: 簽署子鑰 %s 未經交叉認證\n"
  
- #: g10/sig-check.c:145
++#: g10/sig-check.c:151
  #, c-format
  msgid "please see %s for more information\n"
  msgstr "請參考 %s 上進一步的資訊\n"
  
- #: g10/sig-check.c:155
++#: g10/sig-check.c:161
  #, c-format
  msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
  msgstr "警告: 簽署子鑰 %s 有無效的交叉憑證\n"
  
- #: g10/sig-check.c:277
++#: g10/sig-check.c:281
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu second newer than the signature\n"
  msgid_plural "public key %s is %lu seconds newer than the signature\n"
  msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
  
- #: g10/sig-check.c:286
++#: g10/sig-check.c:290
  #, fuzzy, c-format
  #| msgid "public key %s is %lu second newer than the signature\n"
  msgid "public key %s is %lu day newer than the signature\n"
  msgid_plural "public key %s is %lu days newer than the signature\n"
  msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
  
- #: g10/sig-check.c:300 g10/sign.c:266
++#: g10/sig-check.c:304 g10/sign.c:266
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6501,7 -5140,6 +6543,7 @@@ msgid_plural "
  msgstr[0] ""
  "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
  
- #: g10/sig-check.c:309
++#: g10/sig-check.c:313
  #, fuzzy, c-format
  #| msgid ""
  #| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6511,27 -5149,22 +6553,27 @@@ msgid_plural "
  msgstr[0] ""
  "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
  
- #: g10/sig-check.c:326
++#: g10/sig-check.c:330
  #, c-format
  msgid "Note: signature key %s expired %s\n"
  msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
  
- #: g10/sig-check.c:337
++#: g10/sig-check.c:341
  #, c-format
  msgid "Note: signature key %s has been revoked\n"
  msgstr "請注意: 簽章金鑰 %s 已遭撤銷\n"
  
- #: g10/sig-check.c:471
++#: g10/sig-check.c:475
  #, c-format
  msgid "assuming bad signature from key %s due to an unknown critical bit\n"
  msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
  
- #: g10/sig-check.c:1048
++#: g10/sig-check.c:1052
  #, c-format
  msgid "key %s: no subkey for subkey revocation signature\n"
  msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
  
- #: g10/sig-check.c:1051
++#: g10/sig-check.c:1055
  #, c-format
  msgid "key %s: no subkey for subkey binding signature\n"
  msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
@@@ -6591,7 -5213,6 +6633,7 @@@ msgstr "已跳過: 私鑰已經存在\n
  msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
  msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
  
- #: g10/tdbdump.c:57 g10/trustdb.c:361
++#: g10/tdbdump.c:57 g10/trustdb.c:362
  #, c-format
  msgid "trust record %lu, type %d: write failed: %s\n"
  msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
@@@ -6636,12 -5249,10 +6678,12 @@@ msgstr "在 '%s' 中尋找信任記錄�
  msgid "read error in '%s': %s\n"
  msgstr "'%s' 讀取錯誤: %s\n"
  
- #: g10/tdbdump.c:230 g10/trustdb.c:376
++#: g10/tdbdump.c:230 g10/trustdb.c:377
  #, c-format
  msgid "trustdb: sync failed: %s\n"
  msgstr "信任資料庫: 同步化失敗: %s\n"
  
- #: g10/tdbio.c:141 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:356
  #, c-format
  msgid "can't create lock for '%s'\n"
  msgstr "無法為 '%s' 建立鎖定\n"
@@@ -6670,7 -5276,6 +6712,7 @@@ msgstr "信任資料庫更動量過大\
  msgid "%s: directory does not exist!\n"
  msgstr "%s: 目錄不存在!\n"
  
- #: g10/tdbio.c:703 dirmngr/dirmngr.c:593
++#: g10/tdbio.c:703 dirmngr/http.c:501
  #, c-format
  msgid "can't access '%s': %s\n"
  msgstr "無法存取 '%s': %s\n"
@@@ -6779,173 -5362,164 +6821,202 @@@ msgstr "無法處理長於 %d 字符的
  msgid "input line longer than %d characters\n"
  msgstr "輸入列比 %d 字符還長\n"
  
- #: g10/tofu.c:200 g10/tofu.c:217 g10/tofu.c:459
++#: g10/tofu.c:234 g10/tofu.c:258 g10/tofu.c:525
  #, fuzzy, c-format
  #| msgid "error sending standard options: %s\n"
  msgid "error beginning transaction on TOFU database: %s\n"
  msgstr "送出標準選項時出錯: %s\n"
  
- #: g10/tofu.c:252 g10/tofu.c:271 g10/tofu.c:631
++#: g10/tofu.c:304 g10/tofu.c:327 g10/tofu.c:710
  #, c-format
  msgid "error committing transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:305 g10/tofu.c:620
++#: g10/tofu.c:357 g10/tofu.c:699
  #, c-format
  msgid "error rolling back transaction on TOFU database: %s\n"
  msgstr ""
  
- #: g10/tofu.c:435
++#: g10/tofu.c:501
  #, fuzzy, c-format
  #| msgid "unsupported algorithm: %s"
  msgid "unsupported TOFU database version: %s\n"
  msgstr "未支援的演算法: %s"
  
- #: g10/tofu.c:472 g10/tofu.c:1024 g10/tofu.c:1039 g10/tofu.c:1051
- #: g10/tofu.c:1064 g10/tofu.c:1624 g10/tofu.c:1936 g10/tofu.c:2216
++#: g10/tofu.c:538 g10/tofu.c:1143 g10/tofu.c:1159 g10/tofu.c:1171
++#: g10/tofu.c:1184 g10/tofu.c:1921 g10/tofu.c:2724 g10/tofu.c:2757
++#: g10/tofu.c:3056
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error reading TOFU database: %s\n"
  msgstr "送出資料時出錯: %s\n"
  
- #: g10/tofu.c:500 g10/tofu.c:508
++#: g10/tofu.c:566 g10/tofu.c:574
  #, fuzzy, c-format
  #| msgid "error writing base64 encoding: %s\n"
  msgid "error determining TOFU database's version: %s\n"
  msgstr "寫入 base64 編碼時出錯: %s\n"
  
- #: g10/tofu.c:521 g10/tofu.c:534 g10/tofu.c:580 g10/tofu.c:608
++#: g10/tofu.c:587 g10/tofu.c:600 g10/tofu.c:646 g10/tofu.c:674
  #, fuzzy, c-format
  #| msgid "error initializing reader object: %s\n"
  msgid "error initializing TOFU database: %s\n"
  msgstr "啟始讀取程式物件時出錯: %s\n"
  
- #: g10/tofu.c:658
++#: g10/tofu.c:765
  #, fuzzy, c-format
  #| msgid "error opening '%s': %s\n"
  msgid "error opening TOFU database '%s': %s\n"
  msgstr "開啟 '%s' 時出錯: %s\n"
  
- #: g10/tofu.c:828 g10/tofu.c:2266
++#: g10/tofu.c:943 g10/tofu.c:3110 g10/tofu.c:3224
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error updating TOFU database: %s\n"
  msgstr "送出資料時出錯: %s\n"
  
- #: g10/tofu.c:1118
++#: g10/tofu.c:1239
  #, c-format
- msgid "The binding %s is NOT known."
+ msgid ""
+ "This is the first time the email address \"%s\" is being used with key %s."
  msgstr ""
  
- #: g10/tofu.c:1128
++#: g10/tofu.c:1247
  #, c-format
- msgid ""
- "The key with fingerprint %s raised a conflict with the binding %s.  Since "
- "this binding's policy was 'auto', it was changed to 'ask'."
+ msgid "The email address \"%s\" is associated with %d keys!"
  msgstr ""
  
- #: g10/tofu.c:1140
++#: g10/tofu.c:1251
+ msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
+ msgstr ""
+ 
++#: g10/tofu.c:1257
  #, c-format
  msgid ""
- "Please indicate whether you believe the binding %s%sis legitimate (the key "
- "belongs to the stated owner) or a forgery (bad)."
+ "Please indicate whether this email address should be associated with key %s "
+ "or whether you think someone is impersonating \"%s\"."
  msgstr ""
  
- #: g10/tofu.c:1214
++#: g10/tofu.c:1513
  #, fuzzy, c-format
  #| msgid "error getting responder ID: %s\n"
  msgid "error gathering other user IDs: %s\n"
  msgstr "取得回應程式 ID 時出錯: %s\n"
  
- #: g10/tofu.c:1223
- msgid "Known user IDs associated with this key:\n"
- msgstr ""
++#: g10/tofu.c:1523
+ #, fuzzy
+ #| msgid "list key and user IDs"
+ msgid "This key's user IDs:\n"
+ msgstr "列出金鑰和使用者 ID"
  
- #: g10/tofu.c:1239 g10/tofu.c:1334 g10/tofu.c:2028
++#: g10/tofu.c:1539 g10/tofu.c:1695 g10/tofu.c:2847
  #, fuzzy, c-format
  #| msgid "validity: %s"
  msgid "policy: %s"
  msgstr "有效性: %s"
  
- #: g10/tofu.c:1290
++#: g10/tofu.c:1630
  #, fuzzy, c-format
  #| msgid "error getting stored flags: %s\n"
  msgid "error gathering signature stats: %s\n"
  msgstr "取得已存放的旗標時出錯: %s\n"
  
- #: g10/tofu.c:1294
++#: g10/tofu.c:1634
  #, c-format
  msgid "The email address \"%s\" is associated with %d key:\n"
  msgid_plural "The email address \"%s\" is associated with %d keys:\n"
  msgstr[0] ""
  
- #: g10/tofu.c:1318
++#: g10/tofu.c:1651
  #, c-format
  msgid "Statistics for keys with the email address \"%s\":\n"
  msgstr ""
  
- #: g10/tofu.c:1332
++#: g10/tofu.c:1684 g10/tofu.c:1689
+ msgid ", "
+ msgstr ""
+ 
++#: g10/tofu.c:1693
  #, fuzzy
  #| msgid "list keys"
  msgid "this key"
  msgstr "列出金鑰"
  
- #: g10/tofu.c:1342
- #, c-format
- msgid "%ld message signed in the future."
- msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- 
- #: g10/tofu.c:1351
++#: g10/tofu.c:1715
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "%ld message signed"
- msgid_plural "%ld messages signed"
+ msgid "Verified %d message"
+ msgid_plural "Verified %d messages"
  msgstr[0] "印出訊息摘要"
  
- #: g10/tofu.c:1357
++#: g10/tofu.c:1719
+ #, c-format
+ msgid "Encrypted %d message"
+ msgid_plural "Encrypted %d messages"
+ msgstr[0] ""
+ 
++#: g10/tofu.c:1734
  #, c-format
- msgid " over the past %ld day."
- msgid_plural " over the past %ld days."
+ msgid " over the past day."
+ msgid_plural " over the past %d days."
  msgstr[0] ""
  
- #: g10/tofu.c:1361
++#: g10/tofu.c:1740
  #, c-format
- msgid " over the past %ld week."
- msgid_plural " over the past %ld weeks."
+ msgid " over the past month."
+ msgid_plural " over the past %d months."
  msgstr[0] ""
  
- #: g10/tofu.c:1365
++#: g10/tofu.c:1746
  #, c-format
- msgid " over the past %ld month."
- msgid_plural " over the past %ld months."
+ msgid " over the past year."
+ msgid_plural " over the past %d years."
  msgstr[0] ""
  
++#: g10/tofu.c:1752
+ msgid " in the past."
+ msgstr ""
+ 
  #. TRANSLATORS: Please translate the text found in the source
  #. * file below.  We don't directly internationalize that text so
  #. * that we can tweak it without breaking translations.
- #: g10/tofu.c:1382
++#: g10/tofu.c:1767
  msgid "TOFU detected a binding conflict"
  msgstr ""
  
  #. TRANSLATORS: Two letters (normally the lower and upper case
  #. * version of the hotkey) for each of the five choices.  If
  #. * there is only one choice in your language, repeat it.
- #: g10/tofu.c:1420
++#: g10/tofu.c:1809
  msgid "gGaAuUrRbB"
  msgstr ""
  
- #: g10/tofu.c:1426
++#: g10/tofu.c:1815
  msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
  msgstr ""
  
- #: g10/tofu.c:1538 g10/tofu.c:1653 g10/tofu.c:1682
++#: g10/tofu.c:1823
+ msgid "Defaulting to unknown."
+ msgstr ""
+ 
++#: g10/tofu.c:1938 g10/tofu.c:2074
+ msgid "TOFU db corruption detected.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:1994
+ #, fuzzy, c-format
+ #| msgid "error writing key: %s\n"
+ msgid "resetting keydb: %s\n"
+ msgstr "寫入金鑰時出錯: %s\n"
+ 
++#: g10/tofu.c:2219 g10/tofu.c:2332 g10/tofu.c:2372 g10/tofu.c:2400
++#: g10/tofu.c:2425
  #, fuzzy, c-format
  #| msgid "error setting OCSP target: %s\n"
  msgid "error setting TOFU binding's trust level to %s\n"
  msgstr "設定 OCSP 目標時出錯: %s\n"
  
- #: g10/tofu.c:1727
++#: g10/tofu.c:2473
  #, fuzzy, c-format
  #| msgid "error creating a pipe: %s\n"
  msgid "error changing TOFU policy: %s\n"
@@@ -6953,87 -5527,79 +7024,95 @@@ msgstr "建立管道時出錯: %s\n
  
  #. TRANSLATORS: The tilde ('~') is used here to indicate a
  #. * non-breakable space
- #: g10/tofu.c:1819
++#: g10/tofu.c:2574
  #, c-format
  msgid "%d~year"
  msgid_plural "%d~years"
  msgstr[0] ""
  
- #: g10/tofu.c:1828
++#: g10/tofu.c:2583
  #, c-format
  msgid "%d~month"
  msgid_plural "%d~months"
  msgstr[0] ""
  
- #: g10/tofu.c:1837
++#: g10/tofu.c:2592
  #, c-format
  msgid "%d~day"
  msgid_plural "%d~days"
  msgstr[0] ""
  
- #: g10/tofu.c:1846
++#: g10/tofu.c:2601
  #, c-format
  msgid "%d~hour"
  msgid_plural "%d~hours"
  msgstr[0] ""
  
- #: g10/tofu.c:1855
++#: g10/tofu.c:2610
  #, c-format
  msgid "%d~minute"
  msgid_plural "%d~minutes"
  msgstr[0] ""
  
- #: g10/tofu.c:1864
++#: g10/tofu.c:2619
  #, c-format
  msgid "%d~second"
  msgid_plural "%d~seconds"
  msgstr[0] ""
  
- #: g10/tofu.c:1947
++#: g10/tofu.c:2802
  #, c-format
- msgid "Have never verified a message signed by key %s!\n"
+ msgid "%s: "
  msgstr ""
  
- #: g10/tofu.c:1976
- #, c-format
- msgid ""
- "Failed to collect signature statistics for \"%s\"\n"
- "(key %s)\n"
- msgstr ""
++#: g10/tofu.c:2806
+ #, fuzzy, c-format
+ #| msgid "Deleted %d signatures.\n"
+ msgid "Verified %ld signatures"
+ msgstr "已經刪除了 %d 份簽章.\n"
  
- #: g10/tofu.c:1996
++#: g10/tofu.c:2816
  #, fuzzy, c-format
  #| msgid "print message digests"
- msgid "Verified %ld messages signed by \"%s\"."
- msgstr "印出訊息摘要"
+ msgid "Verified %ld signature in the past %s"
+ msgid_plural "Verified %ld signatures in the past %s"
+ msgstr[0] "印出訊息摘要"
  
- #: g10/tofu.c:2007
- #, c-format
++#: g10/tofu.c:2826
+ #, fuzzy, c-format
+ #| msgid "encrypted with %lu passphrases\n"
+ msgid ", and encrypted %ld messages"
+ msgstr "已用 %lu 個密語加密了\n"
+ 
++#: g10/tofu.c:2835
+ #, fuzzy, c-format
+ #| msgid "print message digests"
+ msgid ", and encrypted %ld message in the past %s"
+ msgid_plural ", and encrypted %ld messages in the past %s"
+ msgstr[0] "印出訊息摘要"
+ 
++#: g10/tofu.c:2880
  msgid ""
- "Verified %ld message signed by \"%s\"\n"
- "in the past %s."
- msgid_plural ""
- "Verified %ld messages signed by \"%s\"\n"
- "in the past %s."
- msgstr[0] ""
+ "Warning: we have yet to see a message signed using this key and user id!\n"
+ msgstr ""
  
- #: g10/tofu.c:2018
- #, c-format
- msgid "The most recent message was verified %s ago."
++#: g10/tofu.c:2883
+ msgid ""
+ "Warning: we've only seen one message signed using this key and user id!\n"
  msgstr ""
  
- #: g10/tofu.c:2066
- msgid "Warning: we've have yet to see a message signed by this key!\n"
++#: g10/tofu.c:2887
+ msgid "Warning: you have yet to encrypt a message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2069
- msgid "Warning: we've only seen a single message signed by this key!\n"
++#: g10/tofu.c:2890
+ msgid "Warning: you have only encrypted one message to this key!\n"
  msgstr ""
  
- #: g10/tofu.c:2077
++#: g10/tofu.c:2919
  #, c-format
  msgid ""
- "Warning: if you think you've seen more than %ld message signed by this key, "
+ "Warning: if you think you've seen more signatures by this key and user id, "
  "then this key might be a forgery!  Carefully examine the email address for "
  "small variations.  If the key is suspect, then use\n"
  "  %s\n"
@@@ -7046,127 -5612,111 +7125,139 @@@ msgid_plural "
  "to mark it as being bad.\n"
  msgstr[0] ""
  
- #: g10/tofu.c:2165 g10/tofu.c:2383 g10/tofu.c:2433 g10/tofu.c:2511
++#: g10/tofu.c:3001 g10/tofu.c:3152 g10/tofu.c:3329 g10/tofu.c:3371
++#: g10/tofu.c:3480 g10/tofu.c:3572
  #, fuzzy, c-format
  #| msgid "error sending data: %s\n"
  msgid "error opening TOFU database: %s\n"
  msgstr "送出資料時出錯: %s\n"
  
- #: g10/trustdb.c:215
++#: g10/tofu.c:3185
+ #, c-format
+ msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+ msgstr ""
+ 
++#: g10/tofu.c:3515
+ #, fuzzy, c-format
+ #| msgid "error writing public keyring '%s': %s\n"
+ msgid "error setting policy for key %s, user id \"%s\": %s"
+ msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
+ 
++#: g10/trustdb.c:216
  #, c-format
  msgid "'%s' is not a valid long keyID\n"
  msgstr "'%s' 不是有效的長式金鑰 ID\n"
  
- #: g10/trustdb.c:241
++#: g10/trustdb.c:242
  #, c-format
  msgid "key %s: accepted as trusted key\n"
  msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
  
- #: g10/trustdb.c:279
++#: g10/trustdb.c:280
  #, c-format
  msgid "key %s occurs more than once in the trustdb\n"
  msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
  
- #: g10/trustdb.c:294
++#: g10/trustdb.c:295
  #, c-format
  msgid "key %s: no public key for trusted key - skipped\n"
  msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
  
- #: g10/trustdb.c:304
++#: g10/trustdb.c:305
  #, c-format
  msgid "key %s marked as ultimately trusted\n"
  msgstr "金鑰 %s 已標記成徹底信任了\n"
  
- #: g10/trustdb.c:340
++#: g10/trustdb.c:341
  #, c-format
  msgid "trust record %lu, req type %d: read failed: %s\n"
  msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
  
- #: g10/trustdb.c:346
++#: g10/trustdb.c:347
  #, c-format
  msgid "trust record %lu is not of requested type %d\n"
  msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
  
- #: g10/trustdb.c:421
++#: g10/trustdb.c:422
  msgid "You may try to re-create the trustdb using the commands:\n"
  msgstr "你可以試著用下列指令來重建信任資料庫:\n"
  
- #: g10/trustdb.c:430
++#: g10/trustdb.c:431
  msgid "If that does not work, please consult the manual\n"
  msgstr "如果行不通的話, 請查閱手冊\n"
  
- #: g10/trustdb.c:467
++#: g10/trustdb.c:468
  #, c-format
  msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
  msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
  
- #: g10/trustdb.c:473
++#: g10/trustdb.c:474
  #, c-format
  msgid "using %s trust model\n"
  msgstr "正在使用 %s 信任模型\n"
  
- #: g10/trustdb.c:510
++#: g10/trustdb.c:511
  msgid "no need for a trustdb check\n"
  msgstr "不需要檢查信任資料庫\n"
  
- #: g10/trustdb.c:516 g10/trustdb.c:2130
++#: g10/trustdb.c:517 g10/trustdb.c:2160
  #, c-format
  msgid "next trustdb check due at %s\n"
  msgstr "下次信任資料庫檢查將於 %s 進行\n"
  
- #: g10/trustdb.c:525
++#: g10/trustdb.c:526
  #, c-format
  msgid "no need for a trustdb check with '%s' trust model\n"
  msgstr "在 '%s' 信任模型中並不需要檢查信任資料庫\n"
  
- #: g10/trustdb.c:541
++#: g10/trustdb.c:542
  #, c-format
  msgid "no need for a trustdb update with '%s' trust model\n"
  msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
  
- #: g10/trustdb.c:748 g10/trustdb.c:1283
++#: g10/trustdb.c:749 g10/trustdb.c:1313
  #, c-format
  msgid "public key %s not found: %s\n"
  msgstr "找不到公鑰 %s: %s\n"
  
- #: g10/trustdb.c:965
++#: g10/trustdb.c:966
  msgid "please do a --check-trustdb\n"
  msgstr "請做一次 --check-trustdb\n"
  
- #: g10/trustdb.c:970
++#: g10/trustdb.c:971
  msgid "checking the trustdb\n"
  msgstr "正在檢查信任資料庫\n"
  
- #: g10/trustdb.c:1853
++#: g10/trustdb.c:1883
  #, fuzzy, c-format
  #| msgid "%lu keys processed so far\n"
  msgid "%d key processed"
  msgid_plural "%d keys processed"
  msgstr[0] "目前已處理 %lu 把金鑰\n"
  
- #: g10/trustdb.c:1856
++#: g10/trustdb.c:1886
  #, fuzzy, c-format
  #| msgid "%d keys processed (%d validity counts cleared)\n"
  msgid " (%d validity count cleared)\n"
  msgid_plural " (%d validity counts cleared)\n"
  msgstr[0] "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
  
- #: g10/trustdb.c:1926
++#: g10/trustdb.c:1956
  msgid "no ultimately trusted keys found\n"
  msgstr "沒有找到任何徹底信任的金鑰\n"
  
- #: g10/trustdb.c:1940
++#: g10/trustdb.c:1970
  #, c-format
  msgid "public key of ultimately trusted key %s not found\n"
  msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
  
- #: g10/trustdb.c:2057
++#: g10/trustdb.c:2087
  #, c-format
  msgid ""
  "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
  msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
  
- #: g10/trustdb.c:2137
++#: g10/trustdb.c:2167
  #, c-format
  msgid "unable to update trustdb version record: write failed: %s\n"
  msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@@ -7285,138 -5814,108 +7376,140 @@@ msgstr "
  "語法: kbxutil [選項] [檔案]\n"
  "列出, 匯出, 匯入金鑰鑰匙盒資料\n"
  
- #: scd/app-nks.c:714 scd/app-openpgp.c:2995
++#: scd/app-nks.c:718 scd/app-openpgp.c:3208
  #, c-format
  msgid "RSA modulus missing or not of size %d bits\n"
  msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
  
- #: scd/app-nks.c:722 scd/app-openpgp.c:3007
++#: scd/app-nks.c:726 scd/app-openpgp.c:3220
  #, c-format
  msgid "RSA public exponent missing or larger than %d bits\n"
  msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
  
- #: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
- #: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
- #: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
++#: scd/app-nks.c:806 scd/app-openpgp.c:1952 scd/app-openpgp.c:1971
++#: scd/app-openpgp.c:2136 scd/app-openpgp.c:2153 scd/app-openpgp.c:2417
++#: scd/app-openpgp.c:2464 scd/app-openpgp.c:2569 scd/app-dinsig.c:303
  #, c-format
  msgid "PIN callback returned error: %s\n"
  msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
  
- #: scd/app-nks.c:835
++#: scd/app-nks.c:839
  msgid "the NullPIN has not yet been changed\n"
  msgstr "NullPIN 還沒有變更過\n"
  
- #: scd/app-nks.c:1096
++#: scd/app-nks.c:1100
  msgid "|N|Please enter a new PIN for the standard keys."
  msgstr "|N|請輸入標準金鑰將採用的新個人識別碼 (PIN)."
  
- #: scd/app-nks.c:1097
++#: scd/app-nks.c:1101
  msgid "||Please enter the PIN for the standard keys."
  msgstr "||請輸入標準金鑰的個人識別碼 (PIN)."
  
- #: scd/app-nks.c:1103
++#: scd/app-nks.c:1107
  msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|NP|請輸入標準金鑰將採用的 PIN 重設碼 (PUK)."
  
- #: scd/app-nks.c:1105
++#: scd/app-nks.c:1109
  msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
  msgstr "|P|請輸入標準金鑰的 PIN 重設碼 (PUK)."
  
- #: scd/app-nks.c:1113
++#: scd/app-nks.c:1117
  msgid "|N|Please enter a new PIN for the key to create qualified signatures."
  msgstr "|N|請輸入金鑰的新個人識別碼 (PIN) 以建立完善的簽章."
  
- #: scd/app-nks.c:1115
++#: scd/app-nks.c:1119
  msgid "||Please enter the PIN for the key to create qualified signatures."
  msgstr "||請輸入金鑰的個人識別碼 (PIN) 以建立完善的簽章."
  
- #: scd/app-nks.c:1123
++#: scd/app-nks.c:1127
  msgid ""
  "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr "|NP|請輸入金鑰的新 PIN 重設碼 (PUK) 以建立完善的簽章."
  
- #: scd/app-nks.c:1125
++#: scd/app-nks.c:1129
  msgid ""
  "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
  "qualified signatures."
  msgstr "|P|請輸入金鑰的 PIN 重設碼 (PUK) 以建立完善的簽章."
  
- #: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
++#: scd/app-nks.c:1233 scd/app-openpgp.c:2498 scd/app-dinsig.c:532
  #, c-format
  msgid "error getting new PIN: %s\n"
  msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
  
- #: scd/app-openpgp.c:805
++#: scd/app-openpgp.c:806
  #, c-format
  msgid "failed to store the fingerprint: %s\n"
  msgstr "存放指紋失敗: %s\n"
  
- #: scd/app-openpgp.c:818
++#: scd/app-openpgp.c:819
  #, c-format
  msgid "failed to store the creation date: %s\n"
  msgstr "存放創生日期失敗: %s\n"
  
- #: scd/app-openpgp.c:1286
- #, c-format
- msgid "reading public key failed: %s\n"
- msgstr "讀取公鑰時失敗: %s\n"
- 
- #: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
- msgid "response does not contain the public key data\n"
- msgstr "回應中未包含公鑰資料\n"
- 
- #: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
++#: scd/app-openpgp.c:1236
  msgid "response does not contain the RSA modulus\n"
  msgstr "回應中未包含 RSA 系數\n"
  
- #: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
++#: scd/app-openpgp.c:1243
  msgid "response does not contain the RSA public exponent\n"
  msgstr "回應中未包含 RSA 公用指數\n"
  
- #: scd/app-openpgp.c:1322
- msgid "response does not contain the EC public point\n"
++#: scd/app-openpgp.c:1353
+ #, fuzzy
+ #| msgid "response does not contain the EC public point\n"
+ msgid "response does not contain the EC public key\n"
  msgstr "回應中未包含 EC 公用指數\n"
  
- #: scd/app-openpgp.c:1708
++#: scd/app-openpgp.c:1453 scd/app-openpgp.c:3813
+ msgid "response does not contain the public key data\n"
+ msgstr "回應中未包含公鑰資料\n"
+ 
++#: scd/app-openpgp.c:1551
+ #, c-format
+ msgid "reading public key failed: %s\n"
+ msgstr "讀取公鑰時失敗: %s\n"
+ 
++#: scd/app-openpgp.c:1903
  #, c-format
  msgid "using default PIN as %s\n"
  msgstr "以 %s 做為預設 PIN\n"
  
- #: scd/app-openpgp.c:1715
++#: scd/app-openpgp.c:1910
  #, c-format
  msgid "failed to use default PIN as %s: %s - disabling further default use\n"
  msgstr "使用 %s 做為預設個人識別碼 (PIN) 失敗: %s - 正在停用之後的預設使用\n"
  
- #: scd/app-openpgp.c:1730
++#: scd/app-openpgp.c:1925
  #, c-format
  msgid "||Please enter the PIN%%0A[sigs done: %lu]"
  msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
  
- #: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
++#: scd/app-openpgp.c:1936 scd/app-openpgp.c:2411
  msgid "||Please enter the PIN"
  msgstr "||請輸入個人識別碼 (PIN)"
  
- #: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
++#: scd/app-openpgp.c:1978 scd/app-openpgp.c:2160 scd/app-openpgp.c:2424
  #, c-format
  msgid "PIN for CHV%d is too short; minimum length is %d\n"
  msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
  
- #: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
- #: scd/app-openpgp.c:3937
++#: scd/app-openpgp.c:1991 scd/app-openpgp.c:2030 scd/app-openpgp.c:2172
++#: scd/app-openpgp.c:4114
  #, c-format
  msgid "verify CHV%d failed: %s\n"
  msgstr "驗證 CHV%d 失敗: %s\n"
  
- #: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
++#: scd/app-openpgp.c:2059 scd/app-openpgp.c:2445 scd/app-openpgp.c:4537
  msgid "error retrieving CHV status from card\n"
  msgstr "從卡片取回 CHV 狀態時出錯\n"
  
- #: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
++#: scd/app-openpgp.c:2065 scd/app-openpgp.c:4546
  msgid "card is permanently locked!\n"
  msgstr "卡片永久鎖定了!!\n"
  
- #: scd/app-openpgp.c:1877
++#: scd/app-openpgp.c:2072
  #, fuzzy, c-format
  #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
  msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@@ -7426,24 -5925,19 +7519,24 @@@ msgstr[0] "%d 管理者個人識別碼 
  
  #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
  #. the start of the string.  Use %%0A to force a linefeed.
- #: scd/app-openpgp.c:1887
++#: scd/app-openpgp.c:2082
  #, c-format
  msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
  msgstr "|A|請在上輸入管理者 PIN%%0A[剩餘嘗試次數: %d]"
  
- #: scd/app-openpgp.c:1891
++#: scd/app-openpgp.c:2086
  msgid "|A|Please enter the Admin PIN"
  msgstr "|A|請輸入管理者 PIN"
  
- #: scd/app-openpgp.c:1912
++#: scd/app-openpgp.c:2107
  msgid "access to admin commands is not configured\n"
  msgstr "管理者指令存取權限尚未組態\n"
  
- #: scd/app-openpgp.c:2265
++#: scd/app-openpgp.c:2460
  msgid "||Please enter the Reset Code for the card"
  msgstr "||請輸入卡片的重設碼"
  
- #: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
++#: scd/app-openpgp.c:2470 scd/app-openpgp.c:2524
  #, c-format
  msgid "Reset Code is too short; minimum length is %d\n"
  msgstr "重設碼太短; 長度最少要有 %d\n"
@@@ -7451,109 -5945,85 +7544,109 @@@
  #. TRANSLATORS: Do not translate the "|*|" prefixes but
  #. keep it at the start of the string.  We need this elsewhere
  #. to get some infos on the string.
- #: scd/app-openpgp.c:2298
++#: scd/app-openpgp.c:2493
  msgid "|RN|New Reset Code"
  msgstr "|RN|新增重設碼"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|AN|New Admin PIN"
  msgstr "|AN|新增管理者個人識別碼 (PIN)"
  
- #: scd/app-openpgp.c:2299
++#: scd/app-openpgp.c:2494
  msgid "|N|New PIN"
  msgstr "|N|新增個人識別碼 (PIN)"
  
- #: scd/app-openpgp.c:2370
++#: scd/app-openpgp.c:2565
  msgid "||Please enter the Admin PIN and New Admin PIN"
  msgstr "||請輸入管理者 PIN 及新的管理者 PIN"
  
- #: scd/app-openpgp.c:2371
++#: scd/app-openpgp.c:2566
  msgid "||Please enter the PIN and New PIN"
  msgstr "||請輸入個人識別碼及新的個人識別碼 (PIN)"
  
- #: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
++#: scd/app-openpgp.c:2622 scd/app-openpgp.c:3873
  msgid "error reading application data\n"
  msgstr "讀取應用程式資料時出錯\n"
  
- #: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
++#: scd/app-openpgp.c:2628 scd/app-openpgp.c:3880
  msgid "error reading fingerprint DO\n"
  msgstr "讀取指紋 DO 時出錯\n"
  
- #: scd/app-openpgp.c:2443
++#: scd/app-openpgp.c:2638
  msgid "key already exists\n"
  msgstr "金鑰已存在\n"
  
- #: scd/app-openpgp.c:2447
++#: scd/app-openpgp.c:2642
  msgid "existing key will be replaced\n"
  msgstr "既有的金鑰將被取代\n"
  
- #: scd/app-openpgp.c:2449
++#: scd/app-openpgp.c:2644
  msgid "generating new key\n"
  msgstr "正在產生新的金鑰\n"
  
- #: scd/app-openpgp.c:2451
++#: scd/app-openpgp.c:2646
  msgid "writing new key\n"
  msgstr "正在寫入新的金鑰\n"
  
- #: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
++#: scd/app-openpgp.c:3188 scd/app-openpgp.c:3540
  msgid "creation timestamp missing\n"
  msgstr "缺漏創生時間戳印\n"
  
- #: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
++#: scd/app-openpgp.c:3230 scd/app-openpgp.c:3238
  #, c-format
  msgid "RSA prime %s missing or not of size %d bits\n"
  msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
  
- #: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
++#: scd/app-openpgp.c:3371 scd/app-openpgp.c:3634
  #, c-format
  msgid "failed to store the key: %s\n"
  msgstr "存放金鑰失敗: %s\n"
  
- #: scd/app-openpgp.c:3320
++#: scd/app-openpgp.c:3534
  #, fuzzy
  #| msgid "unsupported inquiry '%s'\n"
  msgid "unsupported curve\n"
  msgstr "未支援的查詢 '%s'\n"
  
- #: scd/app-openpgp.c:3577
++#: scd/app-openpgp.c:3790
  msgid "please wait while key is being generated ...\n"
  msgstr "正在產生金鑰中, 請稍候 ...\n"
  
- #: scd/app-openpgp.c:3590
++#: scd/app-openpgp.c:3798
  msgid "generating key failed\n"
  msgstr "產生金鑰時失敗\n"
  
- #: scd/app-openpgp.c:3596
++#: scd/app-openpgp.c:3804
  #, fuzzy, c-format
  #| msgid "key generation completed (%d seconds)\n"
  msgid "key generation completed (%d second)\n"
  msgid_plural "key generation completed (%d seconds)\n"
  msgstr[0] "金鑰產生完畢 (%d 秒)\n"
  
- #: scd/app-openpgp.c:3661
++#: scd/app-openpgp.c:3838
  msgid "invalid structure of OpenPGP card (DO 0x93)\n"
  msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
  
- #: scd/app-openpgp.c:3711
++#: scd/app-openpgp.c:3888
  msgid "fingerprint on card does not match requested one\n"
  msgstr "卡片上的指紋與所要求的那個並不吻合\n"
  
- #: scd/app-openpgp.c:3827
++#: scd/app-openpgp.c:4004
  #, c-format
  msgid "card does not support digest algorithm %s\n"
  msgstr "卡片不支援 %s 摘要演算法\n"
  
- #: scd/app-openpgp.c:3912
++#: scd/app-openpgp.c:4089
  #, c-format
  msgid "signatures created so far: %lu\n"
  msgstr "目前建立的簽章: %lu\n"
  
- #: scd/app-openpgp.c:4365
++#: scd/app-openpgp.c:4551
  msgid ""
  "verification of Admin PIN is currently prohibited through this command\n"
  msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
  
- #: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
++#: scd/app-openpgp.c:4854 scd/app-openpgp.c:4865
  #, c-format
  msgid "can't access %s - invalid OpenPGP card?\n"
  msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@@ -7573,7 -6040,6 +7666,7 @@@ msgstr "|N|開始新增個人識別碼 
  msgid "run in multi server mode (foreground)"
  msgstr "以多重伺服器模式執行 (前景)"
  
- #: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:164
++#: scd/scdaemon.c:124 sm/gpgsm.c:336 dirmngr/dirmngr.c:173
  msgid "|LEVEL|set the debugging level to LEVEL"
  msgstr "|等級|設定除錯等級為指定等級"
  
@@@ -7625,16 -6080,13 +7718,16 @@@ msgstr "
  "語法: scdaemon [選項] [指令 [引數]]\n"
  "@GNUPG@ 智慧卡服務\n"
  
- #: scd/scdaemon.c:785
++#: scd/scdaemon.c:786
  msgid "please use the option '--daemon' to run the program in the background\n"
  msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
  
- #: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1826
++#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1900
  #, c-format
  msgid "handler for fd %d started\n"
  msgstr "用於 fd %d 的經手程式已啟動\n"
  
- #: scd/scdaemon.c:1158 dirmngr/dirmngr.c:1831
++#: scd/scdaemon.c:1172 dirmngr/dirmngr.c:1905
  #, c-format
  msgid "handler for fd %d terminated\n"
  msgstr "用於 fd %d 的經手程式已終止\n"
@@@ -7655,11 -6104,9 +7748,11 @@@ msgstr "在此階段中沒有執行中�
  msgid "validation model requested by certificate: %s"
  msgstr "憑證所要求的驗證模型: %s"
  
- #: sm/certchain.c:195 sm/certchain.c:1919
++#: sm/certchain.c:195 sm/certchain.c:1937
  msgid "chain"
  msgstr "chain"
  
- #: sm/certchain.c:196 sm/certchain.c:1919
++#: sm/certchain.c:196 sm/certchain.c:1937
  msgid "shell"
  msgstr "shell"
  
@@@ -7689,194 -6130,147 +7782,194 @@@ msgstr "請注意: 不允許非關鍵�
  msgid "certificate policy not allowed"
  msgstr "未允許憑證原則"
  
- #: sm/certchain.c:527
++#: sm/certchain.c:538
  msgid "looking up issuer at external location\n"
  msgstr "從外部位置尋找發行者\n"
  
- #: sm/certchain.c:546
++#: sm/certchain.c:558
  #, c-format
  msgid "number of issuers matching: %d\n"
  msgstr "吻合的發行者數量: %d\n"
  
- #: sm/certchain.c:590
++#: sm/certchain.c:606
  msgid "looking up issuer from the Dirmngr cache\n"
  msgstr "從 Dirmngr 快取尋找發行者\n"
  
- #: sm/certchain.c:614
++#: sm/certchain.c:631
  #, c-format
  msgid "number of matching certificates: %d\n"
  msgstr "吻合的憑證數量: %d\n"
  
- #: sm/certchain.c:616
++#: sm/certchain.c:634
  #, c-format
  msgid "dirmngr cache-only key lookup failed: %s\n"
  msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
  
- #: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
- #: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
++#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:262
++#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1133 sm/keydb.c:1219
 +#: sm/sign.c:337 sm/verify.c:114
  msgid "failed to allocate keyDB handle\n"
  msgstr "配置 keyDB 代號失敗\n"
  
- #: sm/certchain.c:981
++#: sm/certchain.c:999
  msgid "certificate has been revoked"
  msgstr "憑證已撤銷"
  
- #: sm/certchain.c:996
++#: sm/certchain.c:1014
  msgid "the status of the certificate is unknown"
  msgstr "憑證的狀態未知"
  
- #: sm/certchain.c:1003
++#: sm/certchain.c:1021
  msgid "please make sure that the \"dirmngr\" is properly installed\n"
  msgstr "請確認 \"dirmngr\" 已安裝妥善\n"
  
- #: sm/certchain.c:1009
++#: sm/certchain.c:1027
  #, c-format
  msgid "checking the CRL failed: %s"
  msgstr "檢查 CRL 時失敗: %s"
  
- #: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:469
++#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:469
  #, c-format
  msgid "certificate with invalid validity: %s"
  msgstr "有效性無效的憑證: %s"
  
- #: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:487
++#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:487
  msgid "certificate not yet valid"
  msgstr "憑證尚未生效"
  
- #: sm/certchain.c:1054 sm/certchain.c:1139
++#: sm/certchain.c:1072 sm/certchain.c:1157
  msgid "root certificate not yet valid"
  msgstr "根憑證尚未生效"
  
- #: sm/certchain.c:1055 sm/certchain.c:1140
++#: sm/certchain.c:1073 sm/certchain.c:1158
  msgid "intermediate certificate not yet valid"
  msgstr "媒介憑證尚未生效"
  
- #: sm/certchain.c:1068 dirmngr/validate.c:498
++#: sm/certchain.c:1086 dirmngr/validate.c:498
  msgid "certificate has expired"
  msgstr "憑證已過期"
  
- #: sm/certchain.c:1069
++#: sm/certchain.c:1087
  msgid "root certificate has expired"
  msgstr "根憑證已過期"
  
- #: sm/certchain.c:1070
++#: sm/certchain.c:1088
  msgid "intermediate certificate has expired"
  msgstr "媒介憑證已過期"
  
- #: sm/certchain.c:1112
++#: sm/certchain.c:1130
  #, c-format
  msgid "required certificate attributes missing: %s%s%s"
  msgstr "遺失所需的憑證屬性: %s%s%s"
  
- #: sm/certchain.c:1121
++#: sm/certchain.c:1139
  msgid "certificate with invalid validity"
  msgstr "有效性無效的憑證"
  
- #: sm/certchain.c:1158
++#: sm/certchain.c:1176
  msgid "signature not created during lifetime of certificate"
  msgstr "簽章並非在憑證生存時間內所造"
  
- #: sm/certchain.c:1160
++#: sm/certchain.c:1178
  msgid "certificate not created during lifetime of issuer"
  msgstr "憑證並非在發行者生存時間內所造"
  
- #: sm/certchain.c:1161
++#: sm/certchain.c:1179
  msgid "intermediate certificate not created during lifetime of issuer"
  msgstr "媒介憑證並非在發行者生存時間內所造"
  
- #: sm/certchain.c:1165
++#: sm/certchain.c:1183
  msgid "  (  signature created at "
  msgstr "  (            簽章建立於 "
  
- #: sm/certchain.c:1166
++#: sm/certchain.c:1184
  msgid "  (certificate created at "
  msgstr "  (            憑證建立於 "
  
- #: sm/certchain.c:1169
++#: sm/certchain.c:1187
  msgid "  (certificate valid from "
  msgstr "  (憑證有效自 "
  
- #: sm/certchain.c:1170
++#: sm/certchain.c:1188
  msgid "  (     issuer valid from "
  msgstr "  (        發行者有效自 "
  
- #: sm/certchain.c:1200 dirmngr/validate.c:548
++#: sm/certchain.c:1218 dirmngr/validate.c:548
  #, c-format
  msgid "fingerprint=%s\n"
  msgstr "指紋=%s\n"
  
- #: sm/certchain.c:1209
++#: sm/certchain.c:1227
  msgid "root certificate has now been marked as trusted\n"
  msgstr "根憑證現在已標記為已信任\n"
  
- #: sm/certchain.c:1222
++#: sm/certchain.c:1240
  msgid "interactive marking as trusted not enabled in gpg-agent\n"
  msgstr "在 gpg-agent 中未啟用互動式標記為已信任\n"
  
- #: sm/certchain.c:1228
++#: sm/certchain.c:1246
  msgid "interactive marking as trusted disabled for this session\n"
  msgstr "互動式標記為已信任在此作業階段中已停用\n"
  
- #: sm/certchain.c:1286
++#: sm/certchain.c:1304
  msgid "WARNING: creation time of signature not known - assuming current time"
  msgstr "警告: 簽章創造時間未知 - 假設為此刻"
  
- #: sm/certchain.c:1350
++#: sm/certchain.c:1368
  msgid "no issuer found in certificate"
  msgstr "憑證中找不到發行者"
  
- #: sm/certchain.c:1428
++#: sm/certchain.c:1446
  msgid "self-signed certificate has a BAD signature"
  msgstr "自簽憑證有 不良 簽章"
  
- #: sm/certchain.c:1497 dirmngr/validate.c:546
++#: sm/certchain.c:1515 dirmngr/validate.c:546
  msgid "root certificate is not marked trusted"
  msgstr "根憑證未標記為已信任"
  
- #: sm/certchain.c:1513
++#: sm/certchain.c:1531
  #, c-format
  msgid "checking the trust list failed: %s\n"
  msgstr "檢查信任清單時失敗: %s\n"
  
- #: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:601
++#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:601
  msgid "certificate chain too long\n"
  msgstr "憑證鏈太長\n"
  
- #: sm/certchain.c:1556 dirmngr/validate.c:613
++#: sm/certchain.c:1574 dirmngr/validate.c:613
  msgid "issuer certificate not found"
  msgstr "找不到發行者憑證"
  
- #: sm/certchain.c:1589 dirmngr/validate.c:639
++#: sm/certchain.c:1607 dirmngr/validate.c:639
  msgid "certificate has a BAD signature"
  msgstr "憑證有 不良 簽章"
  
- #: sm/certchain.c:1621 dirmngr/validate.c:663
++#: sm/certchain.c:1639 dirmngr/validate.c:663
  msgid "found another possible matching CA certificate - trying again"
  msgstr "找到了另一個可能吻合的 CA 憑證 - 正再試一次"
  
- #: sm/certchain.c:1680 dirmngr/validate.c:688
++#: sm/certchain.c:1698 dirmngr/validate.c:688
  #, c-format
  msgid "certificate chain longer than allowed by CA (%d)"
  msgstr "憑證鏈比 CA 所允許的 (%d) 還長"
  
- #: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:718
++#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:718
  msgid "certificate is good\n"
  msgstr "憑證完好\n"
  
- #: sm/certchain.c:1723
++#: sm/certchain.c:1741
  msgid "intermediate certificate is good\n"
  msgstr "媒介憑證良好\n"
  
- #: sm/certchain.c:1724
++#: sm/certchain.c:1742
  msgid "root certificate is good\n"
  msgstr "根憑證完好\n"
  
- #: sm/certchain.c:1906
++#: sm/certchain.c:1924
  msgid "switching to chain model"
  msgstr "切換至鏈模型"
  
- #: sm/certchain.c:1915
++#: sm/certchain.c:1933
  #, c-format
  msgid "validation model used: %s"
  msgstr "已使用的驗證模型: %s"
@@@ -8194,7 -6522,6 +8287,7 @@@ msgstr "(這看起來不像是個加密
  msgid "certificate '%s' not found: %s\n"
  msgstr "找不到憑證 '%s': %s\n"
  
- #: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
++#: sm/delete.c:122 sm/keydb.c:1229 sm/keydb.c:1327
  #, c-format
  msgid "error locking keybox: %s\n"
  msgstr "鎖住金鑰鑰匙盒時出錯: %s\n"
@@@ -8218,123 -6541,93 +8311,123 @@@ msgstr "刪除憑證 \"%s\" 時失敗: 
  msgid "no valid recipients given\n"
  msgstr "沒有給定有效的收件者\n"
  
- #: sm/gpgsm.c:207
++#: sm/gpgsm.c:209
  msgid "list external keys"
  msgstr "列出外部金鑰"
  
- #: sm/gpgsm.c:209
++#: sm/gpgsm.c:211
  msgid "list certificate chain"
  msgstr "列出憑證鏈"
  
- #: sm/gpgsm.c:216
++#: sm/gpgsm.c:218
  msgid "import certificates"
  msgstr "匯入憑證"
  
- #: sm/gpgsm.c:217
++#: sm/gpgsm.c:219
  msgid "export certificates"
  msgstr "匯出憑證"
  
- #: sm/gpgsm.c:225
++#: sm/gpgsm.c:227
  msgid "register a smartcard"
  msgstr "註冊智慧卡"
  
- #: sm/gpgsm.c:228
++#: sm/gpgsm.c:230
  msgid "pass a command to the dirmngr"
  msgstr "將指令遞送給 dirmngr"
  
- #: sm/gpgsm.c:230
++#: sm/gpgsm.c:232
  msgid "invoke gpg-protect-tool"
  msgstr "叫用 gpg-protect-tool"
  
- #: sm/gpgsm.c:246
++#: sm/gpgsm.c:248
  msgid "create base-64 encoded output"
  msgstr "建立以 base-64 編碼過的輸出"
  
- #: sm/gpgsm.c:254
++#: sm/gpgsm.c:256
  msgid "assume input is in PEM format"
  msgstr "假設輸入的是 PEM 格式"
  
- #: sm/gpgsm.c:256
++#: sm/gpgsm.c:258
  msgid "assume input is in base-64 format"
  msgstr "假設輸入的是 base-64 格式"
  
- #: sm/gpgsm.c:258
++#: sm/gpgsm.c:260
  msgid "assume input is in binary format"
  msgstr "假設輸入的是二進制格式"
  
- #: sm/gpgsm.c:265
++#: sm/gpgsm.c:267
  msgid "never consult a CRL"
  msgstr "永遠不要查閱 CRL"
  
- #: sm/gpgsm.c:275
++#: sm/gpgsm.c:277
  msgid "check validity using OCSP"
  msgstr "用 OCSP 檢查有效性"
  
- #: sm/gpgsm.c:280
++#: sm/gpgsm.c:282
  msgid "|N|number of certificates to include"
  msgstr "|N|要包含的憑證數量"
  
- #: sm/gpgsm.c:283
++#: sm/gpgsm.c:285
  msgid "|FILE|take policy information from FILE"
  msgstr "|檔案|從指定檔案中取得原則資訊"
  
- #: sm/gpgsm.c:286
++#: sm/gpgsm.c:288
  msgid "do not check certificate policies"
  msgstr "不要檢查憑證原則"
  
- #: sm/gpgsm.c:290
++#: sm/gpgsm.c:292
  msgid "fetch missing issuer certificates"
  msgstr "取回遺失的發行者憑證"
  
- #: sm/gpgsm.c:301
++#: sm/gpgsm.c:303
  msgid "don't use the terminal at all"
  msgstr "完全不要使用終端機"
  
- #: sm/gpgsm.c:303
++#: sm/gpgsm.c:305
  msgid "|FILE|write a server mode log to FILE"
  msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
  
- #: sm/gpgsm.c:308
++#: sm/gpgsm.c:310
  msgid "|FILE|write an audit log to FILE"
  msgstr "|檔案|將稽核日誌寫入至指定檔案"
  
- #: sm/gpgsm.c:311
++#: sm/gpgsm.c:313
  msgid "batch mode: never ask"
  msgstr "批次模式: 永遠不詢問"
  
- #: sm/gpgsm.c:312
++#: sm/gpgsm.c:314
  msgid "assume yes on most questions"
  msgstr "假設大部分的問題都回答是"
  
- #: sm/gpgsm.c:313
++#: sm/gpgsm.c:315
  msgid "assume no on most questions"
  msgstr "假設大部分的問題都回答否"
  
- #: sm/gpgsm.c:316
++#: sm/gpgsm.c:318
  msgid "|FILE|add keyring to the list of keyrings"
  msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
  
- #: sm/gpgsm.c:319
++#: sm/gpgsm.c:321
  msgid "|USER-ID|use USER-ID as default secret key"
  msgstr "|使用者-ID|使用指定使用者 ID 做為預設私鑰"
  
- #: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
++#: sm/gpgsm.c:331 tools/gpgconf-comp.c:793
  msgid "|SPEC|use this keyserver to lookup keys"
  msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
  
- #: sm/gpgsm.c:346
++#: sm/gpgsm.c:348
  msgid "|NAME|use cipher algorithm NAME"
  msgstr "|名稱|使用指定名稱的編密演算法"
  
- #: sm/gpgsm.c:348
++#: sm/gpgsm.c:350
  msgid "|NAME|use message digest algorithm NAME"
  msgstr "|名稱|使用指定名稱的訊息摘要演算法"
  
- #: sm/gpgsm.c:564
++#: sm/gpgsm.c:567
  msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
  msgstr "用法: @GPGSM@ [選項] [檔案] (或用 -h 求助)"
  
- #: sm/gpgsm.c:567
++#: sm/gpgsm.c:570
  msgid ""
  "Syntax: @GPGSM@ [options] [files]\n"
  "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@@ -8344,46 -6637,37 +8437,46 @@@ msgstr "
  "用 S/MIME 協定來簽署, 檢查, 加密, 解密\n"
  "預設的操作會依輸入資料而定\n"
  
- #: sm/gpgsm.c:771
++#: sm/gpgsm.c:774
  #, c-format
  msgid "Note: won't be able to encrypt to '%s': %s\n"
  msgstr "請注意: 將無法加密為 '%s': %s\n"
  
- #: sm/gpgsm.c:782
++#: sm/gpgsm.c:785
  #, c-format
  msgid "unknown validation model '%s'\n"
  msgstr "未知的驗證模型 '%s'\n"
  
- #: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
++#: sm/gpgsm.c:836 dirmngr/ldapserver.c:86
  #, c-format
  msgid "%s:%u: no hostname given\n"
  msgstr "%s:%u: 沒有給定主機名稱\n"
  
- #: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
++#: sm/gpgsm.c:855 dirmngr/ldapserver.c:105
  #, c-format
  msgid "%s:%u: password given without user\n"
  msgstr "%s:%u: 給定的密碼沒有使用者\n"
  
- #: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
++#: sm/gpgsm.c:876 dirmngr/ldapserver.c:126
  #, c-format
  msgid "%s:%u: skipping this line\n"
  msgstr "%s:%u: 正在跳過這一列\n"
  
- #: sm/gpgsm.c:1430
++#: sm/gpgsm.c:1433
  msgid "could not parse keyserver\n"
  msgstr "無法剖析金鑰伺服器\n"
  
- #: sm/gpgsm.c:1629
++#: sm/gpgsm.c:1636
  #, c-format
  msgid "importing common certificates '%s'\n"
  msgstr "正在匯入通用憑證 '%s'\n"
  
- #: sm/gpgsm.c:1670
++#: sm/gpgsm.c:1677
  #, c-format
  msgid "can't sign using '%s': %s\n"
  msgstr "無法用 '%s' 來簽署: %s\n"
  
- #: sm/gpgsm.c:2026
++#: sm/gpgsm.c:2033
  msgid "invalid command (there is no implicit command)\n"
  msgstr "無效的指令 (沒有這樣的指令)\n"
  
@@@ -8400,7 -6681,6 +8493,7 @@@ msgstr "存放憑證時出錯\n
  msgid "basic certificate checks failed - not imported\n"
  msgstr "基本的憑證檢查失敗了 - 未匯入\n"
  
- #: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
++#: sm/import.c:467 sm/keydb.c:1249 sm/keydb.c:1339
  #, c-format
  msgid "error getting stored flags: %s\n"
  msgstr "取得已存放的旗標時出錯: %s\n"
@@@ -8415,31 -6693,25 +8508,31 @@@ msgstr "匯入憑證時出錯: %s\n
  msgid "error reading input: %s\n"
  msgstr "讀取輸入時出錯: %s\n"
  
- #: sm/keydb.c:1120 sm/keydb.c:1206
++#: sm/keydb.c:1126 sm/keydb.c:1212
  msgid "failed to get the fingerprint\n"
  msgstr "取得指紋失敗\n"
  
- #: sm/keydb.c:1162
++#: sm/keydb.c:1168
  #, c-format
  msgid "problem looking for existing certificate: %s\n"
  msgstr "查找既有憑證的問題: %s\n"
  
- #: sm/keydb.c:1174
++#: sm/keydb.c:1180
  #, c-format
  msgid "error finding writable keyDB: %s\n"
  msgstr "尋找可寫入的 keyDB 時出錯: %s\n"
  
- #: sm/keydb.c:1182
++#: sm/keydb.c:1188
  #, c-format
  msgid "error storing certificate: %s\n"
  msgstr "存放憑證時出錯: %s\n"
  
- #: sm/keydb.c:1234
++#: sm/keydb.c:1240
  #, c-format
  msgid "problem re-searching certificate: %s\n"
  msgstr "重新搜尋憑證的問題: %s\n"
  
- #: sm/keydb.c:1255 sm/keydb.c:1344
++#: sm/keydb.c:1261 sm/keydb.c:1350
  #, c-format
  msgid "error storing flags: %s\n"
  msgstr "存放旗標時出錯: %s\n"
@@@ -9296,108 -7391,84 +9389,112 @@@ msgstr "應該要有絕對檔名\n
  msgid "looking up '%s'\n"
  msgstr "正在查找 '%s'\n"
  
- #: dirmngr/dirmngr.c:148
++#: dirmngr/dirmngr.c:157
  msgid "list the contents of the CRL cache"
  msgstr "列出 CRL 快取的內容"
  
- #: dirmngr/dirmngr.c:149
++#: dirmngr/dirmngr.c:158
  msgid "|FILE|load CRL from FILE into cache"
  msgstr "|檔案|從指定檔案載入 CRL 至快取"
  
- #: dirmngr/dirmngr.c:150
++#: dirmngr/dirmngr.c:159
  msgid "|URL|fetch a CRL from URL"
  msgstr "|網址|從指定網址取得 CRL"
  
- #: dirmngr/dirmngr.c:151
++#: dirmngr/dirmngr.c:160
  msgid "shutdown the dirmngr"
  msgstr "關閉 dirmngr"
  
- #: dirmngr/dirmngr.c:152
++#: dirmngr/dirmngr.c:161
  msgid "flush the cache"
  msgstr "清除快取"
  
- #: dirmngr/dirmngr.c:167 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
++#: dirmngr/dirmngr.c:176 tools/gpgconf-comp.c:513 tools/gpgconf-comp.c:722
 +#: tools/gpgconf-comp.c:807 tools/gpgconf-comp.c:894
  msgid "|FILE|write server mode logs to FILE"
  msgstr "|檔案|將伺服器模式日誌寫入至指定檔案"
  
- #: dirmngr/dirmngr.c:168
++#: dirmngr/dirmngr.c:177
  msgid "run without asking a user"
  msgstr "以不詢問使用者的方式執行"
  
- #: dirmngr/dirmngr.c:169
++#: dirmngr/dirmngr.c:178
  msgid "force loading of outdated CRLs"
  msgstr "強迫載入過時的 CRL"
  
- #: dirmngr/dirmngr.c:170
++#: dirmngr/dirmngr.c:179
  msgid "allow sending OCSP requests"
  msgstr "允許送出 OCSP 請求"
  
- #: dirmngr/dirmngr.c:171
++#: dirmngr/dirmngr.c:181
+ msgid "allow online software version check"
+ msgstr ""
+ 
++#: dirmngr/dirmngr.c:182
  msgid "inhibit the use of HTTP"
  msgstr "避免使用 HTTP"
  
- #: dirmngr/dirmngr.c:172
++#: dirmngr/dirmngr.c:183
  msgid "inhibit the use of LDAP"
  msgstr "避免使用 LDAP"
  
- #: dirmngr/dirmngr.c:174
++#: dirmngr/dirmngr.c:185
  msgid "ignore HTTP CRL distribution points"
  msgstr "忽略 HTTP CRL 分布點"
  
- #: dirmngr/dirmngr.c:176
++#: dirmngr/dirmngr.c:187
  msgid "ignore LDAP CRL distribution points"
  msgstr "忽略 LDAP CRL 分布點"
  
- #: dirmngr/dirmngr.c:178
++#: dirmngr/dirmngr.c:189
  msgid "ignore certificate contained OCSP service URLs"
  msgstr "忽略含有 OCSP 伺服器網址的憑證"
  
- #: dirmngr/dirmngr.c:181
++#: dirmngr/dirmngr.c:192
  msgid "|URL|redirect all HTTP requests to URL"
  msgstr "|網址|重新導向所有對指定網址提出的 HTTP 請求"
  
- #: dirmngr/dirmngr.c:183
++#: dirmngr/dirmngr.c:194
  msgid "|HOST|use HOST for LDAP queries"
  msgstr "|主機|指定 LDAP 查詢主機"
  
- #: dirmngr/dirmngr.c:185
++#: dirmngr/dirmngr.c:196
  msgid "do not use fallback hosts with --ldap-proxy"
  msgstr "不要將主機備案與 --ldap-proxy 並用"
  
- #: dirmngr/dirmngr.c:188
++#: dirmngr/dirmngr.c:199
  msgid "|FILE|read LDAP server list from FILE"
  msgstr "|檔案|從指定檔案讀取 LDAP 伺服器清單"
  
- #: dirmngr/dirmngr.c:190
++#: dirmngr/dirmngr.c:201
  msgid "add new servers discovered in CRL distribution points to serverlist"
  msgstr "將從 CRL 分布點發現的新伺服器加入至伺服器清單"
  
- #: dirmngr/dirmngr.c:193 dirmngr/dirmngr_ldap.c:137
++#: dirmngr/dirmngr.c:204 dirmngr/dirmngr_ldap.c:137
  msgid "|N|set LDAP timeout to N seconds"
  msgstr "|N|把 LDAP 逾時設成 N 秒"
  
- #: dirmngr/dirmngr.c:196
++#: dirmngr/dirmngr.c:207
  msgid "|URL|use OCSP responder at URL"
  msgstr "|網址|使用位於指定網址的 OCSP 回應程式"
  
- #: dirmngr/dirmngr.c:198
++#: dirmngr/dirmngr.c:209
  msgid "|FPR|OCSP response signed by FPR"
  msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
  
- #: dirmngr/dirmngr.c:204
++#: dirmngr/dirmngr.c:215
  msgid "|N|do not return more than N items in one query"
  msgstr "|N|單次查詢不要傳回超過 N 筆項目"
  
- #: dirmngr/dirmngr.c:209
++#: dirmngr/dirmngr.c:220
  msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
  msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
  
- #: dirmngr/dirmngr.c:211
++#: dirmngr/dirmngr.c:222
  msgid "route all network traffic via Tor"
  msgstr ""
  
- #: dirmngr/dirmngr.c:228
++#: dirmngr/dirmngr.c:240
  msgid ""
  "@\n"
  "(See the \"info\" manual for a complete listing of all commands and "
@@@ -9406,11 -7477,9 +9503,11 @@@ msgstr "
  "@\n"
  "(請參照「資訊」手冊來取得所有命令和選項的完整清單)\n"
  
- #: dirmngr/dirmngr.c:340
++#: dirmngr/dirmngr.c:353
  msgid "Usage: @DIRMNGR@ [options] (-h for help)"
  msgstr "用法: @DIRMNGR@ [選項] (或用 -h 求助)"
  
- #: dirmngr/dirmngr.c:342
++#: dirmngr/dirmngr.c:355
  msgid ""
  "Syntax: @DIRMNGR@ [options] [command [args]]\n"
  "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@@ -9418,77 -7487,60 +9515,77 @@@ msgstr "
  "語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
  "@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
  
- #: dirmngr/dirmngr.c:422
++#: dirmngr/dirmngr.c:435
  #, c-format
  msgid "valid debug levels are: %s\n"
  msgstr "有效的除錯等級為: %s\n"
  
- #: dirmngr/dirmngr.c:475 tools/gpgconf.c:295 tools/gpgconf.c:329
- #: tools/gpgconf.c:400
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:543 tools/gpgconf.c:577
++#: tools/gpgconf.c:648
  #, c-format
  msgid "usage: %s [options] "
  msgstr "用法: %s [選項] "
  
- #: dirmngr/dirmngr.c:1001
++#: dirmngr/dirmngr.c:1062
  msgid "colons are not allowed in the socket name\n"
  msgstr "socket 名稱內不允許使用冒號\n"
  
- #: dirmngr/dirmngr.c:1227 dirmngr/server.c:1540
++#: dirmngr/dirmngr.c:1301 dirmngr/server.c:1585
  #, c-format
  msgid "fetching CRL from '%s' failed: %s\n"
  msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
  
- #: dirmngr/dirmngr.c:1233 dirmngr/server.c:1546
++#: dirmngr/dirmngr.c:1307 dirmngr/server.c:1591
  #, c-format
  msgid "processing CRL from '%s' failed: %s\n"
  msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
  
- #: dirmngr/dirmngr.c:1418
++#: dirmngr/dirmngr.c:1484
  #, c-format
  msgid "%s:%u: line too long - skipped\n"
  msgstr "%s:%u: 列太長 - 已跳過\n"
  
- #: dirmngr/dirmngr.c:1473 dirmngr/dirmngr.c:1557
++#: dirmngr/dirmngr.c:1539 dirmngr/dirmngr.c:1623
  #, c-format
  msgid "%s:%u: invalid fingerprint detected\n"
  msgstr "%s:%u: 偵測到無效的指紋\n"
  
- #: dirmngr/dirmngr.c:1509 dirmngr/dirmngr.c:1535
++#: dirmngr/dirmngr.c:1575 dirmngr/dirmngr.c:1601
  #, c-format
  msgid "%s:%u: read error: %s\n"
  msgstr "%s:%u: 讀取錯誤: %s\n"
  
- #: dirmngr/dirmngr.c:1564
++#: dirmngr/dirmngr.c:1630
  #, c-format
  msgid "%s:%u: garbage at end of line ignored\n"
  msgstr "%s:%u: 列尾的垃圾已忽略\n"
  
- #: dirmngr/dirmngr.c:1631
++#: dirmngr/dirmngr.c:1697
  msgid "SIGHUP received - re-reading configuration and flushing caches\n"
  msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
  
- #: dirmngr/dirmngr.c:1658
++#: dirmngr/dirmngr.c:1734
  msgid "SIGUSR2 received - no action defined\n"
  msgstr "收到 SIGUSR2 - 無定義行動\n"
  
- #: dirmngr/dirmngr.c:1663 dirmngr/dirmngr.c:1754
++#: dirmngr/dirmngr.c:1739
  msgid "SIGTERM received - shutting down ...\n"
  msgstr "收到 SIGTERM - 正在關閉 ...\n"
  
- #: dirmngr/dirmngr.c:1665
++#: dirmngr/dirmngr.c:1741
  #, c-format
  msgid "SIGTERM received - still %d active connections\n"
  msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
  
- #: dirmngr/dirmngr.c:1670 dirmngr/dirmngr.c:1757
++#: dirmngr/dirmngr.c:1746
  msgid "shutdown forced\n"
  msgstr "已強迫關閉\n"
  
- #: dirmngr/dirmngr.c:1678
++#: dirmngr/dirmngr.c:1754
  msgid "SIGINT received - immediate shutdown\n"
  msgstr "收到 SIGINT - 立即關閉\n"
  
- #: dirmngr/dirmngr.c:1685
++#: dirmngr/dirmngr.c:1761
  #, c-format
  msgid "signal %d received - no action defined\n"
  msgstr "收到訊號 %d - 無定義行動\n"
@@@ -9658,13 -7674,6 +9755,7 @@@ msgstr "'%s' 不是一個 LDAP 位址\n
  msgid "'%s' is an invalid LDAP URL\n"
  msgstr "'%s' 是無效的 LDAP 網址\n"
  
- #: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
- #: dirmngr/ldap-wrapper.c:693
- #, c-format
- msgid "error allocating memory: %s\n"
- msgstr "配置記憶體時出錯: %s\n"
- 
 +#: dirmngr/ldap-wrapper.c:207
  #, c-format
  msgid "error printing log line: %s\n"
  msgstr "印出日誌記錄列時出錯: %s\n"
@@@ -9915,76 -7872,60 +10006,76 @@@ msgstr "OCSP 回應程式傳回非當�
  msgid "OCSP responder returned an too old status\n"
  msgstr "OCSP 回應程式傳回老舊的狀態\n"
  
- #: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
++#: dirmngr/server.c:382 dirmngr/server.c:494 dirmngr/server.c:540
  #, c-format
  msgid "assuan_inquire(%s) failed: %s\n"
  msgstr "assuan_inquire(%s) 失敗: %s\n"
  
- #: dirmngr/server.c:893
++#: dirmngr/server.c:938
  msgid "ldapserver missing"
  msgstr "遺失 ldapserver"
  
- #: dirmngr/server.c:967
++#: dirmngr/server.c:1012
  msgid "serialno missing in cert ID"
  msgstr "憑證 ID 中遺失 serialno"
  
- #: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
- #: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
++#: dirmngr/server.c:1148 dirmngr/server.c:1234 dirmngr/server.c:1670
++#: dirmngr/server.c:1721 dirmngr/server.c:2213 dirmngr/server.c:2229
  #, c-format
  msgid "assuan_inquire failed: %s\n"
  msgstr "assuan_inquire 失敗: %s\n"
  
- #: dirmngr/server.c:1232
++#: dirmngr/server.c:1277
  #, c-format
  msgid "fetch_cert_by_url failed: %s\n"
  msgstr "fetch_cert_by_url 失敗: %s\n"
  
- #: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
++#: dirmngr/server.c:1289 dirmngr/server.c:1320 dirmngr/server.c:1479
  #, c-format
  msgid "error sending data: %s\n"
  msgstr "送出資料時出錯: %s\n"
  
- #: dirmngr/server.c:1382
++#: dirmngr/server.c:1427
  #, c-format
  msgid "start_cert_fetch failed: %s\n"
  msgstr "start_cert_fetch 失敗: %s\n"
  
- #: dirmngr/server.c:1415
++#: dirmngr/server.c:1460
  #, c-format
  msgid "fetch_next_cert failed: %s\n"
  msgstr "fetch_next_cert 失敗: %s\n"
  
- #: dirmngr/server.c:1442
++#: dirmngr/server.c:1487
  #, c-format
  msgid "max_replies %d exceeded\n"
  msgstr "max_replies %d 已超出\n"
  
- #: dirmngr/server.c:2366
++#: dirmngr/server.c:2463
  #, c-format
  msgid "can't allocate control structure: %s\n"
  msgstr "無法配置控制結構: %s\n"
  
- #: dirmngr/server.c:2377
++#: dirmngr/server.c:2474
  #, c-format
  msgid "failed to allocate assuan context: %s\n"
  msgstr "配置 assuan 脈絡失敗: %s\n"
  
- #: dirmngr/server.c:2398
++#: dirmngr/server.c:2495
  #, c-format
  msgid "failed to initialize the server: %s\n"
  msgstr "伺服器啟始失敗: %s\n"
  
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2503
  #, c-format
  msgid "failed to the register commands with Assuan: %s\n"
  msgstr "向 Assuan 註冊指令時失敗: %s\n"
  
- #: dirmngr/server.c:2437
++#: dirmngr/server.c:2534
  #, c-format
  msgid "Assuan accept problem: %s\n"
  msgstr "Assuan 接受問題: %s\n"
  
- #: dirmngr/server.c:2456
++#: dirmngr/server.c:2553
  #, c-format
  msgid "Assuan processing failed: %s\n"
  msgstr "Assuan 處理時失敗: %s\n"
@@@ -10026,7 -7958,6 +10117,7 @@@ msgstr "DSA 要求使用 160 位元的�
  msgid "certificate should not have been used for CRL signing\n"
  msgstr "憑證應該還未被用於 CRL 簽署\n"
  
- #: tools/gpg-connect-agent.c:78 tools/gpgconf.c:92 tools/symcryptrun.c:167
++#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:96 tools/symcryptrun.c:167
  msgid "quiet"
  msgstr "安靜模式"
  
@@@ -10194,11 -8084,9 +10285,11 @@@ msgstr "|名字|也加密給指定名�
  msgid "|SPEC|set up email aliases"
  msgstr "|SPEC|設定電子郵件別名"
  
- #: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
++#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:925
  msgid "Configuration for Keyservers"
  msgstr "金鑰伺服器組態"
  
- #: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
++#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:927
  msgid "|URL|use keyserver at URL"
  msgstr "|URL|使用位於 URL 的金鑰伺服器"
  
@@@ -10230,130 -8111,112 +10321,144 @@@ msgstr "控制著輸出格式的選項
  msgid "Options controlling the interactivity and enforcement"
  msgstr "控制著互動及強制執行的選項"
  
- #: tools/gpgconf-comp.c:915
++#: tools/gpgconf-comp.c:918
  #, fuzzy
  #| msgid "Options controlling the security"
  msgid "Options controlling the use of Tor"
  msgstr "控制著安全性的選項"
  
- #: tools/gpgconf-comp.c:929
++#: tools/gpgconf-comp.c:932
  msgid "Configuration for HTTP servers"
  msgstr "HTTP 伺服器組態"
  
- #: tools/gpgconf-comp.c:940
++#: tools/gpgconf-comp.c:943
  msgid "use system's HTTP proxy setting"
  msgstr "使用系統的 HTTP 代理伺服器設定"
  
- #: tools/gpgconf-comp.c:945
++#: tools/gpgconf-comp.c:948
  msgid "Configuration of LDAP servers to use"
  msgstr "要用的 LDAP 伺服器組態"
  
- #: tools/gpgconf-comp.c:974
++#: tools/gpgconf-comp.c:977
  msgid "LDAP server list"
  msgstr "LDAP 伺服器清單"
  
- #: tools/gpgconf-comp.c:982
++#: tools/gpgconf-comp.c:985
  msgid "Configuration for OCSP"
  msgstr "OCSP 組態"
  
- #: tools/gpgconf-comp.c:1063
- msgid "GPG for OpenPGP"
++#: tools/gpgconf-comp.c:1066
+ #, fuzzy
+ #| msgid "GPG for OpenPGP"
+ msgid "OpenPGP"
  msgstr "OpenPGP 版 GPG"
  
- #: tools/gpgconf-comp.c:1064
- msgid "GPG Agent"
- msgstr "GPG Agent"
++#: tools/gpgconf-comp.c:1067
+ msgid "Private Keys"
+ msgstr ""
  
- #: tools/gpgconf-comp.c:1065
- msgid "Smartcard Daemon"
++#: tools/gpgconf-comp.c:1068
+ #, fuzzy
+ #| msgid "Smartcard Daemon"
+ msgid "Smartcards"
  msgstr "智慧卡服務"
  
- #: tools/gpgconf-comp.c:1066
- msgid "GPG for S/MIME"
++#: tools/gpgconf-comp.c:1069
+ #, fuzzy
+ #| msgid "GPG for S/MIME"
+ msgid "S/MIME"
  msgstr "S/MIME 版 GPG"
  
- #: tools/gpgconf-comp.c:1067
- msgid "Key Acquirer"
++#: tools/gpgconf-comp.c:1070
+ msgid "Network"
  msgstr ""
  
- #: tools/gpgconf-comp.c:1068
- msgid "PIN and Passphrase Entry"
++#: tools/gpgconf-comp.c:1071
+ #, fuzzy
+ #| msgid "PIN and Passphrase Entry"
+ msgid "Passphrase Entry"
  msgstr "個人識別碼及密語項目"
  
- #: tools/gpgconf-comp.c:1182
++#: tools/gpgconf-comp.c:1225
  msgid "Component not suitable for launching"
  msgstr "元件不適合啟動"
  
- #: tools/gpgconf-comp.c:3240
++#: tools/gpgconf-comp.c:3283
  #, c-format
  msgid "External verification of component %s failed"
  msgstr "元件 %s 的外部驗證失敗"
  
- #: tools/gpgconf-comp.c:3391
++#: tools/gpgconf-comp.c:3434
  msgid "Note that group specifications are ignored\n"
  msgstr "請注意群組規格已忽略\n"
  
- #: tools/gpgconf.c:69
++#: tools/gpgconf.c:71
  msgid "list all components"
  msgstr "列出所有的元件"
  
- #: tools/gpgconf.c:70
++#: tools/gpgconf.c:72
  msgid "check all programs"
  msgstr "檢查所有的程式"
  
- #: tools/gpgconf.c:71
++#: tools/gpgconf.c:73
  msgid "|COMPONENT|list options"
  msgstr "|元件|列出選項"
  
- #: tools/gpgconf.c:72
++#: tools/gpgconf.c:74
  msgid "|COMPONENT|change options"
  msgstr "|元件|變更選項"
  
- #: tools/gpgconf.c:73
++#: tools/gpgconf.c:75
  msgid "|COMPONENT|check options"
  msgstr "|元件|檢查選項"
  
- #: tools/gpgconf.c:75
++#: tools/gpgconf.c:77
  msgid "apply global default values"
  msgstr "套用全域預設值"
  
- #: tools/gpgconf.c:77
++#: tools/gpgconf.c:79
  msgid "get the configuration directories for @GPGCONF@"
  msgstr "取得 @GPGCONF@ 的組態目錄"
  
- #: tools/gpgconf.c:79
++#: tools/gpgconf.c:81
  msgid "list global configuration file"
  msgstr "列出全域組態檔"
  
- #: tools/gpgconf.c:81
++#: tools/gpgconf.c:83
  msgid "check global configuration file"
  msgstr "檢查全域組態檔案"
  
- #: tools/gpgconf.c:82
++#: tools/gpgconf.c:85
+ #, fuzzy
+ #| msgid "update the trust database"
+ msgid "query the software version database"
+ msgstr "更新信任資料庫"
+ 
++#: tools/gpgconf.c:86
  msgid "reload all or a given component"
  msgstr "重新載入所有或給定的元件"
  
- #: tools/gpgconf.c:83
++#: tools/gpgconf.c:87
  msgid "launch a given component"
  msgstr "啟動給定的元件"
  
- #: tools/gpgconf.c:84
++#: tools/gpgconf.c:88
  msgid "kill a given component"
  msgstr "刪除給定的元件"
  
- #: tools/gpgconf.c:90
++#: tools/gpgconf.c:94
  msgid "use as output file"
  msgstr "當作輸出檔案來使用"
  
- #: tools/gpgconf.c:94
++#: tools/gpgconf.c:98
  msgid "activate changes at runtime, if possible"
  msgstr "如果可能的話, 在執行期啟用變更"
  
- #: tools/gpgconf.c:118
++#: tools/gpgconf.c:122
  msgid "Usage: @GPGCONF@ [options] (-h for help)"
  msgstr "用法: @GPGCONF@ [選項] (或用 -h 求助)"
  
- #: tools/gpgconf.c:121
++#: tools/gpgconf.c:125
  msgid ""
  "Syntax: @GPGCONF@ [options]\n"
  "Manage configuration options for tools of the @GNUPG@ system\n"
@@@ -10361,15 -8224,12 +10466,15 @@@ msgstr "
  "語法: @GPGCONF@ [選項]\n"
  "管理 @GNUPG@ 系統工具的組態選項\n"
  
- #: tools/gpgconf.c:297 tools/gpgconf.c:331
++#: tools/gpgconf.c:545 tools/gpgconf.c:579
  msgid "Need one component argument"
  msgstr "需要一個元件引數"
  
- #: tools/gpgconf.c:306 tools/gpgconf.c:343 tools/gpgconf.c:376
++#: tools/gpgconf.c:554 tools/gpgconf.c:591 tools/gpgconf.c:624
  msgid "Component not found"
  msgstr "找不到元件"
  
- #: tools/gpgconf.c:402
++#: tools/gpgconf.c:650
  msgid "No argument allowed"
  msgstr "未允許使用引數"
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list